[MediaWiki-commits] [Gerrit] operations/puppet[production]: netboot.cfg: change partman config for notebook1002

2017-12-11 Thread Elukey (Code Review) 
Elukey has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397743 )

Change subject: netboot.cfg: change partman config for notebook1002
..


netboot.cfg: change partman config for notebook1002

Bug: T181518
Change-Id: I711a9aedee507bbdea99fd92e66179ddcf081804
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 11778af..a33a71e 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -60,7 +60,7 @@
 bast4002|dns400[12]) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
 helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;; 
\
-lawrencium|notebook1001|notebook1002|tungsten|labvirt1019|labvirt1020) 
echo partman/db.cfg ;; \
+lawrencium|notebook1001|tungsten|labvirt1019|labvirt1020) echo 
partman/db.cfg ;; \
 cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg ;; \
 conf100[1-6]) echo partman/raid1-lvm-conf.cfg ;; \
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
@@ -91,7 +91,7 @@
 graphite100[13]) echo partman/graphite.cfg ;; \
 graphite1002) echo partman/graphite-dmcache.cfg ;; \
 graphite200[12]) echo partman/graphite.cfg ;; \
-kafka1013|kafka1014|kafka1020|kafka1023) echo partman/raid1-30G.cfg ;; 
\
+kafka1013|kafka1014|kafka1020|kafka1023|notebook1002) echo 
partman/raid1-30G.cfg ;; \
 kafka100[1-3]|kafka200[1-3]|stat1004) echo 
partman/raid10-gpt-srv-ext4.cfg ;; \
 kafka-jumbo100[1-6]) echo partman/kafka-jumbo.cfg ;; \
 kubernetes[12]00[1-4]|kubestage100[12]) echo partman/docker-host.cfg 
;; \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I711a9aedee507bbdea99fd92e66179ddcf081804
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
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]: Added monolingual languages per requests on Phabricator

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374052 )

Change subject: Added monolingual languages per requests on Phabricator
..


Added monolingual languages per requests on Phabricator

List of languages:
1. pyu (Puyuma)
2. trv (Seediq / Taroko)
3. uun (Pazeh)
4. bnn (Bunun)
5. pwn (Paiwan)
6. ppu (Papora / Hoanya)
7. fos (Siraya)
8. ssf (Thao)
9. ami (Amis)

Bug: T174227
Bug: T174228
Bug: T174229
Bug: T174230
Bug: T174231
Bug: T174233
Bug: T174234
Bug: T174236
Bug: T174238
Change-Id: I65f743c4a2210a25fcf870a0feb9eec24e7d8b20
---
M repo/includes/WikibaseRepo.php
1 file changed, 28 insertions(+), 0 deletions(-)

Approvals:
  Liuxinyu970226: Looks good to me, but someone else must approve
  Jon Harald Søby: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 6e69dba..9ba9f56 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1819,6 +1819,34 @@
 
// T167811
'xpu',
+
+   // T174227
+   'pyu',
+
+   // T174228
+   'trv',
+
+   // T174229
+   'uun',
+
+   // T174230
+   'bnn',
+
+   // T174231
+   'pwn',
+
+   // T174233
+   'ppu',
+
+   // T174234
+   'fos',
+
+   // T174236
+   'ssf',
+
+   // T174238
+   'ami',
+
] )
),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65f743c4a2210a25fcf870a0feb9eec24e7d8b20
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 
Gerrit-Reviewer: Ebe123 
Gerrit-Reviewer: Jon Harald Søby 
Gerrit-Reviewer: Liuxinyu970226 <541329...@qq.com>
Gerrit-Reviewer: Mbch331 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netboot.cfg: change partman config for notebook1002

2017-12-11 Thread Elukey (Code Review) 
Elukey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397743 )

Change subject: netboot.cfg: change partman config for notebook1002
..

netboot.cfg: change partman config for notebook1002

Bug: T181518
Change-Id: I711a9aedee507bbdea99fd92e66179ddcf081804
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/397743/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 11778af..a33a71e 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -60,7 +60,7 @@
 bast4002|dns400[12]) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
 helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;; 
\
-lawrencium|notebook1001|notebook1002|tungsten|labvirt1019|labvirt1020) 
echo partman/db.cfg ;; \
+lawrencium|notebook1001|tungsten|labvirt1019|labvirt1020) echo 
partman/db.cfg ;; \
 cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg ;; \
 conf100[1-6]) echo partman/raid1-lvm-conf.cfg ;; \
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
@@ -91,7 +91,7 @@
 graphite100[13]) echo partman/graphite.cfg ;; \
 graphite1002) echo partman/graphite-dmcache.cfg ;; \
 graphite200[12]) echo partman/graphite.cfg ;; \
-kafka1013|kafka1014|kafka1020|kafka1023) echo partman/raid1-30G.cfg ;; 
\
+kafka1013|kafka1014|kafka1020|kafka1023|notebook1002) echo 
partman/raid1-30G.cfg ;; \
 kafka100[1-3]|kafka200[1-3]|stat1004) echo 
partman/raid10-gpt-srv-ext4.cfg ;; \
 kafka-jumbo100[1-6]) echo partman/kafka-jumbo.cfg ;; \
 kubernetes[12]00[1-4]|kubestage100[12]) echo partman/docker-host.cfg 
;; \

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

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

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

[MediaWiki-commits] [Gerrit] operations...apertium-mk-en[master]: apertium-mk-en: Update dependency on cg3

2017-12-11 Thread KartikMistry (Code Review) 
KartikMistry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397742 )

Change subject: apertium-mk-en: Update dependency on cg3
..

apertium-mk-en: Update dependency on cg3

Bug: T171406
Change-Id: Icbeab7385cd347f98159d9e246a89cf54a108211
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-mk-en
 refs/changes/42/397742/1

diff --git a/debian/changelog b/debian/changelog
index 3050e56..eedb310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-mk-en (0.1.1~r57554-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated depends on cg3
+
+ -- Kartik Mistry   Tue, 12 Dec 2017 12:56:14 +0530
+
 apertium-mk-en (0.1.1~r57554-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index cf6f0f9..90a6f7f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -18,7 +18,10 @@
 
 Package: apertium-mk-en
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Provides: apertium-en-mk
 Conflicts: apertium-en-mk
 Description: Apertium translation data for the Macedonian-English pair

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbeab7385cd347f98159d9e246a89cf54a108211
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-mk-en
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...apertium-mk-bg[master]: apertium-mk-bg: Depends on cg3 (>= 1.0.0~r12254)

2017-12-11 Thread KartikMistry (Code Review) 
KartikMistry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397741 )

Change subject: apertium-mk-bg: Depends on cg3 (>= 1.0.0~r12254)
..

apertium-mk-bg: Depends on cg3 (>= 1.0.0~r12254)

Bug: T171406
Change-Id: Ice7bb5551ed5fbf991b7b7987bc62a0765cc38ef
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-mk-bg
 refs/changes/41/397741/1

diff --git a/debian/changelog b/debian/changelog
index 526c55a..21d2fa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-mk-bg (0.2.0~r49489-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Depends on cg3 (>= 1.0.0~r12254)
+
+ -- Kartik Mistry   Tue, 12 Dec 2017 12:45:41 +0530
+
 apertium-mk-bg (0.2.0~r49489-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index b5f4201..f448b62 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -18,7 +18,10 @@
 
 Package: apertium-mk-bg
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Provides: apertium-bg-mk
 Conflicts: apertium-bg-mk
 Description: Apertium translation data for the Macedonian-Bulgarian pair

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice7bb5551ed5fbf991b7b7987bc62a0765cc38ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-mk-bg
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/mediawiki-config[master]: db-eqiad.php: Depool db1084

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397740 )

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


db-eqiad.php: Depool db1084

Needs alter table

Bug: T174569
Change-Id: I65b28cc5c86f40ec13ab720f204b1d356868f6d0
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 9f8e426..3d3eb1f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -136,8 +136,8 @@
'db1068' => 0,   # D1 2.8TB 160GB, master
# 'db1056' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1064' => 0,   # D1 2.8TB 160GB, vslow, dump #Master for 
db1095 - new sanitarium
-   'db1081' => 300, # A2 3.6TB 512GB, api
-   'db1084' => 400, # B1 3.6TB 512GB, api
+   # 'db1081' => 300, # A2 3.6TB 512GB, api # T174569
+   'db1084' => 300, # B1 3.6TB 512GB, api # temporary lower weight 
T174569
'db1091' => 500, # D2 3.6TB 512GB
'db1097:3314' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1103:3314' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
@@ -364,7 +364,7 @@
'db1064' => 1,
],
'api' => [
-   'db1081' => 2,
+   # 'db1081' => 2,
'db1084' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65b28cc5c86f40ec13ab720f204b1d356868f6d0
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 db1084

2017-12-11 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397740 )

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

db-eqiad.php: Depool db1084

Needs alter table

Bug: T174569
Change-Id: I65b28cc5c86f40ec13ab720f204b1d356868f6d0
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 9f8e426..3d3eb1f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -136,8 +136,8 @@
'db1068' => 0,   # D1 2.8TB 160GB, master
# 'db1056' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1064' => 0,   # D1 2.8TB 160GB, vslow, dump #Master for 
db1095 - new sanitarium
-   'db1081' => 300, # A2 3.6TB 512GB, api
-   'db1084' => 400, # B1 3.6TB 512GB, api
+   # 'db1081' => 300, # A2 3.6TB 512GB, api # T174569
+   'db1084' => 300, # B1 3.6TB 512GB, api # temporary lower weight 
T174569
'db1091' => 500, # D2 3.6TB 512GB
'db1097:3314' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1103:3314' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
@@ -364,7 +364,7 @@
'db1064' => 1,
],
'api' => [
-   'db1081' => 2,
+   # 'db1081' => 2,
'db1084' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65b28cc5c86f40ec13ab720f204b1d356868f6d0
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: Depool db1055

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397739 )

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


db-eqiad.php: Depool db1055

db1055 is no longer needed as rc slave as we have the two new
multi-instance hosts in s1 serving with no problems.

Also db1055 will be rebooted to see if we can address the errors on the
PSU

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1ba636f..9f8e426 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -106,7 +106,7 @@
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
-   'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager # T178359
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
@@ -265,27 +265,27 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77f30953f1c8f87e5fcf911ca0ac00b64924d76f
Gerrit-PatchSet: 2
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 db1055

2017-12-11 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397739 )

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

db-eqiad.php: Depool db1055

db1055 is no longer needed as rc slave as we have the two new
multi-instance hosts in s1 serving with no problems.

Also db1055 will be rebooted to see if we can address the errors on the
PSU

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1ba636f..e78b0ad 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -106,7 +106,7 @@
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
-   'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager # T178359
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
@@ -265,27 +265,27 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   'db1055' => 1,
+   # 'db1055' => 1,
'db1099:3311' => 1,
'db1105:3311' => 1,
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77f30953f1c8f87e5fcf911ca0ac00b64924d76f
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] All-Projects[refs/meta/config]: Modify access rules

2017-12-11 Thread SaikrishnaS (Code Review) 
SaikrishnaS has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397738 )

Change subject: Modify access rules
..

Modify access rules

Change-Id: I2f061cb601b0497b7d87351e2b1d114a3c955d62
---
M project.config
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/All-Projects 
refs/changes/38/397738/1

diff --git a/project.config b/project.config
index 4967b0f..fa7e4fb 100644
--- a/project.config
+++ b/project.config
@@ -22,6 +22,7 @@
 [access "refs/for/refs/*"]
push = group Registered Users
pushMerge = group Registered Users
+   exclusiveGroupPermissions = push
 [access "refs/meta/config"]
label-Code-Review = -2..+2 group Administrators
label-Code-Review = -2..+2 group Project Owners
@@ -90,5 +91,3 @@
addPatchSet = group Registered Users
 [plugin "its-phabricator"]
enabled = true
-
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f061cb601b0497b7d87351e2b1d114a3c955d62
Gerrit-PatchSet: 1
Gerrit-Project: All-Projects
Gerrit-Branch: refs/meta/config
Gerrit-Owner: SaikrishnaS 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: References: back_link as object

2017-12-11 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397737 )

Change subject: References: back_link as object
..

References: back_link as object

Instead of a single string a backlink is now an object with an href and
a text field.
The content of the text field is just returns what Parsoid gives us in
the DOM but spaces are trimmed on the beginning and the end.

Bug: T182647
Change-Id: Ie0c03e1695b291d6040252f66b6d3aa4319aa939
---
M lib/references/structureReferenceListContent.js
M test/lib/references/structureReferenceListContent.test.js
2 files changed, 37 insertions(+), 25 deletions(-)


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

diff --git a/lib/references/structureReferenceListContent.js 
b/lib/references/structureReferenceListContent.js
index de1bee7..cbf6064 100644
--- a/lib/references/structureReferenceListContent.js
+++ b/lib/references/structureReferenceListContent.js
@@ -10,8 +10,11 @@
 const hasOnlyWhitespace = node =>
 node.nodeType === NodeType.TEXT_NODE && /^\s*$/.test(node.textContent);
 
-const buildBackLinkText = (element) => {
-return element.getAttribute('href');
+const buildBackLinkObject = (element) => {
+return {
+href: element.getAttribute('href'),
+text: element.textContent.trim()
+};
 };
 
 const structureBackLinks = (listItemElement, logger) => {
@@ -19,7 +22,7 @@
 const element = listItemElement.firstElementChild;
 if (element.tagName === 'A') {
 // single back link directly
-resultArray.push(buildBackLinkText(element));
+resultArray.push(buildBackLinkObject(element));
 } else if (element.tagName === 'SPAN') {
 // multiple back links inside a 
 
@@ -29,7 +32,7 @@
 for (let i = 0; i < spanChildElements.length; i++) {
 const spanChildEl = spanChildElements[i];
 if (spanChildEl.tagName === 'A') {
-resultArray.push(buildBackLinkText(spanChildEl));
+resultArray.push(buildBackLinkObject(spanChildEl));
 }
 }
 } else {
diff --git a/test/lib/references/structureReferenceListContent.test.js 
b/test/lib/references/structureReferenceListContent.test.js
index 6b8cbb4..e4e6b48 100644
--- a/test/lib/references/structureReferenceListContent.test.js
+++ b/test/lib/references/structureReferenceListContent.test.js
@@ -74,19 +74,23 @@
 it('one back link', () => {
 const doc = createDocument(simpleDogRef);
 assert.deepEqual(
-mut.unit.structureBackLinks(doc.querySelector('li'), logger), [
-'./Dog#cite_ref-101'
-]);
+mut.unit.structureBackLinks(doc.querySelector('li'), logger), 
[{
+href: './Dog#cite_ref-101',
+text: '↑'
+}]);
 assert.ok(logger.log.notCalled);
 });
 
 it('two back links', () => {
 const doc = createDocument(twoBacklinksDogRef);
 assert.deepEqual(
-mut.unit.structureBackLinks(doc.querySelector('li'), logger), [
-'./Dog#cite_ref-perri2016_13-0',
-'./Dog#cite_ref-perri2016_13-1'
-]
+mut.unit.structureBackLinks(doc.querySelector('li'), logger), 
[ {
+href: './Dog#cite_ref-perri2016_13-0',
+text: '1'
+}, {
+href: './Dog#cite_ref-perri2016_13-1',
+text: '2'
+}]
 );
 assert.ok(logger.log.notCalled);
 });
@@ -150,9 +154,10 @@
 const doc = createDocument(simpleDogRef);
 const result = 
mut.unit.buildOneReferenceItem(doc.querySelector('li'), logger);
 assert.deepEqual(result, {
-back_links: [
-'./Dog#cite_ref-101'
-],
+back_links: [ {
+"href": "./Dog#cite_ref-101",
+"text": "↑"
+}],
 content: 'some HTML',
 id: '101'
 });
@@ -163,11 +168,13 @@
 const doc = createDocument(twoBacklinksDogRef);
 const result = 
mut.unit.buildOneReferenceItem(doc.querySelector('li'), logger);
 assert.deepEqual(result, {
-back_links: [
-'./Dog#cite_ref-perri2016_13-0',
-'./Dog#cite_ref-perri2016_13-1'
-
-],
+back_links: [{
+"href": "./Dog#cite_ref-perri2016_13-0",
+"text": "1"
+}, {
+"href": "./Dog#cite_ref-perri2016_13-1",
+"text": "2"
+}],
 content: 'cite 
1more HTML',
 citations: [

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix popup direction changing when the "anchor" is partially ...

2017-12-11 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397736 )

Change subject: Fix popup direction changing when the "anchor" is partially 
offscreen
..

Fix popup direction changing when the "anchor" is partially offscreen

When the "anchor" (floatable container) is partially offscreen, and
'hideWhenOutOfView' is not disabled, the popup/menu (floatable) gets
hidden. That means we get a 0x0px box when calculating its dimensions,
which in turn means it never has to be clipped.

So, whenever we're checking whether the floatable is clipped, let's
also check if it's completely offscreen.

Bug: T182650
Change-Id: I3568f445d5354c6bedee2c532c538b5e8b64ebe2
---
M src/mixins/FloatableElement.js
M src/toolgroups/PopupToolGroup.js
M src/widgets/MenuSelectWidget.js
M src/widgets/PopupWidget.js
4 files changed, 20 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/36/397736/1

diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index c5b6da3..8003ee3 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -41,6 +41,7 @@
this.$floatableContainer = null;
this.$floatableWindow = null;
this.$floatableClosestScrollable = null;
+   this.floatableOutOfView = false;
this.onFloatableScrollHandler = this.position.bind( this );
this.onFloatableWindowResizeHandler = this.position.bind( this );
 
@@ -245,6 +246,15 @@
 };
 
 /**
+ * Check if the floatable is offscreen (not visible to the user).
+ *
+ * @return {boolean} Floatable is out of view
+ */
+OO.ui.mixin.FloatableElement.prototype.isFloatableOutOfView = function () {
+   return this.floatableOutOfView;
+}
+
+/**
  * Position the floatable below its container.
  *
  * This should only be done when both of them are attached to the DOM and 
visible.
@@ -270,7 +280,8 @@
return this;
}
 
-   if ( this.hideWhenOutOfView && !this.isElementInViewport( 
this.$floatableContainer, this.$floatableClosestScrollable ) ) {
+   this.floatableOutOfView = this.hideWhenOutOfView && 
!this.isElementInViewport( this.$floatableContainer, 
this.$floatableClosestScrollable );
+   if ( this.floatableOutOfView ) {
this.$floatable.addClass( 'oo-ui-element-hidden' );
return this;
} else {
diff --git a/src/toolgroups/PopupToolGroup.js b/src/toolgroups/PopupToolGroup.js
index 96345dd..3adf7f3 100644
--- a/src/toolgroups/PopupToolGroup.js
+++ b/src/toolgroups/PopupToolGroup.js
@@ -211,7 +211,7 @@
this.$element.addClass( 'oo-ui-popupToolGroup-active 
oo-ui-popupToolGroup-left' );
this.setFlags( { progressive: true } );
this.toggleClipping( true );
-   if ( this.isClippedHorizontally() ) {
+   if ( this.isClippedHorizontally() || 
this.isFloatableOutOfView() ) {
// Anchoring to the left caused the popup to 
clip, so anchor it to the right instead
this.toggleClipping( false );
this.$element
@@ -219,7 +219,7 @@
.addClass( 'oo-ui-popupToolGroup-right' 
);
this.toggleClipping( true );
}
-   if ( this.isClippedHorizontally() ) {
+   if ( this.isClippedHorizontally() || 
this.isFloatableOutOfView() ) {
// Anchoring to the right also caused the popup 
to clip, so just make it fill the container
containerWidth = 
this.$clippableScrollableContainer.width();
containerLeft = 
this.$clippableScrollableContainer[ 0 ] === document.documentElement ?
diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index a11d3a2..5beb7b0 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -357,11 +357,11 @@
this.togglePositioning( !!this.$floatableContainer );
this.toggleClipping( true );
 
-   if ( this.isClippedVertically() ) {
+   if ( this.isClippedVertically() || 
this.isFloatableOutOfView() ) {
// If opening the menu downwards causes it to 
be clipped, flip it to open upwards instead
belowHeight = this.$element.height();
this.setVerticalPosition( 'above' );
-   if ( this.isClippedVertically() ) {
+   if ( this.isClippedVertically() || 
this.isFloatableOutOfView() ) {
// If opening upwards also causes it to 
be clipped, flip it to open in

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: [WIP] Additional integration test features for cindy

2017-12-11 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397735 )

Change subject: [WIP] Additional integration test features for cindy
..

[WIP] Additional integration test features for cindy

WIP because the full integration with the barry script to automate
running hasn't been finished, so there is probably still more to do.

* Cindy didn't like that we were using npm dependencies that
 weren't explicitly called out. Perhaps due to a difference in
 npm version of something. Regardless it's good practice to call
 out our dependencies explicitly.
* Add a --tag=... option to request only specific tags are run.
 This can, for example, specify an or of tags with '@foo or @bar'.
 All tests except those marked frozen can be selected with "not
 @frozen". See cucumber-tag-expressions lib for more details.
* Add a configuration file specifically for mwv in labs that generates
 appropriate urls. Triggered by setting MWV_LABS_HOSTNAME environment
 variable to the hostname of the machine. ex:
 MWV_LABS_HOTSNAME=cirrus-browser-bot
* Increase max parallelism of chrome to 8. This will still be limited
 by the top level maxInstances to 1 by default (necessary when mixing
 frozen index tests with the others).
* Add a grunt cli parameter to set parallelism from the command line.

Change-Id: I4d8837b2c56b018f682429756a2ba6efd106969d
---
M Gruntfile.js
M package.json
M tests/integration/config/wdio.conf.js
A tests/integration/config/wdio.conf.mwvlabs.js
A tests/integration/log/.gitkeep
5 files changed, 50 insertions(+), 2 deletions(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index b3841f7..16637ca 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -19,6 +19,8 @@
 
if ( process.env.JENKINS_HOME ) {
WebdriverIOconfigFile = 
'./tests/integration/config/wdio.conf.jenkins.js';
+   } else if ( process.env.MWV_LABS_HOSTNAME ) {
+   WebdriverIOconfigFile = 
'./tests/integration/config/wdio.conf.mwvlabs.js';
} else {
WebdriverIOconfigFile = 
'./tests/integration/config/wdio.conf.js';
}
@@ -59,6 +61,15 @@
webdriver: {
test: {
configFile: WebdriverIOconfigFile,
+   cucumberOpts: {
+   tagExpression: ( () => {
+   return grunt.option( 'tags' );
+   )()
+   },
+   maxInstances: ( () => {
+   let max = grunt.option( 'maxInstances' 
);
+   return max ? parseInt( max, 10 ) : 1;
+   } )(),
spec: ( () => {
let spec = grunt.option( 'spec' );
if ( !spec ) {
diff --git a/package.json b/package.json
index cf4a6b3..b6855f5 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,10 @@
 "selenium": "killall -0 chromedriver 2>/dev/null || chromedriver 
--url-base=/wd/hub --port= & grunt webdriver:test; killall chromedriver"
   },
   "devDependencies": {
+"bluebird": "3.5.1",
 "chai": "^4.1.2",
 "cucumber": "^3.0.1",
+"deepmerge": "2.0.1",
 "grunt": "1.0.1",
 "grunt-banana-checker": "0.5.0",
 "grunt-contrib-jshint": "1.0.0",
@@ -21,8 +23,11 @@
 "stylelint-config-wikimedia": "0.4.1",
 "wdio-cucumber-framework": "^1.0.1",
 "webdriverio": "^4.8.0",
+"wdio-spec-reporter": "1.2.0",
+"wdio-junit-reporter": "1.1.3",
 "restify": "^6.3.4",
 "request": "^2.83.0",
-"request-promise-native": "^1.0.5"
+"request-promise-native": "^1.0.5",
+"semlog": "0.6.10"
   }
 }
diff --git a/tests/integration/config/wdio.conf.js 
b/tests/integration/config/wdio.conf.js
index 82601f7..89bb9a3 100644
--- a/tests/integration/config/wdio.conf.js
+++ b/tests/integration/config/wdio.conf.js
@@ -124,7 +124,7 @@
// maxInstances can get overwritten per capability. So if you 
have an in-house Selenium
// grid with only 5 firefox instances available you can make 
sure that not more than
// 5 instances get started at a time.
-   maxInstances: 1,
+   maxInstances: 8,
//
browserName: 'chrome',
// Since Chrome v57 
https://bugs.chromium.org/p/chromedriver/issues/detail?id=1625
diff --git a/tests/integration/config/wdio.conf.mwvlabs.js 
b/tests/integration/config/wdio.conf.mwvlabs.js
new file mode 100644
index 000..7b3a7a7
--- /dev/null
+++ b/tests/integration/config/wdio.conf.mwvlabs.js
@@ -0,0 +1,32 @@
+/*jshint esversion: 6,  node:true */
+
+/* eslint

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: drop duplicate standard include

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397734 )

Change subject: planet: drop duplicate standard include
..

planet: drop duplicate standard include

Change-Id: I3ec2e6c40e2326a26c8733725cb6cb0e57feebcb
---
M modules/planet/manifests/init.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/397734/1

diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index ab83558..7a3b9ac 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -24,7 +24,6 @@
 
 # locales are essential for planet
 # if a new language is added check these too
-include ::standard
 include ::locales::extended
 
 # things done once for all planet per languages

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: correct variable name for list of servers

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397733 )

Change subject: gerrit: correct variable name for list of servers
..

gerrit: correct variable name for list of servers

Change-Id: I6e1bfdb37415bcc061dda4f7f0934f9c3db78f4e
---
M hieradata/role/common/gerrit.yaml
M modules/profile/manifests/gerrit/server.pp
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/hieradata/role/common/gerrit.yaml 
b/hieradata/role/common/gerrit.yaml
index ffb288b..a390792 100644
--- a/hieradata/role/common/gerrit.yaml
+++ b/hieradata/role/common/gerrit.yaml
@@ -11,7 +11,7 @@
 gerrit::server::config: 'gerrit.config.erb'
 
 # list of gerrit servers used in firewall rules
-gerrit::servers:
+gerrit::server::servers:
  - cobalt.wikimedia.org
  - gerrit2001.wikimedia.org
 
diff --git a/modules/profile/manifests/gerrit/server.pp 
b/modules/profile/manifests/gerrit/server.pp
index b0175af..7780a46 100644
--- a/modules/profile/manifests/gerrit/server.pp
+++ b/modules/profile/manifests/gerrit/server.pp
@@ -8,7 +8,7 @@
 $slave_hosts = hiera('gerrit::server::slave_hosts'),
 $master_host = hiera('gerrit::server::master_host'),
 $bacula = hiera('gerrit::server::bacula'),
-$gerrit_servers = join(hiera('gerrit::servers'), ' '),
+$gerrit_servers = join(hiera('gerrit::server::servers'), ' '),
 $config = hiera('gerrit::server::config'),
 ) {
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga::nsca: drop system::role not in role class

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397732 )

Change subject: icinga::nsca: drop system::role not in role class
..

icinga::nsca: drop system::role not in role class

Change-Id: I01b14f334e269866efb7c45382c1884f286126de
---
M modules/icinga/manifests/nsca/daemon.pp
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/modules/icinga/manifests/nsca/daemon.pp 
b/modules/icinga/manifests/nsca/daemon.pp
index a82e1aa..aabd594 100644
--- a/modules/icinga/manifests/nsca/daemon.pp
+++ b/modules/icinga/manifests/nsca/daemon.pp
@@ -4,8 +4,6 @@
 # results from hosts
 class icinga::nsca::daemon {
 
-system::role { 'icinga::nsca::daemon': description => 'Nagios Service 
Checks Acceptor Daemon' }
-
 package { 'nsca':
 ensure => 'present',
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: pentest::tools: add missing system::role

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397731 )

Change subject: pentest::tools: add missing system::role
..

pentest::tools: add missing system::role

Change-Id: I4a2c325787ae723c6a36c25265bf3a6347ca1c4e
---
M modules/role/manifests/pentest/tools.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/397731/1

diff --git a/modules/role/manifests/pentest/tools.pp 
b/modules/role/manifests/pentest/tools.pp
index 319abe6..fe5fb1b 100644
--- a/modules/role/manifests/pentest/tools.pp
+++ b/modules/role/manifests/pentest/tools.pp
@@ -1,5 +1,9 @@
 # T118763
 class role::pentest::tools {
+
+system::role { 'pentest::tools':
+description => 'VM for use in penetration testing',
+}
 
 require_package('nmap')
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: move Hiera calls into parameters

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397730 )

Change subject: aptrepo: move Hiera calls into parameters
..

aptrepo: move Hiera calls into parameters

Change-Id: I154a6d41fbbcd4323ab7d9fa60ef195b0470c822
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 4 insertions(+), 5 deletions(-)


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

diff --git a/modules/aptrepo/manifests/rsync.pp 
b/modules/aptrepo/manifests/rsync.pp
index 1e796fd..877fb40 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -1,10 +1,9 @@
 # sets up rsync of APT repos between 2 servers
 # activates rsync for push from the primary to secondary
-class aptrepo::rsync {
-
-$primary_server = hiera('install_server', 'install1002.wikimedia.org')
-$secondary_server = hiera('install_server_failover', 
'install2002.wikimedia.org')
-
+class aptrepo::rsync (
+$primary_server = hiera('install_server'),
+$secondary_server = hiera('install_server_failover'),
+){
 # only activate rsync/firewall hole on the server that is NOT active
 if $::fqdn == $primary_server {
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: add some missing Hiera calls for parameters

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397729 )

Change subject: planet: add some missing Hiera calls for parameters
..

planet: add some missing Hiera calls for parameters

Change-Id: If05cfb26d9980306b45de9d93aa930bda0efaac0
---
M hieradata/role/common/planet_server.yaml
M modules/profile/manifests/planet/venus.pp
2 files changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/hieradata/role/common/planet_server.yaml 
b/hieradata/role/common/planet_server.yaml
index a5e57bb..faa111c 100644
--- a/hieradata/role/common/planet_server.yaml
+++ b/hieradata/role/common/planet_server.yaml
@@ -1,3 +1,5 @@
 cluster: misc
-planet_domain_name: 'wikimedia.org'
 standard::has_ganglia: false
+profile::planet::venus::planet_domain_name: 'wikimedia.org'
+profile::planet::venus::planet_meta_link: 
'meta.wikimedia.org/wiki/Planet_Wikimedia'
+profile::planet::venus::planet_http_proxy: 
'http://url-downloader.${::site}.wikimedia.org:8080'
diff --git a/modules/profile/manifests/planet/venus.pp 
b/modules/profile/manifests/planet/venus.pp
index 4e2a6cf..ea260c4 100644
--- a/modules/profile/manifests/planet/venus.pp
+++ b/modules/profile/manifests/planet/venus.pp
@@ -12,8 +12,8 @@
 #
 class profile::planet::venus (
 $planet_domain_name = hiera('planet_domain_name'),
-$planet_meta_link = 'meta.wikimedia.org/wiki/Planet_Wikimedia',
-$planet_http_proxy = "http://url-downloader.${::site}.wikimedia.org:8080;,
+$planet_meta_link = hiera('planet_meta_link'),
+$planet_http_proxy = hiera('planet_http_proxy'),
 $planet_languages = {
 ar => {
 'subscribe' => '',

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mirrors: move standard include out of site

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397728 )

Change subject: mirrors: move standard include out of site
..

mirrors: move standard include out of site

Change-Id: Ie204128ba6ea47223e520eaa630f3b932eeaf311
---
M manifests/site.pp
M modules/role/manifests/mirrors.pp
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/397728/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 10d8be1..c0b32ef 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2141,8 +2141,6 @@
 
 node 'sodium.wikimedia.org' {
 role(mirrors)
-include ::standard
-
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/mirrors.pp 
b/modules/role/manifests/mirrors.pp
index 5af8128..7dea485 100644
--- a/modules/role/manifests/mirrors.pp
+++ b/modules/role/manifests/mirrors.pp
@@ -7,6 +7,7 @@
 description => 'Mirrors server',
 }
 
+include ::standard
 include mirrors::serve
 include mirrors::tails
 include ::profile::base::firewall

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: move duplicate firewall/standard include

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397727 )

Change subject: prometheus: move duplicate firewall/standard include
..

prometheus: move duplicate firewall/standard include

Change-Id: I2421f6c9236160438d43d929e9ea616aad00c3a1
---
M manifests/site.pp
M modules/role/manifests/prometheus/global.pp
2 files changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 10d8be1..6679931 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1966,8 +1966,6 @@
 role(prometheus::ops, prometheus::global, prometheus::services, 
prometheus::analytics,
   prometheus::k8s)
 
-include ::base::firewall
-include ::standard
 include ::lvs::realserver
 
 interface::add_ip6_mapped { 'main': }
diff --git a/modules/role/manifests/prometheus/global.pp 
b/modules/role/manifests/prometheus/global.pp
index a1302c0..8476659 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -3,6 +3,7 @@
 description => 'Prometheus server (global)',
 }
 
+include ::standard
 include ::base::firewall
 
 # Pull selected metrics from all DC-local Prometheus servers.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: druid: move firewall includes from site to roles

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397726 )

Change subject: druid: move firewall includes from site to roles
..

druid: move firewall includes from site to roles

Change-Id: I980010842b69e5d848dff6d989fdd30c63737217
---
M manifests/site.pp
M modules/role/manifests/druid/analytics/worker.pp
M modules/role/manifests/druid/public/worker.pp
3 files changed, 2 insertions(+), 6 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 10d8be1..c83870c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -738,9 +738,6 @@
 # https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
 node /^druid100[123].eqiad.wmnet$/ {
 role(druid::analytics::worker)
-
-include ::base::firewall
-include ::standard
 }
 
 # Druid public-eqiad servers.
@@ -748,9 +745,6 @@
 # https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
 node /^druid100[456].eqiad.wmnet$/ {
 role(druid::public::worker)
-
-include ::base::firewall
-include ::standard
 }
 
 # nfs server for dumps generation, also rsyncs
diff --git a/modules/role/manifests/druid/analytics/worker.pp 
b/modules/role/manifests/druid/analytics/worker.pp
index 9f03d55..da3b17f 100644
--- a/modules/role/manifests/druid/analytics/worker.pp
+++ b/modules/role/manifests/druid/analytics/worker.pp
@@ -8,6 +8,7 @@
 description => "Druid worker in the analytics-${::site} cluster",
 }
 
+include ::profile::base::firewall
 include ::profile::druid::broker
 include ::profile::druid::coordinator
 include ::profile::druid::historical
diff --git a/modules/role/manifests/druid/public/worker.pp 
b/modules/role/manifests/druid/public/worker.pp
index b24226e..18c5bd5 100644
--- a/modules/role/manifests/druid/public/worker.pp
+++ b/modules/role/manifests/druid/public/worker.pp
@@ -8,6 +8,7 @@
 
 class { '::lvs::realserver': }
 
+include ::profile::base::firewall
 include ::profile::druid::broker
 include ::profile::druid::coordinator
 include ::profile::druid::historical

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb::tendril: move firewall to role, use profile

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397725 )

Change subject: mariadb::tendril: move firewall to role, use profile
..

mariadb::tendril: move firewall to role, use profile

Change-Id: I9dd2d43b3f9cc374e4fabe06face8fd9252bd558
---
M manifests/site.pp
M modules/role/manifests/mariadb/tendril.pp
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/397725/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 10d8be1..437ace0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -616,7 +616,6 @@
 # tendril db
 node 'db1011.eqiad.wmnet' {
 role(mariadb::tendril)
-include ::base::firewall
 }
 
 node 'dbstore1001.eqiad.wmnet' {
diff --git a/modules/role/manifests/mariadb/tendril.pp 
b/modules/role/manifests/mariadb/tendril.pp
index 84f9b79..1ad8801 100644
--- a/modules/role/manifests/mariadb/tendril.pp
+++ b/modules/role/manifests/mariadb/tendril.pp
@@ -5,6 +5,8 @@
 description => 'tendril database server',
 }
 
+include ::profile::base::firewall
+
 include mariadb::packages_wmf
 include mariadb::service
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Update en/i18n message for multiple-unclosed-formatting-tags

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397705 )

Change subject: Update en/i18n message for multiple-unclosed-formatting-tags
..


Update en/i18n message for multiple-unclosed-formatting-tags

* On the Parsoid side, we update the use of this linter category
  for more than small and big tags.

Change-Id: I55ac9e3cc16135ac4e353a03d4d9223a599b58b8
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index c25c1b5..e6a9b10 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -22,7 +22,7 @@
"linter-pager-tidy-whitespace-bug-details": "Tidy whitespace bug",
"linter-pager-html5-misnesting-details": "Misnesting in HTML5 (but not 
in Tidy)",
"linter-pager-tidy-font-bug-details": "Font tag changes link color in 
Tidy but won't in HTML5",
-   "linter-pager-multiple-unclosed-formatting-tags-details": "Multiple 
unclosed small or big tags on the page",
+   "linter-pager-multiple-unclosed-formatting-tags-details": "Multiple 
unclosed formatting tags on the page",
"linter-pager-unclosed-quotes-in-heading-details": "Unclosed quote 
which leaks out of the table of contents",
"linter-pager-multiline-html-table-in-list-details": "Multiline HTML5 
table inside a list, rendered differently in HTML5 and Tidy",
"linter-pager-misc-tidy-replacement-issues-details": "Miscellaneous 
markup errors affecting Tidy replacement",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55ac9e3cc16135ac4e353a03d4d9223a599b58b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
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...ContentTranslation[master]: Guard against js errors for invalid/corrupted(?) templates

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397408 )

Change subject: Guard against js errors for invalid/corrupted(?) templates
..


Guard against js errors for invalid/corrupted(?) templates

This just prevents a potential js error when a templates data-mw
has no parts attribute, which I had assumed impossible.

I tried to reproduce the issue, but failed.

Bug: T182528
Change-Id: I68f42397aec336af84f568b51c71ef62e85d7957
---
M modules/tools/ext.cx.tools.template.js
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index 13e4d0d..e36d248 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -68,6 +68,11 @@
}
}
 
+   if ( !mwData.parts ) {
+   mw.log( '[CX] data-mw for Template#' + 
this.$template.attr( 'id' ) + ' has no parts.' );
+   return $.Deferred().reject().promise();
+   }
+
if ( mwData.parts.length > 1 ) {
mw.log( '[CX] Skipping multipart template for now for 
Template#' + this.$template.attr( 'id' ) );
return $.Deferred().reject().promise();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68f42397aec336af84f568b51c71ef62e85d7957
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Nikerabbit 
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]: Convert includes/Feed.php to Mustache templates

2017-12-11 Thread Pppery (Code Review) 
Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397724 )

Change subject: Convert includes/Feed.php to Mustache templates
..

Convert includes/Feed.php to Mustache templates

Bug: T182212
Change-Id: Ic198efb6a46ecc2d8b8b49ab594205d69a03efdb
---
M includes/Feed.php
A includes/templates/AtomHeader.mustache
A includes/templates/AtomItem.mustache
A includes/templates/RSSHeader.mustache
A includes/templates/RSSItem.mustache
5 files changed, 174 insertions(+), 86 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/397724/1

diff --git a/includes/Feed.php b/includes/Feed.php
index 35f2ce9..bcaf8a7 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -86,11 +86,16 @@
/**
 * Get the unique id of this item
 *
+* @param bool $escape Whether to xml-encode the returned string
 * @return string
 */
-   public function getUniqueId() {
+   public function getUniqueId( $escape = true ) {
if ( $this->uniqueId ) {
-   return $this->xmlEncode( wfExpandUrl( $this->uniqueId, 
PROTO_CURRENT ) );
+   $result = wfExpandUrl( $this->uniqueId, PROTO_CURRENT );
+   if ( $escape ) {
+   $result = $this->xmlEncode( $result );
+   }
+   return $result;
}
}
 
@@ -106,30 +111,45 @@
}
 
/**
-* Get the title of this item; already xml-encoded
+* Get the title of this item
 *
+* @param bool $escape Whether to xml-encode the returned string
 * @return string
 */
-   public function getTitle() {
-   return $this->xmlEncode( $this->title );
+   public function getTitle( $escape = true ) {
+   $title = $this->title;
+   if ( $escape ) {
+   $title = $this->xmlEncode( $title );
+   }
+   return $title;
}
 
/**
-* Get the URL of this item; already xml-encoded
+* Get the URL of this item
 *
+* @param bool $escape Whether to xml-encode the returned string
 * @return string
 */
-   public function getUrl() {
-   return $this->xmlEncode( $this->url );
+   public function getUrl( $escape = true ) {
+   $url = $this->url;
+   if ( $escape ) {
+   $url = $this->xmlEncode( $url );
+   }
+   return $url;
}
 
/**
-* Get the description of this item; already xml-encoded
+* Get the description of this item
 *
+* @param bool $escape Whether to xml-encode the returned string
 * @return string
 */
-   public function getDescription() {
-   return $this->xmlEncode( $this->description );
+   public function getDescription( $escape = true ) {
+   $desc = $this->description;
+   if ( $escape ) {
+   $desc = $this->xmlEncode( $desc );
+   }
+   return $desc;
}
 
/**
@@ -145,28 +165,43 @@
/**
 * Get the date of this item
 *
+* @param bool $escape Whether to xml-encode the returned string
 * @return string
 */
-   public function getDate() {
-   return $this->date;
+   public function getDate( $escape = true ) {
+   $date = $this->date;
+   if ( $escape ) {
+   $date = $this->xmlEncode( $date );
+   }
+   return $date;
}
 
/**
-* Get the author of this item; already xml-encoded
+* Get the author of this item
 *
+* @param bool $escape Whether to xml-encode the returned string
 * @return string
 */
-   public function getAuthor() {
-   return $this->xmlEncode( $this->author );
+   public function getAuthor( $escape = true ) {
+   $author = $this->author;
+   if ( $escape ) {
+   $author = $this->xmlEncode( $author );
+   }
+   return $author;
}
 
/**
-* Get the comment of this item; already xml-encoded
+* Get the comment of this item
 *
+* @param bool $escape Whether to xml-encode the returned string
 * @return string
 */
-   public function getComments() {
-   return $this->xmlEncode( $this->comments );
+   public function getComments( $escape = true ) {
+   $comments = $this->comments;
+   if ( $escape ) {
+   $comments = $this->xmlEncode( $comments );
+   }
+   return $comments;
}
 
/**
@@ -187,6

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bird anycast: add anycast_healthchecker

2017-12-11 Thread Ayounsi (Code Review) 
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397723 )

Change subject: Bird anycast: add anycast_healthchecker
..

Bird anycast: add anycast_healthchecker

Still a few points to clarify but the most part is there, reviews welcome.

https://github.com/unixsurfer/anycast_healthchecker

To be merged after:
- https://gerrit.wikimedia.org/r/#/c/397615/
- https://gerrit.wikimedia.org/r/#/c/397619/
- Packages moved to the apt repository

Change-Id: Iab13114b8268c48502cd5161629bec72ddc51fdc
---
A modules/bird/manifests/anycast_healthchecker.pp
A modules/bird/manifests/anycast_healthchecker_check.pp
A modules/bird/templates/anycast-healthchecker-check.conf.erb
A modules/bird/templates/anycast-healthchecker.conf.erb
A modules/bird/templates/anycast-healthchecker.service.erb
M modules/bird/templates/bird_anycast.conf.erb
M modules/profile/manifests/bird/anycast.pp
7 files changed, 166 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/397723/1

diff --git a/modules/bird/manifests/anycast_healthchecker.pp 
b/modules/bird/manifests/anycast_healthchecker.pp
new file mode 100644
index 000..53b6c02
--- /dev/null
+++ b/modules/bird/manifests/anycast_healthchecker.pp
@@ -0,0 +1,64 @@
+# == Class: bird::anycast_healthchecker
+#
+# Install and configure the base of anycast_healthchecker
+# https://github.com/unixsurfer/anycast_healthchecker
+#
+# - Global configuration file
+# - pid directory
+# - Services checks directory
+# - Log directory
+# - systemd service
+#
+# The actual services checks are configured with 
bird::anycast_healthchecker_check
+#
+#
+class bird::anycast_healthchecker(){
+
+  require_package('python-anycast-healthchecker')
+
+  file { '/etc/anycast-healthchecker.conf':
+  ensure  => present,
+  owner   => 'bird',
+  group   => 'bird',
+  mode=> '0664',
+  content => template('bird/anycast-healthchecker.conf.erb'),
+  }
+
+  file {'/var/run/anycast-healthchecker/':
+  ensure => directory,
+  owner  => 'bird',
+  group  => 'bird',
+  mode   => '0775',
+  }
+
+  file {'/etc/anycast-healthchecker.d/':
+  ensure => directory,
+  owner  => 'bird',
+  group  => 'bird',
+  mode   => '0775',
+  }
+
+  file {'/var/log/anycast-healthchecker/':
+  ensure => directory,
+  owner  => 'bird',
+  group  => 'bird',
+  mode   => '0775',
+  }
+
+  systemd::service { 'anycast-healthchecker':
+  ensure  => present,
+  content => template('bird/anycast-healthchecker.service.erb'),
+  require => [File['/etc/anycast-healthchecker.conf'],
+  File['/var/run/anycast-healthchecker/'],
+  File['/var/log/anycast-healthchecker/'],
+  File['/etc/anycast-healthchecker.d/'], ],
+  }
+
+  service { 'anycast-healthchecker':
+  ensure  => running,
+  enable  => true,
+  require => [Package['python-anycast-healthchecker'],
+  Systemd::Service['anycast-healthchecker'] ],
+  }
+
+}
diff --git a/modules/bird/manifests/anycast_healthchecker_check.pp 
b/modules/bird/manifests/anycast_healthchecker_check.pp
new file mode 100644
index 000..05d215f
--- /dev/null
+++ b/modules/bird/manifests/anycast_healthchecker_check.pp
@@ -0,0 +1,30 @@
+# == Class: bird::anycast_healthchecker_check
+#
+# Add service health check for anycast_healthchecker
+#
+# === Parameters
+#
+# [*ensure*]
+#  Standard file ensure
+#
+# [*anycast_vip*]
+#  The VIP being monitored with this check
+#
+# [*check_cmd*]
+#  The full health check command for this VIP
+#
+class bird::anycast_healthchecker_check(
+  $ensure,
+  $anycast_vip,
+  $check_cmd,
+  ){
+
+  file { "/etc/anycast-healthchecker.d/${title}.conf":
+  ensure  => $ensure,
+  owner   => 'bird',
+  group   => 'bird',
+  mode=> '0664',
+  content => template('bird/anycast-healthchecker-check.conf.erb'),
+  notify  => Service['anycast-healthchecker'],
+  }
+}
diff --git a/modules/bird/templates/anycast-healthchecker-check.conf.erb 
b/modules/bird/templates/anycast-healthchecker-check.conf.erb
new file mode 100644
index 000..4ba5445
--- /dev/null
+++ b/modules/bird/templates/anycast-healthchecker-check.conf.erb
@@ -0,0 +1,9 @@
+[<%= @title %>]
+check_cmd = <%= @check_cmd %>
+check_interval= 1
+check_timeout = 1
+check_fail= 1
+check_rise= 10
+check_disabled= false
+on_disabled   = withdraw
+ip_prefix = <%= @anycast_vip %>/32
diff --git a/modules/bird/templates/anycast-healthchecker.conf.erb 
b/modules/bird/templates/anycast-healthchecker.conf.erb
new file mode 100644
index 000..7a2682d
--- /dev/null
+++ b/modules/bird/templates/anycast-healthchecker.conf.erb
@@ -0,0 +1,27 @@
+[DEFAULT]
+interface= lo
+
+[daemon]
+pidfile= 
/var/run/anycast-healthchecker/anycast-healthchecker.pid
+ipv4

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Switch to using a PSR-4 autoloader

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397722 )

Change subject: Switch to using a PSR-4 autoloader
..


Switch to using a PSR-4 autoloader

Change-Id: Iea8f1348f7911e0e094a40db2e9dbe294e8dbe7f
---
M extension.json
1 file changed, 2 insertions(+), 12 deletions(-)

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



diff --git a/extension.json b/extension.json
index d5a48d1..230c712 100644
--- a/extension.json
+++ b/extension.json
@@ -9,18 +9,8 @@
],
"descriptionmsg": "linter-desc",
"type": "specialpage",
-   "AutoloadClasses": {
-   "MediaWiki\\Linter\\CategoryManager": 
"includes/CategoryManager.php",
-   "MediaWiki\\Linter\\Hooks": "includes/Hooks.php",
-   "MediaWiki\\Linter\\Database": "includes/Database.php",
-   "MediaWiki\\Linter\\LintError": "includes/LintError.php",
-   "MediaWiki\\Linter\\ApiRecordLint": 
"includes/ApiRecordLint.php",
-   "MediaWiki\\Linter\\ApiQueryLintErrors": 
"includes/ApiQueryLintErrors.php",
-   "MediaWiki\\Linter\\ApiQueryLinterStats": 
"includes/ApiQueryLinterStats.php",
-   "MediaWiki\\Linter\\RecordLintJob": 
"includes/RecordLintJob.php",
-   "MediaWiki\\Linter\\SpecialLintErrors": 
"includes/SpecialLintErrors.php",
-   "MediaWiki\\Linter\\LintErrorsPager": 
"includes/LintErrorsPager.php",
-   "MediaWiki\\Linter\\TotalsLookup": "includes/TotalsLookup.php"
+   "AutoloadNamespaces": {
+   "MediaWiki\\Linter\\": "includes/"
},
"MessagesDirs": {
"Linter": "i18n"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea8f1348f7911e0e094a40db2e9dbe294e8dbe7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Switch to using a PSR-4 autoloader

2017-12-11 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397722 )

Change subject: Switch to using a PSR-4 autoloader
..

Switch to using a PSR-4 autoloader

Change-Id: Iea8f1348f7911e0e094a40db2e9dbe294e8dbe7f
---
M extension.json
1 file changed, 2 insertions(+), 12 deletions(-)


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

diff --git a/extension.json b/extension.json
index d5a48d1..230c712 100644
--- a/extension.json
+++ b/extension.json
@@ -9,18 +9,8 @@
],
"descriptionmsg": "linter-desc",
"type": "specialpage",
-   "AutoloadClasses": {
-   "MediaWiki\\Linter\\CategoryManager": 
"includes/CategoryManager.php",
-   "MediaWiki\\Linter\\Hooks": "includes/Hooks.php",
-   "MediaWiki\\Linter\\Database": "includes/Database.php",
-   "MediaWiki\\Linter\\LintError": "includes/LintError.php",
-   "MediaWiki\\Linter\\ApiRecordLint": 
"includes/ApiRecordLint.php",
-   "MediaWiki\\Linter\\ApiQueryLintErrors": 
"includes/ApiQueryLintErrors.php",
-   "MediaWiki\\Linter\\ApiQueryLinterStats": 
"includes/ApiQueryLinterStats.php",
-   "MediaWiki\\Linter\\RecordLintJob": 
"includes/RecordLintJob.php",
-   "MediaWiki\\Linter\\SpecialLintErrors": 
"includes/SpecialLintErrors.php",
-   "MediaWiki\\Linter\\LintErrorsPager": 
"includes/LintErrorsPager.php",
-   "MediaWiki\\Linter\\TotalsLookup": "includes/TotalsLookup.php"
+   "AutoloadNamespaces": {
+   "MediaWiki\\Linter\\": "includes/"
},
"MessagesDirs": {
"Linter": "i18n"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea8f1348f7911e0e094a40db2e9dbe294e8dbe7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: Rename classes to match file names

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396599 )

Change subject: Rename classes to match file names
..


Rename classes to match file names

Change-Id: I39c60b2d059d1cb2c1c0d3a4206232d961536697
---
M .phpcs.xml
R CheckUserHooks.php
M api/ApiQueryCheckUser.php
M extension.json
M maintenance/purgeOldData.php
M specials/SpecialCheckUser.php
R tests/phpunit/SpecialCheckUserTest.php
7 files changed, 20 insertions(+), 19 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 68a2c86..124ea83 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,8 +7,9 @@



-   
-   
+   
+   
+   */maintenance/*


CheckUser\.alias\.php
diff --git a/CheckUser.hooks.php b/CheckUserHooks.php
similarity index 100%
rename from CheckUser.hooks.php
rename to CheckUserHooks.php
diff --git a/api/ApiQueryCheckUser.php b/api/ApiQueryCheckUser.php
index de9d53f..8d3e0e7 100644
--- a/api/ApiQueryCheckUser.php
+++ b/api/ApiQueryCheckUser.php
@@ -90,7 +90,7 @@
$resultIPs[] = $data;
}
 
-   CheckUser::addLogEntry( 'userips', 'user', 
$target, $reason, $user_id );
+   SpecialCheckUser::addLogEntry( 'userips', 
'user', $target, $reason, $user_id );
$result->addValue( [
'query', $this->getModuleName() ], 
'userips', $resultIPs );
$result->addIndexedTagName( [
@@ -99,7 +99,7 @@
 
case 'edits':
if ( IP::isIPAddress( $target ) ) {
-   $cond = CheckUser::getIpConds( $db, 
$target, isset( $xff ) );
+   $cond = SpecialCheckUser::getIpConds( 
$db, $target, isset( $xff ) );
if ( !$cond ) {
if ( is_callable( [ $this, 
'dieWithError' ] ) ) {
$this->dieWithError( 
'apierror-badip', 'invalidip' );
@@ -162,7 +162,7 @@
$edits[] = $edit;
}
 
-   CheckUser::addLogEntry( $log_type[0], 
$log_type[1],
+   SpecialCheckUser::addLogEntry( $log_type[0], 
$log_type[1],
$target, $reason, isset( $user_id ) ? 
$user_id : '0' );
$result->addValue( [
'query', $this->getModuleName() ], 
'edits', $edits );
@@ -172,7 +172,7 @@
 
case 'ipusers':
if ( IP::isIPAddress( $target ) ) {
-   $cond = CheckUser::getIpConds( $db, 
$target, isset( $xff ) );
+   $cond = SpecialCheckUser::getIpConds( 
$db, $target, isset( $xff ) );
$this->addWhere( $cond );
$log_type = 'ipusers';
if ( isset( $xff ) ) {
@@ -224,7 +224,7 @@
$resultUsers[] = $userData;
}
 
-   CheckUser::addLogEntry( $log_type, 'ip', 
$target, $reason );
+   SpecialCheckUser::addLogEntry( $log_type, 'ip', 
$target, $reason );
$result->addValue( [
'query', $this->getModuleName() ], 
'ipusers', $resultUsers );
$result->addIndexedTagName( [
diff --git a/extension.json b/extension.json
index 4ecf9ce..efc162a 100644
--- a/extension.json
+++ b/extension.json
@@ -105,13 +105,13 @@
"checkuser-log"
],
"SpecialPages": {
-   "CheckUser": "CheckUser",
+   "CheckUser": "SpecialCheckUser",
"CheckUserLog": "SpecialCheckUserLog"
},
"AutoloadClasses": {
-   "CheckUser": "specials/SpecialCheckUser.php",
-   "CheckUserHooks": "CheckUser.hooks.php",
+   "CheckUserHooks": "CheckUserHooks.php",
"CheckUserLogPager": "CheckUserLogPager.php",
+   "SpecialCheckUser": "specials/SpecialCheckUser.php",
"SpecialCheckUserLog": "specials/SpecialCheckUserLog.php",
"CheckUserEncryptedData": "CheckUserEncryptedData.php",
"ApiQueryCheckUser": "api/ApiQueryCheckUser.php",
diff --git

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: On this day event text not shown fully

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397703 )

Change subject: On this day event text not shown fully
..


On this day event text not shown fully

- Removed the 5 line max limit on the event text.

Bug: T182593
Change-Id: I917848d6074d06ee3292dc90240734525060e7d1
---
M app/src/main/res/layout/view_on_this_day_event.xml
1 file changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/app/src/main/res/layout/view_on_this_day_event.xml 
b/app/src/main/res/layout/view_on_this_day_event.xml
index d162e01..41bc11a 100644
--- a/app/src/main/res/layout/view_on_this_day_event.xml
+++ b/app/src/main/res/layout/view_on_this_day_event.xml
@@ -94,15 +94,13 @@
 android:id="@+id/text"
 android:layout_width="wrap_content"
 android:layout_height="wrap_content"
-android:layout_marginStart="19dp"
-android:layout_marginEnd="12dp"
-android:layout_marginTop="2dp"
 android:layout_marginBottom="2dp"
+android:layout_marginEnd="12dp"
+android:layout_marginStart="19dp"
+android:layout_marginTop="2dp"
 android:lineSpacingExtra="8sp"
-android:textSize="16sp"
 android:textColor="?attr/primary_text_color"
-android:maxLines="5"
-android:ellipsize="end"
+android:textSize="16sp"
 tools:text="Thomas Edison films American sharpshooter Annie Oakley, 
which is instrumental in her hiring by Buffalo Bill for his Wild West Show." />
 
 https://gerrit.wikimedia.org/r/397703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I917848d6074d06ee3292dc90240734525060e7d1
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sharvaniharan 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove manual firejailing of Score binaries

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394913 )

Change subject: Remove manual firejailing of Score binaries
..


Remove manual firejailing of Score binaries

As of d333ae89df, this is now done by MediaWiki/Score itself.

Bug: T181535
Change-Id: I481d7918d53569d47e30f169a2ad72ed29fb3b87
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 479f817..c5e4695 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1096,9 +1096,6 @@
 if ( $wmgUseScore ) {
wfLoadExtension( 'Score' );
$wgScoreSafeMode = false;
-   $wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
-   $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
-   $wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I481d7918d53569d47e30f169a2ad72ed29fb3b87
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Have ExtensionDistributor treat REL1_30 as stable

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397719 )

Change subject: Have ExtensionDistributor treat REL1_30 as stable
..


Have ExtensionDistributor treat REL1_30 as stable

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3bc58e3..479f817 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -999,10 +999,10 @@
];
 
// Current stable release
-   $wgExtDistDefaultSnapshot = 'REL1_29';
+   $wgExtDistDefaultSnapshot = 'REL1_30';
 
// Current development snapshot
-   $wgExtDistCandidateSnapshot = 'REL1_30';
+   // $wgExtDistCandidateSnapshot = 'REL1_31';
 
// Available snapshots
$wgExtDistSnapshotRefs = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9672c1cf8c5083c985afe95516af86f819a9f417
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Enable using PSR-4 autoloader for MediaWiki core and extensions

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373626 )

Change subject: Enable using PSR-4 autoloader for MediaWiki core and extensions
..


Enable using PSR-4 autoloader for MediaWiki core and extensions

This adds support for a PSR-4 ()
autoloader, so instead of needing to manually list each class, just the
namespace prefix is needed.

Extensions can set a "AutoloadNamespaces" property in extension.json to
register PSR-4 compatible namespaces to be autoloaded.

The implementation is based off of the example implementation
() with some modifications
for performance, notably cutting down on function calls, and only trying
to look up classes that are namespaced.

The generateLocalAutoload.php script will ignore any directory that is
registered as a PSR-4 namespace.

Bug: T99865
Bug: T173799
Change-Id: Id095dde37cbb40aa424fb628bd3c94e684ca2f65
---
M autoload.php
M docs/extension.schema.v1.json
M docs/extension.schema.v2.json
M includes/AutoLoader.php
M includes/registration/ExtensionRegistry.php
M includes/utils/AutoloadGenerator.php
M maintenance/generateLocalAutoload.php
M tests/phpunit/structure/AutoLoaderTest.php
8 files changed, 112 insertions(+), 17 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 2661fd7..988701d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -892,9 +892,6 @@
'MediaWiki\\Languages\\Data\\CrhExceptions' => __DIR__ . 
'/languages/data/CrhExceptions.php',
'MediaWiki\\Languages\\Data\\Names' => __DIR__ . 
'/languages/data/Names.php',
'MediaWiki\\Languages\\Data\\ZhConversion' => __DIR__ . 
'/languages/data/ZhConversion.php',
-   'MediaWiki\\Linker\\LinkRenderer' => __DIR__ . 
'/includes/linker/LinkRenderer.php',
-   'MediaWiki\\Linker\\LinkRendererFactory' => __DIR__ . 
'/includes/linker/LinkRendererFactory.php',
-   'MediaWiki\\Linker\\LinkTarget' => __DIR__ . 
'/includes/linker/LinkTarget.php',
'MediaWiki\\Logger\\ConsoleLogger' => __DIR__ . 
'/includes/debug/logger/ConsoleLogger.php',
'MediaWiki\\Logger\\ConsoleSpi' => __DIR__ . 
'/includes/debug/logger/ConsoleSpi.php',
'MediaWiki\\Logger\\LegacyLogger' => __DIR__ . 
'/includes/debug/logger/LegacyLogger.php',
diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json
index 7cfebca..ddf82e8 100644
--- a/docs/extension.schema.v1.json
+++ b/docs/extension.schema.v1.json
@@ -567,6 +567,10 @@
"type": "object",
"description": "SpecialPages implemented in this 
extension (mapping of page name to class name)"
},
+   "AutoloadNamespaces": {
+   "type": "object",
+   "description": "Mapping of PSR-4 compliant namespace to 
directory for autoloading"
+   },
"AutoloadClasses": {
"type": "object"
},
diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index 75a4f2c..0bdf97d 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -588,6 +588,10 @@
"type": "object",
"description": "SpecialPages implemented in this 
extension (mapping of page name to class name)"
},
+   "AutoloadNamespaces": {
+   "type": "object",
+   "description": "Mapping of PSR-4 compliant namespace to 
directory for autoloading"
+   },
"AutoloadClasses": {
"type": "object"
},
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 8dc7d40..675e347 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -31,6 +31,12 @@
static protected $autoloadLocalClassesLower = null;
 
/**
+* @private Only public for ExtensionRegistry
+* @var string[] Namespace (ends with \) => Path (ends with /)
+*/
+   static public $psr4Namespaces = [];
+
+   /**
 * autoload - take a class name and attempt to load it
 *
 * @param string $className Name of class we're looking for.
@@ -67,6 +73,28 @@
}
}
 
+   if ( !$filename && strpos( $className, '\\' ) !== false ) {
+   // This class is namespaced, so try looking at the 
namespace map
+   $prefix = $className;
+   while ( false !== $pos = strrpos( $prefix, '\\' ) ) {
+   // Check to see if this namespace prefix is in 
the map
+   $prefix = substr( $className, 0, $pos + 1 );
+   if ( isset(

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Doin't install the npm package on stretch

2017-12-11 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397720 )

Change subject: contint: Doin't install the npm package on stretch
..

contint: Doin't install the npm package on stretch

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


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


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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Disable ORES in fawiki"

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396806 )

Change subject: Revert "Disable ORES in fawiki"
..


Revert "Disable ORES in fawiki"

The error that broke it should now be fixed.

This reverts commit c7fcbedb5ce048d3b3bac1d1b1bb1699b308c5e0.

Bug: T182354
Change-Id: Ia98b7b3c348b9c71651878452f150cc398ef3ced
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 12fbb29..8fc668c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18959,7 +18959,7 @@
'cswiki' => true, // T151611
'enwiki' => true, // T140003
'etwiki' => true, // T159609
-   'fawiki' => false, // T130211, disabled T182354
+   'fawiki' => true, // T130211
'fiwiki' => true, // T163011
'frwiki' => true,
'hewiki' => true, // T161621

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia98b7b3c348b9c71651878452f150cc398ef3ced
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] Handle table end following templates in attribute posi...

2017-12-11 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397721 )

Change subject: [WIP] Handle table end following templates in attribute position
..

[WIP] Handle table end following templates in attribute position

Bug: T126834
Change-Id: I1b83ef52efdafcd96aeac9a06a951235bbb69f5b
---
M lib/wt2html/tt/AttributeExpander.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/lib/wt2html/tt/AttributeExpander.js 
b/lib/wt2html/tt/AttributeExpander.js
index 9a76502..f34cd24 100644
--- a/lib/wt2html/tt/AttributeExpander.js
+++ b/lib/wt2html/tt/AttributeExpander.js
@@ -14,6 +14,7 @@
 // define some constructor shortcuts
 var NlTk = defines.NlTk;
 var TagTk = defines.TagTk;
+var EndTagTk = defines.EndTagTk;
 var SelfclosingTagTk = defines.SelfclosingTagTk;
 
 
@@ -346,6 +347,9 @@
expandedK = updatedK.preNLBuf;
postNLToks = updatedK.postNLBuf;
metaTokens = 
updatedK.metaTokens;
+   if 
(postNLToks[postNLToks.length - 1] === '|}') {
+   
postNLToks.splice(postNLToks.length - 1, 1, new EndTagTk('table'));
+   }
} else {
// Scenario 2 from the 
documentation comment above.
updatedK = 
stripMetaTags(expandedK, wrapTemplates);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b83ef52efdafcd96aeac9a06a951235bbb69f5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Oops, forgot installed.json!

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397717 )

Change subject: Oops, forgot installed.json!
..


Oops, forgot installed.json!

Change-Id: I305a8696ac0db23520637461dba6bd3ea55f9b00
---
M composer/installed.json
1 file changed, 65 insertions(+), 63 deletions(-)

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



diff --git a/composer/installed.json b/composer/installed.json
index 196e534..abacab8 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1815,69 +1815,6 @@
 ]
 },
 {
-"name": "wikimedia/smash-pig",
-"version": "0.5.0",
-"version_normalized": "0.5.0.0",
-"source": {
-"type": "git",
-"url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "def9c6f3cfc8e3878aa74cf94ebb8287b08ac2cc"
-},
-"require": {
-"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
-"coderkungfu/php-queue": "^1.0",
-"corneltek/getoptionkit": "^2.5",
-"php": ">=5.3.3",
-"phpmailer/phpmailer": "^5.2",
-"predis/predis": "^1.1",
-"psr/cache": "^1.0",
-"symfony/event-dispatcher": "^2.1",
-"symfony/http-foundation": "^2.1",
-"symfony/yaml": "^2.8"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "^0.9",
-"mediawiki/mediawiki-codesniffer": "0.11.0",
-"phpunit/phpunit": "^4.8"
-},
-"time": "2017-09-11T13:31:06+00:00",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"psr-4": {
-"SmashPig\\": "./"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"GPL-2.0"
-],
-"authors": [
-{
-"name": "Katie Horn",
-"email": "kh...@wikimedia.org"
-},
-{
-"name": "Matthew Walker",
-"email": "mwal...@wikimedia.org"
-},
-{
-"name": "Adam Roses Wight",
-"email": "awi...@wikimedia.org"
-},
-{
-"name": "Elliott Eggleston",
-"email": "eeggles...@wikimedia.org"
-}
-],
-"description": "The open source PHP flexible payments library and 
frontend/backend mediator.",
-"homepage": "http://smashpig.org;,
-"keywords": [
-"donations",
-"payments"
-]
-},
-{
 "name": "maxmind-db/reader",
 "version": "v1.1.3",
 "version_normalized": "1.1.3.0",
@@ -2318,5 +2255,70 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library"
+},
+{
+"name": "wikimedia/smash-pig",
+"version": "v0.5.1",
+"version_normalized": "0.5.1.0",
+"source": {
+"type": "git",
+"url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
+"reference": "268799f492e3548006e13d28ffe14df0124edd28"
+},
+"require": {
+"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
+"coderkungfu/php-queue": "^1.0",
+"corneltek/getoptionkit": "^2.5",
+"php": ">=5.4",
+"phpmailer/phpmailer": "^5.2",
+"predis/predis": "^1.1",
+"psr/cache": "^1.0",
+"psr/log": "^1.0",
+"symfony/event-dispatcher": "^2.1",
+"symfony/http-foundation": "^2.1",
+"symfony/yaml": "^2.8"
+},
+"require-dev": {
+"ext-sqlite3": "*",
+"jakub-onderka/php-parallel-lint": "^0.9",
+"mediawiki/mediawiki-codesniffer": "0.11.0",
+"phpunit/phpunit": "^4.8"
+},
+"time": "2017-12-11T19:36:55+00:00",
+"type": "library",
+"installation-source": "source",
+"autoload": {
+"psr-4": {
+"SmashPig\\": "./"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"GPL-2.0"
+],
+"authors": [
+{
+"name": "Katie Horn",
+"email": "kh...@wikimedia.org"
+},
+{
+"name": "Matthew Walker",
+"email": "mwal...@wikimedia.org"
+},
+{
+"name": "Adam Roses Wight",
+"email": "awi...@wikimedia.org"
+},
+{
+"name": "Elliott Eggleston",
+"email": "eeggles...@wikimedia.org"
+}
+],
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Have ExtensionDistributor treat REL1_30 as stable

2017-12-11 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397719 )

Change subject: Have ExtensionDistributor treat REL1_30 as stable
..

Have ExtensionDistributor treat REL1_30 as stable

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3bc58e3..479f817 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -999,10 +999,10 @@
];
 
// Current stable release
-   $wgExtDistDefaultSnapshot = 'REL1_29';
+   $wgExtDistDefaultSnapshot = 'REL1_30';
 
// Current development snapshot
-   $wgExtDistCandidateSnapshot = 'REL1_30';
+   // $wgExtDistCandidateSnapshot = 'REL1_31';
 
// Available snapshots
$wgExtDistSnapshotRefs = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9672c1cf8c5083c985afe95516af86f819a9f417
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] wikimedia...crm[deployment]: Fixed vendor commit

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397718 )

Change subject: Fixed vendor commit
..


Fixed vendor commit

Change-Id: I3e047d02721556c085991e48b919d3e9f02ddc98
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index bb6bb3f..4a2f871 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit bb6bb3f86f4bd0a098e28c842f2ababdef8b7e0a
+Subproject commit 4a2f871ce564adfa60c15eabb53ad7fc2f85dcd3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e047d02721556c085991e48b919d3e9f02ddc98
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
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...crm[deployment]: Fixed vendor commit

2017-12-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397718 )

Change subject: Fixed vendor commit
..

Fixed vendor commit

Change-Id: I3e047d02721556c085991e48b919d3e9f02ddc98
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/18/397718/1

diff --git a/vendor b/vendor
index bb6bb3f..4a2f871 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit bb6bb3f86f4bd0a098e28c842f2ababdef8b7e0a
+Subproject commit 4a2f871ce564adfa60c15eabb53ad7fc2f85dcd3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e047d02721556c085991e48b919d3e9f02ddc98
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Add stripe import

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397716 )

Change subject: Add stripe import
..


Add stripe import

At this stage an exception is thrown if non-USD currencies are in use and 
utm_campaign column is respected
if set, ditto utm_medium with a default of MGEventEmail

There is a desire for currency support & I think that might be the case for 
another import too.
I also feel there is a desire for being able to set an import-wide default for 
a field. I've left these
out of this iteration.

Bug: T172423

Change-Id: I63a85f352caec1d695724a9b1dd1129f9a29781c
---
A sites/all/modules/offline2civicrm/StripeFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
A sites/all/modules/offline2civicrm/tests/StripeFileTest.php
A sites/all/modules/offline2civicrm/tests/data/stripe.csv
5 files changed, 184 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/StripeFile.php 
b/sites/all/modules/offline2civicrm/StripeFile.php
new file mode 100644
index 000..49b9f03
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/StripeFile.php
@@ -0,0 +1,119 @@
+ 'gateway_txn_id',
+  'utm_source' => 'utm_source',
+  'utm_campaign' => 'utm_campaign',
+  'utm_medium' => 'utm_medium',
+  'Card Address Line1' => 'street_address',
+  'Card Address Line2' => 'supplemental_address_1',
+  'Card Address City' => 'city',
+  'Converted Amount' => 'gross',
+  'Amount' => 'original_gross',
+  'Created (UTC)' => 'date',
+  'Customer Email' => 'email',
+  'Converted Currency' => 'currency',
+  'Currency' => 'original_currency',
+  'Card Name' => 'full_name',
+  'Card Address State' => 'state_province',
+  'Card Address Zip' => 'postal_code',
+  'Card Address Country' => 'country',
+
+
+  //id,
+  //Description,
+  //Amount ,,
+  //Amount Refunded,
+  //Currency,
+  //Converted Amount Refunded,Fee,
+  //Tax,
+  //Converted Currency,
+  //Mode,
+  //Status,
+  //Statement Descriptor,
+  //Customer ID,
+  //Customer Description,,
+  //Captured,Card ID,
+  //Card Last4,
+  //Card Brand,
+  //Card Funding,
+  //Card Exp Month,
+  //Card Exp Year,
+  //Card Issue Country,
+  //Card Fingerprint,
+  //Card CVC Status,
+  //Card AVS Zip Status,
+  //Card AVS Line1 Status,
+  //Card Tokenization Method,
+  //Disputed Amount,
+  //Dispute Status,
+  //Dispute Reason,
+  //Dispute Date (UTC),
+  //Dispute Evidence Due (UTC)
+  //Invoice ID,
+  //Payment Source Type,
+  //Destination,
+  //Transfer,
+  //Transfer Group,
+  //event_id (metadata),
+  //event_name (metadata),
+  //order_number (metadata)
+);
+  }
+
+  protected function getDefaultValues() {
+return array_merge(parent::getDefaultValues(), array(
+'gateway' => 'stripe',
+'no_thank_you' => 'stripe',
+'payment_instrument' => 'Stripe',
+'payment_method' => 'Stripe',
+'utm_medium' => 'MGEventEmail',
+'contact_source' => 'Stripe import',
+  )
+);
+  }
+
+  /**
+   * Read a row and transform into normalized queue message form
+   *
+   * @param $data
+   *
+   * @return array queue message format
+   *
+   * @throws \EmptyRowException
+   * @throws \WmfException
+   */
+  protected function parseRow($data) {
+if (!empty($data['Converted Amount Refunded'])) {
+  throw new WmfException(WmfException::INVALID_MESSAGE, 'Refunds not 
currently handled. Please log a Phab if required');
+}
+return parent::parseRow($data);
+  }
+
+}
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info 
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index 4a49a4f..967c081 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -22,6 +22,7 @@
 files[] = PayPalChecksFile.php
 files[] = RefundFile.php
 files[] = SquareFile.php
+files[] = StripeFile.php
 files[] = TrilogyFile.php
 files[] = WmfImportFile.php
 files[] = WmfOrgImportFile.php
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module 
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 71cb137..ed491c3 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -115,6 +115,7 @@
   'jpmorgan' => t('JP Morgan'),
   'paypal' => t('PayPal EFT'),
   'square' => t('Square'),
+  'stripe' => t('Stripe'),
   'trilogy' => t('Trilogy'),
 ),
   );
@@ -194,6 +195,11 @@
 case 'square':
   $importer = new SquareFile($file->uri);
   break;
+
+case

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Apply drupal formatting to offline2civicrm.module

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397715 )

Change subject: Apply drupal formatting to offline2civicrm.module
..


Apply drupal formatting to offline2civicrm.module

Re-formatted using drupal rules in IDE

Change-Id: If7940b90edb13ab46df2cebf336c99ab8289f556
---
M sites/all/modules/offline2civicrm/offline2civicrm.module
1 file changed, 90 insertions(+), 90 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module 
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 18ff9fa..71cb137 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -70,59 +70,59 @@
 }
 
 function offline2civicrm_import_checks_form() {
-  $dir = drupal_get_path( 'module', 'offline2civicrm' );
-  drupal_add_js( $dir . '/upload_form.js' );
+  $dir = drupal_get_path('module', 'offline2civicrm');
+  drupal_add_js($dir . '/upload_form.js');
 
   $log_events = ChecksImportLog::recentEvents();
-  $headers = array( 'Time', 'Who', 'Done' );
+  $headers = array('Time', 'Who', 'Done');
   $rows = array();
-  foreach ( $log_events as $event ) {
+  foreach ($log_events as $event) {
 $rows[] = array(
   $event->time,
   $event->who,
   $event->done,
 );
   }
-  $log_html = theme_table( array(
-'header' => $headers,
-'rows' => $rows,
-'empty' => "No events yet.",
-'attributes' => array(),
-'caption' => t( 'Latest import events' ),
-'colgroups' => array(),
-'sticky' => true,
-  ) ).theme('pager');
+  $log_html = theme_table(array(
+  'header' => $headers,
+  'rows' => $rows,
+  'empty' => "No events yet.",
+  'attributes' => array(),
+  'caption' => t('Latest import events'),
+  'colgroups' => array(),
+  'sticky' => TRUE,
+)) . theme('pager');
 
   $form['import_upload_file'] = array(
-'#title' => t( 'Upload checks file' ),
+'#title' => t('Upload checks file'),
 '#type' => 'file',
   );
   $form['import_upload_submit'] = array(
 '#type' => 'submit',
-'#value' => t( 'Upload' ),
+'#value' => t('Upload'),
   );
   $form['import_upload_format'] = array(
-'#title' => t( 'File format' ),
+'#title' => t('File format'),
 '#type' => 'radios',
 '#default_value' => 'generic_ind',
 '#options' => array(
-'benevity' => t('Benevity'),
-'engage' => t( 'Engage' ),
-'coinbase' => t( 'Coinbase Merchant Orders' ),
-'foreign_checks' => t( 'Foreign Checks' ),
-'generic_ind' => t( 'Generic Individuals' ),
-'generic_org' => t( 'Generic Organizations' ),
-'jpmorgan' => t( 'JP Morgan' ),
-'paypal' => t( 'PayPal EFT' ),
-'square' => t( 'Square' ),
-'trilogy' => t( 'Trilogy' ),
+  'benevity' => t('Benevity'),
+  'engage' => t('Engage'),
+  'coinbase' => t('Coinbase Merchant Orders'),
+  'foreign_checks' => t('Foreign Checks'),
+  'generic_ind' => t('Generic Individuals'),
+  'generic_org' => t('Generic Organizations'),
+  'jpmorgan' => t('JP Morgan'),
+  'paypal' => t('PayPal EFT'),
+  'square' => t('Square'),
+  'trilogy' => t('Trilogy'),
 ),
   );
   $form['log'] = array(
 '#markup' => $log_html,
   );
 
-  $form['#attributes'] = array( 'enctype' => "multipart/form-data" );
+  $form['#attributes'] = array('enctype' => "multipart/form-data");
 
   return $form;
 }
@@ -133,88 +133,88 @@
  * @param $file_name
  */
 function offline2civicrm_download_csv($file_name) {
-global $user;
-if (!preg_match ('/\.' . $user->uid . '$/', $file_name)) {
-  return drupal_access_denied();
-}
-$fileURI = 'temporary://' . $file_name . '.csv';
-if ($file_name && file_exists($fileURI)) {
-  file_transfer($fileURI, array(
-'Content-Type' => 'text/csv',
-'Content-Disposition' => 'attachment; filename="' . $file_name . 
'.csv"',
-  ));
-}
-else {
-  return drupal_access_denied();
-}
+  global $user;
+  if (!preg_match('/\.' . $user->uid . '$/', $file_name)) {
+return drupal_access_denied();
+  }
+  $fileURI = 'temporary://' . $file_name . '.csv';
+  if ($file_name && file_exists($fileURI)) {
+file_transfer($fileURI, array(
+  'Content-Type' => 'text/csv',
+  'Content-Disposition' => 'attachment; filename="' . $file_name . '.csv"',
+));
+  }
+  else {
+return drupal_access_denied();
+  }
 }
 
-function offline2civicrm_import_checks_form_submit( $form, $form_state ) {
-  wmf_common_create_smashpig_context( 'offline2civicrm' );
-  if ( !empty( $form_state['values']['import_upload_submit'] ) ) {
+function offline2civicrm_import_checks_form_submit($form, $form_state) {
+  wmf_common_create_smashpig_context('offline2civicrm');
+  if

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Oops, forgot installed.json!

2017-12-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397717 )

Change subject: Oops, forgot installed.json!
..

Oops, forgot installed.json!

Change-Id: I305a8696ac0db23520637461dba6bd3ea55f9b00
---
M composer/installed.json
1 file changed, 65 insertions(+), 63 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/17/397717/1

diff --git a/composer/installed.json b/composer/installed.json
index 196e534..abacab8 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1815,69 +1815,6 @@
 ]
 },
 {
-"name": "wikimedia/smash-pig",
-"version": "0.5.0",
-"version_normalized": "0.5.0.0",
-"source": {
-"type": "git",
-"url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "def9c6f3cfc8e3878aa74cf94ebb8287b08ac2cc"
-},
-"require": {
-"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
-"coderkungfu/php-queue": "^1.0",
-"corneltek/getoptionkit": "^2.5",
-"php": ">=5.3.3",
-"phpmailer/phpmailer": "^5.2",
-"predis/predis": "^1.1",
-"psr/cache": "^1.0",
-"symfony/event-dispatcher": "^2.1",
-"symfony/http-foundation": "^2.1",
-"symfony/yaml": "^2.8"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "^0.9",
-"mediawiki/mediawiki-codesniffer": "0.11.0",
-"phpunit/phpunit": "^4.8"
-},
-"time": "2017-09-11T13:31:06+00:00",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"psr-4": {
-"SmashPig\\": "./"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"GPL-2.0"
-],
-"authors": [
-{
-"name": "Katie Horn",
-"email": "kh...@wikimedia.org"
-},
-{
-"name": "Matthew Walker",
-"email": "mwal...@wikimedia.org"
-},
-{
-"name": "Adam Roses Wight",
-"email": "awi...@wikimedia.org"
-},
-{
-"name": "Elliott Eggleston",
-"email": "eeggles...@wikimedia.org"
-}
-],
-"description": "The open source PHP flexible payments library and 
frontend/backend mediator.",
-"homepage": "http://smashpig.org;,
-"keywords": [
-"donations",
-"payments"
-]
-},
-{
 "name": "maxmind-db/reader",
 "version": "v1.1.3",
 "version_normalized": "1.1.3.0",
@@ -2318,5 +2255,70 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library"
+},
+{
+"name": "wikimedia/smash-pig",
+"version": "v0.5.1",
+"version_normalized": "0.5.1.0",
+"source": {
+"type": "git",
+"url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
+"reference": "268799f492e3548006e13d28ffe14df0124edd28"
+},
+"require": {
+"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
+"coderkungfu/php-queue": "^1.0",
+"corneltek/getoptionkit": "^2.5",
+"php": ">=5.4",
+"phpmailer/phpmailer": "^5.2",
+"predis/predis": "^1.1",
+"psr/cache": "^1.0",
+"psr/log": "^1.0",
+"symfony/event-dispatcher": "^2.1",
+"symfony/http-foundation": "^2.1",
+"symfony/yaml": "^2.8"
+},
+"require-dev": {
+"ext-sqlite3": "*",
+"jakub-onderka/php-parallel-lint": "^0.9",
+"mediawiki/mediawiki-codesniffer": "0.11.0",
+"phpunit/phpunit": "^4.8"
+},
+"time": "2017-12-11T19:36:55+00:00",
+"type": "library",
+"installation-source": "source",
+"autoload": {
+"psr-4": {
+"SmashPig\\": "./"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"GPL-2.0"
+],
+"authors": [
+{
+"name": "Katie Horn",
+"email": "kh...@wikimedia.org"
+},
+{
+"name": "Matthew Walker",
+"email": "mwal...@wikimedia.org"
+},
+{
+"name": "Adam Roses Wight",
+"email": "awi...@wikimedia.org"
+},
+{
+"name": "Elliott Eggleston",
+"email": "eeggles...@wikimedia.org"
+}
+],
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add stripe import

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392566 )

Change subject: Add stripe import
..


Add stripe import

At this stage an exception is thrown if non-USD currencies are in use and 
utm_campaign column is respected
if set, ditto utm_medium with a default of MGEventEmail

There is a desire for currency support & I think that might be the case for 
another import too.
I also feel there is a desire for being able to set an import-wide default for 
a field. I've left these
out of this iteration.

Bug: T172423

Change-Id: I63a85f352caec1d695724a9b1dd1129f9a29781c
---
A sites/all/modules/offline2civicrm/StripeFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
A sites/all/modules/offline2civicrm/tests/StripeFileTest.php
A sites/all/modules/offline2civicrm/tests/data/stripe.csv
5 files changed, 184 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/StripeFile.php 
b/sites/all/modules/offline2civicrm/StripeFile.php
new file mode 100644
index 000..49b9f03
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/StripeFile.php
@@ -0,0 +1,119 @@
+ 'gateway_txn_id',
+  'utm_source' => 'utm_source',
+  'utm_campaign' => 'utm_campaign',
+  'utm_medium' => 'utm_medium',
+  'Card Address Line1' => 'street_address',
+  'Card Address Line2' => 'supplemental_address_1',
+  'Card Address City' => 'city',
+  'Converted Amount' => 'gross',
+  'Amount' => 'original_gross',
+  'Created (UTC)' => 'date',
+  'Customer Email' => 'email',
+  'Converted Currency' => 'currency',
+  'Currency' => 'original_currency',
+  'Card Name' => 'full_name',
+  'Card Address State' => 'state_province',
+  'Card Address Zip' => 'postal_code',
+  'Card Address Country' => 'country',
+
+
+  //id,
+  //Description,
+  //Amount ,,
+  //Amount Refunded,
+  //Currency,
+  //Converted Amount Refunded,Fee,
+  //Tax,
+  //Converted Currency,
+  //Mode,
+  //Status,
+  //Statement Descriptor,
+  //Customer ID,
+  //Customer Description,,
+  //Captured,Card ID,
+  //Card Last4,
+  //Card Brand,
+  //Card Funding,
+  //Card Exp Month,
+  //Card Exp Year,
+  //Card Issue Country,
+  //Card Fingerprint,
+  //Card CVC Status,
+  //Card AVS Zip Status,
+  //Card AVS Line1 Status,
+  //Card Tokenization Method,
+  //Disputed Amount,
+  //Dispute Status,
+  //Dispute Reason,
+  //Dispute Date (UTC),
+  //Dispute Evidence Due (UTC)
+  //Invoice ID,
+  //Payment Source Type,
+  //Destination,
+  //Transfer,
+  //Transfer Group,
+  //event_id (metadata),
+  //event_name (metadata),
+  //order_number (metadata)
+);
+  }
+
+  protected function getDefaultValues() {
+return array_merge(parent::getDefaultValues(), array(
+'gateway' => 'stripe',
+'no_thank_you' => 'stripe',
+'payment_instrument' => 'Stripe',
+'payment_method' => 'Stripe',
+'utm_medium' => 'MGEventEmail',
+'contact_source' => 'Stripe import',
+  )
+);
+  }
+
+  /**
+   * Read a row and transform into normalized queue message form
+   *
+   * @param $data
+   *
+   * @return array queue message format
+   *
+   * @throws \EmptyRowException
+   * @throws \WmfException
+   */
+  protected function parseRow($data) {
+if (!empty($data['Converted Amount Refunded'])) {
+  throw new WmfException(WmfException::INVALID_MESSAGE, 'Refunds not 
currently handled. Please log a Phab if required');
+}
+return parent::parseRow($data);
+  }
+
+}
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info 
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index 4462913..058cd03 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -22,6 +22,7 @@
 files[] = PayPalChecksFile.php
 files[] = RefundFile.php
 files[] = SquareFile.php
+files[] = StripeFile.php
 files[] = TrilogyFile.php
 files[] = WmfImportFile.php
 files[] = WmfOrgImportFile.php
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module 
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 71cb137..ed491c3 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -115,6 +115,7 @@
   'jpmorgan' => t('JP Morgan'),
   'paypal' => t('PayPal EFT'),
   'square' => t('Square'),
+  'stripe' => t('Stripe'),
   'trilogy' => t('Trilogy'),
 ),
   );
@@ -194,6 +195,11 @@
 case 'square':
   $importer = new SquareFile($file->uri);
   break;
+
+case

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397714 )

Change subject: Update vendor
..


Update vendor

Change-Id: Idc53d5ddfc75f21b0a365cfadb31ebc463bce178
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index bc7a828..bb6bb3f 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit bc7a8289659754c7fd06c2f2d0eb12fd87947a52
+Subproject commit bb6bb3f86f4bd0a098e28c842f2ababdef8b7e0a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc53d5ddfc75f21b0a365cfadb31ebc463bce178
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
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...crm[deployment]: Apply drupal formatting to offline2civicrm.module

2017-12-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397715 )

Change subject: Apply drupal formatting to offline2civicrm.module
..

Apply drupal formatting to offline2civicrm.module

Re-formatted using drupal rules in IDE

Change-Id: If7940b90edb13ab46df2cebf336c99ab8289f556
---
M sites/all/modules/offline2civicrm/offline2civicrm.module
1 file changed, 90 insertions(+), 90 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/15/397715/1

diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module 
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 18ff9fa..71cb137 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -70,59 +70,59 @@
 }
 
 function offline2civicrm_import_checks_form() {
-  $dir = drupal_get_path( 'module', 'offline2civicrm' );
-  drupal_add_js( $dir . '/upload_form.js' );
+  $dir = drupal_get_path('module', 'offline2civicrm');
+  drupal_add_js($dir . '/upload_form.js');
 
   $log_events = ChecksImportLog::recentEvents();
-  $headers = array( 'Time', 'Who', 'Done' );
+  $headers = array('Time', 'Who', 'Done');
   $rows = array();
-  foreach ( $log_events as $event ) {
+  foreach ($log_events as $event) {
 $rows[] = array(
   $event->time,
   $event->who,
   $event->done,
 );
   }
-  $log_html = theme_table( array(
-'header' => $headers,
-'rows' => $rows,
-'empty' => "No events yet.",
-'attributes' => array(),
-'caption' => t( 'Latest import events' ),
-'colgroups' => array(),
-'sticky' => true,
-  ) ).theme('pager');
+  $log_html = theme_table(array(
+  'header' => $headers,
+  'rows' => $rows,
+  'empty' => "No events yet.",
+  'attributes' => array(),
+  'caption' => t('Latest import events'),
+  'colgroups' => array(),
+  'sticky' => TRUE,
+)) . theme('pager');
 
   $form['import_upload_file'] = array(
-'#title' => t( 'Upload checks file' ),
+'#title' => t('Upload checks file'),
 '#type' => 'file',
   );
   $form['import_upload_submit'] = array(
 '#type' => 'submit',
-'#value' => t( 'Upload' ),
+'#value' => t('Upload'),
   );
   $form['import_upload_format'] = array(
-'#title' => t( 'File format' ),
+'#title' => t('File format'),
 '#type' => 'radios',
 '#default_value' => 'generic_ind',
 '#options' => array(
-'benevity' => t('Benevity'),
-'engage' => t( 'Engage' ),
-'coinbase' => t( 'Coinbase Merchant Orders' ),
-'foreign_checks' => t( 'Foreign Checks' ),
-'generic_ind' => t( 'Generic Individuals' ),
-'generic_org' => t( 'Generic Organizations' ),
-'jpmorgan' => t( 'JP Morgan' ),
-'paypal' => t( 'PayPal EFT' ),
-'square' => t( 'Square' ),
-'trilogy' => t( 'Trilogy' ),
+  'benevity' => t('Benevity'),
+  'engage' => t('Engage'),
+  'coinbase' => t('Coinbase Merchant Orders'),
+  'foreign_checks' => t('Foreign Checks'),
+  'generic_ind' => t('Generic Individuals'),
+  'generic_org' => t('Generic Organizations'),
+  'jpmorgan' => t('JP Morgan'),
+  'paypal' => t('PayPal EFT'),
+  'square' => t('Square'),
+  'trilogy' => t('Trilogy'),
 ),
   );
   $form['log'] = array(
 '#markup' => $log_html,
   );
 
-  $form['#attributes'] = array( 'enctype' => "multipart/form-data" );
+  $form['#attributes'] = array('enctype' => "multipart/form-data");
 
   return $form;
 }
@@ -133,88 +133,88 @@
  * @param $file_name
  */
 function offline2civicrm_download_csv($file_name) {
-global $user;
-if (!preg_match ('/\.' . $user->uid . '$/', $file_name)) {
-  return drupal_access_denied();
-}
-$fileURI = 'temporary://' . $file_name . '.csv';
-if ($file_name && file_exists($fileURI)) {
-  file_transfer($fileURI, array(
-'Content-Type' => 'text/csv',
-'Content-Disposition' => 'attachment; filename="' . $file_name . 
'.csv"',
-  ));
-}
-else {
-  return drupal_access_denied();
-}
+  global $user;
+  if (!preg_match('/\.' . $user->uid . '$/', $file_name)) {
+return drupal_access_denied();
+  }
+  $fileURI = 'temporary://' . $file_name . '.csv';
+  if ($file_name && file_exists($fileURI)) {
+file_transfer($fileURI, array(
+  'Content-Type' => 'text/csv',
+  'Content-Disposition' => 'attachment; filename="' . $file_name . '.csv"',
+));
+  }
+  else {
+return drupal_access_denied();
+  }
 }
 
-function offline2civicrm_import_checks_form_submit( $form, $form_state ) {
-  wmf_common_create_smashpig_context( 'offline2civicrm' );
-  if ( !empty( $form_state['values']['import_upload_submit'] ) ) {
+function offline2civicrm_import_checks_form_submit($form, $form_state) {
+  wmf_common_create_smashpig_context('offline2civicrm');
+  if

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Add stripe import

2017-12-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397716 )

Change subject: Add stripe import
..

Add stripe import

At this stage an exception is thrown if non-USD currencies are in use and 
utm_campaign column is respected
if set, ditto utm_medium with a default of MGEventEmail

There is a desire for currency support & I think that might be the case for 
another import too.
I also feel there is a desire for being able to set an import-wide default for 
a field. I've left these
out of this iteration.

Bug: T172423

Change-Id: I63a85f352caec1d695724a9b1dd1129f9a29781c
---
A sites/all/modules/offline2civicrm/StripeFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
A sites/all/modules/offline2civicrm/tests/StripeFileTest.php
A sites/all/modules/offline2civicrm/tests/data/stripe.csv
5 files changed, 184 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/16/397716/1

diff --git a/sites/all/modules/offline2civicrm/StripeFile.php 
b/sites/all/modules/offline2civicrm/StripeFile.php
new file mode 100644
index 000..49b9f03
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/StripeFile.php
@@ -0,0 +1,119 @@
+ 'gateway_txn_id',
+  'utm_source' => 'utm_source',
+  'utm_campaign' => 'utm_campaign',
+  'utm_medium' => 'utm_medium',
+  'Card Address Line1' => 'street_address',
+  'Card Address Line2' => 'supplemental_address_1',
+  'Card Address City' => 'city',
+  'Converted Amount' => 'gross',
+  'Amount' => 'original_gross',
+  'Created (UTC)' => 'date',
+  'Customer Email' => 'email',
+  'Converted Currency' => 'currency',
+  'Currency' => 'original_currency',
+  'Card Name' => 'full_name',
+  'Card Address State' => 'state_province',
+  'Card Address Zip' => 'postal_code',
+  'Card Address Country' => 'country',
+
+
+  //id,
+  //Description,
+  //Amount ,,
+  //Amount Refunded,
+  //Currency,
+  //Converted Amount Refunded,Fee,
+  //Tax,
+  //Converted Currency,
+  //Mode,
+  //Status,
+  //Statement Descriptor,
+  //Customer ID,
+  //Customer Description,,
+  //Captured,Card ID,
+  //Card Last4,
+  //Card Brand,
+  //Card Funding,
+  //Card Exp Month,
+  //Card Exp Year,
+  //Card Issue Country,
+  //Card Fingerprint,
+  //Card CVC Status,
+  //Card AVS Zip Status,
+  //Card AVS Line1 Status,
+  //Card Tokenization Method,
+  //Disputed Amount,
+  //Dispute Status,
+  //Dispute Reason,
+  //Dispute Date (UTC),
+  //Dispute Evidence Due (UTC)
+  //Invoice ID,
+  //Payment Source Type,
+  //Destination,
+  //Transfer,
+  //Transfer Group,
+  //event_id (metadata),
+  //event_name (metadata),
+  //order_number (metadata)
+);
+  }
+
+  protected function getDefaultValues() {
+return array_merge(parent::getDefaultValues(), array(
+'gateway' => 'stripe',
+'no_thank_you' => 'stripe',
+'payment_instrument' => 'Stripe',
+'payment_method' => 'Stripe',
+'utm_medium' => 'MGEventEmail',
+'contact_source' => 'Stripe import',
+  )
+);
+  }
+
+  /**
+   * Read a row and transform into normalized queue message form
+   *
+   * @param $data
+   *
+   * @return array queue message format
+   *
+   * @throws \EmptyRowException
+   * @throws \WmfException
+   */
+  protected function parseRow($data) {
+if (!empty($data['Converted Amount Refunded'])) {
+  throw new WmfException(WmfException::INVALID_MESSAGE, 'Refunds not 
currently handled. Please log a Phab if required');
+}
+return parent::parseRow($data);
+  }
+
+}
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info 
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index 4a49a4f..967c081 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -22,6 +22,7 @@
 files[] = PayPalChecksFile.php
 files[] = RefundFile.php
 files[] = SquareFile.php
+files[] = StripeFile.php
 files[] = TrilogyFile.php
 files[] = WmfImportFile.php
 files[] = WmfOrgImportFile.php
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module 
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 71cb137..ed491c3 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -115,6 +115,7 @@
   'jpmorgan' => t('JP Morgan'),
   'paypal' => t('PayPal EFT'),
   'square' => t('Square'),
+  'stripe' => t('Stripe'),
   'trilogy' => t('Trilogy'),
 ),
   );
@@ -194,6 +195,11 @@
 case 'square':
   $importer = new SquareFile($file->uri);
   break;
+
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor

2017-12-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397714 )

Change subject: Update vendor
..

Update vendor

Change-Id: Idc53d5ddfc75f21b0a365cfadb31ebc463bce178
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/14/397714/1

diff --git a/vendor b/vendor
index bc7a828..bb6bb3f 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit bc7a8289659754c7fd06c2f2d0eb12fd87947a52
+Subproject commit bb6bb3f86f4bd0a098e28c842f2ababdef8b7e0a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc53d5ddfc75f21b0a365cfadb31ebc463bce178
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update SmashPig lib

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397712 )

Change subject: Update SmashPig lib
..


Update SmashPig lib

Get the XML stream processing for Ingenico WX files

Change-Id: I78cf55536772b92e3e2c6e19495cec53c14a86b6
---
M composer.lock
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 9336700..e06dee5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2138,25 +2138,27 @@
 },
 {
 "name": "wikimedia/smash-pig",
-"version": "0.5.0",
+"version": "v0.5.1",
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "def9c6f3cfc8e3878aa74cf94ebb8287b08ac2cc"
+"reference": "268799f492e3548006e13d28ffe14df0124edd28"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
 "coderkungfu/php-queue": "^1.0",
 "corneltek/getoptionkit": "^2.5",
-"php": ">=5.3.3",
+"php": ">=5.4",
 "phpmailer/phpmailer": "^5.2",
 "predis/predis": "^1.1",
 "psr/cache": "^1.0",
+"psr/log": "^1.0",
 "symfony/event-dispatcher": "^2.1",
 "symfony/http-foundation": "^2.1",
 "symfony/yaml": "^2.8"
 },
 "require-dev": {
+"ext-sqlite3": "*",
 "jakub-onderka/php-parallel-lint": "^0.9",
 "mediawiki/mediawiki-codesniffer": "0.11.0",
 "phpunit/phpunit": "^4.8"
@@ -2195,7 +2197,7 @@
 "donations",
 "payments"
 ],
-"time": "2017-09-11T13:31:06+00:00"
+"time": "2017-12-11T19:36:55+00:00"
 },
 {
 "name": "zordius/lightncandy",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78cf55536772b92e3e2c6e19495cec53c14a86b6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
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...crm[deployment]: Update SmashPig lib

2017-12-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397712 )

Change subject: Update SmashPig lib
..

Update SmashPig lib

Get the XML stream processing for Ingenico WX files

Change-Id: I78cf55536772b92e3e2c6e19495cec53c14a86b6
---
M composer.lock
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/12/397712/1

diff --git a/composer.lock b/composer.lock
index 9336700..e06dee5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2138,25 +2138,27 @@
 },
 {
 "name": "wikimedia/smash-pig",
-"version": "0.5.0",
+"version": "v0.5.1",
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "def9c6f3cfc8e3878aa74cf94ebb8287b08ac2cc"
+"reference": "268799f492e3548006e13d28ffe14df0124edd28"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
 "coderkungfu/php-queue": "^1.0",
 "corneltek/getoptionkit": "^2.5",
-"php": ">=5.3.3",
+"php": ">=5.4",
 "phpmailer/phpmailer": "^5.2",
 "predis/predis": "^1.1",
 "psr/cache": "^1.0",
+"psr/log": "^1.0",
 "symfony/event-dispatcher": "^2.1",
 "symfony/http-foundation": "^2.1",
 "symfony/yaml": "^2.8"
 },
 "require-dev": {
+"ext-sqlite3": "*",
 "jakub-onderka/php-parallel-lint": "^0.9",
 "mediawiki/mediawiki-codesniffer": "0.11.0",
 "phpunit/phpunit": "^4.8"
@@ -2195,7 +2197,7 @@
 "donations",
 "payments"
 ],
-"time": "2017-09-11T13:31:06+00:00"
+"time": "2017-12-11T19:36:55+00:00"
 },
 {
 "name": "zordius/lightncandy",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78cf55536772b92e3e2c6e19495cec53c14a86b6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Give rcOresDamagingPref the same default as oresDamagingPref

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396805 )

Change subject: Give rcOresDamagingPref the same default as oresDamagingPref
..


Give rcOresDamagingPref the same default as oresDamagingPref

These two preferences were split in Ifbc5a6b3a5f.

Bug: T182354
Change-Id: Ie7cd6593fe98ac82343f65a2ac032fdb23a64cc4
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f22043a..3bc58e3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3411,7 +3411,9 @@
 if ( $wmgUseORES ) {
wfLoadExtension( 'ORES' );
$wgOresBaseUrl = 'http://ores.discovery.wmnet:8081/';
-   $wgDefaultUserOptions['oresDamagingPref'] = 
$wmgOresDefaultSensitivityLevel;
+   $wgDefaultUserOptions['oresDamagingPref'] =
+   $wgDefaultUserOptions['rcOresDamagingPref'] =
+   $wmgOresDefaultSensitivityLevel;
 
// Backwards compatibility for upcoming config format change
if ( isset( $wgOresFiltersThresholds['goodfaith']['good'] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7cd6593fe98ac82343f65a2ac032fdb23a64cc4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: WMCS: use puppet 4 for any VM-hosted puppetmasters

2017-12-11 Thread Andrew Bogott (Code Review) 
Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397711 )

Change subject: WMCS: use puppet 4 for any VM-hosted puppetmasters
..

WMCS: use puppet 4 for any VM-hosted puppetmasters

Change-Id: I60a513ff633ab3b5fdfb9598eb16d9ce883cca61
---
M hieradata/labs.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/397711/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index ce53a17..fbaa220 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -135,3 +135,7 @@
 jenkins_agent_username: 'jenkins-deploy'
 
 role::logging::mediawiki::udp2log::logstash_host: 
'deployment-logstash2.deployment-prep.eqiad.wmflabs'
+
+# Until this is just taken for granted cluster-wide... make sure
+#  any new puppetmasters are built with v4
+puppet_major_version: 4

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Set correct request ID according to MediaWiki

2017-12-11 Thread Ppchelko (Code Review) 
Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397710 )

Change subject: Set correct request ID according to MediaWiki
..

Set correct request ID according to MediaWiki

Change-Id: Ib465d990c10a3d38ffdee15317f3364439a2db69
Depends-On: Ieab17db6f7ed1a7d37ee801d581791a240bbe74b
---
M EventBus.php
1 file changed, 1 insertion(+), 13 deletions(-)


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

diff --git a/EventBus.php b/EventBus.php
index 05b407b..097c7db 100644
--- a/EventBus.php
+++ b/EventBus.php
@@ -316,25 +316,13 @@
'meta' => [
'uri'=> $uri,
'topic'  => $topic,
-   'request_id' => self::getRequestId(),
+   'request_id' => WebRequest::getRequestId(),
'id' => self::newId(),
'dt' => date( 'c' ),
'domain' => $wgServerName ?: "unknown",
],
];
return $event + $attrs;
-   }
-
-   /**
-* Returns the X-Request-ID header, if set, otherwise a newly generated
-* type 4 UUID string.
-*
-* @return string
-*/
-   private static function getRequestId() {
-   $context = RequestContext::getMain();
-   $xreqid = $context->getRequest()->getHeader( 'x-request-id' );
-   return $xreqid ?: UIDGenerator::newUUIDv4();
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib465d990c10a3d38ffdee15317f3364439a2db69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Temporary removed 'pattern' for request_id from schemas.

2017-12-11 Thread Ppchelko (Code Review) 
Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397709 )

Change subject: Temporary removed 'pattern' for request_id from schemas.
..

Temporary removed 'pattern' for request_id from schemas.

In MediaWiki the request_id is actually a 26-symbols-long
random string obtained with WebRequest::getRequestID(), however
EventBus for some reason uses some custom method of obtaining the
request ID. However, seems like that metod always fails and defaults
to a v1 UUID - including that doesn't have anything in common with
the actual MediaWiki request ID.

As MediaWiki request ID will have different pattern, we need to first
remove the pattern property, deploy code changes, and then reintroduce
the pattern.

Change-Id: Ieab17db6f7ed1a7d37ee801d581791a240bbe74b
---
M jsonschema/change-prop/continue/1.yaml
M jsonschema/change-prop/retry/1.yaml
M jsonschema/error/1.yaml
M jsonschema/mediawiki/job/1.yaml
M jsonschema/mediawiki/page/delete/2.yaml
M jsonschema/mediawiki/page/move/1.yaml
M jsonschema/mediawiki/page/move/2.yaml
M jsonschema/mediawiki/page/properties-change/1.yaml
M jsonschema/mediawiki/page/restrictions-change/1.yaml
M jsonschema/mediawiki/page/undelete/2.yaml
M jsonschema/mediawiki/recentchange/1.yaml
M jsonschema/mediawiki/revision/create/2.yaml
M jsonschema/mediawiki/revision/visibility-change/1.yaml
M jsonschema/mediawiki/user/blocks-change/1.yaml
M jsonschema/resource_change/1.yaml
M jsonschema/test/event/1.yaml
M test/jsonschema/index.js
M test/jsonschema/meta_common_schema.yaml
18 files changed, 18 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/event-schemas 
refs/changes/09/397709/1

diff --git a/jsonschema/change-prop/continue/1.yaml 
b/jsonschema/change-prop/continue/1.yaml
index ae5f67c..7566d49 100644
--- a/jsonschema/change-prop/continue/1.yaml
+++ b/jsonschema/change-prop/continue/1.yaml
@@ -23,8 +23,7 @@
 description: the unique URI identifying the event / resource
   request_id:
 type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
-description: the unique UUID v1 ID of the event derived from the 
X-Request-Id header
+description: The unique ID of the request that caused the event 
derived from the X-Request-Id header.
   id:
 type: string
 pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
diff --git a/jsonschema/change-prop/retry/1.yaml 
b/jsonschema/change-prop/retry/1.yaml
index 1d0be6b..caed5f4 100644
--- a/jsonschema/change-prop/retry/1.yaml
+++ b/jsonschema/change-prop/retry/1.yaml
@@ -23,8 +23,7 @@
 description: the unique URI identifying the event / resource
   request_id:
 type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
-description: the unique UUID v1 ID of the event derived from the 
X-Request-Id header
+description: The unique ID of the request that caused the event 
derived from the X-Request-Id header.
   id:
 type: string
 pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
diff --git a/jsonschema/error/1.yaml b/jsonschema/error/1.yaml
index 5734d0a..2e9bec0 100644
--- a/jsonschema/error/1.yaml
+++ b/jsonschema/error/1.yaml
@@ -23,8 +23,7 @@
 description: the unique URI identifying the event / resource
   request_id:
 type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
-description: the unique UUID v1 ID of the event derived from the 
X-Request-Id header
+description: The unique ID of the request that caused the event 
derived from the X-Request-Id header.
   id:
 type: string
 pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml
index 1517323..e9ab20b 100644
--- a/jsonschema/mediawiki/job/1.yaml
+++ b/jsonschema/mediawiki/job/1.yaml
@@ -23,7 +23,7 @@
 type: string
 format: uri
   request_id:
-description: The unique UUID v1 ID of the event derived from the 
X-Request-Id header.
+description: the unique ID of the request that caused the event 
derived from the X-Request-Id header.
 type: string
 pattern: '^[a-zA-Z0-9\-@]+$'
   id:
diff --git a/jsonschema/mediawiki/page/delete/2.yaml 
b/jsonschema/mediawiki/page/delete/2.yaml
index 65e35e8..17affdc 100644
--- a/jsonschema/mediawiki/page/delete/2.yaml
+++ b/jsonschema/mediawiki/page/delete/2.yaml
@@ -22,9 +22,8 @@
 type: string
 format: uri
   request_id:
-description: The unique UUID v1 ID of the event derived from the 
X-Request-Id header.
+description: the unique ID of the request that caused the event 
derived from the X-Request-Id header.
 type: string
-pattern:

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 9bdcf53

2017-12-11 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397708 )

Change subject: Update mobileapps to 9bdcf53
..

Update mobileapps to 9bdcf53

List of changes:
f000b0c Revert "Revert "Bump mobile-sections and definitions version""
xxx Update node module dependencies

Change-Id: I85ef5efc22461a512d379ff94e676a86cf903555
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M src
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/08/397708/1

diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index c5708f1..8fb4ff3 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "5f5c6d52ee716664bdd13227e8e69a6286e6a9d5",
+  "_shasum": "1a38c50bf781fea0b1d214c9d96234d22a591a69",
   "_shrinkwrap": null,
   "_spec": "kad@git+https://github.com/gwicke/kad.git#master;,
   "_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json 
b/node_modules/swagger-ui/package.json
index 8d36901..6b79de6 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
 "/"
   ],
   "_resolved": 
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541;,
-  "_shasum": "2db7370d391b424b5fabb26adf9a19995dc530f1",
+  "_shasum": "b6d6ffd0baaf041c5e500648421f4b88af44e1f6",
   "_shrinkwrap": null,
   "_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master;,
   "_where": "/opt/service",
diff --git a/src b/src
index e290b17..9bdcf53 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit e290b179a34d996cf5bbcee714a71d5d85a27d07
+Subproject commit 9bdcf5332a11a41aae325efb7d00f7bc0b724b7f

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Revert "Revert "Bump mobile-sections and definitions version""

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397707 )

Change subject: Revert "Revert "Bump mobile-sections and definitions version""
..


Revert "Revert "Bump mobile-sections and definitions version""

This reverts commit bd943b98b1acf8c71c44ff1552267215da5cdf95.

Change-Id: I8dad1500d8c1727b77632f984a693baacfb2375d
---
M lib/mobile-util.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index acbccc8..3e9b515 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -10,11 +10,11 @@
 const NS_MAIN = 0;
 
 mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.13.0' },
+mobileSections: { name: 'mobile-sections', version: '0.13.1' },
 media: { name: 'Media', version: '1.0.0' },
 readHtml: { name: 'ReadHtml', version: '0.1.0' },
 summary: { name: 'Summary', version: '1.3.0' },
-definition: { name: 'definition', version: '0.7.2' },
+definition: { name: 'definition', version: '0.7.3' },
 random: { name: 'random', version: '0.6.0' },
 announcements: { name: 'announcements', version: '0.1.0' },
 compilations: { name: 'compilations', version: '0.1.0' },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8dad1500d8c1727b77632f984a693baacfb2375d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Revert "Revert "Bump mobile-sections and definitions version""

2017-12-11 Thread Mholloway (Code Review) 
Hello BearND, Fjalapeno, Ppchelko, Mhurd, jenkins-bot, Jdlrobson,

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

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

to review the following change.


Change subject: Revert "Revert "Bump mobile-sections and definitions version""
..

Revert "Revert "Bump mobile-sections and definitions version""

This reverts commit bd943b98b1acf8c71c44ff1552267215da5cdf95.

Change-Id: I8dad1500d8c1727b77632f984a693baacfb2375d
---
M lib/mobile-util.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index acbccc8..3e9b515 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -10,11 +10,11 @@
 const NS_MAIN = 0;
 
 mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.13.0' },
+mobileSections: { name: 'mobile-sections', version: '0.13.1' },
 media: { name: 'Media', version: '1.0.0' },
 readHtml: { name: 'ReadHtml', version: '0.1.0' },
 summary: { name: 'Summary', version: '1.3.0' },
-definition: { name: 'definition', version: '0.7.2' },
+definition: { name: 'definition', version: '0.7.3' },
 random: { name: 'random', version: '0.6.0' },
 announcements: { name: 'announcements', version: '0.1.0' },
 compilations: { name: 'compilations', version: '0.1.0' },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dad1500d8c1727b77632f984a693baacfb2375d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to e290b17

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397704 )

Change subject: Update mobileapps to e290b17
..


Update mobileapps to e290b17

List of changes:
c86a701 Bump mobile-sections and definitions version
bd943b9 Revert "Bump mobile-sections and definitions version"
e290b17 Summary: Send empty extracts, not 204, for main pages
xxx Update node module dependencies

Change-Id: I296b93088d37539cb1f324c646cd1bfecd9d97af
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M src
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index a0db53e..c5708f1 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "9bc228c0234d93a62c28507ff478513ad418406e",
+  "_shasum": "5f5c6d52ee716664bdd13227e8e69a6286e6a9d5",
   "_shrinkwrap": null,
   "_spec": "kad@git+https://github.com/gwicke/kad.git#master;,
   "_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json 
b/node_modules/swagger-ui/package.json
index ce498dd..8d36901 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
 "/"
   ],
   "_resolved": 
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541;,
-  "_shasum": "a2047593ad901549f99030afbef69c3ce8c79ba2",
+  "_shasum": "2db7370d391b424b5fabb26adf9a19995dc530f1",
   "_shrinkwrap": null,
   "_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master;,
   "_where": "/opt/service",
diff --git a/src b/src
index 61ca333..e290b17 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 61ca33362ad188c262b965f31b7b8b07cd6bfe28
+Subproject commit e290b179a34d996cf5bbcee714a71d5d85a27d07

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I296b93088d37539cb1f324c646cd1bfecd9d97af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 289c64a

2017-12-11 Thread Ppchelko (Code Review) 
Ppchelko has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397706 )

Change subject: Update restbase to 289c64a
..


Update restbase to 289c64a

List of changes:
43f0856 Fix failure if there's no content-type returned

Change-Id: I872ffc2d164f1ddf84cf860a5306203d87db7927
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/restbase b/restbase
index ef54e7b..289c64a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit ef54e7b54954535152aaf4782df840c9310764f4
+Subproject commit 289c64aed98b6e90d4364d518c22fc683dba9ac9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I872ffc2d164f1ddf84cf860a5306203d87db7927
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 289c64a

2017-12-11 Thread Ppchelko (Code Review) 
Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397706 )

Change subject: Update restbase to 289c64a
..

Update restbase to 289c64a

List of changes:
43f0856 Fix failure if there's no content-type returned

Change-Id: I872ffc2d164f1ddf84cf860a5306203d87db7927
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/06/397706/1

diff --git a/restbase b/restbase
index ef54e7b..289c64a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit ef54e7b54954535152aaf4782df840c9310764f4
+Subproject commit 289c64aed98b6e90d4364d518c22fc683dba9ac9

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I872ffc2d164f1ddf84cf860a5306203d87db7927
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Update en/i18n message for multiple-unclosed-formatting-tags

2017-12-11 Thread Subramanya Sastry (Code Review) 
Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397705 )

Change subject: Update en/i18n message for multiple-unclosed-formatting-tags
..

Update en/i18n message for multiple-unclosed-formatting-tags

* On the Parsoid side, we update the use of this linter category
  for more than small and big tags.

Change-Id: I55ac9e3cc16135ac4e353a03d4d9223a599b58b8
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index c25c1b5..e6a9b10 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -22,7 +22,7 @@
"linter-pager-tidy-whitespace-bug-details": "Tidy whitespace bug",
"linter-pager-html5-misnesting-details": "Misnesting in HTML5 (but not 
in Tidy)",
"linter-pager-tidy-font-bug-details": "Font tag changes link color in 
Tidy but won't in HTML5",
-   "linter-pager-multiple-unclosed-formatting-tags-details": "Multiple 
unclosed small or big tags on the page",
+   "linter-pager-multiple-unclosed-formatting-tags-details": "Multiple 
unclosed formatting tags on the page",
"linter-pager-unclosed-quotes-in-heading-details": "Unclosed quote 
which leaks out of the table of contents",
"linter-pager-multiline-html-table-in-list-details": "Multiline HTML5 
table inside a list, rendered differently in HTML5 and Tidy",
"linter-pager-misc-tidy-replacement-issues-details": "Miscellaneous 
markup errors affecting Tidy replacement",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55ac9e3cc16135ac4e353a03d4d9223a599b58b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
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...deploy[master]: Update mobileapps to e290b17

2017-12-11 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397704 )

Change subject: Update mobileapps to e290b17
..

Update mobileapps to e290b17

List of changes:
c86a701 Bump mobile-sections and definitions version
bd943b9 Revert "Bump mobile-sections and definitions version"
e290b17 Summary: Send empty extracts, not 204, for main pages
xxx Update node module dependencies

Change-Id: I296b93088d37539cb1f324c646cd1bfecd9d97af
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M src
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/04/397704/1

diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index a0db53e..c5708f1 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "9bc228c0234d93a62c28507ff478513ad418406e",
+  "_shasum": "5f5c6d52ee716664bdd13227e8e69a6286e6a9d5",
   "_shrinkwrap": null,
   "_spec": "kad@git+https://github.com/gwicke/kad.git#master;,
   "_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json 
b/node_modules/swagger-ui/package.json
index ce498dd..8d36901 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
 "/"
   ],
   "_resolved": 
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541;,
-  "_shasum": "a2047593ad901549f99030afbef69c3ce8c79ba2",
+  "_shasum": "2db7370d391b424b5fabb26adf9a19995dc530f1",
   "_shrinkwrap": null,
   "_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master;,
   "_where": "/opt/service",
diff --git a/src b/src
index 61ca333..e290b17 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 61ca33362ad188c262b965f31b7b8b07cd6bfe28
+Subproject commit e290b179a34d996cf5bbcee714a71d5d85a27d07

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: On this day event text not shown fully

2017-12-11 Thread Sharvaniharan (Code Review) 
Sharvaniharan has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397703 )

Change subject: On this day event text not shown fully
..

On this day event text not shown fully

- Removed the 5 line max limit on the event text.

Change-Id: I917848d6074d06ee3292dc90240734525060e7d1
---
M app/src/main/res/layout/view_on_this_day_event.xml
1 file changed, 4 insertions(+), 6 deletions(-)


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

diff --git a/app/src/main/res/layout/view_on_this_day_event.xml 
b/app/src/main/res/layout/view_on_this_day_event.xml
index d162e01..41bc11a 100644
--- a/app/src/main/res/layout/view_on_this_day_event.xml
+++ b/app/src/main/res/layout/view_on_this_day_event.xml
@@ -94,15 +94,13 @@
 android:id="@+id/text"
 android:layout_width="wrap_content"
 android:layout_height="wrap_content"
-android:layout_marginStart="19dp"
-android:layout_marginEnd="12dp"
-android:layout_marginTop="2dp"
 android:layout_marginBottom="2dp"
+android:layout_marginEnd="12dp"
+android:layout_marginStart="19dp"
+android:layout_marginTop="2dp"
 android:lineSpacingExtra="8sp"
-android:textSize="16sp"
 android:textColor="?attr/primary_text_color"
-android:maxLines="5"
-android:ellipsize="end"
+android:textSize="16sp"
 tools:text="Thomas Edison films American sharpshooter Annie Oakley, 
which is instrumental in her hiring by Buffalo Bill for his Wild West Show." />
 
 https://gerrit.wikimedia.org/r/397703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Correct API url for queries to Wikidata api

2017-12-11 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397702 )

Change subject: Correct API url for queries to Wikidata api
..

Correct API url for queries to Wikidata api

Bug: T182630
Change-Id: I16ab6f852a096eb727b1d901b2b525e099f0659c
---
M lib/api-util.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/lib/api-util.js b/lib/api-util.js
index efb4686..8696842 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -21,6 +21,10 @@
 query = query || {};
 query.continue = query.continue || '';
 
+if ( domain === 'wikidata.org' ) {
+// without www, it will redirect so avoid redirect...(T182630)
+domain = 'www.wikidata.org';
+}
 const request = app.mwapi_tpl.expand({
 request: {
 params: { domain },

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Summary: Send empty extracts, not 204, for main pages

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397622 )

Change subject: Summary: Send empty extracts, not 204, for main pages
..


Summary: Send empty extracts, not 204, for main pages

I believe this was added based on a misreading of the earlier patch for
handling redirects.  Instead, main pages should be handled in the general
case of pages with no lead intros, which is to return a valid summary
object with empty extract fields.

This is subject to confirmation from Reading Web but I'm putting in the
patch now since it's nearly deployment time.

Bug: T177431
Change-Id: I3b5448369bd07580842188305d2c246b9f78b111
---
M lib/mobile-util.js
M test/features/summary/pagecontent.js
2 files changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index acbccc8..91649f7 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -200,7 +200,6 @@
 const meta = pageData.meta;
 const isContentModelWikitext = meta.contentmodel === 'wikitext';
 const isWhiteListedNamespace = 
mUtil.SUMMARY_NS_WHITELIST.includes(meta.ns);
-const isMainPage = meta.mainpage;
 const isRedirect = meta.redirect;
 
 if (!isContentModelWikitext) {
@@ -208,10 +207,6 @@
 }
 
 if (!isWhiteListedNamespace) {
-return { code: 204 };
-}
-
-if (isMainPage) {
 return { code: 204 };
 }
 
diff --git a/test/features/summary/pagecontent.js 
b/test/features/summary/pagecontent.js
index 4366281..82a6cd8 100644
--- a/test/features/summary/pagecontent.js
+++ b/test/features/summary/pagecontent.js
@@ -46,6 +46,17 @@
 });
 });
 
+it('empty summary (not 204) should be sent for project main page', () => {
+const uri = localUri('Main_Page');
+return preq.get({ uri })
+.then((res) => {
+assert.deepEqual(res.status, 200);
+assert.deepEqual(res.body.type, 'standard');
+assert.deepEqual(res.body.extract, '', 'should send empty 
plaintext extract');
+assert.deepEqual(res.body.extract_html, '', 'should send empty 
html extract');
+});
+});
+
 it('204 should be returned for redirect page', () => {
 const uri = localUri('Barack');
 return preq.get({ uri })

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b5448369bd07580842188305d2c246b9f78b111
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mwlog: style fixes, move firewall include

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397701 )

Change subject: mwlog: style fixes, move firewall include
..

mwlog: style fixes, move firewall include

- use profile::base::firewall not base::firewall
- move firewall includes out of site / node level into role
  (it's already there so duplicate)
- same for the ::standard include

Change-Id: I9795c0b6ef3ac88b27e622e9047943e19be8f9b8
---
M manifests/site.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
2 files changed, 2 insertions(+), 7 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 10d8be1..b150816 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1803,17 +1803,11 @@
 # mw logging host codfw
 node 'mwlog2001.codfw.wmnet' {
 role(xenon, logging::mediawiki::udp2log)
-
-include ::base::firewall
-include ::standard
 }
 
 # mw logging host eqiad
 node 'mwlog1001.eqiad.wmnet' {
 role(xenon, logging::mediawiki::udp2log)
-
-include ::base::firewall
-include ::standard
 }
 
 node 'mx1001.wikimedia.org' {
diff --git a/modules/role/manifests/logging/mediawiki/udp2log.pp 
b/modules/role/manifests/logging/mediawiki/udp2log.pp
index 9724f96..a95fb2f 100644
--- a/modules/role/manifests/logging/mediawiki/udp2log.pp
+++ b/modules/role/manifests/logging/mediawiki/udp2log.pp
@@ -14,7 +14,8 @@
 description => 'MediaWiki log collector',
 }
 
-include ::base::firewall
+include ::standard
+include ::profile::base::firewall
 
 # Rsync archived slow-parse logs to dumps.wikimedia.org.
 # These are available for download at 
http://dumps.wikimedia.org/other/slow-parse/

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: only install puppetdb-terminus on jessie

2017-12-11 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397700 )

Change subject: puppetmaster: only install puppetdb-terminus on jessie
..

puppetmaster: only install puppetdb-terminus on jessie

This package is not available on stretch so it fails to install.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/397700/1


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Revert "Bump mobile-sections and definitions version"

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397646 )

Change subject: Revert "Bump mobile-sections and definitions version"
..


Revert "Bump mobile-sections and definitions version"

Reverting this for now in order to merge and deploy a quick fix.

This reverts commit c86a701a5247c1ff56866e06eb0207094c3035ea.

Change-Id: I9cbf36bab418e7ec3705ed62cf23b60f6d870ff7
---
M lib/mobile-util.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 3e9b515..acbccc8 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -10,11 +10,11 @@
 const NS_MAIN = 0;
 
 mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.13.1' },
+mobileSections: { name: 'mobile-sections', version: '0.13.0' },
 media: { name: 'Media', version: '1.0.0' },
 readHtml: { name: 'ReadHtml', version: '0.1.0' },
 summary: { name: 'Summary', version: '1.3.0' },
-definition: { name: 'definition', version: '0.7.3' },
+definition: { name: 'definition', version: '0.7.2' },
 random: { name: 'random', version: '0.6.0' },
 announcements: { name: 'announcements', version: '0.1.0' },
 compilations: { name: 'compilations', version: '0.1.0' },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cbf36bab418e7ec3705ed62cf23b60f6d870ff7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Fix Updater performance issue

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396474 )

Change subject: Fix Updater performance issue
..


Fix Updater performance issue

Do not use removeAll - just assemble the collections in straightforward way.

Bug: T182464
Change-Id: I02530690e877cc1b60f11dc2fc8b97622c742d68
---
M 
tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
2 files changed, 39 insertions(+), 23 deletions(-)

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



diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
index caf3ff6..85b6208 100644
--- 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
+++ 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
@@ -97,10 +97,6 @@
 int batchSize, Map seenIDs, int tailSeconds) {
 this.wikibase = wikibase;
 this.firstStartTime = firstStartTime;
-// FIXME: temporary plug for T182464, remove after it's fixed
-if (batchSize > 200) {
-batchSize = 200;
-}
 this.batchSize = batchSize;
 this.seenIDs = seenIDs;
 this.tailSeconds = tailSeconds;
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index e6e891e..b048f6d 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -2,7 +2,6 @@
 
 import static com.google.common.collect.Sets.newHashSetWithExpectedSize;
 import static com.google.common.io.Resources.getResource;
-import static org.wikidata.query.rdf.tool.FilteredStatements.filtered;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -372,7 +371,7 @@
 }
 
 /**
- * Provides the SPARQL needed to synchronize the data statements.
+ * Provides the SPARQL needed to synchronize the data statements for a 
single entity.
  *
  * @param entityId id of the entity to sync
  * @param statements all known statements about the entity
@@ -390,17 +389,13 @@
 b.bind("uris.statement", uris.statement());
 b.bindStatements("insertStatements", statements);
 
-Collection entityStatements = 
filtered(statements).withSubject(uris.entity() + entityId);
+List entityStatements = new ArrayList<>();
+List statementStatements = new ArrayList<>();
+Set aboutStatements = new HashSet<>();
+classifyStatements(statements, entityId, entityStatements, 
statementStatements, aboutStatements);
+
 b.bindValues("entityStatements", entityStatements);
-
-Collection statementStatements = 
filtered(statements).withSubjectStarts(uris.statement());
 b.bindValues("statementStatements", statementStatements);
-
-Collection aboutStatements = new 
HashSet(statements);
-aboutStatements.removeAll(entityStatements);
-aboutStatements.removeAll(statementStatements);
-
aboutStatements.removeAll(filtered(statements).withSubjectStarts(uris.value()));
-
aboutStatements.removeAll(filtered(statements).withSubjectStarts(uris.reference()));
 b.bindValues("aboutStatements", aboutStatements);
 
 if (valueList != null && !valueList.isEmpty()) {
@@ -412,6 +407,36 @@
 }
 
 return b.toString();
+}
+
+/**
+ * Sort statements into a set of specialized collections, by subject.
+ * @param statements List of statements to process
+ * @param entityId
+ * @param entityStatements subject is entity
+ * @param statementStatements subject is any statement
+ * @param aboutStatements not entity, not statement, not value and not 
reference
+ */
+private void classifyStatements(Collection statements,
+String entityId, Collection entityStatements,
+Collection statementStatements,
+Collection aboutStatements) {
+for (Statement statement: statements) {
+String s = statement.getSubject().stringValue();
+if (s.equals(uris.entity() + entityId)) {
+entityStatements.add(statement);
+}
+if (s.startsWith(uris.statement())) {
+statementStatements.add(statement);
+}
+if (!s.equals(uris.entity() + entityId)
+&& !s.startsWith(uris.statement())
+&& !s.startsWith(uris.value())
+&& !s.startsWith(uris.reference())
+) {
+aboutStatements.add(statement);
+}
+}
 }
 
 /**
@@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labnet100[34]: use role::spare until used

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397635 )

Change subject: labnet100[34]: use role::spare until used
..


labnet100[34]: use role::spare until used

Assigning role::spare until these are in use
similar to labmon1002 above.

Assigning a role ensures getting security upgrades via debdeploy,
being able to target all hosts via Hiera (for things like decom Ganglia),
and other things. Please give a spare::system or test role
to all systems in site.

Bug: T165779
Change-Id: I952eaa11f6f5733274e57a02851935aa99951f21
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a06027c..10d8be1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1283,9 +1283,9 @@
 include ::standard
 }
 
+# role spare until pushed into service via T165779
 node /labnet100[34]\.eqiad\.wmnet/ {
-include ::standard
-include ::base::firewall
+role(spare::system)
 }
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I952eaa11f6f5733274e57a02851935aa99951f21
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Rush 
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...parsoid[master]: Add some metrics to the http api to count the original version

2017-12-11 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397647 )

Change subject: Add some metrics to the http api to count the original version
..

Add some metrics to the http api to count the original version

Change-Id: I63316e525d8a8f1569868283f981391b831b7f94
---
M lib/api/routes.js
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/lib/api/routes.js b/lib/api/routes.js
index a2a5f56..d36b083 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -443,9 +443,12 @@
} else if (original && original.html) {
env.originalVersion = 
apiUtils.versionFromType(original.html);
if (env.originalVersion === null) {
-   // Or, should we check for a meta in the 
original html?
return apiUtils.fatalRequest(env, 'Content-type 
of original html is missing.', 400);
}
+   }
+   if (metrics) {
+   var ver = env.hasOwnProperty('originalVersion') ? 
env.originalVersion : 'default';
+   metrics.increment('html2wt.original.version.' + ver);
}
 
var pb, origPb;
@@ -553,6 +556,9 @@
if (env.originalVersion === null) {
return apiUtils.fatalRequest(env, 'Content-type of 
revision html is missing.', 400);
}
+   if (metrics) {
+   metrics.increment('pb2pb.original.version.' + 
env.originalVersion);
+   }
 
var contentmodel = (revision && revision.contentmodel);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63316e525d8a8f1569868283f981391b831b7f94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Stop emitting isIW in dp

2017-12-11 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397648 )

Change subject: Stop emitting isIW in dp
..

Stop emitting isIW in dp

Change-Id: I22fb1d8bdf1cceea6855d67feacf158f127243c6
---
M lib/html2wt/LinkHandler.js
M lib/wt2html/tt/LinkHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 22 insertions(+), 19 deletions(-)


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

diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index b9f4f06..c5ba776 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -89,16 +89,21 @@
tail: dp.tail || '',
prefix: dp.prefix || '',
content: {},  // string or tokens
+   isInterwiki: false,
};
+
+   var isIW = false;
 
// Figure out the type of the link
var rel = node.getAttribute('rel');
if (rel) {
-   // Parsoid only emits and recognizes ExtLink, WikiLink, and 
PageProp rel values.
-   // Everything else defaults to ExtLink during serialization 
(unless it is
-   // serializable to a wikilink)
+   // Parsoid only emits and recognizes ExtLink, WikiLink, Media, 
and
+   // PageProp rel values.  Everything else defaults to ExtLink 
during
+   // serialization (unless it is serializable to a wikilink).
var typeMatch = 
rel.match(/\b(mw:(WikiLink|ExtLink|Media|PageProp)[^\s]*)\b/);
if (typeMatch) {
+   // Note this before stripping the subtype
+   isIW = (typeMatch[0] === 'mw:WikiLink/Interwiki');
rtData.type = typeMatch[1];
// Strip link subtype info
if (/^mw:(Wiki|Ext)Link\//.test(rtData.type)) {
@@ -193,9 +198,8 @@
&& !/^#|\?./.test(interWikiMatch[1])
// ExtLinks should have content to convert.
&& (rtData.type !== 'mw:ExtLink' || 
rtData.content.string || rtData.contentNode)
-   && (dp.isIW || target.modified || 
rtData.contentModified)) {
+   && (isIW || target.modified || rtData.contentModified)) 
{
// External link that is really an interwiki link. 
Convert it.
-   // TODO: Leaving this for backwards compatibility, 
remove when 1.5 is no longer bound
if (rtData.type === 'mw:ExtLink') {
rtData.type = 'mw:WikiLink';
}
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 5aea514..9faf0ae 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -633,8 +633,7 @@
 
// Change the rel to be mw:ExtLink
Util.lookupKV(newTk.attribs, 'rel').v = 'mw:WikiLink/Interwiki';
-   // Remember that this was using wikitext syntax though
-   newTk.dataAttribs.isIW = true;
+
// Add title unless it's just a fragment (and trim off fragment)
// (The normalization here is similar to what Title#getPrefixedDBKey() 
does.)
if (target.href[0] !== "#") {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index f10fdc9..1a37b1f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -59,7 +59,7 @@
 add("wt2html", "Self-link to numeric title", "0");
 add("wt2html", " inside a link", "Main Page the main page [it's not very good]");
 add("wt2html", "Interlanguage link with spacing", "Blah blah blah\nhttp://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\; 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\"},\"sa\":{\"href\":\;
   zh  :Chinese \"},\"dsr\":[15,43,null,null]}'/>");
-add("wt2html", "Escaping of interlanguage links (T129218, T156308)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Spanish\; 
title=\"es:Spanish\" 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Spanish\"},\"sa\":{\"href\":\":es:Spanish\"},\"isIW\":true,\"dsr\":[15,30,2,2]}'>es:Spanish\n : zh : Chinese ");
+add("wt2html", "Escaping of interlanguage links (T129218, T156308)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Spanish\; 
title=\"es:Spanish\" 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Spanish\"},\"sa\":{\"href\":\":es:Spanish\"},\"dsr\":[15,30,2,2]}'>es:Spanish\n : zh : Chinese ");
 add("wt2html", "Space and question mark encoding in interlanguage links 
(T95473)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Foo%20bar?\; 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Foo%20bar?\"},\"sa\":{\"href\":\"es:Foo

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Revert "Bump mobile-sections and definitions version"

2017-12-11 Thread Mholloway (Code Review) 
Hello BearND, Fjalapeno, Ppchelko, Mhurd, jenkins-bot, Jdlrobson,

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

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

to review the following change.


Change subject: Revert "Bump mobile-sections and definitions version"
..

Revert "Bump mobile-sections and definitions version"

Reverting this for now in order to merge and deploy a quick fix.

This reverts commit c86a701a5247c1ff56866e06eb0207094c3035ea.

Change-Id: I9cbf36bab418e7ec3705ed62cf23b60f6d870ff7
---
M lib/mobile-util.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 3e9b515..acbccc8 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -10,11 +10,11 @@
 const NS_MAIN = 0;
 
 mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.13.1' },
+mobileSections: { name: 'mobile-sections', version: '0.13.0' },
 media: { name: 'Media', version: '1.0.0' },
 readHtml: { name: 'ReadHtml', version: '0.1.0' },
 summary: { name: 'Summary', version: '1.3.0' },
-definition: { name: 'definition', version: '0.7.3' },
+definition: { name: 'definition', version: '0.7.2' },
 random: { name: 'random', version: '0.6.0' },
 announcements: { name: 'announcements', version: '0.1.0' },
 compilations: { name: 'compilations', version: '0.1.0' },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cbf36bab418e7ec3705ed62cf23b60f6d870ff7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Rename puppet-paladox3 to puppet-paladox

2017-12-11 Thread Paladox (Code Review) 
Paladox has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397644 )

Change subject: Rename puppet-paladox3 to puppet-paladox
..


Rename puppet-paladox3 to puppet-paladox

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

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



diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index ec3e916..ecb6472 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -229,12 +229,12 @@
  }
 }
 
-object Host "puppet-paladox3.git.eqiad.wmflabs" {
+object Host "puppet-paladox.git.eqiad.wmflabs" {
 import "generic-host"
 
 display_name = "Puppet-Paladox"
-address = "puppet-paladox3.git.eqiad.wmflabs"
-vars.address = "puppet-paladox3.git.eqiad.wmflabs"
+address = "puppet-paladox.git.eqiad.wmflabs"
+vars.address = "puppet-paladox.git.eqiad.wmflabs"
 vars.check_user = true
 vars.os = "Linux OS"
 vars.sla = "24x7"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If54ad50f243e9bd46cf4cfb059faaa37fdd8f786
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to c86a701

2017-12-11 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397645 )

Change subject: Update mobileapps to c86a701
..

Update mobileapps to c86a701

List of changes:
c86a701 Bump mobile-sections and definitions version
xxx Update node module dependencies

Change-Id: Ie6c1881cfac1b55f505ab7f55d168a55afcd9888
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M src
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/45/397645/1

diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index a0db53e..2e41c94 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "9bc228c0234d93a62c28507ff478513ad418406e",
+  "_shasum": "74f84a21c52d7b40f4020fb23568fcf07cda23b2",
   "_shrinkwrap": null,
   "_spec": "kad@git+https://github.com/gwicke/kad.git#master;,
   "_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json 
b/node_modules/swagger-ui/package.json
index ce498dd..46c83cf 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
 "/"
   ],
   "_resolved": 
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541;,
-  "_shasum": "a2047593ad901549f99030afbef69c3ce8c79ba2",
+  "_shasum": "ba9cb22f433d759ecfb00496c6cf98ab360e8ea0",
   "_shrinkwrap": null,
   "_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master;,
   "_where": "/opt/service",
diff --git a/src b/src
index 61ca333..c86a701 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 61ca33362ad188c262b965f31b7b8b07cd6bfe28
+Subproject commit c86a701a5247c1ff56866e06eb0207094c3035ea

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

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

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Rename puppet-paladox3 to puppet-paladox

2017-12-11 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397644 )

Change subject: Rename puppet-paladox3 to puppet-paladox
..

Rename puppet-paladox3 to puppet-paladox

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/44/397644/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If54ad50f243e9bd46cf4cfb059faaa37fdd8f786
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
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...mobileapps[master]: References: add specific version number

2017-12-11 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397640 )

Change subject: References: add specific version number
..

References: add specific version number

This will be part of PCS.

Change-Id: I2f7600ffc5c6254db99ee18063da35ab503ac777
---
M lib/mobile-util.js
M routes/mobile-sections.js
2 files changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 3e9b515..47b1257 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -13,6 +13,7 @@
 mobileSections: { name: 'mobile-sections', version: '0.13.1' },
 media: { name: 'Media', version: '1.0.0' },
 readHtml: { name: 'ReadHtml', version: '0.1.0' },
+references: { name: 'References', version: '1.0.0' },
 summary: { name: 'Summary', version: '1.3.0' },
 definition: { name: 'definition', version: '0.7.3' },
 random: { name: 'random', version: '0.6.0' },
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index 278ecd2..75fb024 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -374,7 +374,7 @@
 .then((response) => {
 res.status(200);
 mUtil.setETag(res, response.meta.revision);
-mUtil.setContentType(res, mUtil.CONTENT_TYPES.mobileSections);
+mUtil.setContentType(res, mUtil.CONTENT_TYPES.references);
 res.json(buildReferences(response.doc, req.logger)).end();
 });
 });

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Testtesttest: W00t

2017-12-11 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397639 )

Change subject: Testtesttest: W00t
..

Testtesttest: W00t

Change-Id: Id9663a1da99f6caecf6e04260f36089cabf7a905
---
M tests/selenium/specs/previews.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/39/397639/1

diff --git a/tests/selenium/specs/previews.js b/tests/selenium/specs/previews.js
index 26baca2..3c606ce 100644
--- a/tests/selenium/specs/previews.js
+++ b/tests/selenium/specs/previews.js
@@ -12,13 +12,13 @@
it( 'I should see a preview', function () {
page.open();
page.dwellLink();
-   assert( page.seePreview() );
+   assert( page.seePreview(), 'Preview is there!' );
} );
 
it( 'Abandoning link hides preview', function () {
page.open();
page.dwellLink();
page.abandonLink();
-   assert( page.doNotSeePreview() );
+   assert( page.doNotSeePreview(), 'Preview is gone!' );
} );
 } );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9663a1da99f6caecf6e04260f36089cabf7a905
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Make svg_check.sh verbose

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397565 )

Change subject: Make svg_check.sh verbose
..


Make svg_check.sh verbose

So we know what is going on while the CPU is being busy.

Change-Id: I34a7ecadf549833025a197d72ca131888519a92a
---
M dev-scripts/svg_check.sh
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/dev-scripts/svg_check.sh b/dev-scripts/svg_check.sh
index 220e434..db45f91 100755
--- a/dev-scripts/svg_check.sh
+++ b/dev-scripts/svg_check.sh
@@ -3,10 +3,13 @@
 
 while read -r svgfile; do
outfile="$svgfile.tmp"
+   echo -n "Checking compression: $svgfile ... "
node_modules/.bin/svgo --config .svgo.yml -i "$svgfile" -o "$outfile" -q
if [ "$(wc -c < "$svgfile")" -gt "$(wc -c < "$outfile")" ]; then
-   echo "File $svgfile is not compressed."
+   echo -e "\nERR> file $svgfile is not compressed."
found=$((found + 1))
+   else
+   echo "OK"
fi
rm "$outfile"
 done < <(find resources -type f -name '*.svg')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34a7ecadf549833025a197d72ca131888519a92a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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...MinervaNeue[master]: Pass svg_checks.sh via ShellCheck

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397564 )

Change subject: Pass svg_checks.sh via ShellCheck
..


Pass svg_checks.sh via ShellCheck

while read svgfile; do
SC2162: read without -r will mangle backslashes.

if [ $(wc -c < "$svgfile") -gt $(wc -c < "$outfile") ];
SC2046: quote to prevent word splitting

found increment was done in a subshell and hence would not be properly
incremented. Instead of:

  find | while

Switch to:

  while < <( find )

Based on https://github.com/koalaman/shellcheck/wiki/SC2031 , this way
$found is kept in the same context.

Change-Id: Id8eb1027eed373161c8e7932b7745d4f53f2fc6c
---
M dev-scripts/svg_check.sh
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/dev-scripts/svg_check.sh b/dev-scripts/svg_check.sh
index 963b7e5..220e434 100755
--- a/dev-scripts/svg_check.sh
+++ b/dev-scripts/svg_check.sh
@@ -1,16 +1,15 @@
 #!/usr/bin/env bash
 found=0
 
-find resources -type f -name '*.svg' |
-while read svgfile; do
+while read -r svgfile; do
outfile="$svgfile.tmp"
node_modules/.bin/svgo --config .svgo.yml -i "$svgfile" -o "$outfile" -q
-   if [ $(wc -c < "$svgfile") -gt $(wc -c < "$outfile") ]; then
+   if [ "$(wc -c < "$svgfile")" -gt "$(wc -c < "$outfile")" ]; then
echo "File $svgfile is not compressed."
found=$((found + 1))
fi
rm "$outfile"
-done
+done < <(find resources -type f -name '*.svg')
 
 if [ $found -gt 0 ]; then
echo "Found $found uncompressed SVG files. Please compress the files 
and re-submit the patch."

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8eb1027eed373161c8e7932b7745d4f53f2fc6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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...DonationInterface[master]: Tweak informationsharing message to be more upfront

2017-12-11 Thread Pcoombe (Code Review) 
Pcoombe has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397637 )

Change subject: Tweak informationsharing message to be more upfront
..

Tweak informationsharing message to be more upfront

Move "We do not sell or trade your information to anyone" to start
of message so donors are more likely to see it. Change was approved
by legal.

Change-Id: If84cdf6d6599578b4f0664738f905f1b1663afe4
---
M gateway_common/i18n/interface/en-gb.json
M gateway_common/i18n/interface/en.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/gateway_common/i18n/interface/en-gb.json 
b/gateway_common/i18n/interface/en-gb.json
index a04dfdb..d3ebe06 100644
--- a/gateway_common/i18n/interface/en-gb.json
+++ b/gateway_common/i18n/interface/en-gb.json
@@ -18,7 +18,7 @@
"donate_interface-sofortbanking": "Sofortbanking is a direct, real time 
Bank Transfer via DIRECTebanking.com that allows you to directly trigger a bank 
transfer during your online donation with your online banking information. If 
your bank account is not enabled with online capabilities you may want to use 
the \"Donate by manual bank transfer\" option on the main donation page.",
"donate_interface-dd-authorization_id": "Authorisation ID",
"donate_interface-email-unsub-delay": "Please allow up to four (4) days 
for the changes to take effect. We apologise for any emails you receive during 
this time. If you have any questions, please contact ",
-   "donate_interface-informationsharing": "By donating, you agree to share 
your personal information with the Wikimedia Foundation, the nonprofit 
organisation that hosts Wikipedia and other Wikimedia projects, and its service 
providers pursuant to our donor policy. 
Wikimedia Foundation and its service providers are located in the United States 
and in other countries whose privacy laws may not be equivalent to your own. We 
do not sell or trade your information to anyone. For more information please 
read our donor 
policy.",
+   "donate_interface-informationsharing": "We do not sell or trade your 
information to anyone. By donating, you agree to share your personal 
information with the Wikimedia Foundation, the nonprofit organisation that 
hosts Wikipedia and other Wikimedia projects, and its service providers 
pursuant to our donor 
policy. Wikimedia Foundation and its service providers are located in the 
United States and in other countries whose privacy laws may not be equivalent 
to your own. For more information please read our donor policy.",
"donate_interface-bank_transfer_message": "Please notice that your 
statement will show 'Global Collect' as the recipient of this gift. Global 
Collect is authorised to accept and process payments on behalf of Wikimedia 
Foundation. Remember to include the reference number provided here on your bank 
transfer and feel free to email donati...@wikimedia.org if you have any 
questions or concerns.",
"donate_interface-globalcollect-proxy": "Please notice that your 
statement will show 'Global Collect' as the recipient of this gift. Global 
Collect is authorised to accept and process payments on behalf of Wikimedia 
Foundation.",
"donate_interface-statement": "Wikimedia $1"
diff --git a/gateway_common/i18n/interface/en.json 
b/gateway_common/i18n/interface/en.json
index 65ddb7f..e9ac608 100644
--- a/gateway_common/i18n/interface/en.json
+++ b/gateway_common/i18n/interface/en.json
@@ -401,7 +401,7 @@
"donate_interface-email-unsub-warning": "This will opt you out of 
emails from the Wikimedia Foundation sent to you as a donor. You may still 
receive emails to this email address if it is associated with an account on one 
of our projects. If you have any questions, please contact mailto:donati...@wikimedia.org\;>donati...@wikimedia.org.",
"donate_interface-faqs": "Frequently asked questions",
"donate_interface-tax-info": "Tax deductibility information",
-   "donate_interface-informationsharing": "By donating, you agree to share 
your personal information with the Wikimedia Foundation, the nonprofit 
organization that hosts Wikipedia and other Wikimedia projects, and its service 
providers pursuant to our donor policy. 
Wikimedia Foundation and its service providers are located in the United States 
and in other countries whose privacy laws may not be equivalent to your own. We 
do not sell or trade your information to anyone. For more information please 
read our donor 
policy.",
+   "donate_interface-informationsharing": "We do not sell or trade your 
information to anyone. By donating, you agree to share your personal 
information with the Wikimedia Foundation, the nonprofit organization that 
hosts Wikipedia and other Wikimedia projects, and its

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::appserver: move firewall from site to role

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397636 )

Change subject: mediawiki::appserver: move firewall from site to role
..

mediawiki::appserver: move firewall from site to role

Change-Id: I3ce1babecc3ab27bfd991c8ef5fbd9936e6d139e
---
M manifests/site.pp
M modules/role/manifests/mediawiki/appserver.pp
2 files changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/397636/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a06027c..8b2a68c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1092,7 +1092,6 @@
 node /labweb100[12]\.eqiad\.wmnet/ {
 role(mediawiki::appserver)
 
-include ::base::firewall
 include ::ldap::role::client::labs
 
 interface::add_ip6_mapped { 'main': }
@@ -1615,7 +1614,6 @@
 # mw1180-1188 are apaches
 node /^mw118[0-8]\.eqiad\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 # mw1189-1208 are api apaches
@@ -1626,7 +1624,6 @@
 # mw1209-1216, 1218-1220 are apaches
 node /^mw12(09|1[012345689]|20)\.eqiad\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 #mw1221-mw1235 are api apaches
@@ -1637,7 +1634,6 @@
 #mw1238-mw1258 are apaches
 node /^mw12(3[8-9]|4[0-9]|5[0-8])\.eqiad\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 #mw1259-60 are videoscalers
@@ -1654,7 +1650,6 @@
 
 node /^mw12(6[6-9]|7[0-5])\.eqiad\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 # ROW A eqiad api appserver
@@ -1682,7 +1677,6 @@
 # ROW C eqiad appservers
 node /^mw13(19|2[0-8])\.eqiad\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 # ROW B eqiad api-appservers
@@ -1752,7 +1746,6 @@
 #mw2163-mw2199 are appservers
 node /^mw21(6[3-9]|[6-9][0-9])\.codfw\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 #mw2200-2214 are api appservers
@@ -1770,7 +1763,6 @@
 # mw2224-42 are appservers
 node /^mw22(2[4-9]|3[0-9]|4[0-2])\.codfw\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 #mw2244-mw2245 are imagescalers
@@ -1797,7 +1789,6 @@
 #mw2254-2258 are appservers
 node /^mw225[4-8]\.codfw\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 # mw logging host codfw
diff --git a/modules/role/manifests/mediawiki/appserver.pp 
b/modules/role/manifests/mediawiki/appserver.pp
index 8168c29..b027296 100644
--- a/modules/role/manifests/mediawiki/appserver.pp
+++ b/modules/role/manifests/mediawiki/appserver.pp
@@ -3,6 +3,7 @@
 system::role { 'mediawiki::appserver': }
 
 include ::role::mediawiki::webserver
+include ::profile::base::firewall
 include ::profile::prometheus::apache_exporter
 include ::profile::prometheus::hhvm_exporter
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: QA: Add additional steps to guard against slow test runs

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396287 )

Change subject: QA: Add additional steps to guard against slow test runs
..


QA: Add additional steps to guard against slow test runs

Bug: T182202
Change-Id: If46620941924b86c5403c9e928911b1aa5845d7a
---
M tests/browser/features/language.feature
M tests/browser/features/step_definitions/language_steps.rb
M tests/browser/features/step_definitions/search_steps.rb
M tests/browser/features/step_definitions/talk_steps.rb
M tests/browser/features/talk.feature
5 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/tests/browser/features/language.feature 
b/tests/browser/features/language.feature
index d17d090..d85d30e 100644
--- a/tests/browser/features/language.feature
+++ b/tests/browser/features/language.feature
@@ -60,6 +60,7 @@
   Scenario: Checking that the suggested language link has been created
 Given I go to a page that has languages
 And I click the switch-language page action
+And I see the language overlay
 And I click on a language from the list of all languages
 And I click the browser back button
 And I see the language overlay
diff --git a/tests/browser/features/step_definitions/language_steps.rb 
b/tests/browser/features/step_definitions/language_steps.rb
index 676f917..0c2a435 100644
--- a/tests/browser/features/step_definitions/language_steps.rb
+++ b/tests/browser/features/step_definitions/language_steps.rb
@@ -7,7 +7,8 @@
 end
 
 When /^I click on a language from the list of all languages$/ do
-  on(ArticlePage).non_suggested_language_link_element.when_present.click
+  # API requests can sometimes take a long time so give additional time to 
verify this
+  on(ArticlePage).non_suggested_language_link_element.when_present(15).click
 end
 
 Then(/^I should not see the languages overlay$/) do
diff --git a/tests/browser/features/step_definitions/search_steps.rb 
b/tests/browser/features/step_definitions/search_steps.rb
index 3420aac..ecf734b 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -29,7 +29,7 @@
 end
 
 When(/^I click a search watch star$/) do
-  on(ArticlePage).search_watchstars_element.when_present.click
+  on(ArticlePage).search_watchstars_element.when_present(15).click
 end
 
 When(/^I press the enter key$/) do
diff --git a/tests/browser/features/step_definitions/talk_steps.rb 
b/tests/browser/features/step_definitions/talk_steps.rb
index 911ed2c..831d373 100644
--- a/tests/browser/features/step_definitions/talk_steps.rb
+++ b/tests/browser/features/step_definitions/talk_steps.rb
@@ -19,12 +19,17 @@
   end
 end
 
+When(/^I see the talk overlay$/) do
+  on(ArticlePage).overlay_element.when_visible
+end
+
 When(/^I click the add discussion button$/) do
   on(ArticlePage).talkadd_element.when_present.click
 end
 
 Then(/^I should see the topic called "(.+)" in the list of topics$/) do |topic|
-  
expect(on(ArticlePage).talk_overlay_first_topic_title_element.when_present.text).to
 match topic
+  # Timeout is high as the previous action hits the API which may take some 
time
+  
expect(on(ArticlePage).talk_overlay_first_topic_title_element.when_present(20).text).to
 match topic
 end
 
 Then(/^I should see the talk overlay$/) do
diff --git a/tests/browser/features/talk.feature 
b/tests/browser/features/talk.feature
index cf95b31..d81e04b 100644
--- a/tests/browser/features/talk.feature
+++ b/tests/browser/features/talk.feature
@@ -42,6 +42,7 @@
   And I am logged into the mobile website
   And the page "Selenium talk test" exists
 When I click the talk button
+And I see the talk overlay
  And no topic is present
  And I add a topic called "New topic"
 Then I should see the topic called "New topic" in the list of topics

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If46620941924b86c5403c9e928911b1aa5845d7a
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: Zfilipin 
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]: [bugfix] Catch AttributeError and raise the ValueError

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396917 )

Change subject: [bugfix] Catch AttributeError and raise the ValueError
..


[bugfix] Catch AttributeError and raise the ValueError

Bug: T181913
Change-Id: Id03f32e8dc422a22f9998030836da5be8d25af52
---
M pywikibot/proofreadpage.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index f4e6a08..2919514 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -532,12 +532,12 @@
 soup = Soup(response.content)
 
 try:
-# None if nothing is found by .find()
 self._url_image = soup.find(class_='prp-page-image')
+# if None raises AttributeError
 self._url_image = self._url_image.find('img')
 # if None raises TypeError.
 self._url_image = self._url_image['src']
-except TypeError:
+except (TypeError, AttributeError):
 raise ValueError('No prp-page-image src found for %s.' % self)
 else:
 self._url_image = 'https:' + self._url_image

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id03f32e8dc422a22f9998030836da5be8d25af52
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Mpaa 
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...mobileapps[master]: Bump mobile-sections and definitions version

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397633 )

Change subject: Bump mobile-sections and definitions version
..


Bump mobile-sections and definitions version

to hopefully follow shortly after the deployment of
Parsoid section tags.

Once Parsoid deploys the sectioning patch then we'll exercise
different code paths in MCS for the various mobile-sections and
definitions endpoints.

Bug: T179417
Change-Id: Ibb105cb3b7ab71a14c190fd59eadbe3462f6d429
---
M lib/mobile-util.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index acbccc8..3e9b515 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -10,11 +10,11 @@
 const NS_MAIN = 0;
 
 mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.13.0' },
+mobileSections: { name: 'mobile-sections', version: '0.13.1' },
 media: { name: 'Media', version: '1.0.0' },
 readHtml: { name: 'ReadHtml', version: '0.1.0' },
 summary: { name: 'Summary', version: '1.3.0' },
-definition: { name: 'definition', version: '0.7.2' },
+definition: { name: 'definition', version: '0.7.3' },
 random: { name: 'random', version: '0.6.0' },
 announcements: { name: 'announcements', version: '0.1.0' },
 compilations: { name: 'compilations', version: '0.1.0' },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb105cb3b7ab71a14c190fd59eadbe3462f6d429
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: .gitignore /docs/ generated by JSDuck

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397563 )

Change subject: .gitignore /docs/ generated by JSDuck
..


.gitignore /docs/ generated by JSDuck

Change-Id: I04889b8ee6f1bfb8eb524378219c2863953f2038
---
M .gitignore
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index a587932..7951712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-node_modules/
+# JSDuck output
+/docs/
+
+/node_modules/
 /vendor
 /composer.lock
 /composer.phar

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04889b8ee6f1bfb8eb524378219c2863953f2038
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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]: labnet100[34]: use role::spare until used

2017-12-11 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397635 )

Change subject: labnet100[34]: use role::spare until used
..

labnet100[34]: use role::spare until used

Assigning role::spare until these are in use
similar to labmon1002 above.

Assigning a role ensures getting security upgrades via debdeploy,
being able to target all hosts via Hiera (for things like decom Ganglia),
and other things. Please give a spare::system or test role
to all systems in site.

Bug: T165779
Change-Id: I952eaa11f6f5733274e57a02851935aa99951f21
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/397635/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a06027c..10d8be1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1283,9 +1283,9 @@
 include ::standard
 }
 
+# role spare until pushed into service via T165779
 node /labnet100[34]\.eqiad\.wmnet/ {
-include ::standard
-include ::base::firewall
+role(spare::system)
 }
 
 

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to ...

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395684 )

Change subject: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be 
removed
..


[DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed

Bug: T145163
Change-Id: Id73c673704ba9528a8b2a98f4a896905468beec3
---
M demos/pages/icons.js
M src/themes/apex/icons-alerts.json
M src/themes/wikimediaui/icons-alerts.json
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 8ae0e63..824b65b 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -37,7 +37,6 @@
alerts: [
'alert',
'bell',
-   'bellOn',
'comment',
'message',
'notice',
diff --git a/src/themes/apex/icons-alerts.json 
b/src/themes/apex/icons-alerts.json
index 880f765..9bef0a1 100644
--- a/src/themes/apex/icons-alerts.json
+++ b/src/themes/apex/icons-alerts.json
@@ -7,7 +7,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
diff --git a/src/themes/wikimediaui/icons-alerts.json 
b/src/themes/wikimediaui/icons-alerts.json
index 0d45a51..ee79a2e 100644
--- a/src/themes/wikimediaui/icons-alerts.json
+++ b/src/themes/wikimediaui/icons-alerts.json
@@ -27,7 +27,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id73c673704ba9528a8b2a98f4a896905468beec3
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
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]: docker: php5.5 images

2017-12-11 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397634 )

Change subject: docker: php5.5 images
..

docker: php5.5 images

Using the packages build for Jessie as part of T174972

Docker images:

wmfreleng/composer-php55:v2017.12.11.21.40
wmfreleng/php55:v2017.12.11.21.35

Note: XDebug is not available. We don't need it anyway.

Change-Id: Icab9a248dc4d576f0f774c0d6c162d219560f5f6
---
A dockerfiles/composer-php55/.dockerignore
A dockerfiles/composer-php55/Dockerfile
A dockerfiles/php55/.dockerignore
A dockerfiles/php55/Dockerfile
4 files changed, 51 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/34/397634/1

diff --git a/dockerfiles/composer-php55/.dockerignore 
b/dockerfiles/composer-php55/.dockerignore
new file mode 100644
index 000..06cf653
--- /dev/null
+++ b/dockerfiles/composer-php55/.dockerignore
@@ -0,0 +1 @@
+cache
diff --git a/dockerfiles/composer-php55/Dockerfile 
b/dockerfiles/composer-php55/Dockerfile
new file mode 100644
index 000..5b9c03b
--- /dev/null
+++ b/dockerfiles/composer-php55/Dockerfile
@@ -0,0 +1,18 @@
+FROM wmfreleng/composer:latest as composer
+
+FROM wmfreleng/php55:latest
+
+COPY --from=composer /srv/composer /srv/composer
+COPY --from=composer /.cache-buster-composer /.cache-buster-composer
+# Manually link since COPY copies symlink destination instead of the actual 
symlink
+USER root
+RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
+
+USER nobody
+
+# If a later dockerfile enables xdebug, don't
+# spam warnings about it.
+ENV COMPOSER_DISABLE_XDEBUG_WARN=1
+
+ENTRYPOINT ["/srv/composer/vendor/bin/composer"]
+CMD ["help"]
diff --git a/dockerfiles/php55/.dockerignore b/dockerfiles/php55/.dockerignore
new file mode 100644
index 000..06cf653
--- /dev/null
+++ b/dockerfiles/php55/.dockerignore
@@ -0,0 +1 @@
+cache
diff --git a/dockerfiles/php55/Dockerfile b/dockerfiles/php55/Dockerfile
new file mode 100644
index 000..e50b0d1
--- /dev/null
+++ b/dockerfiles/php55/Dockerfile
@@ -0,0 +1,31 @@
+FROM wmfreleng/ci-jessie:latest
+
+RUN echo "deb http://apt.wikimedia.org/wikimedia jessie-wikimedia 
component/ci" \
+> /etc/apt/sources.list.d/jessie-ci-php55.list && \
+apt-get update && \
+apt-get install --yes \
+php5.5-cli \
+php5.5-common \
+php5.5-curl \
+php5.5-dev \
+php5.5-gd \
+php5.5-gmp \
+php5.5-intl \
+php5.5-ldap \
+php5.5-luasandbox \
+php5.5-mbstring \
+php5.5-mcrypt \
+php5.5-mysql \
+php5.5-redis \
+php5.5-sqlite3 \
+php5.5-tidy \
+php5.5-xml \
+php5.5-xsl \
+php5.5-zip \
+&& \
+apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER nobody
+
+ENTRYPOINT ["php"]
+CMD ["--help"]

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: dib: contint::browsers is now a profile

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392977 )

Change subject: dib: contint::browsers is now a profile
..


dib: contint::browsers is now a profile

Change-Id: If89e4f0e509a603f18b25945cf3880eff48c977c
Depends-On: I7c1f9a63631ba3cb81307c404adb042f2a7a7df6
---
M dib/puppet/ciimage.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 78623f6..4ec26da 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -95,7 +95,7 @@
 include contint::packages::python
 
 # Qunit/Selenium related
-include contint::browsers
+include profile::ci::browsers
 
 
 # FIXME: hack, our manifests no more ship libapache2-mod-php5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If89e4f0e509a603f18b25945cf3880eff48c977c
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Bump mobile-sections and definitions version

2017-12-11 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397633 )

Change subject: Bump mobile-sections and definitions version
..

Bump mobile-sections and definitions version

to hopefully follow shortly after the deployment of
Parsoid section tags.

Once Parsoid deploys the sectioning patch then we'll exercise
different code paths in MCS for the various mobile-sections and
definitions endpoints.

Change-Id: Ibb105cb3b7ab71a14c190fd59eadbe3462f6d429
---
M lib/mobile-util.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index acbccc8..92034bb 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -10,7 +10,7 @@
 const NS_MAIN = 0;
 
 mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.13.0' },
+mobileSections: { name: 'mobile-sections', version: '0.13.1' },
 media: { name: 'Media', version: '1.0.0' },
 readHtml: { name: 'ReadHtml', version: '0.1.0' },
 summary: { name: 'Summary', version: '1.3.0' },

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: Migrate HistoryBlob to alternatives without PHP seriali...

2017-12-11 Thread Anomie (Code Review) 
Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397632 )

Change subject: WIP: Migrate HistoryBlob to alternatives without PHP 
serialization
..

WIP: Migrate HistoryBlob to alternatives without PHP serialization

DONE:
* Write the replacements for HistoryBlob.
* Tests for the replacements.
* Adjust code to be able to handle receiving them (untested).

TODO:
* Update the compression maintenance scripts.
* Search for any other relevant unserialize() calls.
* Actually write the new maintenance script(s).



The ExternalStore multi-content HistoryBlob subclasses are migrated to the new
MultiContentBlob classes.

HistoryBlobCurStub is re-saved using modern methods, as should have been
done long ago.

HistoryBlobStub is an error. If for some reason you have some of these
in your database, run the existing maintenance/storage/resolveStubs.php
script first.

Bug: T181555
Change-Id: Ia712c794c65ba9048462f223382e7953c5eb253f
---
M autoload.php
M includes/HistoryBlob.php
M includes/Revision.php
A includes/externalstore/ConcatenatedMultiContentBlob.php
A includes/externalstore/DiffMultiContentBlob.php
M includes/externalstore/ExternalStoreDB.php
A includes/externalstore/MultiContentBlob.php
A maintenance/storage/migrateHistoryBlobs.php
M tests/common/TestsAutoLoader.php
A tests/phpunit/includes/externalstore/ConcatenatedMultiContentBlobTest.php
A tests/phpunit/includes/externalstore/DiffMultiContentBlobTest.php
A tests/phpunit/includes/externalstore/MultiContentBlobTest.php
A tests/phpunit/includes/externalstore/TestMultiContentBlob.php
13 files changed, 1,685 insertions(+), 6 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index cd01828..6ecab67 100644
--- a/autoload.php
+++ b/autoload.php
@@ -885,6 +885,9 @@
'MediaWiki\\EditPage\\TextConflictHelper' => __DIR__ . 
'/includes/editpage/TextConflictHelper.php',
'MediaWiki\\EditPage\\TextboxBuilder' => __DIR__ . 
'/includes/editpage/TextboxBuilder.php',
'MediaWiki\\Edit\\PreparedEdit' => __DIR__ . 
'/includes/edit/PreparedEdit.php',
+   'MediaWiki\\ExternalStore\\ConcatenatedMultiContentBlob' => __DIR__ . 
'/includes/externalstore/ConcatenatedMultiContentBlob.php',
+   'MediaWiki\\ExternalStore\\DiffMultiContentBlob' => __DIR__ . 
'/includes/externalstore/DiffMultiContentBlob.php',
+   'MediaWiki\\ExternalStore\\MultiContentBlob' => __DIR__ . 
'/includes/externalstore/MultiContentBlob.php',
'MediaWiki\\HeaderCallback' => __DIR__ . '/includes/HeaderCallback.php',
'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . 
'/includes/interwiki/ClassicInterwikiLookup.php',
'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . 
'/includes/interwiki/InterwikiLookup.php',
@@ -1004,6 +1007,7 @@
'MessageSpecifier' => __DIR__ . '/includes/libs/MessageSpecifier.php',
'MigrateComments' => __DIR__ . '/maintenance/migrateComments.php',
'MigrateFileRepoLayout' => __DIR__ . 
'/maintenance/migrateFileRepoLayout.php',
+   'MigrateHistoryBlobs' => __DIR__ . 
'/maintenance/storage/migrateHistoryBlobs.php',
'MigrateUserGroup' => __DIR__ . '/maintenance/migrateUserGroup.php',
'MimeAnalyzer' => __DIR__ . '/includes/libs/mime/MimeAnalyzer.php',
'MimeMagic' => __DIR__ . '/includes/MimeMagic.php',
diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index 14d22ec..07a7760 100644
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -24,6 +24,7 @@
  * Base class for general text storage via the "object" flag in old_flags, or
  * two-part external storage URLs. Used for represent efficient concatenated
  * storage, and migration-related pointer objects.
+ * @deprecated since 1.31, MediaWiki\ExternalStore\MultiContentBlob is the 
successor.
  */
 interface HistoryBlob {
/**
@@ -69,6 +70,8 @@
 /**
  * Concatenated gzip (CGZ) storage
  * Improves compression ratio by concatenating like objects before gzipping
+ * @deprecated since 1.31, 
MediaWiki\ExternalStore\ConcatenatedMultiContentBlob is the successor.
+ *  Use maintenance/storage/migrateHistoryBlobs.php to replace references in 
the DB.
  */
 class ConcatenatedGzipHistoryBlob implements HistoryBlob {
public $mVersion = 0, $mCompressed = false, $mItems = [], $mDefaultHash 
= '';
@@ -183,6 +186,9 @@
 
 /**
  * Pointer object for an item within a CGZ blob stored in the text table.
+ * @deprecated since 1.31, but really should have been so since 1.5.
+ *  Use maintenance/storage/resolveStubs.php or
+ *  maintenance/storage/migrateHistoryBlobs.php to replace references in the 
DB.
  */
 class HistoryBlobStub {
/**
@@ -307,6 +313,9 @@
  *
  * Serialized HistoryBlobCurStub objects will be inserted into the text table
  * on conversion if $wgLegacySchemaConversion is set to true.
+ *
+ * @deprecated

[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Track time-to-ready/loaded via window.performance

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397580 )

Change subject: Track time-to-ready/loaded via window.performance
..


Track time-to-ready/loaded via window.performance

Change-Id: Iadb9c131ca6730c20d4b166e686942f9b404e198
---
M modules/ext.wikiEditor.js
1 file changed, 17 insertions(+), 7 deletions(-)

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



diff --git a/modules/ext.wikiEditor.js b/modules/ext.wikiEditor.js
index a9368f1..3defae4 100644
--- a/modules/ext.wikiEditor.js
+++ b/modules/ext.wikiEditor.js
@@ -58,14 +58,24 @@
 
if ( $editingSessionIdInput.length ) {
editingSessionId = $editingSessionIdInput.val();
-   logEditEvent( 'ready', {
-   editingSessionId: editingSessionId
-   } );
-   $textarea.on( 'wikiEditor-toolbar-doneInitialSections', 
function () {
-   logEditEvent( 'loaded', {
-   editingSessionId: editingSessionId
+   if ( window.performance && window.performance.timing ) {
+   // We want to track from the time the user 
started to try to
+   // launch the editor which navigationStart 
approximates. All
+   // of our supported browsers *should* allow 
this. Rather than
+   // fall back to the timestamp when the page 
loaded for those
+   // that don't, we just ignore them, so as to 
not skew the
+   // results towards better-performance in those 
cases.
+   logEditEvent( 'ready', {
+   editingSessionId: editingSessionId,
+   timing: Date.now() - 
window.performance.timing.navigationStart
} );
-   } );
+   $textarea.on( 
'wikiEditor-toolbar-doneInitialSections', function () {
+   logEditEvent( 'loaded', {
+   editingSessionId: 
editingSessionId,
+   timing: Date.now() - 
window.performance.timing.navigationStart
+   } );
+   } );
+   }
$textarea.closest( 'form' ).submit( function () {
submitting = true;
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadb9c131ca6730c20d4b166e686942f9b404e198
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: TheDJ 
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...MinervaNeue[master]: Update RuboCop Ruby gem

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395514 )

Change subject: Update RuboCop Ruby gem
..


Update RuboCop Ruby gem

Bug: T180878
Change-Id: I904e947d7044b259f29f584b568ab2cb689bd5a4
---
A .rubocop_todo.yml
M Gemfile
M Gemfile.lock
3 files changed, 123 insertions(+), 15 deletions(-)

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



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 000..845059a
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,103 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-12-06 12:25:18 + using RuboCop version 0.51.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, 
unindent
+Layout/IndentHeredoc:
+  Exclude:
+- 'tests/browser/features/step_definitions/create_page_api_steps.rb'
+
+# Offense count: 7
+Lint/AmbiguousRegexpLiteral:
+  Exclude:
+- 'tests/browser/features/step_definitions/common_article_steps.rb'
+- 'tests/browser/features/step_definitions/common_steps.rb'
+- 'tests/browser/features/step_definitions/language_icon_steps.rb'
+- 'tests/browser/features/step_definitions/language_steps.rb'
+- 'tests/browser/features/step_definitions/notification_steps.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 131
+
+# Offense count: 42
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, 
IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 156
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: lowercase, uppercase
+Naming/HeredocDelimiterCase:
+  Exclude:
+- 'tests/browser/features/step_definitions/create_page_api_steps.rb'
+
+# Offense count: 1
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
+  Exclude:
+- 'tests/browser/features/step_definitions/create_page_api_steps.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Performance/StringReplacement:
+  Exclude:
+- 'tests/browser/features/step_definitions/common_steps.rb'
+
+# Offense count: 13
+Style/Documentation:
+  Exclude:
+- 'spec/**/*'
+- 'test/**/*'
+- 'tests/browser/features/support/pages/article_page.rb'
+- 'tests/browser/features/support/pages/create_article_page.rb'
+- 'tests/browser/features/support/pages/diff_page.rb'
+- 'tests/browser/features/support/pages/language_page.rb'
+- 'tests/browser/features/support/pages/main_page.rb'
+- 'tests/browser/features/support/pages/notification_page.rb'
+- 'tests/browser/features/support/pages/page.rb'
+- 'tests/browser/features/support/pages/special_history_page.rb'
+- 'tests/browser/features/support/pages/special_mobilediff_page.rb'
+- 'tests/browser/features/support/pages/special_search_page.rb'
+- 'tests/browser/features/support/pages/special_userlogin_page.rb'
+- 'tests/browser/features/support/pages/user_page.rb'
+
+# Offense count: 1
+Style/MixinUsage:
+  Exclude:
+- 'tests/browser/features/support/pages/special_history_page.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Whitelist.
+# Whitelist: be, be_a, be_an, be_between, be_falsey, be_kind_of, 
be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, 
raise_error, respond_to, start_with
+Style/NestedParenthesizedCalls:
+  Exclude:
+- 'tests/browser/features/step_definitions/search_steps.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+- 'tests/browser/features/step_definitions/search_steps.rb'
+- 'tests/browser/features/support/pages/user_page.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+  Exclude:
+- 'tests/browser/features/support/hooks.rb'
diff --git a/Gemfile b/Gemfile
index 144b926..18753bc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,4 +4,4 @@
 gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.3'
 gem 'page-object', '1.1.0'
 gem 'rake', '~> 10.4', '>= 10.4.2'
-gem 'rubocop', '~> 0.29.1', require: false
+gem 'rubocop', '~> 0.51.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b46fb7..4f96163 100644
--- a/Gemfile.lock
+++

[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Track action=loaded when the editor is *fully* ready

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395777 )

Change subject: Track action=loaded when the editor is *fully* ready
..


Track action=loaded when the editor is *fully* ready

Change-Id: I29ee776bdfe5d89ddffb97175588ed037ef0beee
---
M modules/ext.wikiEditor.js
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/ext.wikiEditor.js b/modules/ext.wikiEditor.js
index 33278e0..a9368f1 100644
--- a/modules/ext.wikiEditor.js
+++ b/modules/ext.wikiEditor.js
@@ -61,6 +61,11 @@
logEditEvent( 'ready', {
editingSessionId: editingSessionId
} );
+   $textarea.on( 'wikiEditor-toolbar-doneInitialSections', 
function () {
+   logEditEvent( 'loaded', {
+   editingSessionId: editingSessionId
+   } );
+   } );
$textarea.closest( 'form' ).submit( function () {
submitting = true;
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29ee776bdfe5d89ddffb97175588ed037ef0beee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: TheDJ 
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...CodeMirror[master]: Fix content changed checks on unload

2017-12-11 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397631 )

Change subject: Fix content changed checks on unload
..

Fix content changed checks on unload

CM intercepted textSelection() globally but assumed
nobody will ever need to call it for anything but wpTexbox1.
Thus, attempts to get edit summary returned article text.
Lots of things can probably be fixed in this area, but here's
the beginning.

Bug: T177175
Change-Id: I72d7d72b2a891a0ad242a565dddc076fa6dd1bd1
---
M resources/ext.CodeMirror.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 03a84f0..25388a4 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -54,7 +54,7 @@
function cmTextSelection( command, options ) {
var fn, retval;
 
-   if ( !codeMirror ) {
+   if ( !codeMirror || this[0].id !== 'wpTextbox1' ) {
return origTextSelection.call( this, command, options );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72d7d72b2a891a0ad242a565dddc076fa6dd1bd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: route DMARC reports for donate.wikimedia.org to dmarc@donate...

2017-12-11 Thread Herron (Code Review) 
Herron has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397612 )

Change subject: route DMARC reports for donate.wikimedia.org to 
dm...@donate.wikimedia.org
..


route DMARC reports for donate.wikimedia.org to dm...@donate.wikimedia.org

Bug: T182622
Change-Id: I31f94c2ba7107a0f01993a04deb8cca96b9e506c
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 7467de3..ce481f1 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -48,7 +48,8 @@
 
 ; DMARC records http://dmarc.org/ -- policy none (monitor), for now
 _dmarc  1H  IN TXT "v=DMARC1; p=none; sp=none; 
rua=mailto:dmarc-...@wikimedia.org; ruf=mailto:dmarc-...@wikimedia.org;;
-_dmarc.lists1H  IN TXT "v=DMARC1; p=none; 
rua=mailto:dmarc-...@wikimedia.org, ruf=mailto:dmarc-...@wikimedia.org;;
+_dmarc.lists1H  IN TXT "v=DMARC1; p=none; 
rua=mailto:dmarc-...@wikimedia.org; ruf=mailto:dmarc-...@wikimedia.org;;
+_dmarc.donate   1H  IN TXT "v=DMARC1; p=none; sp=none; 
rua=mailto:dm...@donate.wikimedia.org; ruf=mailto:dm...@donate.wikimedia.org;;
 
 ; SPF txt and rr records
 wikimedia.org.  600 IN TXT  "v=spf1 ip4:91.198.174.0/24 
ip4:208.80.152.0/22 ip6:2620:0:860::/46 include:_spf.google.com 
ip4:74.121.51.111 ~all"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31f94c2ba7107a0f01993a04deb8cca96b9e506c
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jgreen 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Herron 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 61ca333

2017-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397630 )

Change subject: Update mobileapps to 61ca333
..


Update mobileapps to 61ca333

List of changes:
7f8c06b Summary: fix geo coordinates
ac52f11 Media: Remove unwanted selectors from the blacklist
c2643d1 Media: Add section ID numbers
4f33a1c Dev: bring back Sepia request caching
40a2d00 Hygiene: Fix lint errors
6303c15 Stop suppressing RESTBase redirect handling when requesting HTML
34027e8 Hygiene: Update diff results to fix tests
05cf856 Revert "Update: exclude Canada from iOS countries list"
437b22c Hygiene: Fix README section on sepia HTTP recording
2716ab6 Summary: Send empty extracts (not 204) for an empty page
61ca333 Change reference endpoint to return structured reference sections
xxx Update node module dependencies

Change-Id: I8bc249568a123babcc27f029ae959fcfcd6dbeaa
---
M node_modules/core-js/bower.json
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_iter-define.js
M node_modules/core-js/library/modules/_microtask.js
M node_modules/core-js/library/modules/_partial.js
M node_modules/core-js/library/modules/_set-collection-of.js
M node_modules/core-js/library/modules/_typed-buffer.js
A node_modules/core-js/library/modules/_user-agent.js
M node_modules/core-js/library/modules/es6.array.slice.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/es7.observable.js
M node_modules/core-js/library/modules/es7.string.pad-end.js
M node_modules/core-js/library/modules/es7.string.pad-start.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/library/stage/2.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_iter-define.js
M node_modules/core-js/modules/_microtask.js
M node_modules/core-js/modules/_partial.js
M node_modules/core-js/modules/_set-collection-of.js
M node_modules/core-js/modules/_typed-buffer.js
A node_modules/core-js/modules/_user-agent.js
M node_modules/core-js/modules/es6.array.slice.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/es7.observable.js
M node_modules/core-js/modules/es7.string.pad-end.js
M node_modules/core-js/modules/es7.string.pad-start.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/core-js/stage/2.js
M node_modules/kad/package.json
M node_modules/moment/min/moment-with-locales.js
M node_modules/moment/min/moment-with-locales.min.js
M node_modules/moment/min/moment.min.js
M node_modules/moment/moment.d.ts
M node_modules/moment/moment.js
M node_modules/moment/package.json
M node_modules/moment/src/lib/create/from-array.js
M node_modules/moment/src/lib/units/day-of-month.js
M node_modules/moment/src/moment.js
M node_modules/swagger-ui/package.json
M src
53 files changed, 1,409 insertions(+), 1,377 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bc249568a123babcc27f029ae959fcfcd6dbeaa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 61ca333

2017-12-11 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397630 )

Change subject: Update mobileapps to 61ca333
..

Update mobileapps to 61ca333

List of changes:
7f8c06b Summary: fix geo coordinates
ac52f11 Media: Remove unwanted selectors from the blacklist
c2643d1 Media: Add section ID numbers
4f33a1c Dev: bring back Sepia request caching
40a2d00 Hygiene: Fix lint errors
6303c15 Stop suppressing RESTBase redirect handling when requesting HTML
34027e8 Hygiene: Update diff results to fix tests
05cf856 Revert "Update: exclude Canada from iOS countries list"
437b22c Hygiene: Fix README section on sepia HTTP recording
2716ab6 Summary: Send empty extracts (not 204) for an empty page
61ca333 Change reference endpoint to return structured reference sections
xxx Update node module dependencies

Change-Id: I8bc249568a123babcc27f029ae959fcfcd6dbeaa
---
M node_modules/core-js/bower.json
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_iter-define.js
M node_modules/core-js/library/modules/_microtask.js
M node_modules/core-js/library/modules/_partial.js
M node_modules/core-js/library/modules/_set-collection-of.js
M node_modules/core-js/library/modules/_typed-buffer.js
A node_modules/core-js/library/modules/_user-agent.js
M node_modules/core-js/library/modules/es6.array.slice.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/es7.observable.js
M node_modules/core-js/library/modules/es7.string.pad-end.js
M node_modules/core-js/library/modules/es7.string.pad-start.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/library/stage/2.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_iter-define.js
M node_modules/core-js/modules/_microtask.js
M node_modules/core-js/modules/_partial.js
M node_modules/core-js/modules/_set-collection-of.js
M node_modules/core-js/modules/_typed-buffer.js
A node_modules/core-js/modules/_user-agent.js
M node_modules/core-js/modules/es6.array.slice.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/es7.observable.js
M node_modules/core-js/modules/es7.string.pad-end.js
M node_modules/core-js/modules/es7.string.pad-start.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/core-js/stage/2.js
M node_modules/kad/package.json
M node_modules/moment/min/moment-with-locales.js
M node_modules/moment/min/moment-with-locales.min.js
M node_modules/moment/min/moment.min.js
M node_modules/moment/moment.d.ts
M node_modules/moment/moment.js
M node_modules/moment/package.json
M node_modules/moment/src/lib/create/from-array.js
M node_modules/moment/src/lib/units/day-of-month.js
M node_modules/moment/src/moment.js
M node_modules/swagger-ui/package.json
M src
53 files changed, 1,409 insertions(+), 1,377 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/30/397630/1


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

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

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

  1   2   3   4   5   6   7   8   >