[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Replace deprecated Title::escapeFragmentForURL()

[MaxSem (Code Review)]

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

Change subject: Replace deprecated Title::escapeFragmentForURL()
..

Replace deprecated Title::escapeFragmentForURL()

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


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

diff --git a/ApiWikiLove.php b/ApiWikiLove.php
index 86569f9..614c7b2 100644
--- a/ApiWikiLove.php
+++ b/ApiWikiLove.php
@@ -90,7 +90,7 @@
 
$this->getResult()->addValue( 'redirect', 'pageName', 
$talk->getPrefixedDBkey() );
$this->getResult()->addValue( 'redirect', 'fragment',
-   Title::escapeFragmentForURL( $strippedSubject ) );
+   Sanitizer::escapeIdForLink( $strippedSubject ) );
// note that we cannot use Title::makeTitle here as it doesn't 
sanitize the fragment
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1191817ee2db84d8fd3b91aa13e6257faf10a41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
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/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1072 to fix data drifts"

[jenkins-bot (Code Review)]

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

Change subject: Revert "db-eqiad.php: Depool db1072 to fix data drifts"
..


Revert "db-eqiad.php: Depool db1072 to fix data drifts"

This reverts commit 792b4eee1d7cefec4b9bed545c7557aba7371362.

Change-Id: I4c3f08d64e1416e343292e68aaa05a1755ecbfe3
---
M wmf-config/db-eqiad.php
1 file changed, 4 insertions(+), 4 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 ccb6272..c088ab4 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -124,8 +124,8 @@
/* s3 */ 'DEFAULT' => [
'db1075' => 0,   # A2 3.6TB 512GB, master
# 'db1038' => 0,   # B2 1.4TB  64GB, vslow, dump, old master # 
T172679
-   'db1044' => 0,   # B2 1.4TB  64GB, #Temporary master for db1095 
- new sanitarium #T150802 #temporary vslow #T164488
-   # 'db1072' => 0,  # B2 2.8TB 160GB, vslow, dump, old master 
#T164488
+   'db1044' => 0,   # B2 1.4TB  64GB, #Temporary master for db1095 
- new sanitarium #T150802
+   'db1072' => 0,  # B2 2.8TB 160GB, vslow, dump, old master
'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - 
T172679
'db1078' => 500, # C3 3.6TB 512GB
# 'db1103' => 0,  # A3 3.6TB 512GB, # not needed on s3 - has 
db1035's data that we have to checksum
@@ -306,10 +306,10 @@
],
/* s3 */ 'DEFAULT' => [
'vslow' => [
-   'db1044' => 1,
+   'db1072' => 1,
],
'dump' => [
-   'db1044' => 1,
+   'db1072' => 1,
],
'watchlist' => [
'db1077' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c3f08d64e1416e343292e68aaa05a1755ecbfe3
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]: Revert "db-eqiad.php: Depool db1072 to fix data drifts"

[Marostegui (Code Review)]

Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1072 to fix data drifts"
..

Revert "db-eqiad.php: Depool db1072 to fix data drifts"

This reverts commit 792b4eee1d7cefec4b9bed545c7557aba7371362.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4b59c57..3e80b48 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -124,8 +124,8 @@
/* s3 */ 'DEFAULT' => [
'db1075' => 0,   # A2 3.6TB 512GB, master
# 'db1038' => 0,   # B2 1.4TB  64GB, vslow, dump, old master # 
T172679
-   'db1044' => 0,   # B2 1.4TB  64GB, #Temporary master for db1095 
- new sanitarium #T150802 #temporary vslow #T164488
-   # 'db1072' => 0,  # B2 2.8TB 160GB, vslow, dump, old master 
#T164488
+   'db1044' => 0,   # B2 1.4TB  64GB, #Temporary master for db1095 
- new sanitarium #T150802
+   'db1072' => 0,  # B2 2.8TB 160GB, vslow, dump, old master
'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - 
T172679
'db1078' => 500, # C3 3.6TB 512GB
# 'db1103' => 0,  # A3 3.6TB 512GB, # not needed on s3 - has 
db1035's data that we have to checksum
@@ -307,10 +307,10 @@
],
/* s3 */ 'DEFAULT' => [
'vslow' => [
-   'db1044' => 1,
+   'db1072' => 1,
],
'dump' => [
-   'db1044' => 1,
+   'db1072' => 1,
],
'watchlist' => [
'db1077' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c3f08d64e1416e343292e68aaa05a1755ecbfe3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1055

[jenkins-bot (Code Review)]

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

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


db-eqiad.php: Depool db1055

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: I12ef010daee4bb8982bb073051b37b2dacd18de0
---
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 2137288..ccb6272 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,7 +104,7 @@
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 1,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
-   'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager #T174509
'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
@@ -247,23 +247,23 @@
's1' => [
'watchlist' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchanges' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchangeslinked' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'contributions' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'logpager' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'dump' => [
'db1065' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12ef010daee4bb8982bb073051b37b2dacd18de0
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 db1055

[Marostegui (Code Review)]

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

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

db-eqiad.php: Depool db1055

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: I12ef010daee4bb8982bb073051b37b2dacd18de0
---
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/23/384923/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 2137288..ccb6272 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,7 +104,7 @@
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 1,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
-   'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager #T174509
'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
@@ -247,23 +247,23 @@
's1' => [
'watchlist' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchanges' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchangeslinked' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'contributions' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'logpager' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'dump' => [
'db1065' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12ef010daee4bb8982bb073051b37b2dacd18de0
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 db1098

[jenkins-bot (Code Review)]

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

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


db-eqiad.php: Depool db1098

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: I6c789ea9451b8e244dd0bbdf17dd9f3bf39f52a9
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 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 10c4251..2137288 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -159,8 +159,8 @@
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1085' => 300, # B3 3.6TB 512GB, api #master for db1102 
(sanitarium 3) - T153743
'db1088' => 500, # C2 3.6TB 512GB
-   'db1093' => 500, # D2 3.6TB 512GB
-   'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   'db1093' => 300, # D2 3.6TB 512GB #temporary recentchanges
+   # 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174509
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
@@ -402,19 +402,19 @@
'db1085' => 1,
],
'watchlist' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchanges' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchangeslinked' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'contributions' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'logpager' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
],
's7' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c789ea9451b8e244dd0bbdf17dd9f3bf39f52a9
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/puppet[production]: install_server: Reinstall db2084 with stretch

[Marostegui (Code Review)]

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

Change subject: install_server: Reinstall db2084 with stretch
..


install_server: Reinstall db2084 with stretch

In order to test 10.1+multi-instance on core servers, I want to
reinstall db2084 to be stretch

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

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 071b1d1..491d374 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1620,6 +1620,8 @@
 host db2084 {
 hardware ethernet 18:66:DA:F8:E0:A4;
 fixed-address db2084.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db2085 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If377defb8461e319e2db6e11968a151bb0de5283
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1098

[Marostegui (Code Review)]

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

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

db-eqiad.php: Depool db1098

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: I6c789ea9451b8e244dd0bbdf17dd9f3bf39f52a9
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 10c4251..2137288 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -159,8 +159,8 @@
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1085' => 300, # B3 3.6TB 512GB, api #master for db1102 
(sanitarium 3) - T153743
'db1088' => 500, # C2 3.6TB 512GB
-   'db1093' => 500, # D2 3.6TB 512GB
-   'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   'db1093' => 300, # D2 3.6TB 512GB #temporary recentchanges
+   # 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174509
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
@@ -402,19 +402,19 @@
'db1085' => 1,
],
'watchlist' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchanges' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchangeslinked' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'contributions' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'logpager' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
],
's7' => [

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

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

[jenkins-bot (Code Review)]

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

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


Revert "db-eqiad.php: Depool db1067"

This reverts commit b43c7085cf07802e58a2a1f7a4f1d2a0b6a2b601.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5165f48..10c4251 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,7 +102,7 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   # 'db1067' => 0,   # D1 2.8TB 160GB, old master #T174509
+   'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 1,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

[Marostegui (Code Review)]

Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


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

Revert "db-eqiad.php: Depool db1067"

This reverts commit b43c7085cf07802e58a2a1f7a4f1d2a0b6a2b601.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 15ed4e5..4748737 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,7 +102,7 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   # 'db1067' => 0,   # D1 2.8TB 160GB, old master #T174509
+   'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 1,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e650341400bafe524a129b5b942a3146cdf2ac3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: jquery.badge: Align with Echo notifications style and Wikime...

[VolkerE (Code Review)]

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

Change subject: jquery.badge: Align with Echo notifications style and 
WikimediaUI palette
..

jquery.badge: Align with Echo notifications style and WikimediaUI palette

Aligning badge style to Echo notifications, ensuring WCAG level AA conformance
and also to WikimediaUI color palette.

Bug: T152025
Change-Id: I279a607f3c1b13ea6e21e59df0c6d21e525f587e
---
M resources/src/jquery/jquery.badge.css
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/384920/1

diff --git a/resources/src/jquery/jquery.badge.css 
b/resources/src/jquery/jquery.badge.css
index 2dbd4a5..1157c27 100644
--- a/resources/src/jquery/jquery.badge.css
+++ b/resources/src/jquery/jquery.badge.css
@@ -1,11 +1,11 @@
 .mw-badge {
+   background-color: #72777d;
min-width: 7px;
border-radius: 2px;
padding: 1px 4px;
text-align: center;
font-size: 12px;
line-height: 12px;
-   background-color: #d2d2d2;
cursor: pointer;
 }
 
@@ -13,7 +13,6 @@
font-weight: bold;
color: #fff;
vertical-align: baseline;
-   text-shadow: 0 1px rgba( 0, 0, 0, 0.4 );
 }
 
 .mw-badge-inline {

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Check for duplicate subscr_cancel

[jenkins-bot (Code Review)]

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

Change subject: Check for duplicate subscr_cancel
..


Check for duplicate subscr_cancel

Change-Id: Ia16dde10485e56399a07f206349c4e4f535ec8db
TODO: tests
---
M audit/paypal/SarFile.py
M civicrm/civicrm.py
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/audit/paypal/SarFile.py b/audit/paypal/SarFile.py
index 1668b9f..fbe10bf 100644
--- a/audit/paypal/SarFile.py
+++ b/audit/paypal/SarFile.py
@@ -112,6 +112,9 @@
 
log.info("-Ignored\t{id}\t{date}\tsubscr_modify".format(**log_params))
 return
 elif row['Subscription Action Type'] == 'S0200':
+if not self.crm.subscription_exists(out['subscr_id']):
+
log.info("-Duplicate\t{id}\t{date}\tsubscr_cancel".format(id=out['subscr_id'], 
date=out['subscr_date']))
+return
 out['txn_type'] = 'subscr_cancel'
 out['cancel_date'] = date
 elif row['Subscription Action Type'] == 'S0300':
diff --git a/civicrm/civicrm.py b/civicrm/civicrm.py
index 14ac187..5e5d0c1 100644
--- a/civicrm/civicrm.py
+++ b/civicrm/civicrm.py
@@ -31,7 +31,7 @@
 # FIXME: trxn_id style is inconsistent between gateways.  This will 
only work for paypal.
 sql = """
 SELECT COUNT(*) AS count FROM civicrm_contribution_recur
-WHERE trxn_id = %s
+WHERE trxn_id = %s AND end_date IS NULL
 """
 
 count = list(self.db.execute(sql, (subscr_id, )))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia16dde10485e56399a07f206349c4e4f535ec8db
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
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]: Show available languages on suggested pages filter

[jenkins-bot (Code Review)]

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

Change subject: Show available languages on suggested pages filter
..


Show available languages on suggested pages filter

Bug: T176626
Change-Id: Ib2418ca379694082041f259b4d73d2c00785fdff
---
M modules/base/ext.cx.sitemapper.js
M modules/dashboard/ext.cx.dashboard.js
M modules/source/ext.cx.source.selector.js
3 files changed, 62 insertions(+), 41 deletions(-)

Approvals:
  Petar.petkovic: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Santhosh: Looks good to me, approved



diff --git a/modules/base/ext.cx.sitemapper.js 
b/modules/base/ext.cx.sitemapper.js
index cdd1d89..6116328 100644
--- a/modules/base/ext.cx.sitemapper.js
+++ b/modules/base/ext.cx.sitemapper.js
@@ -18,6 +18,7 @@
 */
mw.cx.SiteMapper = function ( siteconfig ) {
this.config = siteconfig;
+   this.languagePairsPromise = null;
};
 
/**
@@ -152,6 +153,36 @@
};
 
/**
+* Get all the source and target languages.
+*
+* @return {jQuery.Promise}
+*/
+   mw.cx.SiteMapper.prototype.getLanguagePairs = function () {
+   var languagePairsAPIUrl,
+   self = this;
+
+   if ( !this.languagePairsPromise ) {
+   languagePairsAPIUrl = this.getCXServerUrl( 
'/list/languagepairs' );
+   this.languagePairsPromise = $.get( languagePairsAPIUrl )
+   .then( function ( response ) {
+   return {
+   targetLanguages: 
response.target,
+   sourceLanguages: response.source
+   };
+   }, function ( response ) {
+   mw.log(
+   'Error getting language pairs 
from ' + languagePairsAPIUrl + ' . ' +
+   response.statusText + ' (' + 
response.status + '). ' +
+   response.responseText
+   );
+   mw.hook( 'mw.cx.error' ).fire( mw.msg( 
'cx-error-server-connection' ) );
+   self.languagePairsPromise = null;
+   } );
+   }
+   return this.languagePairsPromise;
+   };
+
+   /**
 * Get the URL for Special:CX on the needed wiki
 * according to given source and target title and the target language.
 *
diff --git a/modules/dashboard/ext.cx.dashboard.js 
b/modules/dashboard/ext.cx.dashboard.js
index da7c6e1..8e8d908 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -437,25 +437,39 @@
 * Creates source and target language ULS for suggestions list
 */
CXDashboard.prototype.createUlsForSuggestionsList = function () {
-   var list = this.lists.suggestions,
+   var self = this,
+   list = this.lists.suggestions,
ulsOptions = {
menuWidth: 'medium',
-   quickList: function () {
-   return mw.uls.getFrequentLanguageList();
-   },
compact: true
};
 
-   createUls(
-   list.languageFilter.$sourceLanguageFilter,
-   this.setFilter.bind( this, 'sourceLanguage' ),
-   ulsOptions
-   );
-   createUls(
-   list.languageFilter.$targetLanguageFilter,
-   this.setFilter.bind( this, 'targetLanguage' ),
-   ulsOptions
-   );
+   this.siteMapper.getLanguagePairs().then( function ( data ) {
+   createUls(
+   list.languageFilter.$sourceLanguageFilter,
+   self.setFilter.bind( self, 'sourceLanguage' ),
+   $.extend( {
+   languages: getAutonyms( 
data.sourceLanguages ),
+   quickList: function () {
+   return 
mw.uls.getFrequentLanguageList().filter( function ( n ) {
+   return 
data.sourceLanguages.indexOf( n ) !== -1;
+   } );
+   }
+   }, ulsOptions )
+   );
+  

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use wikiUrlencode in getPageUrl

[jenkins-bot (Code Review)]

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

Change subject: Use wikiUrlencode in getPageUrl
..


Use wikiUrlencode in getPageUrl

This fixes links to certain page titles, such as those
containing '?'.

Change-Id: Id81e88c0e519e2a3b06f9ce086ffa62ff39975bc
---
M modules/base/ext.cx.sitemapper.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/base/ext.cx.sitemapper.js 
b/modules/base/ext.cx.sitemapper.js
index cdd1d89..31dbbae 100644
--- a/modules/base/ext.cx.sitemapper.js
+++ b/modules/base/ext.cx.sitemapper.js
@@ -85,7 +85,7 @@
 
return base
.replace( '$1', domain.replace( /\$/g, '' ) )
-   .replace( '$2', title.replace( / /g, '_' ).replace( 
/\$/g, '' ) ) + extra;
+   .replace( '$2', mw.util.wikiUrlencode( title ).replace( 
/\$/g, '' ) ) + extra;
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id81e88c0e519e2a3b06f9ce086ffa62ff39975bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Introduce Shell\CommandFactory

[jenkins-bot (Code Review)]

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

Change subject: Introduce Shell\CommandFactory
..


Introduce Shell\CommandFactory

Bug: T177038
Change-Id: Id875e68ea1fa72b44a463f977ab52270fe1e7088
(cherry picked from commit 32912b8c8d82b02c71a067de346e5990acc2f6dc)
---
M autoload.php
M includes/MediaWikiServices.php
M includes/ServiceWiring.php
M includes/shell/Command.php
A includes/shell/CommandFactory.php
M includes/shell/Shell.php
M tests/phpunit/includes/MediaWikiServicesTest.php
A tests/phpunit/includes/shell/CommandFactoryTest.php
8 files changed, 138 insertions(+), 19 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 61fd192..89d22b0 100644
--- a/autoload.php
+++ b/autoload.php
@@ -931,6 +931,7 @@
'MediaWiki\\Session\\UserInfo' => __DIR__ . 
'/includes/session/UserInfo.php',
'MediaWiki\\ShellDisabledError' => __DIR__ . 
'/includes/exception/ShellDisabledError.php',
'MediaWiki\\Shell\\Command' => __DIR__ . '/includes/shell/Command.php',
+   'MediaWiki\\Shell\\CommandFactory' => __DIR__ . 
'/includes/shell/CommandFactory.php',
'MediaWiki\\Shell\\Result' => __DIR__ . '/includes/shell/Result.php',
'MediaWiki\\Shell\\Shell' => __DIR__ . '/includes/shell/Shell.php',
'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . 
'/includes/site/MediaWikiPageNameNormalizer.php',
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index 84fc959..0d010b4 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -10,6 +10,7 @@
 use GlobalVarConfig;
 use Hooks;
 use IBufferingStatsdDataFactory;
+use MediaWiki\Shell\CommandFactory;
 use Wikimedia\Rdbms\LBFactory;
 use LinkCache;
 use Wikimedia\Rdbms\LoadBalancer;
@@ -681,6 +682,14 @@
return $this->getService( 'ReadOnlyMode' );
}
 
+   /**
+* @since 1.30
+* @return CommandFactory
+*/
+   public function getShellCommandFactory() {
+   return $this->getService( 'ShellCommandFactory' );
+   }
+

///
// NOTE: When adding a service getter here, don't forget to add a test
// case for it in MediaWikiServicesTest::provideGetters() and in
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index d048007..75ce8ec 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -41,6 +41,7 @@
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\CommandFactory;
 
 return [
'DBLoadBalancerFactory' => function ( MediaWikiServices $services ) {
@@ -428,6 +429,23 @@
);
},
 
+   'ShellCommandFactory' => function ( MediaWikiServices $services ) {
+   $config = $services->getMainConfig();
+
+   $limits = [
+   'time' => $config->get( 'MaxShellTime' ),
+   'walltime' => $config->get( 'MaxShellWallClockTime' ),
+   'memory' => $config->get( 'MaxShellMemory' ),
+   'filesize' => $config->get( 'MaxShellFileSize' ),
+   ];
+   $cgroup = $config->get( 'ShellCgroup' );
+
+   $factory = new CommandFactory( $limits, $cgroup );
+   $factory->setLogger( LoggerFactory::getInstance( 'exec' ) );
+
+   return $factory;
+   },
+

///
// NOTE: When adding a service here, don't forget to add a getter 
function
// in the MediaWikiServices class. The convenience getter should just 
call
diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 9afaf9c..3663d88 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -63,7 +63,7 @@
private $everExecuted = false;
 
/** @var string|false */
-   private $cGroup = false;
+   private $cgroup = false;
 
/**
 * Constructor. Don't call directly, instead use Shell::command()
@@ -133,7 +133,8 @@
/**
 * Sets execution limits
 *
-* @param array $limits Optional array with limits(filesize, memory, 
time, walltime).
+* @param array $limits Associative array of limits. Keys (all 
optional):
+*   filesize (for ulimit -f), memory, time, walltime.
 * @return $this
 */
public function limits( array $limits ) {
@@ -187,11 +188,11 @@
/**
 * Sets cgroup for this command
 *
-* @param string|false $cgroup
+* @param string|false $cgroup Absolute file path to the cgroup, or 
false to not use a cgroup
 * @return 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Introduce Shell\CommandFactory

[Legoktm (Code Review)]

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

Change subject: Introduce Shell\CommandFactory
..

Introduce Shell\CommandFactory

Bug: T177038
Change-Id: Id875e68ea1fa72b44a463f977ab52270fe1e7088
(cherry picked from commit 32912b8c8d82b02c71a067de346e5990acc2f6dc)
---
M autoload.php
M includes/MediaWikiServices.php
M includes/ServiceWiring.php
M includes/shell/Command.php
A includes/shell/CommandFactory.php
M includes/shell/Shell.php
M tests/phpunit/includes/MediaWikiServicesTest.php
A tests/phpunit/includes/shell/CommandFactoryTest.php
8 files changed, 138 insertions(+), 19 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index 61fd192..89d22b0 100644
--- a/autoload.php
+++ b/autoload.php
@@ -931,6 +931,7 @@
'MediaWiki\\Session\\UserInfo' => __DIR__ . 
'/includes/session/UserInfo.php',
'MediaWiki\\ShellDisabledError' => __DIR__ . 
'/includes/exception/ShellDisabledError.php',
'MediaWiki\\Shell\\Command' => __DIR__ . '/includes/shell/Command.php',
+   'MediaWiki\\Shell\\CommandFactory' => __DIR__ . 
'/includes/shell/CommandFactory.php',
'MediaWiki\\Shell\\Result' => __DIR__ . '/includes/shell/Result.php',
'MediaWiki\\Shell\\Shell' => __DIR__ . '/includes/shell/Shell.php',
'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . 
'/includes/site/MediaWikiPageNameNormalizer.php',
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index 84fc959..0d010b4 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -10,6 +10,7 @@
 use GlobalVarConfig;
 use Hooks;
 use IBufferingStatsdDataFactory;
+use MediaWiki\Shell\CommandFactory;
 use Wikimedia\Rdbms\LBFactory;
 use LinkCache;
 use Wikimedia\Rdbms\LoadBalancer;
@@ -681,6 +682,14 @@
return $this->getService( 'ReadOnlyMode' );
}
 
+   /**
+* @since 1.30
+* @return CommandFactory
+*/
+   public function getShellCommandFactory() {
+   return $this->getService( 'ShellCommandFactory' );
+   }
+

///
// NOTE: When adding a service getter here, don't forget to add a test
// case for it in MediaWikiServicesTest::provideGetters() and in
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index d048007..75ce8ec 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -41,6 +41,7 @@
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\CommandFactory;
 
 return [
'DBLoadBalancerFactory' => function ( MediaWikiServices $services ) {
@@ -428,6 +429,23 @@
);
},
 
+   'ShellCommandFactory' => function ( MediaWikiServices $services ) {
+   $config = $services->getMainConfig();
+
+   $limits = [
+   'time' => $config->get( 'MaxShellTime' ),
+   'walltime' => $config->get( 'MaxShellWallClockTime' ),
+   'memory' => $config->get( 'MaxShellMemory' ),
+   'filesize' => $config->get( 'MaxShellFileSize' ),
+   ];
+   $cgroup = $config->get( 'ShellCgroup' );
+
+   $factory = new CommandFactory( $limits, $cgroup );
+   $factory->setLogger( LoggerFactory::getInstance( 'exec' ) );
+
+   return $factory;
+   },
+

///
// NOTE: When adding a service here, don't forget to add a getter 
function
// in the MediaWikiServices class. The convenience getter should just 
call
diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 9afaf9c..3663d88 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -63,7 +63,7 @@
private $everExecuted = false;
 
/** @var string|false */
-   private $cGroup = false;
+   private $cgroup = false;
 
/**
 * Constructor. Don't call directly, instead use Shell::command()
@@ -133,7 +133,8 @@
/**
 * Sets execution limits
 *
-* @param array $limits Optional array with limits(filesize, memory, 
time, walltime).
+* @param array $limits Associative array of limits. Keys (all 
optional):
+*   filesize (for ulimit -f), memory, time, walltime.
 * @return $this
 */
public function limits( array $limits ) {
@@ -187,11 +188,11 @@
/**
 * Sets cgroup for this command
 *
-* @param string|false $cgroup
+* @param string|false $cgroup Absolute file path to the cgroup, or 
false to not use a cgroup
 * @return 

[MediaWiki-commits] [Gerrit] mediawiki...PdfHandler[master]: Switch to the new shell framework

[MaxSem (Code Review)]

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

Change subject: Switch to the new shell framework
..

Switch to the new shell framework

Change-Id: Ibb28f4f62603c77fc719593afb20f2e738a79352
---
M PdfHandler.image.php
1 file changed, 17 insertions(+), 11 deletions(-)


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

diff --git a/PdfHandler.image.php b/PdfHandler.image.php
index 8346b31..e3f3534 100644
--- a/PdfHandler.image.php
+++ b/PdfHandler.image.php
@@ -20,6 +20,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Shell\Shell;
 use UtfNormal\Validator;
 
 /**
@@ -113,13 +114,17 @@
global $wgPdfInfo, $wgPdftoText;
 
if ( $wgPdfInfo ) {
-   $cmd = wfEscapeShellArg( $wgPdfInfo ) .
-   " -enc UTF-8 " . # Report metadata as UTF-8 
text...
-   " -l 999 " . # Report page sizes for all 
pages
-   " -meta " .  # Report XMP metadata
-   wfEscapeShellArg( $this->mFilename );
-   $retval = '';
-   $dump = wfShellExec( $cmd, $retval );
+   $cmd = [
+   $wgPdfInfo,
+   '-enc', 'UTF-8', # Report metadata as UTF-8 
text...
+   '-l', '999', # Report page sizes for all 
pages
+   '-meta', # Report XMP metadata
+   $this->mFilename,
+   ];
+   $result = Shell::command( $cmd )
+   ->execute();
+
+   $dump = $result->getStdout();
$data = $this->convertDumpToArray( $dump );
} else {
$data = null;
@@ -127,10 +132,11 @@
 
// Read text layer
if ( isset( $wgPdftoText ) ) {
-   $cmd = wfEscapeShellArg( $wgPdftoText ) . ' '. 
wfEscapeShellArg( $this->mFilename ) . ' - ';
-   wfDebug( __METHOD__.": $cmd\n" );
-   $retval = '';
-   $txt = wfShellExec( $cmd, $retval );
+   $cmd = [ $wgPdftoText,  $this->mFilename, '-' ];
+   $result = Shell::command( $cmd )
+   ->execute();
+   $retval = $result->getExitCode();
+   $txt = $result->getStdout();
if ( $retval == 0 ) {
$txt = str_replace( "\r\n", "\n", $txt );
$pages = explode( "\f", $txt );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb28f4f62603c77fc719593afb20f2e738a79352
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PdfHandler
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] mediawiki/core[REL1_30]: Don't trigger PHP errors for unused Shell\Command

[jenkins-bot (Code Review)]

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

Change subject: Don't trigger PHP errors for unused Shell\Command
..


Don't trigger PHP errors for unused Shell\Command

Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
(cherry picked from commit 4d9a95f97005705ade05c71d4c1a64fd3844272c)
---
M includes/shell/Command.php
M tests/phpunit/includes/shell/CommandTest.php
2 files changed, 5 insertions(+), 14 deletions(-)

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



diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 8b83585..9afaf9c 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -83,12 +83,14 @@
 */
public function __destruct() {
if ( !$this->everExecuted ) {
+   $context = [ 'command' => $this->command ];
$message = __CLASS__ . " was instantiated, but 
execute() was never called.";
if ( $this->method ) {
-   $message .= " Calling method: {$this->method}.";
+   $message .= ' Calling method: {method}.';
+   $context['method'] = $this->method;
}
-   $message .= " Command: {$this->command}";
-   trigger_error( $message, E_USER_NOTICE );
+   $message .= ' Command: {command}';
+   $this->logger->warning( $message, $context );
}
}
 
diff --git a/tests/phpunit/includes/shell/CommandTest.php 
b/tests/phpunit/includes/shell/CommandTest.php
index 33a7f44..dc49599 100644
--- a/tests/phpunit/includes/shell/CommandTest.php
+++ b/tests/phpunit/includes/shell/CommandTest.php
@@ -6,17 +6,6 @@
  * @group Shell
  */
 class CommandTest extends PHPUnit_Framework_TestCase {
-   /**
-* @expectedException PHPUnit_Framework_Error_Notice
-*/
-   public function testDestruct() {
-   if ( defined( 'HHVM_VERSION' ) ) {
-   $this->markTestSkipped( 'destructors are unreliable in 
HHVM' );
-   }
-   $command = new Command();
-   $command->params( 'true' );
-   }
-
private function requirePosix() {
if ( wfIsWindows() ) {
$this->markTestSkipped( 'This test requires a POSIX 
environment.' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
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[REL1_30]: Don't trigger PHP errors for unused Shell\Command

[Legoktm (Code Review)]

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

Change subject: Don't trigger PHP errors for unused Shell\Command
..

Don't trigger PHP errors for unused Shell\Command

Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
(cherry picked from commit 4d9a95f97005705ade05c71d4c1a64fd3844272c)
---
M includes/shell/Command.php
M tests/phpunit/includes/shell/CommandTest.php
2 files changed, 5 insertions(+), 14 deletions(-)


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

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 8b83585..9afaf9c 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -83,12 +83,14 @@
 */
public function __destruct() {
if ( !$this->everExecuted ) {
+   $context = [ 'command' => $this->command ];
$message = __CLASS__ . " was instantiated, but 
execute() was never called.";
if ( $this->method ) {
-   $message .= " Calling method: {$this->method}.";
+   $message .= ' Calling method: {method}.';
+   $context['method'] = $this->method;
}
-   $message .= " Command: {$this->command}";
-   trigger_error( $message, E_USER_NOTICE );
+   $message .= ' Command: {command}';
+   $this->logger->warning( $message, $context );
}
}
 
diff --git a/tests/phpunit/includes/shell/CommandTest.php 
b/tests/phpunit/includes/shell/CommandTest.php
index 33a7f44..dc49599 100644
--- a/tests/phpunit/includes/shell/CommandTest.php
+++ b/tests/phpunit/includes/shell/CommandTest.php
@@ -6,17 +6,6 @@
  * @group Shell
  */
 class CommandTest extends PHPUnit_Framework_TestCase {
-   /**
-* @expectedException PHPUnit_Framework_Error_Notice
-*/
-   public function testDestruct() {
-   if ( defined( 'HHVM_VERSION' ) ) {
-   $this->markTestSkipped( 'destructors are unreliable in 
HHVM' );
-   }
-   $command = new Command();
-   $command->params( 'true' );
-   }
-
private function requirePosix() {
if ( wfIsWindows() ) {
$this->markTestSkipped( 'This test requires a POSIX 
environment.' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix login button label to accept RawMessage.

[Cicalese (Code Review)]

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

Change subject: Fix login button label to accept RawMessage.
..

Fix login button label to accept RawMessage.

The label is already a Message at this point. For Messages that
are not RawMessages, the call to wfMessage() does not do any harm.
However, for RawMessages, it causes the label to appear in <>.
Removing the call to wfMessage() does not harm regular Messages
and fixes the problem for RawMessages.

Change-Id: I943628e2a1fbf6fff579dd52c1058ca2ef125d34
(cherry picked from commit b1ddb0cef127d75e2045d4cc3aba4d612b2f7676)
---
M includes/specialpage/AuthManagerSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/specialpage/AuthManagerSpecialPage.php 
b/includes/specialpage/AuthManagerSpecialPage.php
index fbc3022a..5dfe279 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -679,7 +679,7 @@
];
 
if ( $type === 'submit' && isset( $singleFieldInfo['label'] ) ) 
{
-   $descriptor['default'] = wfMessage( 
$singleFieldInfo['label'] )->plain();
+   $descriptor['default'] = 
$singleFieldInfo['label']->plain();
} elseif ( $type !== 'submit' ) {
$descriptor += array_filter( [
// help-message is omitted as it is usually not 
really useful for a web interface

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I943628e2a1fbf6fff579dd52c1058ca2ef125d34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix login button label to accept RawMessage.

[Cicalese (Code Review)]

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

Change subject: Fix login button label to accept RawMessage.
..

Fix login button label to accept RawMessage.

The label is already a Message at this point. For Messages that
are not RawMessages, the call to wfMessage() does not do any harm.
However, for RawMessages, it causes the label to appear in <>.
Removing the call to wfMessage() does not harm regular Messages
and fixes the problem for RawMessages.

Change-Id: I943628e2a1fbf6fff579dd52c1058ca2ef125d34
(cherry picked from commit b1ddb0cef127d75e2045d4cc3aba4d612b2f7676)
---
M includes/specialpage/AuthManagerSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/specialpage/AuthManagerSpecialPage.php 
b/includes/specialpage/AuthManagerSpecialPage.php
index 0cdc55f..95729f3 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -679,7 +679,7 @@
];
 
if ( $type === 'submit' && isset( $singleFieldInfo['label'] ) ) 
{
-   $descriptor['default'] = wfMessage( 
$singleFieldInfo['label'] )->plain();
+   $descriptor['default'] = 
$singleFieldInfo['label']->plain();
} elseif ( $type !== 'submit' ) {
$descriptor += array_filter( [
// help-message is omitted as it is usually not 
really useful for a web interface

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I943628e2a1fbf6fff579dd52c1058ca2ef125d34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Introduce Shell\CommandFactory

[jenkins-bot (Code Review)]

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

Change subject: Introduce Shell\CommandFactory
..


Introduce Shell\CommandFactory

Bug: T177038
Change-Id: Id875e68ea1fa72b44a463f977ab52270fe1e7088
---
M autoload.php
M includes/MediaWikiServices.php
M includes/ServiceWiring.php
M includes/shell/Command.php
A includes/shell/CommandFactory.php
M includes/shell/Shell.php
M tests/phpunit/includes/MediaWikiServicesTest.php
A tests/phpunit/includes/shell/CommandFactoryTest.php
8 files changed, 138 insertions(+), 19 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 83f2519..cf4a115 100644
--- a/autoload.php
+++ b/autoload.php
@@ -930,6 +930,7 @@
'MediaWiki\\Session\\UserInfo' => __DIR__ . 
'/includes/session/UserInfo.php',
'MediaWiki\\ShellDisabledError' => __DIR__ . 
'/includes/exception/ShellDisabledError.php',
'MediaWiki\\Shell\\Command' => __DIR__ . '/includes/shell/Command.php',
+   'MediaWiki\\Shell\\CommandFactory' => __DIR__ . 
'/includes/shell/CommandFactory.php',
'MediaWiki\\Shell\\Result' => __DIR__ . '/includes/shell/Result.php',
'MediaWiki\\Shell\\Shell' => __DIR__ . '/includes/shell/Shell.php',
'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . 
'/includes/site/MediaWikiPageNameNormalizer.php',
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index 84fc959..0d010b4 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -10,6 +10,7 @@
 use GlobalVarConfig;
 use Hooks;
 use IBufferingStatsdDataFactory;
+use MediaWiki\Shell\CommandFactory;
 use Wikimedia\Rdbms\LBFactory;
 use LinkCache;
 use Wikimedia\Rdbms\LoadBalancer;
@@ -681,6 +682,14 @@
return $this->getService( 'ReadOnlyMode' );
}
 
+   /**
+* @since 1.30
+* @return CommandFactory
+*/
+   public function getShellCommandFactory() {
+   return $this->getService( 'ShellCommandFactory' );
+   }
+

///
// NOTE: When adding a service getter here, don't forget to add a test
// case for it in MediaWikiServicesTest::provideGetters() and in
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index d048007..75ce8ec 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -41,6 +41,7 @@
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\CommandFactory;
 
 return [
'DBLoadBalancerFactory' => function ( MediaWikiServices $services ) {
@@ -428,6 +429,23 @@
);
},
 
+   'ShellCommandFactory' => function ( MediaWikiServices $services ) {
+   $config = $services->getMainConfig();
+
+   $limits = [
+   'time' => $config->get( 'MaxShellTime' ),
+   'walltime' => $config->get( 'MaxShellWallClockTime' ),
+   'memory' => $config->get( 'MaxShellMemory' ),
+   'filesize' => $config->get( 'MaxShellFileSize' ),
+   ];
+   $cgroup = $config->get( 'ShellCgroup' );
+
+   $factory = new CommandFactory( $limits, $cgroup );
+   $factory->setLogger( LoggerFactory::getInstance( 'exec' ) );
+
+   return $factory;
+   },
+

///
// NOTE: When adding a service here, don't forget to add a getter 
function
// in the MediaWikiServices class. The convenience getter should just 
call
diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index a16f4af..bd44ef8 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -63,7 +63,7 @@
private $everExecuted = false;
 
/** @var string|false */
-   private $cGroup = false;
+   private $cgroup = false;
 
/**
 * Constructor. Don't call directly, instead use Shell::command()
@@ -133,7 +133,8 @@
/**
 * Sets execution limits
 *
-* @param array $limits Optional array with limits(filesize, memory, 
time, walltime).
+* @param array $limits Associative array of limits. Keys (all 
optional):
+*   filesize (for ulimit -f), memory, time, walltime.
 * @return $this
 */
public function limits( array $limits ) {
@@ -187,11 +188,11 @@
/**
 * Sets cgroup for this command
 *
-* @param string|false $cgroup
+* @param string|false $cgroup Absolute file path to the cgroup, or 
false to not use a cgroup
 * @return $this
 */
public function cgroup( $cgroup ) {
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't trigger PHP errors for unused Shell\Command

[jenkins-bot (Code Review)]

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

Change subject: Don't trigger PHP errors for unused Shell\Command
..


Don't trigger PHP errors for unused Shell\Command

Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
---
M includes/shell/Command.php
M tests/phpunit/includes/shell/CommandTest.php
2 files changed, 5 insertions(+), 14 deletions(-)

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



diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 59f40bf..a16f4af 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -83,12 +83,14 @@
 */
public function __destruct() {
if ( !$this->everExecuted ) {
+   $context = [ 'command' => $this->command ];
$message = __CLASS__ . " was instantiated, but 
execute() was never called.";
if ( $this->method ) {
-   $message .= " Calling method: {$this->method}.";
+   $message .= ' Calling method: {method}.';
+   $context['method'] = $this->method;
}
-   $message .= " Command: {$this->command}";
-   trigger_error( $message, E_USER_NOTICE );
+   $message .= ' Command: {command}';
+   $this->logger->warning( $message, $context );
}
}
 
diff --git a/tests/phpunit/includes/shell/CommandTest.php 
b/tests/phpunit/includes/shell/CommandTest.php
index 34434b9..32d855e 100644
--- a/tests/phpunit/includes/shell/CommandTest.php
+++ b/tests/phpunit/includes/shell/CommandTest.php
@@ -6,17 +6,6 @@
  * @group Shell
  */
 class CommandTest extends PHPUnit_Framework_TestCase {
-   /**
-* @expectedException PHPUnit_Framework_Error_Notice
-*/
-   public function testDestruct() {
-   if ( defined( 'HHVM_VERSION' ) ) {
-   $this->markTestSkipped( 'destructors are unreliable in 
HHVM' );
-   }
-   $command = new Command();
-   $command->params( 'true' );
-   }
-
private function requirePosix() {
if ( wfIsWindows() ) {
$this->markTestSkipped( 'This test requires a POSIX 
environment.' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Allow override of button text. Coding style.

[Cicalese (Code Review)]

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

Change subject: Allow override of button text. Coding style.
..


Allow override of button text. Coding style.

Change-Id: I2bbbc7a1750945cb8d301780fcbcaf65ac405078
---
M extension.json
M includes/PluggableAuthBeginAuthenticationRequest.php
2 files changed, 10 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 9b4954e..39667cd 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PluggableAuth",
-   "version": "5.3",
+   "version": "5.4",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],
@@ -50,6 +50,7 @@
"PluggableAuth_EnableAutoLogin": false,
"PluggableAuth_EnableLocalLogin": false,
"PluggableAuth_EnableLocalProperties": false,
+   "PluggableAuth_ButtonLabel": null,
"PluggableAuth_ExtraLoginFields": []
},
"manifest_version": 1
diff --git a/includes/PluggableAuthBeginAuthenticationRequest.php 
b/includes/PluggableAuthBeginAuthenticationRequest.php
index 2ca9b74..a749748 100644
--- a/includes/PluggableAuthBeginAuthenticationRequest.php
+++ b/includes/PluggableAuthBeginAuthenticationRequest.php
@@ -7,9 +7,16 @@
ButtonAuthenticationRequest {
 
public function __construct() {
+   if ( isset( $GLOBALS['wgPluggableAuth_ButtonLabelMessage'] ) ) {
+   $label = wfMessage( 
$GLOBALS['wgPluggableAuth_ButtonLabelMessage'] );
+   } elseif ( $GLOBALS['wgPluggableAuth_ButtonLabel'] ) {
+   $label = new RawMessage( 
$GLOBALS['wgPluggableAuth_ButtonLabel'] );
+   } else {
+   $label = wfMessage( 'pluggableauth-loginbutton-label' );
+   }
parent::__construct(
'pluggableauthlogin',
-   wfMessage( 'pluggableauth-loginbutton-label' ),
+   $label,
wfMessage( 'pluggableauth-loginbutton-help' ),
true );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bbbc7a1750945cb8d301780fcbcaf65ac405078
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 
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...GettingStarted[master]: Improve button behaviour on starting dialog

[jenkins-bot (Code Review)]

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

Change subject: Improve button behaviour on starting dialog
..


Improve button behaviour on starting dialog

Aligning secondary button icon with general `.mw-ui-button`
transitions and remove duplicated properties from general class.

Change-Id: I95d1a92b23ff30d520d3d2f1fef227b9d69ed864
---
M resources/ext.gettingstarted.return.less
1 file changed, 13 insertions(+), 6 deletions(-)

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



diff --git a/resources/ext.gettingstarted.return.less 
b/resources/ext.gettingstarted.return.less
index 3e6f08f..3c46e7b 100644
--- a/resources/ext.gettingstarted.return.less
+++ b/resources/ext.gettingstarted.return.less
@@ -67,7 +67,6 @@
font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
 
.mw-ui-button {
-   display: inline-block;
vertical-align: top;
text-align: inherit;
margin-right: 20px;
@@ -75,13 +74,21 @@
margin-top: 15px;
 
&.mw-gettingstarted-cta-secondary {
-   background-color: #f8f9fa;
-   border: 1px solid @colorGray10;
-   color: @colorButtonText;
+   .mw-gettingstarted-cta-button-icon-copyedit {
+   opacity: 0.87; // = `#222` on 
`background-color: #fff`
+   .transition( opacity 100ms );
+   }
 
&:hover {
-   background-color: #fff;
-   color: @colorButtonTextHighlight;
+   .mw-gettingstarted-cta-button-icon-copyedit {
+   opacity: 0.73; // = `#454545` on 
`background-color: #fff`, closest to `#444`
+   }
+   }
+
+   &:active {
+   .mw-gettingstarted-cta-button-icon-copyedit {
+   opacity: 1;
+   }
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95d1a92b23ff30d520d3d2f1fef227b9d69ed864
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Swalling 
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...GettingStarted[master]: Align PNGs to WikimediaUI color palette

[jenkins-bot (Code Review)]

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

Change subject: Align PNGs to WikimediaUI color palette
..


Align PNGs to WikimediaUI color palette

Aligning PNGs to WikimediaUI color palette.

Bug: T177712
Depends-on: I6e05dd47cf6da4ad0e8238f88971dd82354a99cb
Change-Id: I3a4e209b8a97ffeb34824c6a225e6893b3f7fb4d
---
M resources/images/light_bulb_dark_gray.png
M resources/images/lightbulb/check.png
M resources/images/lightbulb/page.png
M resources/lightbulb/images/next-disabled.png
M resources/lightbulb/images/next.png
M resources/lightbulb/images/prev-disabled.png
M resources/lightbulb/images/prev.png
7 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/resources/images/light_bulb_dark_gray.png 
b/resources/images/light_bulb_dark_gray.png
index d464bd5..badc807 100644
--- a/resources/images/light_bulb_dark_gray.png
+++ b/resources/images/light_bulb_dark_gray.png
Binary files differ
diff --git a/resources/images/lightbulb/check.png 
b/resources/images/lightbulb/check.png
index c9fbcce..b329041 100644
--- a/resources/images/lightbulb/check.png
+++ b/resources/images/lightbulb/check.png
Binary files differ
diff --git a/resources/images/lightbulb/page.png 
b/resources/images/lightbulb/page.png
index 7333e3f..7bde4f4 100644
--- a/resources/images/lightbulb/page.png
+++ b/resources/images/lightbulb/page.png
Binary files differ
diff --git a/resources/lightbulb/images/next-disabled.png 
b/resources/lightbulb/images/next-disabled.png
index d12262a..cb7ec68 100644
--- a/resources/lightbulb/images/next-disabled.png
+++ b/resources/lightbulb/images/next-disabled.png
Binary files differ
diff --git a/resources/lightbulb/images/next.png 
b/resources/lightbulb/images/next.png
index 3c90621..4417b22 100644
--- a/resources/lightbulb/images/next.png
+++ b/resources/lightbulb/images/next.png
Binary files differ
diff --git a/resources/lightbulb/images/prev-disabled.png 
b/resources/lightbulb/images/prev-disabled.png
index f4d7304..ea2a787 100644
--- a/resources/lightbulb/images/prev-disabled.png
+++ b/resources/lightbulb/images/prev-disabled.png
Binary files differ
diff --git a/resources/lightbulb/images/prev.png 
b/resources/lightbulb/images/prev.png
index 186aca0..7bb1f02 100644
--- a/resources/lightbulb/images/prev.png
+++ b/resources/lightbulb/images/prev.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a4e209b8a97ffeb34824c6a225e6893b3f7fb4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Swalling 
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]: Don't trigger PHP errors for unused Shell\Command

[MaxSem (Code Review)]

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

Change subject: Don't trigger PHP errors for unused Shell\Command
..

Don't trigger PHP errors for unused Shell\Command

Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
---
M includes/shell/Command.php
M tests/phpunit/includes/shell/CommandTest.php
2 files changed, 5 insertions(+), 14 deletions(-)


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

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 59f40bf..a16f4af 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -83,12 +83,14 @@
 */
public function __destruct() {
if ( !$this->everExecuted ) {
+   $context = [ 'command' => $this->command ];
$message = __CLASS__ . " was instantiated, but 
execute() was never called.";
if ( $this->method ) {
-   $message .= " Calling method: {$this->method}.";
+   $message .= ' Calling method: {method}.';
+   $context['method'] = $this->method;
}
-   $message .= " Command: {$this->command}";
-   trigger_error( $message, E_USER_NOTICE );
+   $message .= ' Command: {command}';
+   $this->logger->warning( $message, $context );
}
}
 
diff --git a/tests/phpunit/includes/shell/CommandTest.php 
b/tests/phpunit/includes/shell/CommandTest.php
index 34434b9..32d855e 100644
--- a/tests/phpunit/includes/shell/CommandTest.php
+++ b/tests/phpunit/includes/shell/CommandTest.php
@@ -6,17 +6,6 @@
  * @group Shell
  */
 class CommandTest extends PHPUnit_Framework_TestCase {
-   /**
-* @expectedException PHPUnit_Framework_Error_Notice
-*/
-   public function testDestruct() {
-   if ( defined( 'HHVM_VERSION' ) ) {
-   $this->markTestSkipped( 'destructors are unreliable in 
HHVM' );
-   }
-   $command = new Command();
-   $command->params( 'true' );
-   }
-
private function requirePosix() {
if ( wfIsWindows() ) {
$this->markTestSkipped( 'This test requires a POSIX 
environment.' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki...GettingStarted[master]: Align SVGs to WikimediaUI color palette and optimize

[jenkins-bot (Code Review)]

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

Change subject: Align SVGs to WikimediaUI color palette and optimize
..


Align SVGs to WikimediaUI color palette and optimize

Aligning SVGs to WikimediaUI color palette, optimizing
by help of SVGO and align markup to each other, among changes:
- removing `standalone=no` as it's default
- removing `px` value unit as it's default
- removing all kinds of application specific markup
- unifying identation
- bringing attributes in order

Bug: T177712
Change-Id: I6e05dd47cf6da4ad0e8238f88971dd82354a99cb
---
M resources/images/close.svg
M resources/images/light_bulb_dark_gray.svg
M resources/images/light_bulb_white.svg
M resources/images/lightbulb/check.svg
M resources/images/lightbulb/page.svg
M resources/images/pencil_white.svg
M resources/lightbulb/images/lightbulb-no.svg
M resources/lightbulb/images/lightbulb-sad.svg
M resources/lightbulb/images/lightbulb.svg
M resources/lightbulb/images/next-disabled.svg
M resources/lightbulb/images/next.svg
M resources/lightbulb/images/prev-disabled.svg
M resources/lightbulb/images/prev.svg
M resources/lightbulb/images/random.svg
M resources/lightbulb/images/refresh.svg
15 files changed, 54 insertions(+), 391 deletions(-)

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



diff --git a/resources/images/close.svg b/resources/images/close.svg
index 44df45b..f5c8fc2 100644
--- a/resources/images/close.svg
+++ b/resources/images/close.svg
@@ -1,4 +1,4 @@
-
+
 http://www.w3.org/2000/svg; width="20" height="20" viewBox="0 0 20 
20">


diff --git a/resources/images/light_bulb_dark_gray.svg 
b/resources/images/light_bulb_dark_gray.svg
index e58d4e3..1c40f4b 100644
--- a/resources/images/light_bulb_dark_gray.svg
+++ b/resources/images/light_bulb_dark_gray.svg
@@ -1,12 +1,4 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-viewBox="0 0 512 512" enable-background="new 0 0 512 512" 
xml:space="preserve">
-
+
+http://www.w3.org/2000/svg; viewBox="0 0 512 512">
+   
 
diff --git a/resources/images/light_bulb_white.svg 
b/resources/images/light_bulb_white.svg
index 1640fa8..f9e95bc 100644
--- a/resources/images/light_bulb_white.svg
+++ b/resources/images/light_bulb_white.svg
@@ -1,12 +1,4 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-viewBox="0 0 512 512" enable-background="new 0 0 512 512" 
xml:space="preserve">
-
+
+http://www.w3.org/2000/svg; viewBox="0 0 512 512">
+   
 
diff --git a/resources/images/lightbulb/check.svg 
b/resources/images/lightbulb/check.svg
index e7fe9d2..4e0c96c 100644
--- a/resources/images/lightbulb/check.svg
+++ b/resources/images/lightbulb/check.svg
@@ -1,9 +1,4 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-width="464.276px" height="464.28px" viewBox="72.354 163.86 464.276 
464.28"
-enable-background="new 72.354 163.86 464.276 464.28" 
xml:space="preserve">
-
+
+http://www.w3.org/2000/svg; width="464" height="464" 
viewBox="72.354 163.86 464 464">
+   
 
diff --git a/resources/images/lightbulb/page.svg 
b/resources/images/lightbulb/page.svg
index 8d6b314..d5e3925 100644
--- a/resources/images/lightbulb/page.svg
+++ b/resources/images/lightbulb/page.svg
@@ -1,12 +1,4 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-width="21px" height="20.999px" viewBox="295.5 385.141 21 20.999" 
enable-background="new 295.5 385.141 21 20.999"
-xml:space="preserve">
-
+
+http://www.w3.org/2000/svg; width="21" height="21" viewBox="295.5 
385.141 21 21">
+   
 
diff --git a/resources/images/pencil_white.svg 
b/resources/images/pencil_white.svg
index 020f55e..1ecedcb 100644
--- a/resources/images/pencil_white.svg
+++ b/resources/images/pencil_white.svg
@@ -1,9 +1,4 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-viewBox="0 0 96 96" enable-background="new 0 0 96 96" 
xml:space="preserve">
-
+
+http://www.w3.org/2000/svg; viewBox="0 0 96 96">
+   
 
diff --git a/resources/lightbulb/images/lightbulb-no.svg 
b/resources/lightbulb/images/lightbulb-no.svg
index d59ba26..5df5319 100644
--- a/resources/lightbulb/images/lightbulb-no.svg
+++ b/resources/lightbulb/images/lightbulb-no.svg
@@ -1,48 +1,9 @@
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-width="92px" height="142.129px" viewBox="0 0 92 142.129" 

[MediaWiki-commits] [Gerrit] mediawiki...GettingStarted[master]: Ensure toolbar's close button WCAG level AA conformance

[jenkins-bot (Code Review)]

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

Change subject: Ensure toolbar's close button WCAG level AA conformance
..


Ensure toolbar's close button WCAG level AA conformance

The color has changed to comply to WikimediaUI color palette in
Ia4cdeebde3803 but failed to pass WCAG level AA contrast ratio.
This fixes the contrast and aligns elment to other interactive
elements in toolbar.

Change-Id: I40034efa86292a7ce6ea3137c398c6ea8efece7b
---
M resources/ext.gettingstarted.taskToolbar.less
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/resources/ext.gettingstarted.taskToolbar.less 
b/resources/ext.gettingstarted.taskToolbar.less
index dd7bec5..5ec51ea 100644
--- a/resources/ext.gettingstarted.taskToolbar.less
+++ b/resources/ext.gettingstarted.taskToolbar.less
@@ -58,12 +58,12 @@
 
 /* X button in top toolbar */
 #mw-gettingstarted-toolbar a.mw-gettingstarted-toolbar-dismiss {
-   color: @colorGray7;
+   color: @colorBaseInverted;
font-size: 1.5em;
margin-left: 15px;
 
&:hover {
-   color: #fff;
+   color: @colorGray15;
text-decoration: none;
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40034efa86292a7ce6ea3137c398c6ea8efece7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Swalling 
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]: Command: Avoid using wfDebug()

[jenkins-bot (Code Review)]

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

Change subject: Command: Avoid using wfDebug()
..


Command: Avoid using wfDebug()

Change-Id: I92ea55d7a5b6a71a6f6b944f377215c08ea3b096
---
M includes/shell/Command.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 4fc282c..59f40bf 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -253,7 +253,7 @@
if ( !$useLogPipe && $this->useStderr ) {
$cmd .= ' 2>&1';
}
-   wfDebug( __METHOD__ . ": $cmd\n" );
+   $this->logger->debug( __METHOD__ . ": $cmd" );
 
// Don't try to execute commands that exceed Linux's 
MAX_ARG_STRLEN.
// Other platforms may be more accomodating, but we don't want 
to be

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92ea55d7a5b6a71a6f6b944f377215c08ea3b096
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 
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]: Command: Avoid using wfDebug()

[Legoktm (Code Review)]

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

Change subject: Command: Avoid using wfDebug()
..

Command: Avoid using wfDebug()

Change-Id: I92ea55d7a5b6a71a6f6b944f377215c08ea3b096
---
M includes/shell/Command.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 4fc282c..59f40bf 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -253,7 +253,7 @@
if ( !$useLogPipe && $this->useStderr ) {
$cmd .= ' 2>&1';
}
-   wfDebug( __METHOD__ . ": $cmd\n" );
+   $this->logger->debug( __METHOD__ . ": $cmd" );
 
// Don't try to execute commands that exceed Linux's 
MAX_ARG_STRLEN.
// Other platforms may be more accomodating, but we don't want 
to be

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Add getWikisBySetting.php script to list wikis with a given ...

[jenkins-bot (Code Review)]

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

Change subject: Add getWikisBySetting.php script to list wikis with a given 
setting/value
..


Add getWikisBySetting.php script to list wikis with a given setting/value

Useful for e.g. iterating over wikis with a particular extension enabled

> deployment-tin:~$ mwscript ~/getWikisBySetting.php  --wiki=aawiki --setting 
> wmgUseSandboxLink
> arwiki
> cawiki
> enwiki
> ...
> deployment-tin:~$ mwscript ~/getWikisBySetting.php  --wiki=aawiki -! -s 
> wmgUseSandboxLink
> commonswiki
> deploymentwiki
> dewiki
> ...

Change-Id: I30253408773eedaf9972089053a2ada3b0bd36a9
---
A getWikisBySetting.php
1 file changed, 66 insertions(+), 0 deletions(-)

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



diff --git a/getWikisBySetting.php b/getWikisBySetting.php
new file mode 100644
index 000..8b06942
--- /dev/null
+++ b/getWikisBySetting.php
@@ -0,0 +1,66 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ * @ingroup Wikimedia
+ */
+
+require_once __DIR__ . '/WikimediaMaintenance.php';
+
+/**
+ * Usage:
+ *  $ mwscript getWikisBySetting.php --setting wgExampleUrl --value '/example'
+ *  $ mwscript getWikisBySetting.php --setting wgExampleUrl --not --value 
'/example'
+ *  $ mwscript getWikisBySetting.php -s wgExampleUrl -! -v '/example'
+ *
+ *  $ mwscript getWikisBySetting.php --setting wgUseExample
+ *  $ mwscript getWikisBySetting.php --setting wgUseExample --not
+ *  $ mwscript getWikisBySetting.php -! -s wmgUseExample
+ */
+class GetWikisBySetting extends Maintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->addDescription( 'Returns a list of wikis where a given 
setting is set to a given value.' );
+   $this->addOption( 'setting', 'Setting name', true, true, 's' );
+   $this->addOption( 'value', 'Value to check against, if omitted 
the script will check for boolean true as value', false, true, 'v' );
+   $this->addOption( 'not', 'Inverse comparison', false, false, 
'!' );
+   }
+
+   public function execute() {
+   global $wgConf;
+
+   $setting = $this->getOption( 'setting' );
+   $expected = $this->getOption( 'value', true );
+   $invert = $this->hasOption( 'not' );
+
+   $wgConf->loadFullData();
+   foreach ( $wgConf->getLocalDatabases() as $wiki ) {
+   $value = $wgConf->get( $setting, $wiki );
+   $match = $value === $expected;
+   if ( $invert ) {
+   $match = !$match;
+   }
+   if ( $match ) {
+   $this->output( "$wiki\n" );
+   }
+   }
+   }
+}
+
+$maintClass = GetWikisBySetting::class;
+require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30253408773eedaf9972089053a2ada3b0bd36a9
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (28e34c1d7)

[Jforrester (Code Review)]

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

Change subject: Update VE core submodule to master (28e34c1d7)
..

Update VE core submodule to master (28e34c1d7)

New changes:
f549faef9 Revert "ve.ui.LinearContextItem: Workaround for T178336"
952faad32 Update OOjs UI to v0.24.0

Change-Id: I76d27222edb29ee9685c7b8807068ac7c99536d9
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/ve b/lib/ve
index ea51798..28e34c1 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit ea5179857cb55525ca98f0b28cd1681a3705f2f5
+Subproject commit 28e34c1d70fb1086c5a99e844dced1227f2dbdb6

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Coding style.

[Cicalese (Code Review)]

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

Change subject: Coding style.
..


Coding style.

Change-Id: Ie4f261843f864fee5d4071ec10616ec3b944afd4
---
M includes/PluggableAuth.php
M includes/PluggableAuthBeginAuthenticationRequest.php
M includes/PluggableAuthLogin.php
M includes/PluggableAuthPrimaryAuthenticationProvider.php
4 files changed, 12 insertions(+), 13 deletions(-)

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



diff --git a/includes/PluggableAuth.php b/includes/PluggableAuth.php
index a0ea3f1..b85d8d1 100644
--- a/includes/PluggableAuth.php
+++ b/includes/PluggableAuth.php
@@ -5,11 +5,11 @@
/**
 * @since 1.0
 *
-* @param &$id
-* @param &$username
-* @param &$realname
-* @param &$email
-* @param &$errorMessage
+* @param int &$id
+* @param string &$username
+* @param string &$realname
+* @param string &$email
+* @param string &$errorMessage
 */
abstract public function authenticate( &$id, &$username, &$realname,
&$email, &$errorMessage );
@@ -24,7 +24,7 @@
/**
 * @since 1.0
 *
-* @param $id
+* @param int $id
 */
abstract public function saveExtraAttributes( $id );
 
@@ -45,6 +45,5 @@
}
wfDebug( 'Could not get authentication plugin instance.' );
return false;
-
}
 }
diff --git a/includes/PluggableAuthBeginAuthenticationRequest.php 
b/includes/PluggableAuthBeginAuthenticationRequest.php
index fb3f151..2ca9b74 100644
--- a/includes/PluggableAuthBeginAuthenticationRequest.php
+++ b/includes/PluggableAuthBeginAuthenticationRequest.php
@@ -9,9 +9,9 @@
public function __construct() {
parent::__construct(
'pluggableauthlogin',
-   wfMessage('pluggableauth-loginbutton-label'),
-   wfMessage('pluggableauth-loginbutton-help'),
-   true);
+   wfMessage( 'pluggableauth-loginbutton-label' ),
+   wfMessage( 'pluggableauth-loginbutton-help' ),
+   true );
}
 
public function getFieldInfo() {
diff --git a/includes/PluggableAuthLogin.php b/includes/PluggableAuthLogin.php
index 113b226..8cf5f94 100644
--- a/includes/PluggableAuthLogin.php
+++ b/includes/PluggableAuthLogin.php
@@ -56,7 +56,7 @@
} else {
wfDebug( 'Authentication failure.' );
if ( is_null( $error ) ) {
-   $error = wfMessage( 
'pluggableauth-authentication-failure')->text();
+   $error = wfMessage( 
'pluggableauth-authentication-failure' )->text();
} else {
if ( !is_string( $error ) ) {
$error = strval( $error );
@@ -71,7 +71,7 @@
}
$returnToUrl = $authManager->getAuthenticationSessionData(
self::RETURNTOURL_SESSION_KEY );
-   if ( is_null( $returnToUrl) || count( $returnToUrl ) === 0 ) {
+   if ( is_null( $returnToUrl ) || count( $returnToUrl ) === 0 ) {
wfDebug( 'ERROR: return to URL is null or empty' );
} else {
$this->getOutput()->redirect( $returnToUrl );
diff --git a/includes/PluggableAuthPrimaryAuthenticationProvider.php 
b/includes/PluggableAuthPrimaryAuthenticationProvider.php
index 3f47ca0..655bbff 100644
--- a/includes/PluggableAuthPrimaryAuthenticationProvider.php
+++ b/includes/PluggableAuthPrimaryAuthenticationProvider.php
@@ -54,7 +54,7 @@
wfMessage( 
'pluggableauth-authentication-workflow-failure' ) );
}
$error = $this->manager->getAuthenticationSessionData(
-   PluggableAuthLogin::ERROR_SESSION_KEY ) ;
+   PluggableAuthLogin::ERROR_SESSION_KEY );
if ( !is_null( $error ) ) {
$this->manager->removeAuthenticationSessionData(
PluggableAuthLogin::ERROR_SESSION_KEY );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4f261843f864fee5d4071ec10616ec3b944afd4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Coding style.

[Cicalese (Code Review)]

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

Change subject: Coding style.
..

Coding style.

Change-Id: Ie4f261843f864fee5d4071ec10616ec3b944afd4
---
M includes/PluggableAuth.php
M includes/PluggableAuthBeginAuthenticationRequest.php
M includes/PluggableAuthLogin.php
M includes/PluggableAuthPrimaryAuthenticationProvider.php
4 files changed, 12 insertions(+), 13 deletions(-)


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

diff --git a/includes/PluggableAuth.php b/includes/PluggableAuth.php
index a0ea3f1..b85d8d1 100644
--- a/includes/PluggableAuth.php
+++ b/includes/PluggableAuth.php
@@ -5,11 +5,11 @@
/**
 * @since 1.0
 *
-* @param &$id
-* @param &$username
-* @param &$realname
-* @param &$email
-* @param &$errorMessage
+* @param int &$id
+* @param string &$username
+* @param string &$realname
+* @param string &$email
+* @param string &$errorMessage
 */
abstract public function authenticate( &$id, &$username, &$realname,
&$email, &$errorMessage );
@@ -24,7 +24,7 @@
/**
 * @since 1.0
 *
-* @param $id
+* @param int $id
 */
abstract public function saveExtraAttributes( $id );
 
@@ -45,6 +45,5 @@
}
wfDebug( 'Could not get authentication plugin instance.' );
return false;
-
}
 }
diff --git a/includes/PluggableAuthBeginAuthenticationRequest.php 
b/includes/PluggableAuthBeginAuthenticationRequest.php
index fb3f151..2ca9b74 100644
--- a/includes/PluggableAuthBeginAuthenticationRequest.php
+++ b/includes/PluggableAuthBeginAuthenticationRequest.php
@@ -9,9 +9,9 @@
public function __construct() {
parent::__construct(
'pluggableauthlogin',
-   wfMessage('pluggableauth-loginbutton-label'),
-   wfMessage('pluggableauth-loginbutton-help'),
-   true);
+   wfMessage( 'pluggableauth-loginbutton-label' ),
+   wfMessage( 'pluggableauth-loginbutton-help' ),
+   true );
}
 
public function getFieldInfo() {
diff --git a/includes/PluggableAuthLogin.php b/includes/PluggableAuthLogin.php
index 113b226..8cf5f94 100644
--- a/includes/PluggableAuthLogin.php
+++ b/includes/PluggableAuthLogin.php
@@ -56,7 +56,7 @@
} else {
wfDebug( 'Authentication failure.' );
if ( is_null( $error ) ) {
-   $error = wfMessage( 
'pluggableauth-authentication-failure')->text();
+   $error = wfMessage( 
'pluggableauth-authentication-failure' )->text();
} else {
if ( !is_string( $error ) ) {
$error = strval( $error );
@@ -71,7 +71,7 @@
}
$returnToUrl = $authManager->getAuthenticationSessionData(
self::RETURNTOURL_SESSION_KEY );
-   if ( is_null( $returnToUrl) || count( $returnToUrl ) === 0 ) {
+   if ( is_null( $returnToUrl ) || count( $returnToUrl ) === 0 ) {
wfDebug( 'ERROR: return to URL is null or empty' );
} else {
$this->getOutput()->redirect( $returnToUrl );
diff --git a/includes/PluggableAuthPrimaryAuthenticationProvider.php 
b/includes/PluggableAuthPrimaryAuthenticationProvider.php
index 3f47ca0..655bbff 100644
--- a/includes/PluggableAuthPrimaryAuthenticationProvider.php
+++ b/includes/PluggableAuthPrimaryAuthenticationProvider.php
@@ -54,7 +54,7 @@
wfMessage( 
'pluggableauth-authentication-workflow-failure' ) );
}
$error = $this->manager->getAuthenticationSessionData(
-   PluggableAuthLogin::ERROR_SESSION_KEY ) ;
+   PluggableAuthLogin::ERROR_SESSION_KEY );
if ( !is_null( $error ) ) {
$this->manager->removeAuthenticationSessionData(
PluggableAuthLogin::ERROR_SESSION_KEY );

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Revert "ve.ui.LinearContextItem: Workaround for T178336"

[jenkins-bot (Code Review)]

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

Change subject: Revert "ve.ui.LinearContextItem: Workaround for T178336"
..


Revert "ve.ui.LinearContextItem: Workaround for T178336"

No longer needed after OOjs UI version update.

This reverts commit 6d90b80c1064bb70fccde7855f8616c4947c5700.

Change-Id: I6a34e14764fe25ef40799720ad6601434bdbdf41
---
M src/ui/styles/contextitems/ve.ui.LinearContextItem.css
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/src/ui/styles/contextitems/ve.ui.LinearContextItem.css 
b/src/ui/styles/contextitems/ve.ui.LinearContextItem.css
index a27ff8a..21087c6 100644
--- a/src/ui/styles/contextitems/ve.ui.LinearContextItem.css
+++ b/src/ui/styles/contextitems/ve.ui.LinearContextItem.css
@@ -69,8 +69,3 @@
 .ve-ui-linearContextItem-body:not( :empty ) {
padding: 0 1em 1em 1em;
 }
-
-/* Temporary workaround for T178336 */
-.ve-ui-linearContextItem-actions .oo-ui-buttonWidget:not( .oo-ui-iconElement ) 
.oo-ui-iconElement-icon {
-   display: none;
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a34e14764fe25ef40799720ad6601434bdbdf41
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.24.0

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.24.0
..


Update OOjs UI to v0.24.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.0

Depends-on: Iad57bf4f6306086cb775629f2d9f2fcf2dbcf5fd
Change-Id: Idf2bed0a1719f8a30bcc66211cbeedd2bb31ec4b
---
M composer.json
M resources/lib/oojs-ui/i18n/ia.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-wikimediaui.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-alerts.json
M resources/lib/oojs-ui/themes/apex/icons-interactions.json
M resources/lib/oojs-ui/themes/apex/icons-layout.json
D resources/lib/oojs-ui/themes/apex/images/icons/sun-ltr.png
D resources/lib/oojs-ui/themes/apex/images/icons/sun-ltr.svg
D resources/lib/oojs-ui/themes/apex/images/icons/sun-rtl.png
D resources/lib/oojs-ui/themes/apex/images/icons/sun-rtl.svg
M resources/lib/oojs-ui/themes/wikimediaui/icons-alerts.json
M resources/lib/oojs-ui/themes/wikimediaui/icons-interactions.json
M resources/lib/oojs-ui/themes/wikimediaui/icons-layout.json
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/alert-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleSearch-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bell-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bigger-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-a-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-ain-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-dad-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-armn-to-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-be-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-zhe-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-g-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/browser-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-destructive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/case-sensitive-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clear-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clip-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clock-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/download-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/edit-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editUndo-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/external-link-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/eye-invert.svg
D resources/lib/oojs-ui/themes/wikimediaui/images/icons/eye-progressive.png
D 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.24.0

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.24.0
..


Update OOjs UI to v0.24.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.0

Change-Id: Iad57bf4f6306086cb775629f2d9f2fcf2dbcf5fd
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/bin/testsuitegenerator.rb
M oojs/oojs-ui/i18n/ia.json
M oojs/oojs-ui/package.json
D oojs/oojs-ui/php/themes/MediaWikiTheme.php
11 files changed, 108 insertions(+), 99 deletions(-)

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



diff --git a/composer.json b/composer.json
index 553e6d0..258478e 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
"mustangostang/spyc": "0.6.2",
"nikic/php-parser": "3.0.6",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.23.5",
+   "oojs/oojs-ui": "0.24.0",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
diff --git a/composer.lock b/composer.lock
index a42b47a..57b289e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "6aecf21f57ced0a527905f88a6f25efe",
+"content-hash": "5ea1fad8f3494e433113cf097d1308af",
 "packages": [
 {
 "name": "composer/semver",
@@ -711,16 +711,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.23.5",
+"version": "v0.24.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6"
+"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6;,
-"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/702a48a61bc597a4053c19dd4e8767461c71fb12;,
+"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12",
 "shasum": ""
 },
 "require": {
@@ -786,7 +786,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-10-12T21:07:17+00:00"
+"time": "2017-10-17T22:42:34+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index 7755082..70efa0a 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -753,7 +753,6 @@
 'OOUI\\LabelElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/LabelElement.php',
 'OOUI\\LabelWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/LabelWidget.php',
 'OOUI\\Layout' => $vendorDir . '/oojs/oojs-ui/php/Layout.php',
-'OOUI\\MediaWikiTheme' => $vendorDir . 
'/oojs/oojs-ui/php/themes/MediaWikiTheme.php',
 'OOUI\\MultilineTextInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php',
 'OOUI\\PanelLayout' => $vendorDir . 
'/oojs/oojs-ui/php/layouts/PanelLayout.php',
 'OOUI\\ProgressBarWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/ProgressBarWidget.php',
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index af1b963..e7fb01d 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -1006,7 +1006,6 @@
 'OOUI\\LabelElement' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/mixins/LabelElement.php',
 'OOUI\\LabelWidget' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/widgets/LabelWidget.php',
 'OOUI\\Layout' => __DIR__ . '/..' . '/oojs/oojs-ui/php/Layout.php',
-'OOUI\\MediaWikiTheme' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/themes/MediaWikiTheme.php',
 'OOUI\\MultilineTextInputWidget' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php',
 'OOUI\\PanelLayout' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/layouts/PanelLayout.php',
 'OOUI\\ProgressBarWidget' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/widgets/ProgressBarWidget.php',
diff --git a/composer/installed.json b/composer/installed.json
index de4b4e0..8eb0fb6 100644
--- a/composer/installed.json
+++ 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.24.0

[VolkerE (Code Review)]

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

Change subject: Update OOjs UI to v0.24.0
..

Update OOjs UI to v0.24.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.0

Depends-on: Iad57bf4f6306086cb775629f2d9f2fcf2dbcf5fd
Change-Id: Idf2bed0a1719f8a30bcc66211cbeedd2bb31ec4b
---
M composer.json
M resources/lib/oojs-ui/i18n/ia.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-wikimediaui.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-alerts.json
M resources/lib/oojs-ui/themes/apex/icons-interactions.json
M resources/lib/oojs-ui/themes/apex/icons-layout.json
D resources/lib/oojs-ui/themes/apex/images/icons/sun-ltr.png
D resources/lib/oojs-ui/themes/apex/images/icons/sun-ltr.svg
D resources/lib/oojs-ui/themes/apex/images/icons/sun-rtl.png
D resources/lib/oojs-ui/themes/apex/images/icons/sun-rtl.svg
M resources/lib/oojs-ui/themes/wikimediaui/icons-alerts.json
M resources/lib/oojs-ui/themes/wikimediaui/icons-interactions.json
M resources/lib/oojs-ui/themes/wikimediaui/icons-layout.json
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/alert-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleSearch-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bell-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bigger-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-a-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-ain-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-dad-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-armn-to-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-be-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-zhe-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-g-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/browser-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-destructive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/case-sensitive-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clear-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clip-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clock-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/download-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/edit-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editUndo-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/external-link-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/eye-invert.svg
D resources/lib/oojs-ui/themes/wikimediaui/images/icons/eye-progressive.png
D 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.24.0

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.24.0
..


Update OOjs UI to v0.24.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.0

Change-Id: If14db00f912efb52c2d032ab290aa558f2990d05
---
M lib/oojs-ui/README.md
M lib/oojs-ui/i18n/ia.json
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
D lib/oojs-ui/oojs-ui-core-mediawiki.css
D lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki.css
D lib/oojs-ui/oojs-ui-mediawiki.js
D lib/oojs-ui/oojs-ui-mediawiki.js.map
D lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
D lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
D lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
D lib/oojs-ui/oojs-ui-widgets-mediawiki.css
D lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Check contact_hash if contact_id exists

[jenkins-bot (Code Review)]

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

Change subject: Check contact_hash if contact_id exists
..


Check contact_hash if contact_id exists

This is to enable passing contact_id from the payments frontend.
The frontend will only pass contact_id along with contact_hash.
When both are present, check that the hash matches the contact id
before updating the contact. Note that we only update email and
mailing address, not name.

Bug: T177663
Change-Id: Id8bbd8711b6742b99a552e363fe604b73df33385
---
M sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 93 insertions(+), 1 deletion(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
index 314d9ca..a6fb81c 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
@@ -10,6 +10,7 @@
 class ImportMessageTest extends BaseWmfDrupalPhpUnitTestCase {
 protected $contact_custom_mangle;
 protected $contribution_id;
+protected $contact_id;
 protected $contribution_custom_mangle;
 static protected $fixtures;
 
@@ -59,6 +60,9 @@
 public function tearDown() {
 if ( $this->contribution_id ) {
   $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
+}
+if ( $this->contact_id ) {
+$this->cleanUpContact( $this->contact_id );
 }
 parent::tearDown();
 }
@@ -683,6 +687,81 @@
 }
 
   /**
+   * When we get a contact ID and matching hash, update instead of create new
+   * @group contactHash
+   */
+  public function testImportWithContactIdAndHash() {
+$existingContact = civicrm_api3('Contact', 'Create', array(
+  'contact_type' => 'Individual',
+  'first_name' => 'Test',
+  'last_name' => 'Es' . mt_rand()
+));
+$this->contact_id = $existingContact['id'];
+$existingContact = $existingContact['values'][$existingContact['id']];
+civicrm_api3('Email', 'Create', array(
+  'contact_id' => $this->contact_id,
+  'email' => 'booboo' . mt_rand() . '@example.org',
+  'location_type_id' => 1,
+));
+$msg = array(
+  'contact_id' => $existingContact['id'],
+  'contact_hash' => $existingContact['hash'],
+  'currency' => 'USD',
+  'date' => '2017-01-01 00:00:00',
+  'invoice_id' => mt_rand(),
+  'email' => 'newspecialem...@wikimedia.org',
+  'gateway' => 'test_gateway',
+  'gateway_txn_id' => mt_rand(),
+  'gross' => '1.25',
+  'payment_method' => 'cc',
+);
+$contribution = wmf_civicrm_contribution_message_import($msg);
+$this->assertEquals($existingContact['id'], $contribution['contact_id']);
+$email = $this->callAPISuccessGetSingle(
+  'Email', array('contact_id' => $existingContact['id'], 'location_type' 
=> 1)
+);
+$this->assertEquals($msg['email'], $email['email']);
+  }
+
+  /**
+   * If we get a contact ID and a bad hash, leave the existing contact alone
+   * @group contactHash
+   */
+  public function testImportWithContactIdAndBadHash() {
+$existingContact = civicrm_api3('Contact', 'Create', array(
+  'contact_type' => 'Individual',
+  'first_name' => 'Test',
+  'last_name' => 'Es' . mt_rand()
+));
+$this->contact_id = $existingContact['id'];
+$existingContact = $existingContact['values'][$existingContact['id']];
+civicrm_api3('Email', 'Create', array(
+  'contact_id' => $this->contact_id,
+  'email' => 'booboo' . mt_rand() . '@example.org',
+  'location_type_id' => 1,
+));
+$msg = array(
+  'contact_id' => $existingContact['id'],
+  'first_name' => 'Lex',
+  'contact_hash' => 'This is not a valid hash',
+  'currency' => 'USD',
+  'date' => '2017-01-01 00:00:00',
+  'invoice_id' => mt_rand(),
+  'email' => 'newspecialem...@wikimedia.org',
+  'gateway' => 'test_gateway',
+  'gateway_txn_id' => mt_rand(),
+  'gross' => '1.25',
+  'payment_method' => 'cc',
+);
+$contribution = wmf_civicrm_contribution_message_import($msg);
+$this->assertNotEquals($existingContact['id'], 
$contribution['contact_id']);
+$email = $this->callAPISuccessGetSingle(
+  'Email', array('contact_id' => $existingContact['id'], 'location_type' 
=> 1)
+);
+$this->assertNotEquals($msg['email'], $email['email']);
+  }
+
+  /**
* Assert that 2 arrays are the same in all the ways that matter :-).
*
* This has been written for a specific test & will probably take extra work
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add ReadingLists extension

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384909 )

Change subject: Add ReadingLists extension
..

Add ReadingLists extension

Bug: T174651
Change-Id: Icc80275afb750b53362329c65cf4287d6ae3e3fd
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 2a98b4c..8c591a0 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -117,6 +117,7 @@
"PropertySuggester",
"QuickSurveys",
"Quiz",
+   "ReadingLists",
"RelatedArticles",
"RelatedSites",
"Renameuser",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc80275afb750b53362329c65cf4287d6ae3e3fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy ReadingLists to the beta cluster

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384908 )

Change subject: Deploy ReadingLists to the beta cluster
..

Deploy ReadingLists to the beta cluster

Bug: T174651
Change-Id: I5d658a2fb384c431545b66866fedcdd8ff36956d
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/extension-list-labs
3 files changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 8278b7d..121d8b5 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -325,6 +325,13 @@
wfLoadSkin( 'Timeless' ); // T160643
 }
 
+if ( $wmgUseReadingLists ) {
+   wfLoadExtension( 'ReadingLists' );
+   $wgReadingListsCentralWiki = 'metawiki';
+   // no clusters in Beta; let's just pick a random wiki DB and use that
+   $wgReadingListsDatabase = 'metawiki';
+}
+
 if ( $wmgUseLoginNotify ) {
$wgLoginNotifyAttemptsKnownIP = 10;
$wgLoginNotifyAttemptsNewIP = 1;
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c58ea41..adc0951 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -658,6 +658,10 @@
'default' => true,
],
 
+   'wmgUseReadingLists' => [
+   'default' => true,
+   ],
+
'wgOresModels' => [
'enwiki' => [
'damaging' => true,
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 3c966f0..45d77bf 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,5 @@
 $IP/extensions/ArticleCreationWorkflow/extension.json
 $IP/extensions/EmailAuth/extension.json
 $IP/extensions/PerformanceInspector/extension.json
+$IP/extensions/ReadingLists/extension.json
 $IP/extensions/Sentry/extension.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d658a2fb384c431545b66866fedcdd8ff36956d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Move resultsType to search context

[Smalyshev (Code Review)]

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

Change subject: Move resultsType to search context
..

Move resultsType to search context

This allows fulltext query builders to override result type,
which is relevant for wikidata when it wants to display different
fields than a regular result type.

Change-Id: Ic818924f83699b1bc333d03499808d390b75faf2
---
M includes/Search/SearchContext.php
M includes/Searcher.php
2 files changed, 34 insertions(+), 17 deletions(-)


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

diff --git a/includes/Search/SearchContext.php 
b/includes/Search/SearchContext.php
index bde76d7..c767117 100644
--- a/includes/Search/SearchContext.php
+++ b/includes/Search/SearchContext.php
@@ -211,6 +211,11 @@
private $isDirty = false;
 
/**
+* @var ResultsType Type of the result for the context.
+*/
+   private $resultsType;
+
+   /**
 * @param SearchConfig $config
 * @param int[]|null $namespaces
 */
@@ -879,4 +884,22 @@
$this->isDirty = true;
$this->fulltextQueryBuilderProfile = $profile;
}
+
+   /**
+* @param ResultsType $resultsType results type to return
+*/
+   public function setResultsType( $resultsType ) {
+   $this->resultsType = $resultsType;
+   }
+
+   /**
+* @return ResultsType $resultsType results type to return
+*/
+   public function getResultsType() {
+   if ( !$this->resultsType === null ) {
+   return new FullTextResultsType( 
FullTextResultsType::HIGHLIGHT_ALL );
+   }
+   return $this->resultsType;
+   }
+
 }
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 5d7bb4c..724441f 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -3,7 +3,6 @@
 namespace CirrusSearch;
 
 use CirrusSearch\Query\SimpleKeywordFeature;
-use CirrusSearch\Search\FullTextResultsType;
 use CirrusSearch\Search\TitleResultsType;
 use CirrusSearch\Search\ResultsType;
 use CirrusSearch\Search\RescoreBuilder;
@@ -90,10 +89,6 @@
private $language;
 
/**
-* @var ResultsType|null type of results.  null defaults to 
FullTextResultsType
-*/
-   protected $resultsType;
-   /**
 * @var string sort type
 */
private $sort = 'relevance';
@@ -164,7 +159,7 @@
 * @param ResultsType $resultsType results type to return
 */
public function setResultsType( $resultsType ) {
-   $this->resultsType = $resultsType;
+   $this->searchContext->setResultsType( $resultsType );
}
 
/**
@@ -552,13 +547,11 @@
 * @return \Elastica\Search
 */
protected function buildSearch() {
-   if ( $this->resultsType === null ) {
-   $this->resultsType = new FullTextResultsType( 
FullTextResultsType::HIGHLIGHT_ALL );
-   }
+   $resultsType = $this->searchContext->getResultsType();
 
$query = new \Elastica\Query();
-   $query->setSource( $this->resultsType->getSourceFiltering() );
-   $query->setStoredFields( $this->resultsType->getStoredFields() 
);
+   $query->setSource( $resultsType->getSourceFiltering() );
+   $query->setStoredFields( $resultsType->getStoredFields() );
 
$extraIndexes = [];
$namespaces = $this->searchContext->getNamespaces();
@@ -581,7 +574,7 @@
$this->installBoosts();
$query->setQuery( $this->searchContext->getQuery() );
 
-   $highlight = $this->searchContext->getHighlight( 
$this->resultsType );
+   $highlight = $this->searchContext->getHighlight( $resultsType );
if ( $highlight ) {
$query->setHighlight( $highlight );
}
@@ -703,10 +696,11 @@
 *
 * @param \Elastica\Search[] $searches
 * @param ResultsType[] $resultsTypes Specific ResultType instances to 
use with $searches. Any
-*  search without a matching key in this array uses $this->resultsType.
+*  search without a matching key in this array uses context result 
type.
 * @return Status results from the query transformed by the resultsType
 */
protected function searchMulti( $searches, array $resultsTypes = [] ) {
+   $contextResultsType = $this->searchContext->getResultsType();
if ( $this->limit <= 0 && ! $this->returnQuery ) {
if ( $this->returnResult ) {
return Status::newGood( [
@@ -718,7 +712,7 @@
$this->searchContext->setResultsPossible( false 
);
   

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: WIP Switch Omnimail job progress tracking to it's own table.

[Eileen (Code Review)]

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

Change subject: WIP Switch Omnimail job progress tracking to it's own table.
..

WIP Switch Omnimail job progress tracking to it's own table.

Turns out we have logging enabled on the civicrm_settings table which makes it 
really inapproprite

We could have stopped logging on that table but it feels like we might someday 
want to do forensics on a setting

Bug: T177451
Change-Id: I7f795f38c34e6d992dd42bd989479fac25225294
---
A 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/BAO/OmnimailJobProgress.php
A 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/DAO/OmnimailJobProgress.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Upgrader.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
A 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/OmnimailJobProgress.php
M sites/default/civicrm/extensions/org.wikimedia.omnimail/omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/sql/omnimail_install.sql
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
A 
sites/default/civicrm/extensions/org.wikimedia.omnimail/xml/schema/CRM/Omnimail/OmnimailJobProgress.entityType.php
A 
sites/default/civicrm/extensions/org.wikimedia.omnimail/xml/schema/CRM/Omnimail/OmnimailJobProgress.xml
12 files changed, 507 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/06/384906/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/BAO/OmnimailJobProgress.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/BAO/OmnimailJobProgress.php
new file mode 100644
index 000..fdc3049
--- /dev/null
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/BAO/OmnimailJobProgress.php
@@ -0,0 +1,25 @@
+copyValues($params);
+* $instance->save();
+* CRM_Utils_Hook::post($hook, $entityName, $instance->id, $instance);
+ *
+* return $instance;
+  * } */
+
+}
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/DAO/OmnimailJobProgress.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/DAO/OmnimailJobProgress.php
new file mode 100644
index 000..3d1063c
--- /dev/null
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/DAO/OmnimailJobProgress.php
@@ -0,0 +1,266 @@
+http://civicrm.org/licensing|
+++
+*/
+/**
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2017
+ *
+ * Generated from xml/schema/CRM/Omnimail/OmnimailJobProgress.xml
+ * DO NOT EDIT.  Generated by CRM_Core_CodeGen
+ * (GenCodeChecksum:9b5f9397769a4b1c942fcf3181cb8b17)
+ */
+require_once 'CRM/Core/DAO.php';
+require_once 'CRM/Utils/Type.php';
+/**
+ * CRM_Omnimail_DAO_OmnimailJobProgress constructor.
+ */
+class CRM_Omnimail_DAO_OmnimailJobProgress extends CRM_Core_DAO {
+  /**
+   * Static instance to hold the table name.
+   *
+   * @var string
+   */
+  static $_tableName = 'civicrm_omnimail_job_progress';
+  /**
+   * Should CiviCRM log any modifications to this table in the civicrm_log 
table.
+   *
+   * @var boolean
+   */
+  static $_log = false;
+  /**
+   * Unique OmnimailJobProgress ID
+   *
+   * @var int unsigned
+   */
+  public $id;
+  /**
+   * Mailing provider name
+   *
+   * @var string
+   */
+  public $mailing_provider;
+  /**
+   * job name
+   *
+   * @var string
+   */
+  public $job;
+  /**
+   * optional suffix to disambiguate the job
+   *
+   * @var string
+   */
+  public $job_identifier;
+  /**
+   * Mailing provider name
+   *
+   * @var timestamp
+   */
+  public $last_timestamp;
+  /**
+   * End timestamp of current retrieval
+   *
+   * @var timestamp
+   */
+  public $progress_end_timestamp;
+  /**
+   * json copy of any paramters that need to be passed to the provider.
+   *
+   * @var string
+   */
+  public $retrieval_parameters;
+  /**
+   * How many lines have been processed
+   *
+   * @var int unsigned
+   */
+  public $offset;
+  /**
+   * Class constructor.
+   */
+  function __construct() {
+$this->__table = 'civicrm_omnimail_job_progress';
+parent::__construct();
+  }
+  /**
+   * Returns all the column names of this table
+   *
+   * @return array
+   */
+  static function () {
+if (!isset(Civi::$statics[__CLASS__]['fields'])) {
+  Civi::$statics[__CLASS__]['fields'] = array(
+'id' => array(
+  'name' => 'id',
+  'type' => CRM_Utils_Type::T_INT,
+  'description' => 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.24.0

[VolkerE (Code Review)]

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

Change subject: Update OOjs UI to v0.24.0
..

Update OOjs UI to v0.24.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.0

Change-Id: Iad57bf4f6306086cb775629f2d9f2fcf2dbcf5fd
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/bin/testsuitegenerator.rb
M oojs/oojs-ui/i18n/ia.json
M oojs/oojs-ui/package.json
D oojs/oojs-ui/php/themes/MediaWikiTheme.php
11 files changed, 157 insertions(+), 99 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/05/384905/1

diff --git a/composer.json b/composer.json
index 553e6d0..258478e 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
"mustangostang/spyc": "0.6.2",
"nikic/php-parser": "3.0.6",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.23.5",
+   "oojs/oojs-ui": "0.24.0",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
diff --git a/composer.lock b/composer.lock
index a42b47a..57b289e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "6aecf21f57ced0a527905f88a6f25efe",
+"content-hash": "5ea1fad8f3494e433113cf097d1308af",
 "packages": [
 {
 "name": "composer/semver",
@@ -711,16 +711,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.23.5",
+"version": "v0.24.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6"
+"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6;,
-"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/702a48a61bc597a4053c19dd4e8767461c71fb12;,
+"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12",
 "shasum": ""
 },
 "require": {
@@ -786,7 +786,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-10-12T21:07:17+00:00"
+"time": "2017-10-17T22:42:34+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index 7755082..70efa0a 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -753,7 +753,6 @@
 'OOUI\\LabelElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/LabelElement.php',
 'OOUI\\LabelWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/LabelWidget.php',
 'OOUI\\Layout' => $vendorDir . '/oojs/oojs-ui/php/Layout.php',
-'OOUI\\MediaWikiTheme' => $vendorDir . 
'/oojs/oojs-ui/php/themes/MediaWikiTheme.php',
 'OOUI\\MultilineTextInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php',
 'OOUI\\PanelLayout' => $vendorDir . 
'/oojs/oojs-ui/php/layouts/PanelLayout.php',
 'OOUI\\ProgressBarWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/ProgressBarWidget.php',
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index af1b963..e7fb01d 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -1006,7 +1006,6 @@
 'OOUI\\LabelElement' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/mixins/LabelElement.php',
 'OOUI\\LabelWidget' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/widgets/LabelWidget.php',
 'OOUI\\Layout' => __DIR__ . '/..' . '/oojs/oojs-ui/php/Layout.php',
-'OOUI\\MediaWikiTheme' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/themes/MediaWikiTheme.php',
 'OOUI\\MultilineTextInputWidget' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php',
 'OOUI\\PanelLayout' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/layouts/PanelLayout.php',
 'OOUI\\ProgressBarWidget' => __DIR__ . '/..' . 
'/oojs/oojs-ui/php/widgets/ProgressBarWidget.php',
diff --git a/composer/installed.json b/composer/installed.json
index de4b4e0..eec1efa 100644
--- a/composer/installed.json
+++ 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.24.0

[VolkerE (Code Review)]

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

Change subject: Update OOjs UI to v0.24.0
..

Update OOjs UI to v0.24.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.0

Change-Id: If14db00f912efb52c2d032ab290aa558f2990d05
---
M lib/oojs-ui/README.md
M lib/oojs-ui/i18n/ia.json
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
D lib/oojs-ui/oojs-ui-core-mediawiki.css
D lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki.css
D lib/oojs-ui/oojs-ui-mediawiki.js
D lib/oojs-ui/oojs-ui-mediawiki.js.map
D lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
D lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
D lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
D lib/oojs-ui/oojs-ui-widgets-mediawiki.css
D lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui.css
M 

[MediaWiki-commits] [Gerrit] mediawiki...Collection[wmf/1.31.0-wmf.4]: Disable special page usage until further notice

[Jdlrobson (Code Review)]

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

Change subject: Disable special page usage until further notice
..

Disable special page usage until further notice

Provide placeholder function for re-adding access later on.

Bug: T178289
Change-Id: I25f35f20ae95cd0a25286610357d09e14a9cb970
(cherry picked from commit 28cdfe8fd55a31fac16350243e42632f687c3bed)
---
M SpecialRenderBook.php
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/SpecialRenderBook.php b/SpecialRenderBook.php
index f33dcca..fa243ef 100644
--- a/SpecialRenderBook.php
+++ b/SpecialRenderBook.php
@@ -14,11 +14,26 @@
$this->setListed( false );
}
 
+   /**
+* A placeholder method for checking whether the current user is
+* allowed to make use of the special page for testing purposes.
+* Currently this defaults to false, until we implement proper
+* permissioning (see T178289)
+* @param User $user to check permissions for
+* @return bool
+*/
+   public function hasUserGotTestingPermission( $user ) {
+   return false;
+   }
+
public function execute( $subPage ) {
$key = null;
if ( strpos( $subPage, '/' ) !== false ) {
list( $subPage, $key ) = explode( '/', $subPage, 2 );
}
+   if ( !$this->hasUserGotTestingPermission( $this->getUser() ) ) {
+   return;
+   }
 
$services = MediaWikiServices::getInstance();
$restClientLogger = LoggerFactory::getInstance( 'http' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25f35f20ae95cd0a25286610357d09e14a9cb970
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.31.0-wmf.4
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.24.0

[jenkins-bot (Code Review)]

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

Change subject: Tag v0.24.0
..


Tag v0.24.0

Change-Id: If7168cb8693145fdc8e463e490a4b1f6997955dc
---
M History.md
M package.json
2 files changed, 18 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index 091a0ee..72a25d0 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,21 @@
 # OOjs UI Release History
+## v0.24.0 / 2017-10-17
+### Breaking changes
+* [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme (James D. 
Forrester)
+* [BREAKING CHANGE] icons: Drop 'stripeSideMenu', renamed in v0.22.2 (James D. 
Forrester)
+* [BREAKING CHANGE] icons: Remove 'eye'/'eyeClosed' icons, deprecated in 
v0.23.0 (Volker E.)
+* [BREAKING CHANGE] icons: Remove 'signature' icon, deprecated in v0.23.0 
(Volker E.)
+* [BREAKING CHANGE] icons: Remove 'sun', deprecated in v0.23.0 (James D. 
Forrester)
+
+### Styles
+* themes: Unify icon/indicator visibility (Volker E.)
+* WikimediaUI theme: Ensure hover feedback on TextInputWidget & descendants 
(Volker E.)
+
+### Code
+* Fix `.oo-ui-selectable()` mixin to actually undo `.oo-ui-unselectable()` 
(Bartosz Dziewoński)
+* WikimediaUI theme: Fix selector in PopupWidget styles (Bartosz Dziewoński)
+
+
 ## v0.23.5 / 2017-10-12
 ### Code
 * PHP MultilineTextInputWidget, SearchInputWidget: Remove duplicate `use` 
statements (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index de1e845..8732bb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.23.5",
+  "version": "0.24.0",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[wmf/1.31.0-wmf.4]: ve.ui.CiteFromIdInspector: Fix CSS for context menus after c...

[jenkins-bot (Code Review)]

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

Change subject: ve.ui.CiteFromIdInspector: Fix CSS for context menus after 
changes in OOjs UI
..


ve.ui.CiteFromIdInspector: Fix CSS for context menus after changes in OOjs UI

Bug: T178324
Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
(cherry picked from commit df3c1d2661923d76c329b9d351cf26a544078092)
---
M modules/ve.ui.CiteFromIdInspector.css
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve.ui.CiteFromIdInspector.css 
b/modules/ve.ui.CiteFromIdInspector.css
index f186347..5c5f95b 100644
--- a/modules/ve.ui.CiteFromIdInspector.css
+++ b/modules/ve.ui.CiteFromIdInspector.css
@@ -31,7 +31,8 @@
font-weight: bold;
 }
 
-.ve-ui-citeFromIdReferenceWidget .oo-ui-iconElement-icon {
+.ve-ui-citeFromIdReferenceWidget.oo-ui-iconElement > .oo-ui-iconElement-icon {
+   position: static;
display: inline-block;
margin-right: 0.5em;
height: 1.875em;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: wmf/1.31.0-wmf.4
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.31.0-wmf.4]: ve.ui.MWMediaInfoFieldWidget: Fix positioning of icons

[jenkins-bot (Code Review)]

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

Change subject: ve.ui.MWMediaInfoFieldWidget: Fix positioning of icons
..


ve.ui.MWMediaInfoFieldWidget: Fix positioning of icons

OOjs UI's styles now include 'top: 0' for icons, which messes us up here.

Bug: T178415
Change-Id: Ia3234848f69fd67d0b3e35c817de1d9847d46143
(cherry picked from commit 99cdc08f53b00452d134579dec5a609b6ac5978e)
---
M modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaInfoFieldWidget.css
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaInfoFieldWidget.css 
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaInfoFieldWidget.css
index e2b8e36..ead4d1e 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaInfoFieldWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaInfoFieldWidget.css
@@ -10,6 +10,7 @@
margin: 0.05em;
height: 1.9em;
position: absolute;
+   top: auto;
opacity: 0.5;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3234848f69fd67d0b3e35c817de1d9847d46143
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.31.0-wmf.4
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.3]: Shell\Command: Better walltime fallback

[jenkins-bot (Code Review)]

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

Change subject: Shell\Command: Better walltime fallback
..


Shell\Command: Better walltime fallback

Previously, it assumed that the only way times could be overridden is to
reduce the limits - which isn't the case for video transcoding.

Bug: T178314
Change-Id: I492a44f280a36ee666e9963788caac2bbc6bc6f3
(cherry picked from commit 945f8870d342b4ac4d7183911c67e14a03ced5ec)
---
M includes/shell/Command.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 4e0c0ec..b25dd2d 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -135,6 +135,11 @@
 * @return $this
 */
public function limits( array $limits ) {
+   if ( !isset( $limits['walltime'] ) && isset( $limits['time'] ) 
) {
+   // Emulate the behavior of old wfShellExec() where 
walltime fell back on time
+   // if the latter was overridden and the former wasn't
+   $limits['walltime'] = $limits['time'];
+   }
$this->limits = $limits + $this->limits;
 
return $this;
@@ -227,8 +232,6 @@
if ( is_executable( '/bin/bash' ) ) {
$time = intval( $this->limits['time'] );
$wallTime = intval( $this->limits['walltime'] );
-   // for b/c, wall time falls back to time
-   $wallTime = min( $time, $wallTime );
$mem = intval( $this->limits['memory'] );
$filesize = intval( $this->limits['filesize'] );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I492a44f280a36ee666e9963788caac2bbc6bc6f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.3
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove setting no longer in MediaWiki

[jenkins-bot (Code Review)]

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

Change subject: Remove setting no longer in MediaWiki
..


Remove setting no longer in MediaWiki

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fc91e33..100bc29 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3570,9 +3570,6 @@
 
 $wgDefaultUserOptions['watchlistdays'] = $wmgWatchlistNumberOfDaysShow;
 
-// Use OOUI to render the buttons on EditPage.php
-$wgOOUIEditPage = true;
-
 if ( $wmgUseWikidataPageBanner ) {
wfLoadExtension( 'WikidataPageBanner' );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9927c3dae7e1bef098ccf24346a4d13c786c9643
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/private[master]:

[Paladox (Code Review)]

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

Change subject: 
..

Gerrit: Replace certificates with tokens for its-phabricator

Requires chad +1 and for

https://gerrit-review.googlesource.com/?polygerrit=0#/c/plugins/its-phabricator/+/133790/

to be merged.

Bug: T178385
Change-Id: I5f3c9e76845a5582bf4aed293195c26fd217d51c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/02/384902/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f3c9e76845a5582bf4aed293195c26fd217d51c
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
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] operations/puppet[production]: Gerrit: Replace certificates with tokens for its-phabricator

[Paladox (Code Review)]

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

Change subject: Gerrit: Replace certificates with tokens for its-phabricator
..

Gerrit: Replace certificates with tokens for its-phabricator

Requires chad +1 and for

https://gerrit-review.googlesource.com/?polygerrit=0#/c/plugins/its-phabricator/+/133790/

to be merged.

Bug: T178385
Change-Id: Ia0a847ce2adf4e78fe076202fc7ef50cbe318707
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0a847ce2adf4e78fe076202fc7ef50cbe318707
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] integration/config[master]: Replace cical...@mitre.org with cin...@gmail.com.

[Cicalese (Code Review)]

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

Change subject: Replace cical...@mitre.org with cin...@gmail.com.
..

Replace cical...@mitre.org with cin...@gmail.com.

Change-Id: I64201e27560b41d323d61d266fa970452cc059bd
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/00/384900/2

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a6f6ca3..acd982a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -75,7 +75,7 @@
 | cenarium\.sysop@gmail\.com
 | christian@quelltextlich\.at
 | christoph\.neuroth@gmail\.com
-| cicalese@mitre\.org
+| cindom@gmail\.com
 | codereview@emsenhuber\.ch
 | CommodoreFabianus@gmx\.de
 | crazy4sb@gmail\.com
@@ -373,7 +373,7 @@
- ^benestar\.wikimedia@gmail\.com$
- ^bryan\.tongminh@gmail\.com$
- ^cenarium\.sysop@gmail\.com$ # Cenarium
-   - ^cicalese@mitre\.org$
+   - ^cindom@gmail\.com$
- ^codereview@emsenhuber\.ch$
- ^CommodoreFabianus@gmx\.de$ # XZise, Pywikibot maintainer
- ^d_entous@yahoo\.com$

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64201e27560b41d323d61d266fa970452cc059bd
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.24.0

[VolkerE (Code Review)]

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

Change subject: Tag v0.24.0
..

Tag v0.24.0

Change-Id: If7168cb8693145fdc8e463e490a4b1f6997955dc
---
M History.md
M package.json
2 files changed, 18 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/99/384899/1

diff --git a/History.md b/History.md
index 091a0ee..72a25d0 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,21 @@
 # OOjs UI Release History
+## v0.24.0 / 2017-10-17
+### Breaking changes
+* [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme (James D. 
Forrester)
+* [BREAKING CHANGE] icons: Drop 'stripeSideMenu', renamed in v0.22.2 (James D. 
Forrester)
+* [BREAKING CHANGE] icons: Remove 'eye'/'eyeClosed' icons, deprecated in 
v0.23.0 (Volker E.)
+* [BREAKING CHANGE] icons: Remove 'signature' icon, deprecated in v0.23.0 
(Volker E.)
+* [BREAKING CHANGE] icons: Remove 'sun', deprecated in v0.23.0 (James D. 
Forrester)
+
+### Styles
+* themes: Unify icon/indicator visibility (Volker E.)
+* WikimediaUI theme: Ensure hover feedback on TextInputWidget & descendants 
(Volker E.)
+
+### Code
+* Fix `.oo-ui-selectable()` mixin to actually undo `.oo-ui-unselectable()` 
(Bartosz Dziewoński)
+* WikimediaUI theme: Fix selector in PopupWidget styles (Bartosz Dziewoński)
+
+
 ## v0.23.5 / 2017-10-12
 ### Code
 * PHP MultilineTextInputWidget, SearchInputWidget: Remove duplicate `use` 
statements (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index de1e845..8732bb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.23.5",
+  "version": "0.24.0",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Scap prep: Clean up everything, fix up StartProfiler symlink...

[Chad (Code Review)]

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

Change subject: Scap prep: Clean up everything, fix up StartProfiler symlink 
mess
..

Scap prep: Clean up everything, fix up StartProfiler symlink mess

Basically refactor all of this to not rely on the class state nearly
so much. Fixes a ton of pylint suggestions, plus is just easier to
follow

While we're here, stop making StartProfiler.php a symlink, instead
include it like we do with LocalSettings.php

Bug: T126306
Change-Id: I88fa235104927e683a9a8a0754d10c16103431f8
---
M scap/plugins/prep.py
1 file changed, 82 insertions(+), 79 deletions(-)


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

diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index 3db4040..c87d8f0 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+"""
+scap.plugins.prep
+~
+Scap plugin for setting up a new version of MediaWiki for deployment
+"""
 import argparse
 import multiprocessing
 import os
@@ -8,33 +14,81 @@
 import scap.git as git
 import scap.utils as utils
 
+GERRIT_URL = 'https://gerrit.wikimedia.org/r/'
 
-def VersionParser(v):
+
+def version_parser(ver):
+"""Validation our version number formats"""
 try:
-return re.match("(\d+\.\d+(\.\d+-)?wmf\.?\d+|master)", v).group(0)
+return re.match("(\d+\.\d+(\.\d+-)?wmf\.?\d+|master)", ver).group(0)
 except:
 raise argparse.ArgumentTypeError(
-"Branch '%s' does not match required format" % (v,))
+"Branch '%s' does not match required format" % ver)
+
+
+def update_update_strategy(path):
+"""For all submodules, update the merge strategy"""
+with utils.cd(path):
+base_cmd = '/usr/bin/git -C %s config ' % path
+base_cmd += 'submodule.$name.update rebase'
+cmd = "/usr/bin/git submodule foreach --recursive '%s'" % base_cmd
+subprocess.call(cmd, shell=True)
+
+
+def write_settings_stub(dest, include):
+"""Write a silly little PHP file that includes another"""
+file_stub = (
+'https://gerrit.wikimedia.org/r/p/'
-dest_dir = ''
-
 """ Scap sub-command to manage checkout new MediaWiki versions """
 @cli.argument('-p', '--prefix', nargs=1, required=False,
   default='php-', metavar='PREFIX',
   help='Directory prefix to checkout version to.')
-@cli.argument('branch', metavar='BRANCH', type=VersionParser,
+@cli.argument('branch', metavar='BRANCH', type=version_parser,
   help='The name of the branch to operate on.')
 def main(self, *extra_args):
 """ Checkout next MediaWiki """
 
-self.branch = self.arguments.branch
-self.dest_dir = os.path.join(
+dest_dir = os.path.join(
 self.config['stage_dir'],
-'{}{}'.format(self.arguments.prefix, self.branch)
+'{}{}'.format(self.arguments.prefix, self.arguments.branch)
 )
 old_branch = self.active_wikiversions().keys()[0]
 copy_dir = os.path.join(
@@ -42,13 +96,13 @@
 '{}{}'.format(self.arguments.prefix, old_branch)
 )
 
-if os.path.isdir(self.dest_dir):
+if os.path.isdir(dest_dir):
 self.get_logger().info('Version already checked out')
 return 0
 
-git.fetch(self.dest_dir, self.gerrit + 'mediawiki/core', copy_dir)
+git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', copy_dir)
 
-with utils.cd(self.dest_dir):
+with utils.cd(dest_dir):
 if subprocess.call(['/usr/bin/git', 'config',
 'branch.autosetuprebase', 'always']) != 0:
 self.get_logger().warn('Unable to setup auto-rebase')
@@ -59,81 +113,30 @@
 self.get_logger().warn('Unable to setup submodule fetch jobs')
 
 checkout_version = 'master'
-if self.branch != 'master':
-checkout_version = 'wmf/%s' % self.branch
+if self.arguments.branch != 'master':
+checkout_version = 'wmf/%s' % self.arguments.branch
 
-git.checkout(self.dest_dir, checkout_version)
+git.checkout(dest_dir, checkout_version)
 
 if checkout_version == 'master':
-self.master_stuff()
+master_stuff(dest_dir)
 else:
-git.update_submodules(self.dest_dir, use_upstream=True)
-self.update_submodule_update_strategy(self.dest_dir)
+git.update_submodules(dest_dir, use_upstream=True)
+update_update_strategy(dest_dir)
 
-self.write_localsettings()
-self.create_startprofiler_symlink()
+write_settings_stub(
+os.path.join(dest_dir, 'LocalSettings.php'),
+os.path.join(self.config['deploy_dir'], 'wmf-config',
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: screen-monitor: raise WARN to 4 days, lower CRIT to 20 days

[Dzahn (Code Review)]

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

Change subject: screen-monitor: raise WARN to 4 days, lower CRIT to 20 days
..


screen-monitor: raise WARN to 4 days, lower CRIT to 20 days

Raise the WARN threshold from 24 hours to 96 hours. Accept
screens running under 4 days without any alert.

Lower CRIT threshold from full year to 20 days. So once a screen
has been running for 3 weeks without the warning being addressed
or the host being whitelisted, turn it into a CRIT that will show
up on IRC.

Bug: T165348
Change-Id: I366d595e87e41de52a717caf4dd92cb1a83b7cde
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 21d7b29..554025b 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -172,7 +172,7 @@
 check_interval => 240,
 retry_interval => 120,
 description=> 'Long running screen/tmux',
-nrpe_command   => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 24 -c 8760',
+nrpe_command   => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 96 -c 480',
 }
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I366d595e87e41de52a717caf4dd92cb1a83b7cde
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
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]: Link to Parsoid Phabricator from the roundtrip page

[jenkins-bot (Code Review)]

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

Change subject: Link to Parsoid Phabricator from the roundtrip page
..


Link to Parsoid Phabricator from the roundtrip page

Currently, the roundtrip page contains a message telling you to report bugs at 
https://www.mediawiki.org/wiki/Talk:Parsoid/Todo .
However, that page greets you with a notice that stuff have moved to 
Phabricator.
This change updates the roundtrip page to link to the right place.

Change-Id: I242704099004a5cbe4113b3088a077c0eb8b3e8e
---
M lib/api/views/roundtrip.html
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/api/views/roundtrip.html b/lib/api/views/roundtrip.html
index db7fa41..de479f4 100644
--- a/lib/api/views/roundtrip.html
+++ b/lib/api/views/roundtrip.html
@@ -15,5 +15,5 @@
 {{{patch}}}
 
 
-http://www.mediawiki.org/w/index.php?title=Talk:Parsoid/Todo=editsection=newpreloadtitle=Issue%20on%20http://parsoid.wmflabs.org{{reqUrl}};>Report
 a parser issue in this page at http://www.mediawiki.org/wiki/Talk:Parsoid/Todo;>[[:mw:Talk:Parsoid/Todo]]
-
\ No newline at end of file
+If you encounter parser problems, https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=Parsoid;>open
 a new issue in the https://phabricator.wikimedia.org/project/profile/487/;>Parsoid 
Phabricator project. See also the list of https://phabricator.wikimedia.org/maniphest/query/8NmDOGHkov2j/#R;>open 
issues on Phabricator.
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I242704099004a5cbe4113b3088a077c0eb8b3e8e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: TK-999 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

5829892bf Backfill country-only addresses

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfa02abb06286204b8892d0b6dc700a022006775
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]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

5829892bf Backfill country-only addresses

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/97/384897/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfa02abb06286204b8892d0b6dc700a022006775
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[master]: blacklist polyfill-php54, update donation-interface

[Ejegg (Code Review)]

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

Change subject: blacklist polyfill-php54, update donation-interface
..

blacklist polyfill-php54, update donation-interface

Change-Id: Ic5d943e8a1d167eaa26cecdf281e6b50fda7b67c
---
M composer.json
M composer.lock
2 files changed, 7 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/96/384896/1

diff --git a/composer.json b/composer.json
index 7cd9248..72a398e 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,9 @@
 "jakub-onderka/php-console-highlighter": "~0.3.2",
 "wikimedia/testing-access-wrapper": "~1.0"
 },
+"replace": {
+"symfony/polyfill-php54": "*"
+},
 "scripts": {
   "test": [
 "parallel-lint -e php,module,install,inc --exclude vendor --exclude 
sites/default/civicrm/extensions/org.wikimedia.omnimail/vendor.",
diff --git a/composer.lock b/composer.lock
index c30a0eb..e1adc58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "a7a5905d3f2e36cb4c3d43c31b3e4669",
+"content-hash": "32a4c6d1dba52d233ae8892c1908badf",
 "packages": [
 {
 "name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -1821,64 +1821,6 @@
 "time": "2017-06-14T15:44:48+00:00"
 },
 {
-"name": "symfony/polyfill-php54",
-"version": "v1.5.0",
-"source": {
-"type": "git",
-"url": "https://github.com/symfony/polyfill-php54.git;,
-"reference": "b7763422a5334c914ef0298ed21b253d25913a6e"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e;,
-"reference": "b7763422a5334c914ef0298ed21b253d25913a6e",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.3"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.5-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"Symfony\\Polyfill\\Php54\\": ""
-},
-"files": [
-"bootstrap.php"
-],
-"classmap": [
-"Resources/stubs"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Nicolas Grekas",
-"email": "p...@tchwork.com"
-},
-{
-"name": "Symfony Community",
-"homepage": "https://symfony.com/contributors;
-}
-],
-"description": "Symfony polyfill backporting some PHP 5.4+ 
features to lower PHP versions",
-"homepage": "https://symfony.com;,
-"keywords": [
-"compatibility",
-"polyfill",
-"portable",
-"shim"
-],
-"time": "2017-06-14T15:44:48+00:00"
-},
-{
 "name": "symfony/polyfill-php55",
 "version": "v1.5.0",
 "source": {
@@ -2103,7 +2045,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git;,
-"reference": "ead1218664346e75adc7c8aff949db56c3b8944e"
+"reference": "81b12c1166d91c689b4b7a9dad0f845f97ccecc1"
 },
 "require": {
 "addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -2145,7 +2087,7 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library",
-"time": "2017-10-15 20:39:37"
+"time": "2017-10-17T15:40:59+00:00"
 },
 {
 "name": "wikimedia/omnimail-silverpop",
@@ -2192,7 +2134,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-09-20 02:50:06"
+"time": "2017-09-20T02:50:06+00:00"
 },
 {
 "name": "wikimedia/smash-pig",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5d943e8a1d167eaa26cecdf281e6b50fda7b67c
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mysql/icinga/labtest: no pages if on labtest, pt.2

[Dzahn (Code Review)]

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

Change subject: mysql/icinga/labtest: no pages if on labtest, pt.2
..

mysql/icinga/labtest: no pages if on labtest, pt.2

This is exactly like Ia490b4b25285cef9 just that it is
for check_disk instead of check_procs.

No other changes besides Hiera are needed for this one
since "critical" is already a variable parameter.

It avoids SMS from Icinga for low disk space if on labtest
hosts.

Bug: T178008
Change-Id: I83909c4e9ff43bf45a63e22e8826cf529dda4d8b
---
M hieradata/regex.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/384895/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 5d30ee7..ea30889 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -124,6 +124,7 @@
   __regex: !ruby/regexp 
/^labtest(net200[1-9]\.codfw\.wmnet|(services|control)100[1-9]\.wikimedia\.org)$/
   cluster: labtest
   mariadb::monitor_process::is_critical: false
+  mariadb::monitor_disk::is_critical: false
 
 swift_be_codfw_dell:
   __regex: !ruby/regexp /^ms-be201[3-5]\.codfw\.wmnet$/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83909c4e9ff43bf45a63e22e8826cf529dda4d8b
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/core[master]: Fix login button label to accept RawMessage.

[jenkins-bot (Code Review)]

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

Change subject: Fix login button label to accept RawMessage.
..


Fix login button label to accept RawMessage.

The label is already a Message at this point. For Messages that
are not RawMessages, the call to wfMessage() does not do any harm.
However, for RawMessages, it causes the label to appear in <>.
Removing the call to wfMessage() does not harm regular Messages
and fixes the problem for RawMessages.

Change-Id: I943628e2a1fbf6fff579dd52c1058ca2ef125d34
---
M includes/specialpage/AuthManagerSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specialpage/AuthManagerSpecialPage.php 
b/includes/specialpage/AuthManagerSpecialPage.php
index 0cdc55f..95729f3 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -679,7 +679,7 @@
];
 
if ( $type === 'submit' && isset( $singleFieldInfo['label'] ) ) 
{
-   $descriptor['default'] = wfMessage( 
$singleFieldInfo['label'] )->plain();
+   $descriptor['default'] = 
$singleFieldInfo['label']->plain();
} elseif ( $type !== 'submit' ) {
$descriptor += array_filter( [
// help-message is omitted as it is usually not 
really useful for a web interface

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I943628e2a1fbf6fff579dd52c1058ca2ef125d34
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Gergő Tisza 
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]: Link to Parsoid Phabricator from the roundtrip page

[TK-999 (Code Review)]

TK-999 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384894 )

Change subject: Link to Parsoid Phabricator from the roundtrip page
..

Link to Parsoid Phabricator from the roundtrip page

Currently, the roundtrip page contains a message telling you to report bugs at 
https://www.mediawiki.org/wiki/Talk:Parsoid/Todo .
However, that page greets you with a notice that stuff have moved to 
Phabricator.
This change updates the roundtrip page to link to the right place.

Change-Id: I242704099004a5cbe4113b3088a077c0eb8b3e8e
---
M lib/api/views/roundtrip.html
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/lib/api/views/roundtrip.html b/lib/api/views/roundtrip.html
index db7fa41..c326bed 100644
--- a/lib/api/views/roundtrip.html
+++ b/lib/api/views/roundtrip.html
@@ -15,5 +15,5 @@
 {{{patch}}}
 
 
-http://www.mediawiki.org/w/index.php?title=Talk:Parsoid/Todo=editsection=newpreloadtitle=Issue%20on%20http://parsoid.wmflabs.org{{reqUrl}};>Report
 a parser issue in this page at http://www.mediawiki.org/wiki/Talk:Parsoid/Todo;>[[:mw:Talk:Parsoid/Todo]]
-
\ No newline at end of file
+https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=Parsoid;>Open
 a new issue in the https://phabricator.wikimedia.org/project/profile/487/;>Parsoid 
Phabricator project. See also the list of https://phabricator.wikimedia.org/maniphest/query/8NmDOGHkov2j/#R;>open 
issues on Phabricator.
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I242704099004a5cbe4113b3088a077c0eb8b3e8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: TK-999 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs/icinga: no paging if on labtest

[Dzahn (Code Review)]

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

Change subject: toollabs/icinga: no paging if on labtest
..

toollabs/icinga: no paging if on labtest

same as I61b50f51d83e517 but for toollabs
instead of openstack2 module

make $critical a class parameter, then set it to
false in Hiera regex.yaml to avoid Icinga SMS for
things from labtest hosts.

Bug: T178008
Change-Id: I7a9f6d34727c7c1c2c06734380fdd4cce3b1de5e
---
M hieradata/regex.yaml
M modules/icinga/manifests/monitor/toollabs.pp
2 files changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/384893/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 5d30ee7..2ee08e2 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -124,6 +124,7 @@
   __regex: !ruby/regexp 
/^labtest(net200[1-9]\.codfw\.wmnet|(services|control)100[1-9]\.wikimedia\.org)$/
   cluster: labtest
   mariadb::monitor_process::is_critical: false
+  icinga::monitor::toollabs::critical: false
 
 swift_be_codfw_dell:
   __regex: !ruby/regexp /^ms-be201[3-5]\.codfw\.wmnet$/
diff --git a/modules/icinga/manifests/monitor/toollabs.pp 
b/modules/icinga/manifests/monitor/toollabs.pp
index 53f09df..8a2c04e 100644
--- a/modules/icinga/manifests/monitor/toollabs.pp
+++ b/modules/icinga/manifests/monitor/toollabs.pp
@@ -3,7 +3,9 @@
 # * relevant cert expirary is monitored in
 #   icinga::monitor::certs
 
-class icinga::monitor::toollabs {
+class icinga::monitor::toollabs (
+critical = true,
+) {
 
 # toolserver.org (redirect page to Tool Labs)
 @monitoring::host { 'www.toolserver.org':
@@ -59,7 +61,7 @@
 description   => 'toolschecker service itself needs to return OK',
 check_command => "${checker}!/self!OK",
 host  => $test_entry_host,
-critical  => true,
+critical  => $critical,
 }
 
 monitoring::service { 'tools-checker-dumps':
@@ -78,7 +80,7 @@
 description   => 'Test LDAP for query',
 check_command => "${checker}!/ldap!OK",
 host  => $test_entry_host,
-critical  => true,
+critical  => $critical,
 }
 
 monitoring::service { 'tools-checker-labs-dns-private':
@@ -91,7 +93,7 @@
 description   => 'NFS read/writeable on labs instances',
 check_command => "${checker}!/nfs/home!OK",
 host  => $test_entry_host,
-critical  => true,
+critical  => $critical,
 }
 
 # new instances will block on this for spinup if failing

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a9f6d34727c7c1c2c06734380fdd4cce3b1de5e
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]: openstack2: no Icinga paging (SMS) if on labtest

[Dzahn (Code Review)]

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

Change subject: openstack2: no Icinga paging (SMS) if on labtest
..

openstack2: no Icinga paging (SMS) if on labtest

Instead of hardcoded "critical => true" for all of the
process checks, make it flexible and a parameter of the class.

Make it true by default.

Then set it to false for "labtest" hosts in Hiera regex.

This should avoid any SMS being sent if things are just on labtest
hosts and not production hosts.

Bug: T178008
Change-Id: I61b50f51d83e517adb711a3d6371b0e910bd9290
---
M hieradata/regex.yaml
M modules/openstack2/manifests/designate/monitor.pp
2 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/384892/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 5d30ee7..7e3f68d 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -124,6 +124,7 @@
   __regex: !ruby/regexp 
/^labtest(net200[1-9]\.codfw\.wmnet|(services|control)100[1-9]\.wikimedia\.org)$/
   cluster: labtest
   mariadb::monitor_process::is_critical: false
+  openstack2::designate::monitor::critical: false
 
 swift_be_codfw_dell:
   __regex: !ruby/regexp /^ms-be201[3-5]\.codfw\.wmnet$/
diff --git a/modules/openstack2/manifests/designate/monitor.pp 
b/modules/openstack2/manifests/designate/monitor.pp
index d37b60b..0188be2 100644
--- a/modules/openstack2/manifests/designate/monitor.pp
+++ b/modules/openstack2/manifests/designate/monitor.pp
@@ -3,6 +3,7 @@
 
 class openstack2::designate::monitor (
 $active,
+$critical = true,
 ) {
 
 # monitoring::service doesn't take a bool
@@ -13,41 +14,41 @@
 $ensure = 'absent'
 }
 
-# Page if designate processes die.  We only have one of each of these,
+# Page if designate processes die and 'critical' is true.  We only have 
one of each of these,
 #  and new instance creation will be very broken if services die.
 nrpe::monitor_service { 'check_designate_sink_process':
 ensure   => $ensure,
 description  => 'designate-sink process',
 nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/designate-sink'",
-critical => true,
+critical => $critical,
 }
 
 nrpe::monitor_service { 'check_designate_api_process':
 ensure   => $ensure,
 description  => 'designate-api process',
 nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/designate-api'",
-critical => true,
+critical => $critical,
 }
 
 nrpe::monitor_service { 'check_designate_central_process':
 ensure   => $ensure,
 description  => 'designate-central process',
 nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/designate-central'",
-critical => true,
+critical => $critical,
 }
 
 nrpe::monitor_service { 'check_designate_mdns':
 ensure   => $ensure,
 description  => 'designate-mdns process',
 nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/designate-mdns'",
-critical => true,
+critical => $critical,
 }
 
 nrpe::monitor_service { 'check_designate_pool-manager':
 ensure   => $ensure,
 description  => 'designate-pool-manager process',
 nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/designate-pool-manager'",
-critical => true,
+critical => $critical,
 }
 
 monitoring::service { 'designate-api-http':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61b50f51d83e517adb711a3d6371b0e910bd9290
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]: WikimediaUI theme: Ensure hover feedback on TextInputWidget ...

[jenkins-bot (Code Review)]

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

Change subject: WikimediaUI theme: Ensure hover feedback on TextInputWidget & 
descendants
..


WikimediaUI theme: Ensure hover feedback on TextInputWidget & descendants

Ensuring user receives visual `:hover` feedback while on
TextInputWidget overlying elements, as example SearchInputWidget's
clear button.

Also removing special casing of `readonly` TextInputWidget `border-color`
changes. We provide same `:focus` and there is no clear user benefit.

Bug: T178199
Change-Id: Ia732b72ed63928c5744455312769e6cd5019affe
---
M src/themes/wikimediaui/common.less
M src/themes/wikimediaui/widgets.less
2 files changed, 8 insertions(+), 12 deletions(-)

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



diff --git a/src/themes/wikimediaui/common.less 
b/src/themes/wikimediaui/common.less
index 62c4f0b..2cd8ad1 100644
--- a/src/themes/wikimediaui/common.less
+++ b/src/themes/wikimediaui/common.less
@@ -104,7 +104,6 @@
 @border-color-focus-inset: @color-base--inverted;
 @border-color-erroneous: @color-erroneous;
 @border-color-base--disabled: #c8ccd1;
-@border-color-base--read-only: #c8ccd1;
 @border-color-input--hover: @border-color-base--active;
 @border-color-dialog-bar: #c8ccd1;
 
diff --git a/src/themes/wikimediaui/widgets.less 
b/src/themes/wikimediaui/widgets.less
index 3b82e9a..35761e5 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -1809,9 +1809,8 @@
box-shadow @transition-ease-out-sine-medium
);
 
-   &:hover {
-   border-color: @border-color-input--hover;
-   }
+   .mw-placeholder();
+
&:focus {
outline: 0;
border-color: @border-color-base--focus;
@@ -1820,16 +1819,14 @@
 
&[readonly] {
background-color: 
@background-color-base--read-only;
-
-   &:hover {
-   border-color: 
@border-color-base--read-only;
-   }
-   &:focus {
-   border-color: @border-color-base--focus;
-   }
}
+   }
 
-   .mw-placeholder();
+   &:hover {
+   input,
+   textarea {
+   border-color: @border-color-input--hover;
+   }
}
 
// HACK: Exclude IE/Edge (and Saf<6) from this selector as it

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia732b72ed63928c5744455312769e6cd5019affe
Gerrit-PatchSet: 2
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] mediawiki/vagrant[master]: Set CiviCRM extension dir / URL

[Ejegg (Code Review)]

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

Change subject: Set CiviCRM extension dir / URL
..

Set CiviCRM extension dir / URL

Change-Id: If36901fdc0d8f3515986e252d9fe65fc58ec646d
---
M puppet/modules/crm/templates/civicrm-install.php.erb
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/91/384891/1

diff --git a/puppet/modules/crm/templates/civicrm-install.php.erb 
b/puppet/modules/crm/templates/civicrm-install.php.erb
index 8840a53..19a73f9 100644
--- a/puppet/modules/crm/templates/civicrm-install.php.erb
+++ b/puppet/modules/crm/templates/civicrm-install.php.erb
@@ -31,3 +31,12 @@
 require_once '<%= @dir %>/civicrm/install/civicrm.php';
 
 civicrm_main( $config );
+$extDir = '<%= @dir %>/sites/default/civicrm/extensions';
+$extUrl = '<%= scope['::crm::base_url'] %>/sites/default/civicrm/extensions';
+file_put_contents('<%= @dir %>/sites/default/civicrm.settings.php', "
+global \$civicrm_setting;
+\$civicrm_setting['Directory Preferences']['extensionsDir'] = '$extDir';
+\$civicrm_setting['URL Preferences']['extensionsURL'] = '$extUrl';",
+FILE_APPEND
+);
+

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add filtertags to ci/slave/labs/docker

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384889 )

Change subject: Add filtertags to ci/slave/labs/docker
..


Add filtertags to ci/slave/labs/docker

Change-Id: I855bb9be3e5e32b393308e4b4a0bb3fe133b0870
---
M modules/role/manifests/ci/slave/labs/docker.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/ci/slave/labs/docker.pp 
b/modules/role/manifests/ci/slave/labs/docker.pp
index 2dcc8d9..5ec80a9 100644
--- a/modules/role/manifests/ci/slave/labs/docker.pp
+++ b/modules/role/manifests/ci/slave/labs/docker.pp
@@ -2,6 +2,7 @@
 #
 # Experimental Jenkins slave instance for providing Docker based CI builds.
 #
+# filtertags: labs-project-integration labs-project-ci-staging
 class role::ci::slave::labs::docker {
 requires_realm('labs')
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I855bb9be3e5e32b393308e4b4a0bb3fe133b0870
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Summary 2.0: language variant content URLs

[Mholloway (Code Review)]

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

Change subject: Summary 2.0: language variant content URLs
..

Summary 2.0: language variant content URLs

Bug: T177619
Change-Id: Ie40fe5fa43f4eae73cc1e464f26346ca78778322
---
M lib/mwapi.js
M routes/mobile-sections.js
M test/features/summary/pagecontent.js
3 files changed, 86 insertions(+), 28 deletions(-)


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

diff --git a/lib/mwapi.js b/lib/mwapi.js
index 1c45e75..60e1a57 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -105,7 +105,7 @@
 const query = apiParams({
 action: 'query',
 meta: 'siteinfo',
-siprop: 'general|namespaces|namespacealiases|specialpagealiases'
+siprop: 
'general|languagevariants|namespaces|namespacealiases|specialpagealiases'
 });
 siteInfoCache[rp.domain] = api.mwApiGet(app, req.params.domain, query)
 .then((res) => {
@@ -117,6 +117,9 @@
 legaltitlechars: general.legaltitlechars,
 case: general.case
 },
+variants: res.body.query.languagevariants
+&& res.body.query.languagevariants[general.lang]
+&& 
Object.keys(res.body.query.languagevariants[general.lang]),
 namespaces: res.body.query.namespaces,
 namespacealiases: res.body.query.namespacealiases,
 specialpagealiases: res.body.query.specialpagealiases,
@@ -234,6 +237,7 @@
   image,
   id: page.pageid,
   languagecount: page.langlinks ? page.langlinks.length : 0,
+  variants: siteinfo.variants,
   lastmodified: revision && revision.timestamp,
   lastmodifier: modifier,
   thumb,
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index 73ed238..9fff704 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -141,6 +141,7 @@
 editable: input.meta.editable,
 mainpage: input.meta.mainpage,
 languagecount: input.meta.languagecount,
+variants: input.meta.variants,
 image: mUtil.defaultVal(mUtil.filterEmpty({
 file: input.meta.image && input.meta.image.file,
 urls: input.meta.thumb && 
mwapi.buildLeadImageUrls(input.meta.thumb.url)
@@ -379,29 +380,49 @@
 };
 }
 
-function buildContentUrls(req, title, lead) {
+function buildContentUrls(req, title, lead, variant) {
+// Use an explicit variant argument where needed rather than a path 
segment, since some
+// wikis with variants (uzwiki, for example) have not enabled language 
variants as path segments
+const prefix = `https://${req.params.domain}/w/index.php?title=`;
+const variantParam = variant ? `=${variant}` : '';
+const talk = lead.talk_ns;
 return {
-page: `https://${req.params.domain}/wiki/${title.getPrefixedDBKey()}`,
-revisions: 
`https://${req.params.domain}/w/index.php?action=history=${title.getPrefixedDBKey()}`,
-edit: 
`https://${req.params.domain}/w/index.php?action=edit=${title.getPrefixedDBKey()}`,
-talk: lead.talk_ns_text ? 
`https://${req.params.domain}/wiki/${lead.talk_ns_text}:${title.getKey()}` : 
undefined,
+page: `${prefix}${title.getPrefixedDBKey()}${variantParam}`,
+revisions: !variant ? 
`${prefix}${title.getPrefixedDBKey()}=history` : undefined,
+edit: !variant ? `${prefix}${title.getPrefixedDBKey()}=edit` : 
undefined,
+talk: talk ? 
`${prefix}${lead.talk_ns_text}:${title.getKey()}${variantParam}` : undefined,
 };
 }
 
 function buildApiUrls(req, title, lead) {
+const path = `https://${req.params.domain}/api/rest_v1/page`;
+const talk = lead.talk_ns;
 return {
-summary: 
`https://${req.params.domain}/api/rest_v1/page/summary/${title.getPrefixedDBKey()}`,
-mobile_sections: 
`https://${req.params.domain}/api/rest_v1/page/mobile-sections/${title.getPrefixedDBKey()}`,
-mobile_sections_lead: 
`https://${req.params.domain}/api/rest_v1/page/mobile-sections-lead/${title.getPrefixedDBKey()}`,
-mobile_sections_remaining: 
`https://${req.params.domain}/api/rest_v1/page/mobile-sections-remaining/${title.getPrefixedDBKey()}`,
-read_html: 
`https://${req.params.domain}/api/rest_v1/page/read-html/${title.getPrefixedDBKey()}`,
-content_html: 
`https://${req.params.domain}/api/rest_v1/page/content-html/${title.getPrefixedDBKey()}`,
-metadata: 
`https://${req.params.domain}/api/rest_v1/page/metadata/${title.getPrefixedDBKey()}`,
-references: 
`https://${req.params.domain}/api/rest_v1/page/references/${title.getPrefixedDBKey()}`,
-gallery: 
`https://${req.params.domain}/api/rest_v1/page/gallery/${title.getPrefixedDBKey()}`,
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add filtertags to ci/slave/labs/docker

[Addshore (Code Review)]

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

Change subject: Add filtertags to ci/slave/labs/docker
..

Add filtertags to ci/slave/labs/docker

Change-Id: I855bb9be3e5e32b393308e4b4a0bb3fe133b0870
---
M modules/role/manifests/ci/slave/labs/docker.pp
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/role/manifests/ci/slave/labs/docker.pp 
b/modules/role/manifests/ci/slave/labs/docker.pp
index 2dcc8d9..5ec80a9 100644
--- a/modules/role/manifests/ci/slave/labs/docker.pp
+++ b/modules/role/manifests/ci/slave/labs/docker.pp
@@ -2,6 +2,7 @@
 #
 # Experimental Jenkins slave instance for providing Docker based CI builds.
 #
+# filtertags: labs-project-integration labs-project-ci-staging
 class role::ci::slave::labs::docker {
 requires_realm('labs')
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: acme_tiny: sync with upstream

[BBlack (Code Review)]

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

Change subject: acme_tiny: sync with upstream
..


acme_tiny: sync with upstream

This syncs us with all changes since our last update, which
amounts to a single line diff for OpenSSL 1.1 compat (similar to
our change in acme-setup earlier).

Change-Id: If5adcc12f0b70a931a81bb89a09a2145f56b7374
---
M modules/letsencrypt/files/acme_tiny.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/letsencrypt/files/acme_tiny.py 
b/modules/letsencrypt/files/acme_tiny.py
index 626afa1..4e9a6e1 100644
--- a/modules/letsencrypt/files/acme_tiny.py
+++ b/modules/letsencrypt/files/acme_tiny.py
@@ -91,7 +91,7 @@
 if proc.returncode != 0:
 raise IOError("Error loading {0}: {1}".format(csr, err))
 domains = set([])
-common_name = re.search(r"Subject:.*? CN=([^\s,;/]+)", out.decode('utf8'))
+common_name = re.search(r"Subject:.*? CN\s?=\s?([^\s,;/]+)", 
out.decode('utf8'))
 if common_name is not None:
 domains.add(common_name.group(1))
 subject_alt_names = re.search(r"X509v3 Subject Alternative Name: \n 
+([^\n]+)\n", out.decode('utf8'), re.MULTILINE|re.DOTALL)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5adcc12f0b70a931a81bb89a09a2145f56b7374
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
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]: acme-setup: make compatible with openssl 1.1

[BBlack (Code Review)]

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

Change subject: acme-setup: make compatible with openssl 1.1
..


acme-setup: make compatible with openssl 1.1

The text output format for a request, emitted by "openssl req -in
foo -text" has changed slightly by adding more whitespace, so fix
it with more \s* in the regex.

Change-Id: If193cdd7b1071a97caf3aedb937ab4ce0a4c8275
---
M modules/letsencrypt/files/acme-setup
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/letsencrypt/files/acme-setup 
b/modules/letsencrypt/files/acme-setup
index fb6c811..064a6b4 100755
--- a/modules/letsencrypt/files/acme-setup
+++ b/modules/letsencrypt/files/acme-setup
@@ -291,7 +291,7 @@
 except:
 return True
 
-subj_re = '^\s*Subject:\s*(.*/)?CN=' + re.escape(subjects[0]) + '(/|\s*$)'
+subj_re = '^\s*Subject:\s*(.*/)?\s*CN\s*=\s*' + re.escape(subjects[0]) + 
'(/|\s*$)'
 if not re.search(subj_re, txt, re.M):
 return True
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If193cdd7b1071a97caf3aedb937ab4ce0a4c8275
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
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]: acme_tiny: sync with upstream

[BBlack (Code Review)]

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

Change subject: acme_tiny: sync with upstream
..

acme_tiny: sync with upstream

This syncs us with all changes since our last update, which
amounts to a single line diff for OpenSSL 1.1 compat (similar to
our change in acme-setup earlier).

Change-Id: If5adcc12f0b70a931a81bb89a09a2145f56b7374
---
M modules/letsencrypt/files/acme_tiny.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/letsencrypt/files/acme_tiny.py 
b/modules/letsencrypt/files/acme_tiny.py
index 626afa1..4e9a6e1 100644
--- a/modules/letsencrypt/files/acme_tiny.py
+++ b/modules/letsencrypt/files/acme_tiny.py
@@ -91,7 +91,7 @@
 if proc.returncode != 0:
 raise IOError("Error loading {0}: {1}".format(csr, err))
 domains = set([])
-common_name = re.search(r"Subject:.*? CN=([^\s,;/]+)", out.decode('utf8'))
+common_name = re.search(r"Subject:.*? CN\s?=\s?([^\s,;/]+)", 
out.decode('utf8'))
 if common_name is not None:
 domains.add(common_name.group(1))
 subject_alt_names = re.search(r"X509v3 Subject Alternative Name: \n 
+([^\n]+)\n", out.decode('utf8'), re.MULTILINE|re.DOTALL)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PhabTaskGraph[master]: Fix help for projects field.

[Cicalese (Code Review)]

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

Change subject: Fix help for projects field.
..

Fix help for projects field.

T177212
Change-Id: Ifb2ec703297d9772d13381924b7eb9ba20e42329
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhabTaskGraph 
refs/changes/44/384844/3

diff --git a/i18n/en.json b/i18n/en.json
index 137ff30..b67cc8e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,8 +13,8 @@
"phabtaskgraph-status-field-label": "Status",
"phabtaskgraph-width-field-label": "Width",
"phabtaskgraph-height-field-label": "Height",
-   "phabtaskgraph-tasks-field-help": "comma-separated list of task IDs 
(starting \"T\" optional); e.g. T123456",
-   "phabtaskgraph-projects-field-help": "comma-separated list of project 
names; e.g. MediaWiki-Platform-Team",
+   "phabtaskgraph-tasks-field-help": "comma-separated list of task IDs 
(starting \"T\" optional); e.g. 'T123456, T654321'",
+   "phabtaskgraph-projects-field-help": "comma-separated list of project 
names; e.g. 'MediaWiki-Platform-Team, Epic'",
"phabtaskgraph-width-field-help": "default: 800",
"phabtaskgraph-height-field-help": "default: 800",
"phabtaskgraph-status-open": "Open",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb2ec703297d9772d13381924b7eb9ba20e42329
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PhabTaskGraph
Gerrit-Branch: master
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki...PhabTaskGraph[master]: Fix help for projects field.

[Cicalese (Code Review)]

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

Change subject: Fix help for projects field.
..


Fix help for projects field.

T177212
Change-Id: Ifb2ec703297d9772d13381924b7eb9ba20e42329
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 137ff30..b67cc8e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,8 +13,8 @@
"phabtaskgraph-status-field-label": "Status",
"phabtaskgraph-width-field-label": "Width",
"phabtaskgraph-height-field-label": "Height",
-   "phabtaskgraph-tasks-field-help": "comma-separated list of task IDs 
(starting \"T\" optional); e.g. T123456",
-   "phabtaskgraph-projects-field-help": "comma-separated list of project 
names; e.g. MediaWiki-Platform-Team",
+   "phabtaskgraph-tasks-field-help": "comma-separated list of task IDs 
(starting \"T\" optional); e.g. 'T123456, T654321'",
+   "phabtaskgraph-projects-field-help": "comma-separated list of project 
names; e.g. 'MediaWiki-Platform-Team, Epic'",
"phabtaskgraph-width-field-help": "default: 800",
"phabtaskgraph-height-field-help": "default: 800",
"phabtaskgraph-status-open": "Open",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb2ec703297d9772d13381924b7eb9ba20e42329
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PhabTaskGraph
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DO NOT MERGE] Demonstration of incorrect rendering of icons...

[Code Review]

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

Change subject: [DO NOT MERGE] Demonstration of incorrect rendering of icons 
with IconElements nested three deep
..

[DO NOT MERGE] Demonstration of incorrect rendering of icons with IconElements 
nested three deep

Bug: T178437
Change-Id: I6a8f558639c99f3ae38209bb3b9a69959430dbf4
---
M demos/pages/widgets.js
M demos/styles/demo.css
2 files changed, 58 insertions(+), 2,858 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/87/384887/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 31678e3..85cc9ce 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1,2926 +1,118 @@
 Demo.static.pages.widgets = function ( demo ) {
-   var i, fieldsets,
-   loremIpsum = 'Lorem ipsum dolor sit amet, consectetur 
adipisicing elit, ' +
-   'sed do eiusmod tempor incididunt ut labore et dolore 
magna aliqua.\u200E',
-   textInputForLabel, labelForTextInput, radioSelectInputForLabel, 
labelForRadioSelectInput,
-   inputForValidation, fieldLayoutForValidation,
-   horizontalDragItems = [],
-   verticalDragItems = [],
-   verticalHandledDragItems = [],
+   var fieldsets,
$overlay = $( '' ).addClass( 'demo-overlay' ).attr( 'id', 
'demo-overlay' ),
$demo = demo.$element;
 
-   for ( i = 0; i <= 12; i++ ) {
-   horizontalDragItems.push(
-   new Demo.DraggableItemWidget( {
-   data: 'item' + i,
-   icon: 'tag',
-   label: 'Inline item ' + i
-   } )
-   );
-   if ( i <= 6 ) {
-   verticalDragItems.push(
-   new Demo.DraggableItemWidget( {
-   data: 'item' + i,
-   icon: 'tag',
-   label: 'Item ' + i
-   } )
-   );
-   verticalHandledDragItems.push(
-   new Demo.DraggableHandledItemWidget( {
-   data: 'item' + i,
-   icon: 'draggable',
-   label: 'Item ' + i
-   } )
-   );
-   }
-   }
-
-   textInputForLabel = new OO.ui.TextInputWidget( { value: 'Input for 
label above' } );
-   labelForTextInput = new OO.ui.LabelWidget( {
-   label: 'Label for TextInputWidget below',
-   input: textInputForLabel
-   } );
-
-   radioSelectInputForLabel = new OO.ui.RadioSelectInputWidget( {
-   options: [
-   {
-   data: 'a',
-   label: 'Input for label above'
-   },
-   {
-   data: 'b',
-   label: 'Input for label above'
-   }
-   ]
-   } );
-   labelForRadioSelectInput = new OO.ui.LabelWidget( {
-   label: 'Label for RadioSelectInputWidget below',
-   input: radioSelectInputForLabel
-   } );
-
-   inputForValidation = new OO.ui.TextInputWidget( {
-   validate: function ( value ) {
-   return value.length % 2 === 0;
-   }
-   } );
-
-   fieldLayoutForValidation = new OO.ui.FieldLayout( inputForValidation, {
-   align: 'top',
-   label: 'FieldLayout aligned top with validation errors',
-   help: 'Enter only even number of characters'
-   } );
-
-   inputForValidation.$input.on( 'blur', function () {
-   inputForValidation.getValidity().then( function () {
-   fieldLayoutForValidation.setErrors( [] );
-   }, function () {
-   fieldLayoutForValidation.setErrors( [
-   'Please enter an even number of characters'
-   ] );
-   } );
-   } );
-
fieldsets = [
new OO.ui.FieldsetLayout( {
-   id: 'demo-section-buttons',
-   label: 'Buttons',
+   id: 'nested-popupbutton',
+   label: 'Nested in PopupButtonWidget',
items: [
new OO.ui.FieldLayout(
-   new OO.ui.ButtonWidget( { label: 
'Normal' } ),
-   {
-   label: 'ButtonWidget 
(normal)\u200E',
-  

[MediaWiki-commits] [Gerrit] operations/puppet[production]: acme-setup: make compatible with openssl 1.1

[BBlack (Code Review)]

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

Change subject: acme-setup: make compatible with openssl 1.1
..

acme-setup: make compatible with openssl 1.1

The text output format for a request, emitted by "openssl req -in
foo -text" has changed slightly by adding more whitespace, so fix
it with more \s* in the regex.

Change-Id: If193cdd7b1071a97caf3aedb937ab4ce0a4c8275
---
M modules/letsencrypt/files/acme-setup
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/384886/1

diff --git a/modules/letsencrypt/files/acme-setup 
b/modules/letsencrypt/files/acme-setup
index fb6c811..064a6b4 100755
--- a/modules/letsencrypt/files/acme-setup
+++ b/modules/letsencrypt/files/acme-setup
@@ -291,7 +291,7 @@
 except:
 return True
 
-subj_re = '^\s*Subject:\s*(.*/)?CN=' + re.escape(subjects[0]) + '(/|\s*$)'
+subj_re = '^\s*Subject:\s*(.*/)?\s*CN\s*=\s*' + re.escape(subjects[0]) + 
'(/|\s*$)'
 if not re.search(subj_re, txt, re.M):
 return True
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add a way to override interwiki prefixes

[jenkins-bot (Code Review)]

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

Change subject: Add a way to override interwiki prefixes
..


Add a way to override interwiki prefixes

Duplicates some specific overrides done in WikimediaMaintenance::DumpInterwiki
to map 's' to 'src' on svwiki.
Sadly I found no easy to unify these configurations.

Bug: T177913
Change-Id: I85e3190ae04b6e1db6075ef72e993f4266c02956
---
M CirrusSearch.php
M docs/settings.txt
M includes/SiteMatrixInterwikiResolver.php
M tests/unit/InterwikiResolverTest.php
4 files changed, 75 insertions(+), 10 deletions(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CirrusSearch.php b/CirrusSearch.php
index 66b0f62..5f4644a 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -1034,6 +1034,25 @@
 $wgCirrusSearchCrossProjectSearchBlackList = [];
 
 /**
+ * List of interwiki prefixes to override.
+ * This is only useful when used with SiteMatrix.
+ * In some cases a specific wiki may want to override
+ * the convention used in SiteMatrix.
+ * e.g. on WMF infrastructure this is used to override
+ * the interwiki prefix 's' to 'src' on the swedish wikipedia.
+ *
+ * NOTE: overrides are applied before reading
+ * $wgCirrusSearchCrossProjectSearchBlackList and
+ * $wgCirrusSearchCrossProjectProfiles
+ *
+ * Example :
+ * $wgCirrusSearchInterwikiPrefixOverrides = [
+ * 's' => 'src',
+ * ];
+ */
+$wgCirrusSearchInterwikiPrefixOverrides = [];
+
+/**
  * Override various profiles to use for interwiki searching.
  * Example:
  * $wgCirrusSearchCrossProjectProfiles = [
diff --git a/docs/settings.txt b/docs/settings.txt
index 465a6ea..ad6494f 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -1210,6 +1210,27 @@
 In WMF context this would remove wikinews and wikiversity from the list of
 crossproject displayed in the sidebar
 
+; $wgCirrusSearchInterwikiPrefixOverrides
+
+Default:
+$wgCirrusSearchInterwikiPrefixOverrides = [];
+
+List of interwiki prefixes to override. This is only useful when used with
+SiteMatrix. In some cases a specific wiki may want to override the convention 
used
+by SiteMatrix. E.g. on WMF infrastructure this is used to override the
+interwiki prefix 's' to 'src' on swedish wikipedia.
+
+NOTE: overrides are applied before reading 
$wgCirrusSearchCrossProjectSearchBlackList
+and $wgCirrusSearchCrossProjectProfiles.
+
+Example:
+$wgCirrusSearchInterwikiPrefixOverrides = [
+'s' => 'src',
+]
+
+
+; $wgCirrusSearchCrossProjectProfiles
+
 Default:
 $wgCirrusSearchCrossProjectProfiles = [];
 
diff --git a/includes/SiteMatrixInterwikiResolver.php 
b/includes/SiteMatrixInterwikiResolver.php
index bb6ca37..0328b35 100644
--- a/includes/SiteMatrixInterwikiResolver.php
+++ b/includes/SiteMatrixInterwikiResolver.php
@@ -76,6 +76,7 @@
$wikiDBname = $this->config->get( 'DBname' );
list( , $myLang ) = $wgConf->siteFromDB( $wikiDBname );
$siteConf = $this->config->get( 'SiteMatrixSites' );
+   $prefixOverrides = $this->config->get( 
'CirrusSearchInterwikiPrefixOverrides' );
$sisterProjects = [];
$crossLanguage = [];
$prefixesByWiki = [];
@@ -89,7 +90,7 @@
foreach ( $matrix->getSites() as $site ) {
if ( $matrix->getDBName( $myLang, $site ) === 
$wikiDBname ) {
$myProject = $site;
-   continue;
+   break;
}
}
 
@@ -114,6 +115,10 @@
$dbName = $matrix->getDBName( $myLang, $site );
$prefix = $siteConf[$site]['prefix'];
 
+   if ( isset( $prefixOverrides[$prefix] ) ) {
+   $prefix = $prefixOverrides[$prefix];
+   }
+
if ( !in_array( $prefix, $this->config->get( 
'CirrusSearchCrossProjectSearchBlackList' ) ) ) {
$sisterProjects[$prefix] = $dbName;
}
diff --git a/tests/unit/InterwikiResolverTest.php 
b/tests/unit/InterwikiResolverTest.php
index df728b0..cd9b0e4 100644
--- a/tests/unit/InterwikiResolverTest.php
+++ b/tests/unit/InterwikiResolverTest.php
@@ -59,13 +59,16 @@
 * @param string $what method to test
 * @param mixed $arg arg to $what
 * @param mixed $expected expected result of $what($arg)
+* @param string[]|null $blacklist
+* @param string[]|null $overrides
 */
-   public function testSiteMatrixResolver( $wiki, 

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: New RCFilters group for "Flagged Revisions"

[jenkins-bot (Code Review)]

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

Change subject: New RCFilters group for "Flagged Revisions"
..


New RCFilters group for "Flagged Revisions"

Create new RC Filters group for "Flagged Revisions",
based on the old 'Hide reviewed edits' function.

Bug: T159791
Change-Id: I67e15ce76f740603a41b57b019b7d8619db2e7e5
---
M frontend/FlaggedRevsUI.hooks.php
M i18n/flaggedrevs/en.json
M i18n/flaggedrevs/qqq.json
3 files changed, 139 insertions(+), 1 deletion(-)

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



diff --git a/frontend/FlaggedRevsUI.hooks.php b/frontend/FlaggedRevsUI.hooks.php
index 6393061..bc533ee 100644
--- a/frontend/FlaggedRevsUI.hooks.php
+++ b/frontend/FlaggedRevsUI.hooks.php
@@ -318,7 +318,8 @@
if ( FlaggedRevs::useSimpleConfig() ) {
return true;
}
-   // TODO: Use the new structured UI: T162902
+
+   // Old filter, replaced in structured UI
$flaggedRevsUnstructuredGroup = new 
ChangesListBooleanFilterGroup(
[
'name' => 'flaggedRevsUnstructured',
@@ -327,6 +328,7 @@
[
'name' => 'hideReviewed',
'showHide' => 
'flaggedrevs-hidereviewed',
+   'isReplacedInStructuredUi' => 
true,
'default' => false,
'queryCallable' => function ( 
$specialClassName, $ctx, $dbr, &$tables,
&$fields, &$conds, 
&$query_options, &$join_conds
@@ -341,6 +343,130 @@
);
 
$specialPage->registerFilterGroup( 
$flaggedRevsUnstructuredGroup );
+
+   $flaggedRevsGroup = new ChangesListStringOptionsFilterGroup(
+   [
+   'name' => 'flaggedrevs',
+   'title' => 'flaggedrevs',
+   'priority' => -9,
+   'default' => 
ChangesListStringOptionsFilterGroup::NONE,
+   'isFullCoverage' => true,
+   'filters' => [
+   [
+   'name' => 'needreview',
+   'label' => 
'flaggedrevs-rcfilters-need-review-label',
+   'description' => 
'flaggedrevs-rcfilters-need-review-desc',
+   'cssClassSuffix' => 
'need-review',
+   'isRowApplicableCallable' => 
function ( $ctx, $rc ) {
+   $namespaces = 
FlaggedRevs::getReviewNamespaces();
+   return ( in_array( 
$rc->getAttribute( 'rc_namespace' ), $namespaces ) &&
+   
$rc->getAttribute( 'rc_type' ) !== RC_EXTERNAL ) &&
+   (
+   
!$rc->getAttribute( 'fp_stable' ) ||
+   (
+   
// The rc_timestamp >= fp_pending_since condition implies that fp_pending_since 
is
+   
// not null, because all comparisons with null values are false in MySQL. It 
doesn't
+   
// work that way in PHP, so we have to explicitly check that fp_pending_since 
is not null
+   
$rc->getAttribute( 'fp_pending_since' ) &&
+   
$rc->getAttribute( 'rc_timestamp' ) >= $rc->getAttribute( 'fp_pending_since' )
+   )
+   );
+   }
+   ],
+   [
+   'name' => 'reviewed',
+   'label' => 
'flaggedrevs-rcfilters-reviewed-label',
+   'description' => 
'flaggedrevs-rcfilters-reviewed-desc',
+ 

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Drop proof of concept code

[EBernhardson (Code Review)]

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

Change subject: Drop proof of concept code
..

Drop proof of concept code

This POC stuff was held over initially as a guide for initial
portions of mjolnir. That is now complete and this is just
extra unnecessary stuff now. Git history will forever remember
it so no point it keeping it in the live tree.

Change-Id: I21a504b34f3f22a4cc907041b838d584585602d2
---
D poc/README
D poc/config.py
D poc/data_prepare.py
D poc/data_process_features.py
D poc/gen_splits.py
D poc/merge_vector_data.py
D poc/parse_feature_logs.py
D poc/utils/__init__.py
D poc/utils/os_utils.py
D poc/utils/spark_utils.py
10 files changed, 0 insertions(+), 723 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/50/384850/1

diff --git a/poc/README b/poc/README
deleted file mode 100644
index 2fe181d..000
--- a/poc/README
+++ /dev/null
@@ -1,32 +0,0 @@
-== Proof of Concept
-
-This directory contains the proof of concept that was built out prior to 
starting this
-library. This code is *not* intended to live on, but instead is here to help 
inform
-the work of building the library. As we build out the related pieces of the 
library
-code should disapear from this part of the repository, until the poc/ directory
-is completely gone.
-
-== How to run
-
-# Collect the raw data to work with
-spark-submit --master yarn --deploy-mode client --jars 
/mnt/hdfs/wmf/refinery/current/artifacts/refinery-hive.jar data_prepare.py
-
-# Train DBN for relevance estimates
-spark-submit --master yarn --deploy-mode client --py-files 
/a/ebernhardson/feature_log/lib/python2.7/site-packages/clickmodels-1.0.2-py2.7.egg
 data_process_dbn.py
-# Collect feature vectors for queries (can run in parallel with DBN)
-spark-submit --master yarn --deploy-mode client --py-files 
/home/ebernhardson/kafka_python-1.3.4.dev-py2.7.egg data_process_features.py
-
-# Copy es queries to somewhere that can send them into relforge
-tar -cvf es_queries.tar -C 
/mnt/hdfs/user/ebernhardson/ltr/en.wikipedia_10S_15Q es_queries
-# run them, collect feature logs, ship them back here, copy to hdfs
-zcat part-00*.gz | pv -l | parallel -j 32 curl -s 
http://localhost:9200/enwikibm25perfield_content/page/_search -d {} > /dev/null
-...
-
-# Parse logs
-pyspark --master yarn parse_feature_logs.py
-
-# Join the various bits of data into a final data frame
-pyspark --master yarn merge_vector_data.py
-
-# (TODO) Convert the vector data df to appropriate formats for ranklib, 
xgboost, lightgbm
-
diff --git a/poc/config.py b/poc/config.py
deleted file mode 100644
index 8b18fa7..000
--- a/poc/config.py
+++ /dev/null
@@ -1,76 +0,0 @@
-import os
-
-from utils import os_utils
-
-# Config for sourcing clicks
-WIKI_PROJECT = 'en.wikipedia'
-MIN_NUM_SEARCHES = 10
-MAX_QUERIES = 15
-
-# Config for training DBN
-DBN_CONFIG = {
-'MAX_ITERATIONS': 40,
-'DEBUG': False,
-'PRETTY_LOG': True,
-'MIN_DOCS_PER_QUERY': 10,
-'MAX_DOCS_PER_QUERY': 20,
-'SERP_SIZE': 20,
-'QUERY_INDEPENDENT_PAGER': False,
-'DEFAULT_REL': 0.5,
-}
-
-# Hadoop Directories
-HADOOP_PREFIX = 'hdfs://analytics-hadoop/user/ebernhardson/ltr/%s_%dS_%dQ' % (
-WIKI_PROJECT, MIN_NUM_SEARCHES, MAX_QUERIES)
-HADOOP_PREFIX_LOCAL = '/mnt/hdfs/user/ebernhardson/ltr/%s_%dS_%dQ' % (
-WIKI_PROJECT, MIN_NUM_SEARCHES, MAX_QUERIES)
-
-# Initial result from sql queries sourcing click data
-CLICK_DATA = '%s/click_data' % (HADOOP_PREFIX)
-
-# feature logs as dataframe
-FEATURE_LOGS = '%s/feature_logs' % (HADOOP_PREFIX)
-
-# Data to feed into DBN
-DBN_INPUT = '%s/dbn_input' % (HADOOP_PREFIX)
-DBN_INPUT_LOCAL = '%s/dbn_input' % (HADOOP_PREFIX_LOCAL)
-# Result data from DBN
-DBN_RELEVANCE = '%s/dbn_output' % (HADOOP_PREFIX)
-
-# Feature vectors sourced from elasticsearch ltr plugin about
-# all the (query, hit_page_id) pairs in CLICK_DATA, merged
-# with relevance scores from RELEVANCE_DATA
-VECTOR_DATA = "%s/vector_data" % (HADOOP_PREFIX)
-
-# Local Directories
-ROOT_DIR = "../data/%s_%dS_%dQ" % (WIKI_PROJECT, MIN_NUM_SEARCHES, MAX_QUERIES)
-DATA_DIR = os.path.join(ROOT_DIR, 'data')
-TMP_DIR = os.path.join(ROOT_DIR, 'tmp')
-
-# Data files
-
-# Train/test/validation splits in svmrank format
-SVMRANK_TRAIN_DATA = os.path.join(DATA_DIR, 'svmrank_train.txt')
-SVMRANK_TEST_DATA = os.path.join(DATA_DIR, 'svmrank_test.txt')
-SVMRANK_VALI_DATA = os.path.join(DATA_DIR, 'svmrank_vali.txt')
-
-# Train/test/validation splits in lightgbm format
-LIGHTGBM_TRAIN_DATA = os.path.join(HADOOP_PREFIX, 'lightgbm/train')
-LIGHTGBM_TEST_DATA = os.path.join(HADOOP_PREFIX, 'lightgbm/test')
-LIGHTGBM_VALI_DATA = os.path.join(HADOOP_PREFIX, 'lightgbm/vali')
-
-# Train/test/validation splits for xgboost on hdfs
-XGBOOST_TRAIN_DATA = os.path.join(HADOOP_PREFIX, 'xgboost/train')
-XGBOOST_TEST_DATA = os.path.join(HADOOP_PREFIX, 'xgboost/test')

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use wikiUrlencode in getPageUrl

[Esanders (Code Review)]

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

Change subject: Use wikiUrlencode in getPageUrl
..

Use wikiUrlencode in getPageUrl

This fixes links to certain page titles, such as those
containing '?'.

Change-Id: Id81e88c0e519e2a3b06f9ce086ffa62ff39975bc
---
M modules/base/ext.cx.sitemapper.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/45/384845/1

diff --git a/modules/base/ext.cx.sitemapper.js 
b/modules/base/ext.cx.sitemapper.js
index cdd1d89..31dbbae 100644
--- a/modules/base/ext.cx.sitemapper.js
+++ b/modules/base/ext.cx.sitemapper.js
@@ -85,7 +85,7 @@
 
return base
.replace( '$1', domain.replace( /\$/g, '' ) )
-   .replace( '$2', title.replace( / /g, '_' ).replace( 
/\$/g, '' ) ) + extra;
+   .replace( '$2', mw.util.wikiUrlencode( title ).replace( 
/\$/g, '' ) ) + extra;
};
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: production dns for cp40(29|3[012]

[RobH (Code Review)]

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

Change subject: production dns for cp40(29|3[012]
..


production dns for cp40(29|3[012]

setting production dns entries for new cp systems

Bug: T178423
Change-Id: I03887f979bb342700b1d3e9b2021070729951cef
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index aeb4272..65fc979 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2810,9 +2810,16 @@
 2   1H  IN PTR  lvs4002.mgmt.ulsfo.wmnet.
 3   1H  IN PTR  lvs4003.mgmt.ulsfo.wmnet.
 4   1H  IN PTR  lvs4004.mgmt.ulsfo.wmnet.
+5   1H  IN PTR  lvs4005.mgmt.ulsfo.wmnet.
+5   1H  IN PTR  WMF7213.mgmt.ulsfo.wmnet.
+6   1H  IN PTR  lvs4006.mgmt.ulsfo.wmnet.
+6   1H  IN PTR  WMF7214.mgmt.ulsfo.wmnet.
+7   1H  IN PTR  lvs4007.mgmt.ulsfo.wmnet.
+7   1H  IN PTR  WMF7215.mgmt.ulsfo.wmnet.
 
 10  1H  IN PTR  bast4001.mgmt.ulsfo.wmnet.
 11  1H  IN PTR  frbackup4001.mgmt.ulsfo.wmnet.
+12  1H  IN PTR  WMF7218.mgmt.ulsfo.wmnet.
 
 105 1H  IN PTR  cp4005.mgmt.ulsfo.wmnet.
 106 1H  IN PTR  cp4006.mgmt.ulsfo.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 11f7a15..ef5614c 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4532,6 +4532,9 @@
 lvs4002 1H  IN A10.128.129.2
 lvs4003 1H  IN A10.128.129.3
 lvs4004 1H  IN A10.128.129.4
+lvs4005 1H  IN A10.128.129.5
+lvs4006 1H  IN A10.128.129.6
+lvs4007 1H  IN A10.128.129.7
 
 bast40011H  IN A10.128.129.10
 frbackup40011H  IN A10.128.129.11
@@ -4572,6 +4575,11 @@
 WMF5812  1H  IN A10.128.129.130
 WMF5813  1H  IN A10.128.129.131
 WMF5814  1H  IN A10.128.129.132
+WMF7213  1H  IN A10.128.129.5
+WMF7214  1H  IN A10.128.129.6
+WMF7215  1H  IN A10.128.129.7
+WMF7218  1H  IN A10.128.129.12
+
 
 
 ;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I03887f979bb342700b1d3e9b2021070729951cef
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: production dns for cp40(29|3[012]

[RobH (Code Review)]

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

Change subject: production dns for cp40(29|3[012]
..

production dns for cp40(29|3[012]

setting production dns entries for new cp systems

Bug: T178423
Change-Id: I03887f979bb342700b1d3e9b2021070729951cef
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/41/384841/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index aeb4272..bc8c23c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2810,9 +2810,16 @@
 2   1H  IN PTR  lvs4002.mgmt.ulsfo.wmnet.
 3   1H  IN PTR  lvs4003.mgmt.ulsfo.wmnet.
 4   1H  IN PTR  lvs4004.mgmt.ulsfo.wmnet.
+5   1H  IN PTR  lvs4005.mgmt.ulsfo.wmnet.
+5   1H  IN PTR  WMF7213.mgmt.ulsfo.wmnet.
+6   1H  IN PTR  lvs4006.mgmt.ulsfo.wmnet.
+6   1H  IN PTR  WMF7214.mgmt.ulsfo.wmnet.
+7   1H  IN PTR  lvs4007.mgmt.ulsfo.wmnet.
+7   1H  IN PTR  WMF7215.mgmt.ulsfo.wmnet.
 
 10  1H  IN PTR  bast4001.mgmt.ulsfo.wmnet.
 11  1H  IN PTR  frbackup4001.mgmt.ulsfo.wmnet.
+12  1H  IN PTR  WMF7218.mgmt.ulsfo.wmnet
 
 105 1H  IN PTR  cp4005.mgmt.ulsfo.wmnet.
 106 1H  IN PTR  cp4006.mgmt.ulsfo.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 11f7a15..ef5614c 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4532,6 +4532,9 @@
 lvs4002 1H  IN A10.128.129.2
 lvs4003 1H  IN A10.128.129.3
 lvs4004 1H  IN A10.128.129.4
+lvs4005 1H  IN A10.128.129.5
+lvs4006 1H  IN A10.128.129.6
+lvs4007 1H  IN A10.128.129.7
 
 bast40011H  IN A10.128.129.10
 frbackup40011H  IN A10.128.129.11
@@ -4572,6 +4575,11 @@
 WMF5812  1H  IN A10.128.129.130
 WMF5813  1H  IN A10.128.129.131
 WMF5814  1H  IN A10.128.129.132
+WMF7213  1H  IN A10.128.129.5
+WMF7214  1H  IN A10.128.129.6
+WMF7215  1H  IN A10.128.129.7
+WMF7218  1H  IN A10.128.129.12
+
 
 
 ;

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: add yaml fact directory to rsyncd on frontends

[Herron (Code Review)]

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

Change subject: puppetmaster: add yaml fact directory to rsyncd on frontends
..

puppetmaster: add yaml fact directory to rsyncd on frontends

Make yaml fact file directory /var/lib/puppet/yaml/facts on puppetmaster
frontends read-only accessible to allowed hosts via rsyncd. Near-term
this is for use by octocatalog-diff on puppetcompiler1001.

Bug: T177843
Change-Id: I7e6b2e13c31e845175cf59ae7720f016d9a50077
---
M modules/profile/manifests/puppetmaster/frontend.pp
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/modules/profile/manifests/puppetmaster/frontend.pp 
b/modules/profile/manifests/puppetmaster/frontend.pp
index ee86a8c..4961581 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -102,4 +102,10 @@
 port   => 8141,
 srange => "(@resolve((${puppetmaster_frontend_ferm})) 
@resolve((${puppetmaster_frontend_ferm}), ))"
 }
+
+# Expose puppet yaml fact files (read-only) via rsyncd to allowed hosts
+rsync::server::module { 'puppet_yaml_facts':
+path => '/var/lib/puppet/yaml/facts',
+hosts_allow => [ '10.64.32.17',\ '2620:0:861:103:10:64:32:17' ] 
#puppetcompiler1001.eqiad.wmnet
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Disable special page usage until further notice

[jenkins-bot (Code Review)]

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

Change subject: Disable special page usage until further notice
..


Disable special page usage until further notice

Provide placeholder function for re-adding access later on.

Bug: T178289
Change-Id: I25f35f20ae95cd0a25286610357d09e14a9cb970
---
M SpecialRenderBook.php
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/SpecialRenderBook.php b/SpecialRenderBook.php
index f33dcca..fa243ef 100644
--- a/SpecialRenderBook.php
+++ b/SpecialRenderBook.php
@@ -14,11 +14,26 @@
$this->setListed( false );
}
 
+   /**
+* A placeholder method for checking whether the current user is
+* allowed to make use of the special page for testing purposes.
+* Currently this defaults to false, until we implement proper
+* permissioning (see T178289)
+* @param User $user to check permissions for
+* @return bool
+*/
+   public function hasUserGotTestingPermission( $user ) {
+   return false;
+   }
+
public function execute( $subPage ) {
$key = null;
if ( strpos( $subPage, '/' ) !== false ) {
list( $subPage, $key ) = explode( '/', $subPage, 2 );
}
+   if ( !$this->hasUserGotTestingPermission( $this->getUser() ) ) {
+   return;
+   }
 
$services = MediaWikiServices::getInstance();
$restClientLogger = LoggerFactory::getInstance( 'http' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25f35f20ae95cd0a25286610357d09e14a9cb970
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix .oo-ui-selectable() mixin to actually undo .oo-ui-unsele...

[jenkins-bot (Code Review)]

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

Change subject: Fix .oo-ui-selectable() mixin to actually undo 
.oo-ui-unselectable()
..


Fix .oo-ui-selectable() mixin to actually undo .oo-ui-unselectable()

The default value that we should be restoring is 'text', not 'all'.
(Technically, the default value is 'auto', but that seems to cause the
value to be inherited, so that doesn't work for us.)

Using 'user-select: all' only allows selecting the *entire* element,
rather than allowing normal text selecting. (It also doesn't seem to
actually work in browsers other than Firefox. MDN documentation hints
that it's only supposed to work in editable documents.)

The only place where we use this is to allow selecting contents of
popups in toolbars (toolbars are marked as unselectable).

Bug: T178320
Change-Id: Id81b36fb4ec5d39c07af9b920e59abdc18b889f7
---
M src/styles/common.less
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/src/styles/common.less b/src/styles/common.less
index f9a0bdd..6802aab 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -99,10 +99,10 @@
 
 .oo-ui-selectable() {
-webkit-touch-callout: default;
-   -webkit-user-select: all;
-   -moz-user-select: all;
-   -ms-user-select: all;
-   user-select: all;
+   -webkit-user-select: text;
+   -moz-user-select: text;
+   -ms-user-select: text;
+   user-select: text;
 }
 
 .oo-ui-inline-spacing( @spacing, @cancelled-spacing: 0 ) {

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Fix selector in PopupWidget styles

[jenkins-bot (Code Review)]

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

Change subject: WikimediaUI theme: Fix selector in PopupWidget styles
..


WikimediaUI theme: Fix selector in PopupWidget styles

We only want to remove the margin of the first child of the popup,
not of first children of any element nested inside the popup.

Change-Id: I0a0511095231589461066c6c377a9db1202b29d7
---
M src/themes/wikimediaui/widgets.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/themes/wikimediaui/widgets.less 
b/src/themes/wikimediaui/widgets.less
index 8e9da32..6e9523f 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -1075,7 +1075,7 @@
&-padded {
margin: @padding-top-menu @padding-horizontal-base 
@padding-bottom-menu;// Use `margin` rather than `padding` to enable margin to 
collapse
 
-   :first-child {
+   > :first-child {
margin-top: 0;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a0511095231589461066c6c377a9db1202b29d7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[wmf/1.31.0-wmf.4]: ve.ui.CiteFromIdInspector: Fix CSS for context menus after c...

[Jforrester (Code Review)]

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

Change subject: ve.ui.CiteFromIdInspector: Fix CSS for context menus after 
changes in OOjs UI
..

ve.ui.CiteFromIdInspector: Fix CSS for context menus after changes in OOjs UI

Bug: T178324
Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
(cherry picked from commit df3c1d2661923d76c329b9d351cf26a544078092)
---
M modules/ve.ui.CiteFromIdInspector.css
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve.ui.CiteFromIdInspector.css 
b/modules/ve.ui.CiteFromIdInspector.css
index f186347..5c5f95b 100644
--- a/modules/ve.ui.CiteFromIdInspector.css
+++ b/modules/ve.ui.CiteFromIdInspector.css
@@ -31,7 +31,8 @@
font-weight: bold;
 }
 
-.ve-ui-citeFromIdReferenceWidget .oo-ui-iconElement-icon {
+.ve-ui-citeFromIdReferenceWidget.oo-ui-iconElement > .oo-ui-iconElement-icon {
+   position: static;
display: inline-block;
margin-right: 0.5em;
height: 1.875em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: wmf/1.31.0-wmf.4
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mirrors: use correct path for the config file

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384803 )

Change subject: mirrors: use correct path for the config file
..


mirrors: use correct path for the config file

Change-Id: I36d0603d2791059425dc0813272953099b6c2fb1
---
M modules/mirrors/manifests/debian.pp
M modules/mirrors/spec/classes/mirrors_debian_spec.rb
2 files changed, 12 insertions(+), 4 deletions(-)

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



diff --git a/modules/mirrors/manifests/debian.pp 
b/modules/mirrors/manifests/debian.pp
index ff5ce64..e82cd2a 100644
--- a/modules/mirrors/manifests/debian.pp
+++ b/modules/mirrors/manifests/debian.pp
@@ -27,12 +27,20 @@
 ensure => present,
 }
 
-# this is our configuration for archvsync
+# package doesn't ship that directory yet
 file { '/etc/ftpsync':
+ensure => directory,
+owner  => 'mirror',
+group  => 'mirror',
+mode   => '0555',
+}
+
+# this is our configuration for archvsync
+file { '/etc/ftpsync/ftpsync.conf':
 ensure  => present,
 owner   => 'mirror',
 group   => 'mirror',
-mode=> '0555',
+mode=> '0444',
 content => template('mirrors/ftpsync.conf.erb'),
 }
 
diff --git a/modules/mirrors/spec/classes/mirrors_debian_spec.rb 
b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
index ed01c24..bf168ff 100644
--- a/modules/mirrors/spec/classes/mirrors_debian_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
@@ -10,11 +10,11 @@
 })
 end
 it do
-should contain_file('/etc/ftpsync').with({
+should contain_file('/etc/ftpsync/ftpsync.conf').with({
 'ensure'  => 'present',
 'owner'   => 'mirror',
 'group'   => 'mirror',
-'mode'=> '0555',
+'mode'=> '0444',
 })
 end
 it do

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36d0603d2791059425dc0813272953099b6c2fb1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
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...Citoid[master]: ve.ui.CiteFromIdInspector: Fix CSS for context menus after c...

[jenkins-bot (Code Review)]

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

Change subject: ve.ui.CiteFromIdInspector: Fix CSS for context menus after 
changes in OOjs UI
..


ve.ui.CiteFromIdInspector: Fix CSS for context menus after changes in OOjs UI

Bug: T178324
Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
---
M modules/ve.ui.CiteFromIdInspector.css
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve.ui.CiteFromIdInspector.css 
b/modules/ve.ui.CiteFromIdInspector.css
index f186347..5c5f95b 100644
--- a/modules/ve.ui.CiteFromIdInspector.css
+++ b/modules/ve.ui.CiteFromIdInspector.css
@@ -31,7 +31,8 @@
font-weight: bold;
 }
 
-.ve-ui-citeFromIdReferenceWidget .oo-ui-iconElement-icon {
+.ve-ui-citeFromIdReferenceWidget.oo-ui-iconElement > .oo-ui-iconElement-icon {
+   position: static;
display: inline-block;
margin-right: 0.5em;
height: 1.875em;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Mobile: Rewrite toolbar centring CSS

[jenkins-bot (Code Review)]

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

Change subject: Mobile: Rewrite toolbar centring CSS
..


Mobile: Rewrite toolbar centring CSS

Change-Id: I43ada52231a0c9a91c98f2a482d2702528d995a2
---
M modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.less
1 file changed, 29 insertions(+), 38 deletions(-)

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



diff --git a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.less 
b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.less
index 677ec71..3ae0fd2 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.less
+++ b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.less
@@ -76,55 +76,46 @@
 .ve-init-mw-mobileArticleTarget-editTools {
width: 100%;
 
-   > .oo-ui-toolGroup {
-   text-align: center;
+   > .oo-ui-popupToolGroup > .oo-ui-popupToolGroup-handle {
+   > .oo-ui-iconElement-icon,
+   > .oo-ui-indicatorElement-indicator {
+   left: 50%;
+   }
+   > .oo-ui-iconElement-icon {
+   margin-left: -1.875em;
+   }
}
 
-   .oo-ui-barToolGroup {
-   .oo-ui-iconElement-icon {
-   left: 50%;
-   margin-left: -0.9375em;
-   }
+   > .oo-ui-barToolGroup {
+   text-align: center;
 
-   @media ( max-width: 479px ) {
-   > .oo-ui-toolGroup-tools > 
.oo-ui-tool.oo-ui-iconElement.oo-ui-tool-with-label > .oo-ui-tool-link {
-   .oo-ui-tool-title {
-   display: none;
+   > .oo-ui-toolGroup-tools > .oo-ui-tool {
+   width: 100%;
+   > .oo-ui-tool-link {
+   padding: 0.85em;
+   > .oo-ui-iconElement-icon {
+   position: static;
+   display: inline-block;
+   vertical-align: middle;
+   margin-right: 0.25em;
}
-
-   .oo-ui-iconElement-icon {
-   margin-left: -0.9375em;
+   > .oo-ui-tool-title {
+   vertical-align: middle;
}
-
}
}
}
 
-   .oo-ui-tool-with-label .oo-ui-iconElement-icon,
-   .oo-ui-popupToolGroup-handle .oo-ui-iconElement-icon {
-   left: 50%;
-   margin-left: -1.875em;
+   > .oo-ui-toolGroup {
+   &-empty {
+   display: none;
+   }
+
+   &:last-child {
+   border-right: 0;
+   }
}
 
-   .oo-ui-popupToolGroup-handle .oo-ui-indicatorElement-indicator {
-   left: 50%;
-   }
-
-   .oo-ui-popupToolGroup .oo-ui-toolGroup-tools {
-   text-align: left;
-   }
-
-   > .oo-ui-toolGroup-empty {
-   display: none;
-   }
-
-   > .oo-ui-toolGroup:last-child {
-   border-right: 0;
-   }
-
-   > .oo-ui-toolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool {
-   width: 100%;
-   }
 }
 
 .ve-init-mw-mobileArticleTarget-editTools-hidden,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ada52231a0c9a91c98f2a482d2702528d995a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mirrors: use correct path for the config file

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384803 )

Change subject: mirrors: use correct path for the config file
..

mirrors: use correct path for the config file

Change-Id: I36d0603d2791059425dc0813272953099b6c2fb1
---
M modules/mirrors/manifests/debian.pp
1 file changed, 10 insertions(+), 2 deletions(-)


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

diff --git a/modules/mirrors/manifests/debian.pp 
b/modules/mirrors/manifests/debian.pp
index ff5ce64..e82cd2a 100644
--- a/modules/mirrors/manifests/debian.pp
+++ b/modules/mirrors/manifests/debian.pp
@@ -27,12 +27,20 @@
 ensure => present,
 }
 
-# this is our configuration for archvsync
+# package doesn't ship that directory yet
 file { '/etc/ftpsync':
+ensure => directory,
+owner  => 'mirror',
+group  => 'mirror',
+mode   => '0555',
+}
+
+# this is our configuration for archvsync
+file { '/etc/ftpsync/ftpsync.conf':
 ensure  => present,
 owner   => 'mirror',
 group   => 'mirror',
-mode=> '0555',
+mode=> '0444',
 content => template('mirrors/ftpsync.conf.erb'),
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36d0603d2791059425dc0813272953099b6c2fb1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mirrors: stop shipping ftpsync, use package instead

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384791 )

Change subject: mirrors: stop shipping ftpsync, use package instead
..


mirrors: stop shipping ftpsync, use package instead

ftpsync (src:archvsync) is now available as a package, albeit only in
buster (and now, stretch-wikimedia). Switch to using that instead of
shipping a copy in our puppet repository, thereby making updates more
streamlined, especially in >= buster.

Change-Id: I1cca0f806a014b5c05f7296b78eda7c2004c79a9
---
D modules/mirrors/files/archvsync/bin/common
D modules/mirrors/files/archvsync/bin/ftpsync
M modules/mirrors/files/ssh-debian-archvsync.pub
M modules/mirrors/manifests/debian.pp
M modules/mirrors/spec/classes/mirrors_debian_spec.rb
M modules/mirrors/templates/ftpsync.conf.erb
6 files changed, 19 insertions(+), 1,191 deletions(-)

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



diff --git a/modules/mirrors/files/archvsync/bin/common 
b/modules/mirrors/files/archvsync/bin/common
deleted file mode 100644
index f97016e..000
--- a/modules/mirrors/files/archvsync/bin/common
+++ /dev/null
@@ -1,292 +0,0 @@
-# -*- mode:sh -*-
-# vim:syn=sh
-# Little common functions
-
-# push a mirror attached to us.
-# Arguments (using an array named SIGNAL_OPTS):
-#
-# $MIRROR  - Name for the mirror, also basename for the logfile
-# $HOSTNAME- Hostname to push to
-# $USERNAME- Username there
-# $SSHPROTO- Protocol version, either 1 or 2.
-# $SSHKEY  - the ssh private key file to use for this push
-# $SSHOPTS - any other option ssh accepts, passed blindly, be careful
-# $PUSHLOCKOWN - own lockfile name to touch after stage1 in pushtype=staged
-# $PUSHTYPE- what kind of push should be done?
-#all- normal, just push once with ssh backgrounded and 
finish
-#staged - staged. first push stage1, then wait for $PUSHLOCKs 
to appear,
-# then push stage2
-# $PUSHARCHIVE - what archive to sync? (Multiple mirrors behind one ssh key!)
-# $PUSHCB  - do we want a callback?
-# $PUSHKIND- whats going on? are we doing mhop push or already stage2?
-# $FROMFTPSYNC - set to true if we run from within ftpsync.
-#
-# This function assumes that the variable LOG is set to a directory where
-# logfiles can be written to.
-# Additionally $PUSHLOCKS has to be defined as a set of space delimited strings
-# (list of "lock"files) to wait for if you want pushtype=staged
-#
-# Pushes might be done in background (for type all).
-signal () {
-ARGS="SIGNAL_OPTS[*]"
-local ${!ARGS}
-
-MIRROR=${MIRROR:-""}
-HOSTNAME=${HOSTNAME:-""}
-USERNAME=${USERNAME:-""}
-SSHPROTO=${SSHPROTO:-""}
-SSHKEY=${SSHKEY:-""}
-SSHOPTS=${SSHOPTS:-""}
-PUSHLOCKOWN=${PUSHLOCKOWN:-""}
-PUSHTYPE=${PUSHTYPE:-"all"}
-PUSHARCHIVE=${PUSHARCHIVE:-""}
-PUSHCB=${PUSHCB:-""}
-PUSHKIND=${PUSHKIND:-"all"}
-FROMFTPSYNC=${FROMFTPSYNC:-"false"}
-
-# And now get # back to space...
-SSHOPTS=${SSHOPTS/\#/ }
-
-# Defaults we always want, no matter what
-SSH_OPTIONS="-o user=${USERNAME} -o BatchMode=yes -o 
ServerAliveInterval=45 -o ConnectTimeout=45 -o PasswordAuthentication=no"
-
-# If there are userdefined ssh options, add them.
-if [[ -n ${SSH_OPTS} ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} ${SSH_OPTS}"
-fi
-
-# Does this machine need a special key?
-if [[ -n ${SSHKEY} ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} -i ${SSHKEY}"
-fi
-
-# Does this machine have an extra own set of ssh options?
-if [[ -n ${SSHOPTS} ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} ${SSHOPTS}"
-fi
-
-# Set the protocol version
-if [[ ${SSHPROTO} -ne 1 ]] && [[ ${SSHPROTO} -ne 2 ]] && [[ ${SSHPROTO} 
-ne 99 ]]; then
-# Idiots, we only want 1 or 2. Cant decide? Lets force 2.
-SSHPROTO=2
-fi
-
-if [[ -n ${SSHPROTO} ]] && [[ ${SSHPROTO} -ne 99 ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} -${SSHPROTO}"
-fi
-
-date -u >> "${LOGDIR}/${MIRROR}.log"
-
-PUSHARGS=""
-# PUSHARCHIVE empty or not, we always add the sync:archive: command to 
transfer.
-# Otherwise, if nothing else is added, ssh -f would not work ("no command 
to execute")
-# But ftpsync does treat "sync:archive:" as the main archive, so this 
works nicely.
-PUSHARGS="${PUSHARGS} sync:archive:${PUSHARCHIVE}"
-
-# We have a callback wish, tell downstreams
-if [[ -n ${PUSHCB} ]]; then
-PUSHARGS="${PUSHARGS} sync:callback"
-fi
-# If we are running an mhop push AND our downstream is one to receive it, 
tell it.
-if [[ mhop = ${PUSHKIND} ]] && [[ mhop = ${PUSHTYPE} ]]; then
-PUSHARGS="${PUSHARGS} sync:mhop"
-fi
-
-if [[ all = ${PUSHTYPE} ]]; then
-# Default normal "fire and forget" push. We background that, we do not 
care about the 

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[master]: ve.ui.CiteFromIdInspector: Fix CSS for context menus after c...

[Code Review]

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

Change subject: ve.ui.CiteFromIdInspector: Fix CSS for context menus after 
changes in OOjs UI
..

ve.ui.CiteFromIdInspector: Fix CSS for context menus after changes in OOjs UI

Bug: T178324
Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
---
M modules/ve.ui.CiteFromIdInspector.css
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/92/384792/1

diff --git a/modules/ve.ui.CiteFromIdInspector.css 
b/modules/ve.ui.CiteFromIdInspector.css
index f186347..5c5f95b 100644
--- a/modules/ve.ui.CiteFromIdInspector.css
+++ b/modules/ve.ui.CiteFromIdInspector.css
@@ -31,7 +31,8 @@
font-weight: bold;
 }
 
-.ve-ui-citeFromIdReferenceWidget .oo-ui-iconElement-icon {
+.ve-ui-citeFromIdReferenceWidget.oo-ui-iconElement > .oo-ui-iconElement-icon {
+   position: static;
display: inline-block;
margin-right: 0.5em;
height: 1.875em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4133d988dc80da8c2cd8067afff46c24e6d0867f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mirrors: stop shipping ftpsync, use package instead

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384791 )

Change subject: mirrors: stop shipping ftpsync, use package instead
..

mirrors: stop shipping ftpsync, use package instead

ftpsync (src:archvsync) is now available as a package, albeit only in
buster (and now, stretch-wikimedia). Switch to using that instead of
shipping a copy in our puppet repository, thereby making updates more
streamlined, especially in >= buster.

Change-Id: I1cca0f806a014b5c05f7296b78eda7c2004c79a9
---
D modules/mirrors/files/archvsync/bin/common
D modules/mirrors/files/archvsync/bin/ftpsync
M modules/mirrors/files/ssh-debian-archvsync.pub
M modules/mirrors/manifests/debian.pp
M modules/mirrors/spec/classes/mirrors_debian_spec.rb
M modules/mirrors/templates/ftpsync.conf.erb
6 files changed, 19 insertions(+), 1,191 deletions(-)


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

diff --git a/modules/mirrors/files/archvsync/bin/common 
b/modules/mirrors/files/archvsync/bin/common
deleted file mode 100644
index f97016e..000
--- a/modules/mirrors/files/archvsync/bin/common
+++ /dev/null
@@ -1,292 +0,0 @@
-# -*- mode:sh -*-
-# vim:syn=sh
-# Little common functions
-
-# push a mirror attached to us.
-# Arguments (using an array named SIGNAL_OPTS):
-#
-# $MIRROR  - Name for the mirror, also basename for the logfile
-# $HOSTNAME- Hostname to push to
-# $USERNAME- Username there
-# $SSHPROTO- Protocol version, either 1 or 2.
-# $SSHKEY  - the ssh private key file to use for this push
-# $SSHOPTS - any other option ssh accepts, passed blindly, be careful
-# $PUSHLOCKOWN - own lockfile name to touch after stage1 in pushtype=staged
-# $PUSHTYPE- what kind of push should be done?
-#all- normal, just push once with ssh backgrounded and 
finish
-#staged - staged. first push stage1, then wait for $PUSHLOCKs 
to appear,
-# then push stage2
-# $PUSHARCHIVE - what archive to sync? (Multiple mirrors behind one ssh key!)
-# $PUSHCB  - do we want a callback?
-# $PUSHKIND- whats going on? are we doing mhop push or already stage2?
-# $FROMFTPSYNC - set to true if we run from within ftpsync.
-#
-# This function assumes that the variable LOG is set to a directory where
-# logfiles can be written to.
-# Additionally $PUSHLOCKS has to be defined as a set of space delimited strings
-# (list of "lock"files) to wait for if you want pushtype=staged
-#
-# Pushes might be done in background (for type all).
-signal () {
-ARGS="SIGNAL_OPTS[*]"
-local ${!ARGS}
-
-MIRROR=${MIRROR:-""}
-HOSTNAME=${HOSTNAME:-""}
-USERNAME=${USERNAME:-""}
-SSHPROTO=${SSHPROTO:-""}
-SSHKEY=${SSHKEY:-""}
-SSHOPTS=${SSHOPTS:-""}
-PUSHLOCKOWN=${PUSHLOCKOWN:-""}
-PUSHTYPE=${PUSHTYPE:-"all"}
-PUSHARCHIVE=${PUSHARCHIVE:-""}
-PUSHCB=${PUSHCB:-""}
-PUSHKIND=${PUSHKIND:-"all"}
-FROMFTPSYNC=${FROMFTPSYNC:-"false"}
-
-# And now get # back to space...
-SSHOPTS=${SSHOPTS/\#/ }
-
-# Defaults we always want, no matter what
-SSH_OPTIONS="-o user=${USERNAME} -o BatchMode=yes -o 
ServerAliveInterval=45 -o ConnectTimeout=45 -o PasswordAuthentication=no"
-
-# If there are userdefined ssh options, add them.
-if [[ -n ${SSH_OPTS} ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} ${SSH_OPTS}"
-fi
-
-# Does this machine need a special key?
-if [[ -n ${SSHKEY} ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} -i ${SSHKEY}"
-fi
-
-# Does this machine have an extra own set of ssh options?
-if [[ -n ${SSHOPTS} ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} ${SSHOPTS}"
-fi
-
-# Set the protocol version
-if [[ ${SSHPROTO} -ne 1 ]] && [[ ${SSHPROTO} -ne 2 ]] && [[ ${SSHPROTO} 
-ne 99 ]]; then
-# Idiots, we only want 1 or 2. Cant decide? Lets force 2.
-SSHPROTO=2
-fi
-
-if [[ -n ${SSHPROTO} ]] && [[ ${SSHPROTO} -ne 99 ]]; then
-SSH_OPTIONS="${SSH_OPTIONS} -${SSHPROTO}"
-fi
-
-date -u >> "${LOGDIR}/${MIRROR}.log"
-
-PUSHARGS=""
-# PUSHARCHIVE empty or not, we always add the sync:archive: command to 
transfer.
-# Otherwise, if nothing else is added, ssh -f would not work ("no command 
to execute")
-# But ftpsync does treat "sync:archive:" as the main archive, so this 
works nicely.
-PUSHARGS="${PUSHARGS} sync:archive:${PUSHARCHIVE}"
-
-# We have a callback wish, tell downstreams
-if [[ -n ${PUSHCB} ]]; then
-PUSHARGS="${PUSHARGS} sync:callback"
-fi
-# If we are running an mhop push AND our downstream is one to receive it, 
tell it.
-if [[ mhop = ${PUSHKIND} ]] && [[ mhop = ${PUSHTYPE} ]]; then
-PUSHARGS="${PUSHARGS} sync:mhop"
-fi
-
-if [[ all = ${PUSHTYPE} ]]; then
-# Default normal "fire and forget" push. We background that, we do not 
care about the 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.3]: Shell\Command: Better walltime fallback

[MaxSem (Code Review)]

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

Change subject: Shell\Command: Better walltime fallback
..

Shell\Command: Better walltime fallback

Previously, it assumed that the only way times could be overridden is to
reduce the limits - which isn't the case for video transcoding.

Bug: T178314
Change-Id: I492a44f280a36ee666e9963788caac2bbc6bc6f3
(cherry picked from commit 945f8870d342b4ac4d7183911c67e14a03ced5ec)
---
M includes/shell/Command.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/384790/1

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 4e0c0ec..b25dd2d 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -135,6 +135,11 @@
 * @return $this
 */
public function limits( array $limits ) {
+   if ( !isset( $limits['walltime'] ) && isset( $limits['time'] ) 
) {
+   // Emulate the behavior of old wfShellExec() where 
walltime fell back on time
+   // if the latter was overridden and the former wasn't
+   $limits['walltime'] = $limits['time'];
+   }
$this->limits = $limits + $this->limits;
 
return $this;
@@ -227,8 +232,6 @@
if ( is_executable( '/bin/bash' ) ) {
$time = intval( $this->limits['time'] );
$wallTime = intval( $this->limits['walltime'] );
-   // for b/c, wall time falls back to time
-   $wallTime = min( $time, $wallTime );
$mem = intval( $this->limits['memory'] );
$filesize = intval( $this->limits['filesize'] );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I492a44f280a36ee666e9963788caac2bbc6bc6f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.3
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki...WhoIsWatching[master]: Replace FooBar with WhoIsWatching

[MarkAHershberger (Code Review)]

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

Change subject: Replace FooBar with WhoIsWatching
..


Replace FooBar with WhoIsWatching

Missed these in I3b80e90fc3df42af6112673d0d68ca9bc888363d

Change-Id: Ie5321c89f7bb7bd88002cc321d4b3884f543aae9
---
M WhoIsWatching.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/WhoIsWatching.php b/WhoIsWatching.php
index 770cf00..1eedc70 100644
--- a/WhoIsWatching.php
+++ b/WhoIsWatching.php
@@ -5,11 +5,11 @@
$wgMessagesDirs['WhoIsWatching'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['WhoIsWatchingAlias'] = __DIR__ . 
'/src/i18n/Alias.php';
wfWarn(
-   'Deprecated PHP entry point used for the FooBar extension. ' .
+   'Deprecated PHP entry point used for the WhoIsWatching 
extension. ' .
'Please use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
);
return;
 } else {
-   die( 'This version of the FooBar extension requires MediaWiki 1.25+' );
+   die( 'This version of the WhoIsWatching extension requires MediaWiki 
1.25+' );
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5321c89f7bb7bd88002cc321d4b3884f543aae9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WhoIsWatching
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: MarkAHershberger 

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