[MediaWiki-commits] [Gerrit] integration/config[master]: Move composer-php70-docker out of experimental

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

Change subject: Move composer-php70-docker out of experimental
..


Move composer-php70-docker out of experimental

All repositories using it currently pass.

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 80929c7..3c3b0de 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1165,9 +1165,8 @@
 gate-and-submit: 
   - composer-php55-jessie
   - composer-hhvm-jessie
-gate-and-submit-swat: *composer-test-gate-and-submit
-experimental:
   - composer-php70-docker
+gate-and-submit-swat: *composer-test-gate-and-submit
 
   - name: mwgate-composer
 check:

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-codfw.php: Depool db2035 and db2056"

2017-10-04 Thread Marostegui (Code Review) 
Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "db-codfw.php: Depool db2035 and db2056"
..

Revert "db-codfw.php: Depool db2035 and db2056"

This reverts commit f5658cb4eddbc3b2b18161f089404b3ad79d1d05.

Change-Id: I0abacbf11e720df77341fb34f9494cce87b15297
---
M wmf-config/db-codfw.php
1 file changed, 11 insertions(+), 11 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index acb5581..0a1f0af 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -114,11 +114,11 @@
],
's2' => [
'db2017' => 0,   # B6 2.9TB  96GB, master
-   # 'db2035' => 50,  # C6 2.9TB 160GB, rc, log #T174509
+   'db2035' => 50,  # C6 2.9TB 160GB, rc, log
'db2041' => 100, # C6 2.9TB 160GB, api
-   'db2049' => 400, # C6 2.9TB 160GB, #temporary rc #T174509
-   # 'db2056' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#innodb compressed #T174509
-   'db2063' => 100, # D6 3.3TB 160GB, api #temporary vslow #T174509
+   'db2049' => 400, # C6 2.9TB 160GB,
+   'db2056' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#innodb compressed
+   'db2063' => 100, # D6 3.3TB 160GB, api
'db2064' => 400, # D6 3.3TB 160GB
],
/* s3 */ 'DEFAULT' => [
@@ -274,25 +274,25 @@
],
's2' => [
'watchlist' => [
-   'db2049' => 1,
+   'db2035' => 1,
],
'recentchanges' => [
-   'db2049' => 1,
+   'db2035' => 1,
],
'recentchangeslinked' => [
-   'db2049' => 1,
+   'db2035' => 1,
],
'contributions' => [
-   'db2049' => 1,
+   'db2035' => 1,
],
'logpager' => [
-   'db2049' => 1,
+   'db2035' => 1,
],
'dump' => [
-   'db2063' => 1,
+   'db2056' => 1,
],
'vslow' => [
-   'db2063' => 1,
+   'db2056' => 1,
],
'api' => [
'db2041' => 1,

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

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

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

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


Revert "db-eqiad.php: Depool db1097"

This reverts commit 79f9a57f8e2cefa0998298274edc8a9229c57864.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 9e18c80..943e452 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -135,10 +135,10 @@
'db1053' => 1,   # A2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1056' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1064' => 0,   # D1 2.8TB 160GB, vslow, dump #Master for 
db1095 - new sanitarium
-   'db1081' => 200, # A2 3.6TB 512GB, api #a bit less weight 
T174509
+   'db1081' => 300, # A2 3.6TB 512GB, api
'db1084' => 500, # B1 3.6TB 512GB
'db1091' => 500, # D2 3.6TB 512GB
-   # 'db1097' => 1,   # D1 3.6TB 512GB, api, old master #T174509
+   'db1097' => 1,   # D1 3.6TB 512GB, api, old master
],
's5' => [
'db1063' => 0,   # C5 2.8TB 128GB, master
@@ -335,7 +335,7 @@
],
'api' => [
'db1081' => 1,
-   # 'db1097' => 3,
+   'db1097' => 3,
],
'watchlist' => [
'db1053' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0edf05532fba77f222d45fe287c03f99f4148f93
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] wikimedia...dash[master]: Update links in donation age widget

2017-10-04 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382362 )

Change subject: Update links in donation age widget
..

Update links in donation age widget

Grafana, not ganglia

Change-Id: Id560d6540f869456ca814cbb9e5c95020db4ce80
---
M src/components/widgets/donation-age/donation-age.html
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/62/382362/1

diff --git a/src/components/widgets/donation-age/donation-age.html 
b/src/components/widgets/donation-age/donation-age.html
index 86cdb94..af3a6aa 100644
--- a/src/components/widgets/donation-age/donation-age.html
+++ b/src/components/widgets/donation-age/donation-age.html
@@ -12,7 +12,8 @@
Average age of last 10 donations
Initial: 
Civi: 
-   https://ganglia.wikimedia.org/latest/graph_all_periods.php?c=Fundraising%20eqiad=frqueue1001.frack.eqiad.wmnet=2hr=small===Donations%20Queue=messages=large;
 >donation queue graphs
+   https://grafana.wikimedia.org/dashboard/db/fundraising-redis; >donation 
queue graphs
+   https://grafana.wikimedia.org/dashboard/db/fundraising-database; 
>database activity graphs


 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id560d6540f869456ca814cbb9e5c95020db4ce80
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
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] mediawiki...VisualEditor[master]: Make sure content is set

2017-10-04 Thread DLynch (Code Review) 
DLynch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382359 )

Change subject: Make sure content is set
..

Make sure content is set

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


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 96bb561..12df277 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -581,7 +581,7 @@
];
if ( $params['paction'] === 'parse' ||
 $params['paction'] === 'wikitext' ||
-( !empty( $params['preload'] ) && 
$content )
+( !empty( $params['preload'] ) && 
isset( $content ) )
) {
$result['content'] = $content;
}

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Move composer-php70-docker out of experimental

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382361 )

Change subject: Move composer-php70-docker out of experimental
..

Move composer-php70-docker out of experimental

All repositories using it currently pass.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/61/382361/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 80929c7..3c3b0de 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1165,9 +1165,8 @@
 gate-and-submit: 
   - composer-php55-jessie
   - composer-hhvm-jessie
-gate-and-submit-swat: *composer-test-gate-and-submit
-experimental:
   - composer-php70-docker
+gate-and-submit-swat: *composer-test-gate-and-submit
 
   - name: mwgate-composer
 check:

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add php7.0-curl to php image

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

Change subject: Add php7.0-curl to php image
..


Add php7.0-curl to php image

Change-Id: I5077183907930476b866c254ea018cbb1dbe34f0
---
M dockerfiles/php/Dockerfile
M jjb/mediawiki.yaml
M jjb/php.yaml
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/dockerfiles/php/Dockerfile b/dockerfiles/php/Dockerfile
index 47a60c6..b547e5f 100644
--- a/dockerfiles/php/Dockerfile
+++ b/dockerfiles/php/Dockerfile
@@ -6,7 +6,7 @@
 # Needed for composer to install things from dist
 php7.0-zip \
 # Needed by libraries/MediaWiki
-php-ast php7.0-dba php7.0-mbstring php-redis php7.0-xml && \
+php-ast php7.0-curl php7.0-dba php7.0-mbstring php-redis php7.0-xml && 
\
 apt-get clean && rm -rf /var/lib/apt/lists/*
 
 USER nobody
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 0a5f8db..259d6db 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -404,7 +404,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/mediawiki-phpcs:v2017.10.05.02.56'
+image: 'wmfreleng/mediawiki-phpcs:v2017.10.05.05.29'
 logdir: '/log'
 publishers:
  - checkstyle:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index db1b8e9..918025c 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -141,7 +141,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/composer-package:v2017.10.05.02.56'
+image: 'wmfreleng/composer-package:v2017.10.05.05.29'
 logdir: '/log'
 
 - job:
@@ -158,7 +158,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/composer-test:v2017.10.05.03.56'
+image: 'wmfreleng/composer-test:v2017.10.05.05.29'
 logdir: '/log'
 
 # Couple jobs with a {name} prefix

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

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

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

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

2017-10-04 Thread Marostegui (Code Review) 
Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


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

Revert "db-eqiad.php: Depool db1097"

This reverts commit 79f9a57f8e2cefa0998298274edc8a9229c57864.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 7e33bd6..2c32f73 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -135,10 +135,10 @@
'db1053' => 1,   # A2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1056' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1064' => 0,   # D1 2.8TB 160GB, vslow, dump #Master for 
db1095 - new sanitarium
-   'db1081' => 200, # A2 3.6TB 512GB, api #a bit less weight 
T174509
+   'db1081' => 300, # A2 3.6TB 512GB, api
'db1084' => 500, # B1 3.6TB 512GB
'db1091' => 500, # D2 3.6TB 512GB
-   # 'db1097' => 1,   # D1 3.6TB 512GB, api, old master #T174509
+   'db1097' => 1,   # D1 3.6TB 512GB, api, old master
],
's5' => [
'db1063' => 0,   # C5 2.8TB 128GB, master
@@ -334,7 +334,7 @@
],
'api' => [
'db1081' => 1,
-   # 'db1097' => 3,
+   'db1097' => 3,
],
'watchlist' => [
'db1053' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0edf05532fba77f222d45fe287c03f99f4148f93
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] integration/config[master]: Add php7.0-curl to php image

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382358 )

Change subject: Add php7.0-curl to php image
..

Add php7.0-curl to php image

Change-Id: I5077183907930476b866c254ea018cbb1dbe34f0
---
M dockerfiles/php/Dockerfile
M jjb/mediawiki.yaml
M jjb/php.yaml
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/58/382358/1

diff --git a/dockerfiles/php/Dockerfile b/dockerfiles/php/Dockerfile
index 47a60c6..b547e5f 100644
--- a/dockerfiles/php/Dockerfile
+++ b/dockerfiles/php/Dockerfile
@@ -6,7 +6,7 @@
 # Needed for composer to install things from dist
 php7.0-zip \
 # Needed by libraries/MediaWiki
-php-ast php7.0-dba php7.0-mbstring php-redis php7.0-xml && \
+php-ast php7.0-curl php7.0-dba php7.0-mbstring php-redis php7.0-xml && 
\
 apt-get clean && rm -rf /var/lib/apt/lists/*
 
 USER nobody
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 0a5f8db..259d6db 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -404,7 +404,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/mediawiki-phpcs:v2017.10.05.02.56'
+image: 'wmfreleng/mediawiki-phpcs:v2017.10.05.05.29'
 logdir: '/log'
 publishers:
  - checkstyle:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index db1b8e9..918025c 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -141,7 +141,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/composer-package:v2017.10.05.02.56'
+image: 'wmfreleng/composer-package:v2017.10.05.05.29'
 logdir: '/log'
 
 - job:
@@ -158,7 +158,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/composer-test:v2017.10.05.03.56'
+image: 'wmfreleng/composer-test:v2017.10.05.05.29'
 logdir: '/log'
 
 # Couple jobs with a {name} prefix

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Extension:DynamicPageList to Turkish Witionary

2017-10-04 Thread Jayprakash12345 (Code Review) 
Jayprakash12345 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382357 )

Change subject: Enable Extension:DynamicPageList to Turkish Witionary
..

Enable Extension:DynamicPageList to Turkish Witionary

Change-Id: Ie5afef550b99e1fafa126773178cd5c1764c81f9
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/57/382357/2

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b8d8d87..5ca991d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12109,6 +12109,7 @@
'srwiktionary' => true, // T70346
'strategywiki' => true,
'viwiktionary' => true, // T10886
+   'trwiktionary' => true, // T177448
 ],
 
 'wmgUseFloatedToc' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5afef550b99e1fafa126773178cd5c1764c81f9
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
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...BlueSpiceExtensions[master]: Update maintenance scipts to use $this->requireExtension

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

Change subject: Update maintenance scipts to use $this->requireExtension
..


Update maintenance scipts to use $this->requireExtension

BUG: T152139
Change-Id: I2231367ae72c0844f2ad2ae5bdcc2b20669d543a
---
M Avatars/maintenance/CreateAvatarHTML.php
M Dashboards/maintenance/clearConfigs.php
M ExtendedSearch/maintenance/searchAddToIndex.php
M ExtendedSearch/maintenance/searchDeleteIndex.php
M ExtendedSearch/maintenance/searchUpdate.php
M UsageTracker/maintenance/usageTrackerUpdate.php
6 files changed, 19 insertions(+), 1 deletion(-)

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



diff --git a/Avatars/maintenance/CreateAvatarHTML.php 
b/Avatars/maintenance/CreateAvatarHTML.php
index f3cc05f..504197f 100644
--- a/Avatars/maintenance/CreateAvatarHTML.php
+++ b/Avatars/maintenance/CreateAvatarHTML.php
@@ -12,6 +12,8 @@
$this->mDescription = "Create HTML with links 
to Avatars";
#$this->addArg( "username", "Username of new 
user" );
#$this->addArg( "password", "Password to set 
(not required if --force is used)", false);
+   $this->requireExtension( 'BlueSpiceExtensions' 
);
+   $this->requireExtension( 'BlueSpiceFoundation' 
);
}
 
public function execute() {
diff --git a/Dashboards/maintenance/clearConfigs.php 
b/Dashboards/maintenance/clearConfigs.php
index 324cb34..e19be2f 100644
--- a/Dashboards/maintenance/clearConfigs.php
+++ b/Dashboards/maintenance/clearConfigs.php
@@ -3,6 +3,12 @@
 require_once( dirname(dirname(dirname(dirname(__DIR__ . 
'/maintenance/Maintenance.php' );
 
 class BSDashBoardsClearConfigMaintenance extends LoggedUpdateMaintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->requireExtension( 'BlueSpiceExtensions' );
+   $this->requireExtension( 'BlueSpiceFoundation' );
+   }
+
public function doDBUpdates() {
$aFinalPortletList = array();
$aPortlets = array();
diff --git a/ExtendedSearch/maintenance/searchAddToIndex.php 
b/ExtendedSearch/maintenance/searchAddToIndex.php
index 2395b00..d4340f2 100644
--- a/ExtendedSearch/maintenance/searchAddToIndex.php
+++ b/ExtendedSearch/maintenance/searchAddToIndex.php
@@ -10,6 +10,7 @@
public function __construct() {
parent::__construct();
$this->addOption( 'input', 'plain text list of article names ( 
NS:Title )', true, true );
+   $this->requireExtension( 'BlueSpiceExtensions' );
}
 
/**
diff --git a/ExtendedSearch/maintenance/searchDeleteIndex.php 
b/ExtendedSearch/maintenance/searchDeleteIndex.php
index 0ef3dce..b2761f8 100644
--- a/ExtendedSearch/maintenance/searchDeleteIndex.php
+++ b/ExtendedSearch/maintenance/searchDeleteIndex.php
@@ -15,7 +15,8 @@
 
public function __construct() {
parent::__construct();
-
+   $this->requireExtension( 'BlueSpiceExtensions' );
+   $this->requireExtension( 'BlueSpiceFoundation' );
$this->addOption( 'param', 'Specific param to delete', false, 
true );
}
 
diff --git a/ExtendedSearch/maintenance/searchUpdate.php 
b/ExtendedSearch/maintenance/searchUpdate.php
index 5a6fa9f..d7ea035 100644
--- a/ExtendedSearch/maintenance/searchUpdate.php
+++ b/ExtendedSearch/maintenance/searchUpdate.php
@@ -17,6 +17,10 @@
 require_once( $IP.'/BlueSpiceFoundation/maintenance/BSMaintenance.php' );
 
 class SearchUpdate extends BSMaintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->requireExtension( 'BlueSpiceExtensions' );
+   }
 
public function execute() {
$oSearchService = SearchService::getInstance();
diff --git a/UsageTracker/maintenance/usageTrackerUpdate.php 
b/UsageTracker/maintenance/usageTrackerUpdate.php
index 1495223..4674925 100644
--- a/UsageTracker/maintenance/usageTrackerUpdate.php
+++ b/UsageTracker/maintenance/usageTrackerUpdate.php
@@ -17,6 +17,10 @@
 require_once( $IP.'/BlueSpiceFoundation/maintenance/BSMaintenance.php' );
 
 class UsageTrackerUpdate extends BSMaintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->requireExtension( 'BlueSpiceExtensions' );
+   }
 
public function execute() {
$aData = BsExtensionManager::getExtension( 'UsageTracker' 
)->getUsageData();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2231367ae72c0844f2ad2ae5bdcc2b20669d543a
Gerrit-PatchSet: 5
Gerrit-Project:

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Apex theme: Fix SelectFileWidget (no browser support)‎ `padd...

2017-10-04 Thread VolkerE (Code Review) 
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382356 )

Change subject: Apex theme: Fix SelectFileWidget (no browser support)‎ `padding`
..

Apex theme: Fix SelectFileWidget (no browser support)‎ `padding`

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


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/382356/1

diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 6094c78..01da8a3 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -1007,7 +1007,7 @@
}
}
 
-   &-notsupported {
+   &-notsupported.oo-ui-selectFileWidget-dropTarget {
.oo-ui-selectFileWidget-label {
padding: 1em;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia06a59ecc5462c289489540cf599cc2900a0aafa
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/puppet[production]: start profile for wikiba.se web hosting

2017-10-04 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382355 )

Change subject: start profile for wikiba.se web hosting
..

start profile for wikiba.se web hosting

Bug: T99531
Change-Id: I3f9ca490788a52513ed4b89e17430706615a40f4
---
A modules/profile/manifests/microsites/wikibase.pp
A modules/profile/templates/wikibase/apache-wikibase.erb
A modules/role/manifests/wikibase.pp
3 files changed, 62 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/382355/1

diff --git a/modules/profile/manifests/microsites/wikibase.pp 
b/modules/profile/manifests/microsites/wikibase.pp
new file mode 100644
index 000..1136341
--- /dev/null
+++ b/modules/profile/manifests/microsites/wikibase.pp
@@ -0,0 +1,28 @@
+# https://wikiba.se (T99531)
+class profile::microsites::wikibase {
+
+include ::base::firewall
+
+ferm::service { 'wikibase_http':
+proto => 'tcp',
+port  => '80',
+}
+
+class { '::apache': }
+class { '::apache::mod::headers': }
+
+apache::site { 'wikiba.se':
+   content  => template('profile/wikibase/apache-wikibase.erb'),
+}
+
+ensure_resource('file', '/srv/org', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikibase', {'ensure' => 'directory' })
+
+git::clone { 'wikibase/wikibase.se':
+ensure=> 'latest', # TODO: talk about latest vs. present
+directory => '/srv/org/wikibase',
+branch=> 'master', # are we using master to deploy?
+}
+
+}
+
diff --git a/modules/profile/templates/wikibase/apache-wikibase.erb 
b/modules/profile/templates/wikibase/apache-wikibase.erb
new file mode 100644
index 000..66b5b14
--- /dev/null
+++ b/modules/profile/templates/wikibase/apache-wikibase.erb
@@ -0,0 +1,23 @@
+
+ServerName <%= @server_name %>
+ServerAdmin <%= @server_admin %>
+DocumentRoot /srv/org/wikibase/
+
+ServerSignature On
+
+LogLevel warn
+ErrorLog /var/log/apache2/<%= @server_name %>.error.log
+CustomLog /var/log/apache2/<%= @server_name %>.access.log wmf
+
+
+Options FollowSymLinks
+AllowOverride None
+
+
+
+Options Indexes FollowSymLinks MultiViews
+AllowOverride None
+Require all granted
+
+
+
diff --git a/modules/role/manifests/wikibase.pp 
b/modules/role/manifests/wikibase.pp
new file mode 100644
index 000..d3894fd
--- /dev/null
+++ b/modules/role/manifests/wikibase.pp
@@ -0,0 +1,11 @@
+# wikiba.se (T99531)
+class role::wikibase {
+
+include ::standard
+
+include ::profile::microsites::wikibase# upcoming https://wikiba.se
+
+system::role { 'wikibase':
+description => 'https://wikiba.se'
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f9ca490788a52513ed4b89e17430706615a40f4
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] integration/config[master]: Port composer-php70 job to docker

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

Change subject: Port composer-php70 job to docker
..


Port composer-php70 job to docker

Change-Id: I58b74bd5e350f2c3a696f0902a1fe8c4ef0cdfa2
---
A dockerfiles/composer-test/Dockerfile
A dockerfiles/composer-test/example-run.sh
A dockerfiles/composer-test/run.sh
M jjb/php.yaml
M zuul/layout.yaml
5 files changed, 48 insertions(+), 1 deletion(-)

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



diff --git a/dockerfiles/composer-test/Dockerfile 
b/dockerfiles/composer-test/Dockerfile
new file mode 100644
index 000..1af5c3e
--- /dev/null
+++ b/dockerfiles/composer-test/Dockerfile
@@ -0,0 +1,5 @@
+FROM wmfreleng/composer:latest
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-test/example-run.sh 
b/dockerfiles/composer-test/example-run.sh
new file mode 100644
index 000..a9b3a36
--- /dev/null
+++ b/dockerfiles/composer-test/example-run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+install --mode 777 --directory log
+docker run \
+--rm --tty \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=integration/jenkins \
+--env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \
+--env ZUUL_REF=refs/changes/31/316231/4 \
+--volume /$(pwd)/log://var/lib/jenkins/log \
+ wmfreleng/composer-test:latest
diff --git a/dockerfiles/composer-test/run.sh b/dockerfiles/composer-test/run.sh
new file mode 100644
index 000..cc5962e
--- /dev/null
+++ b/dockerfiles/composer-test/run.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+cd /src
+
+git init
+git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
+git checkout FETCH_HEAD
+git submodule --quiet update --init --recursive
+
+composer --ansi validate --no-check-publish
+composer install --no-progress
+composer test
diff --git a/jjb/php.yaml b/jjb/php.yaml
index d9b08ba..db1b8e9 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -144,6 +144,23 @@
 image: 'wmfreleng/composer-package:v2017.10.05.02.56'
 logdir: '/log'
 
+- job:
+name: 'composer-php70-docker'
+node: DebianJessieDocker
+concurrent: true
+properties:
+ - build-discarder:
+ days-to-keep: 15
+triggers:
+ - zuul
+builders:
+ - docker-zuul-env
+ - docker-log-dir
+ - docker-cache-dir
+ - docker-run-with-log-and-workspace-cache:
+image: 'wmfreleng/composer-test:v2017.10.05.03.56'
+logdir: '/log'
+
 # Couple jobs with a {name} prefix
 - job-template:
 !!merge : *job_composer-phpflavor-image
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 69a0d10..80929c7 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1167,7 +1167,7 @@
   - composer-hhvm-jessie
 gate-and-submit-swat: *composer-test-gate-and-submit
 experimental:
-  - composer-php70-jessie
+  - composer-php70-docker
 
   - name: mwgate-composer
 check:

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Port composer-php70 job to docker

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382354 )

Change subject: Port composer-php70 job to docker
..

Port composer-php70 job to docker

Change-Id: I58b74bd5e350f2c3a696f0902a1fe8c4ef0cdfa2
---
A dockerfiles/composer-test/Dockerfile
A dockerfiles/composer-test/example-run.sh
A dockerfiles/composer-test/run.sh
M jjb/php.yaml
M zuul/layout.yaml
5 files changed, 48 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/54/382354/1

diff --git a/dockerfiles/composer-test/Dockerfile 
b/dockerfiles/composer-test/Dockerfile
new file mode 100644
index 000..1af5c3e
--- /dev/null
+++ b/dockerfiles/composer-test/Dockerfile
@@ -0,0 +1,5 @@
+FROM wmfreleng/composer:latest
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-test/example-run.sh 
b/dockerfiles/composer-test/example-run.sh
new file mode 100644
index 000..a9b3a36
--- /dev/null
+++ b/dockerfiles/composer-test/example-run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+install --mode 777 --directory log
+docker run \
+--rm --tty \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=integration/jenkins \
+--env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \
+--env ZUUL_REF=refs/changes/31/316231/4 \
+--volume /$(pwd)/log://var/lib/jenkins/log \
+ wmfreleng/composer-test:latest
diff --git a/dockerfiles/composer-test/run.sh b/dockerfiles/composer-test/run.sh
new file mode 100644
index 000..cc5962e
--- /dev/null
+++ b/dockerfiles/composer-test/run.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+cd /src
+
+git init
+git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
+git checkout FETCH_HEAD
+git submodule --quiet update --init --recursive
+
+composer --ansi validate --no-check-publish
+composer install --no-progress
+composer test
diff --git a/jjb/php.yaml b/jjb/php.yaml
index d9b08ba..db1b8e9 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -144,6 +144,23 @@
 image: 'wmfreleng/composer-package:v2017.10.05.02.56'
 logdir: '/log'
 
+- job:
+name: 'composer-php70-docker'
+node: DebianJessieDocker
+concurrent: true
+properties:
+ - build-discarder:
+ days-to-keep: 15
+triggers:
+ - zuul
+builders:
+ - docker-zuul-env
+ - docker-log-dir
+ - docker-cache-dir
+ - docker-run-with-log-and-workspace-cache:
+image: 'wmfreleng/composer-test:v2017.10.05.03.56'
+logdir: '/log'
+
 # Couple jobs with a {name} prefix
 - job-template:
 !!merge : *job_composer-phpflavor-image
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 69a0d10..80929c7 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1167,7 +1167,7 @@
   - composer-hhvm-jessie
 gate-and-submit-swat: *composer-test-gate-and-submit
 experimental:
-  - composer-php70-jessie
+  - composer-php70-docker
 
   - name: mwgate-composer
 check:

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add sanity checking example-run.sh for composer image

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382352 )

Change subject: Add sanity checking example-run.sh for composer image
..

Add sanity checking example-run.sh for composer image

Change-Id: I691eb6a43dd0d513b4da10d6da2bcaad6a9d691e
---
A dockerfiles/composer/example-run.sh
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/52/382352/1

diff --git a/dockerfiles/composer/example-run.sh 
b/dockerfiles/composer/example-run.sh
new file mode 100644
index 000..8ec8815
--- /dev/null
+++ b/dockerfiles/composer/example-run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export output=`docker run --rm --tty wmfreleng/composer:latest --version 
--no-ansi`
+echo $output | grep "Composer version"

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Generalize icon and indicator positioning & visibility

2017-10-04 Thread VolkerE (Code Review) 
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382353 )

Change subject: Generalize icon and indicator positioning & visibility
..

Generalize icon and indicator positioning & visibility

Generalizing icon and indicator positioning & visibility
foremost in WikimediaUI theme.

Bug: T161177

Change-Id: I9d0cbf5d069ae0ecdb56501fb6f352ba68d29c1f
---
M src/styles/elements/ButtonElement.less
M src/styles/elements/IconElement.less
M src/styles/elements/IndicatorElement.less
M src/styles/layouts/FieldsetLayout.less
M src/styles/toolgroups/BarToolGroup.less
M src/styles/toolgroups/PopupToolGroup.less
M src/styles/widgets/ButtonOptionWidget.less
M src/styles/widgets/CapsuleMultiselectWidget.less
M src/styles/widgets/DecoratedOptionWidget.less
M src/styles/widgets/DropdownWidget.less
M src/styles/widgets/SelectFileWidget.less
M src/styles/widgets/TextInputWidget.less
M src/themes/apex/elements.less
M src/themes/apex/layouts.less
M src/themes/apex/tools.less
M src/themes/apex/widgets.less
M src/themes/wikimediaui/elements.less
M src/themes/wikimediaui/layouts.less
M src/themes/wikimediaui/tools.less
M src/themes/wikimediaui/widgets.less
20 files changed, 127 insertions(+), 154 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/53/382353/1

diff --git a/src/styles/elements/ButtonElement.less 
b/src/styles/elements/ButtonElement.less
index 67524b9..c89263b 100644
--- a/src/styles/elements/ButtonElement.less
+++ b/src/styles/elements/ButtonElement.less
@@ -20,23 +20,10 @@
border-color: transparent;
padding: 0;
}
-
-   > .oo-ui-iconElement-icon,
-   > .oo-ui-indicatorElement-indicator {
-   display: none;
-   }
}
 
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
cursor: default;
-   }
-
-   &.oo-ui-indicatorElement > .oo-ui-buttonElement-button > 
.oo-ui-indicatorElement-indicator,
-   &.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label,
-   &-frameless.oo-ui-iconElement > .oo-ui-buttonElement-button > 
.oo-ui-iconElement-icon {
-   // Vertical align text
-   display: inline-block;
-   vertical-align: middle;
}
 
&-frameless {
diff --git a/src/styles/elements/IconElement.less 
b/src/styles/elements/IconElement.less
index 120454b..a7bdc13 100644
--- a/src/styles/elements/IconElement.less
+++ b/src/styles/elements/IconElement.less
@@ -6,12 +6,15 @@
background-size: contain;
background-position: center center;
background-repeat: no-repeat;
+   display: none;
+   position: absolute;
+   top: 0;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
min-width: @min-size-icon;
width: @size-icon;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
min-height: @min-size-icon;
-   height: @size-icon;
+   height: 100%;
}
 
.theme-oo-ui-iconElement();
diff --git a/src/styles/elements/IndicatorElement.less 
b/src/styles/elements/IndicatorElement.less
index b4a6a6d..9819345 100644
--- a/src/styles/elements/IndicatorElement.less
+++ b/src/styles/elements/IndicatorElement.less
@@ -6,12 +6,15 @@
background-size: contain;
background-position: center center;
background-repeat: no-repeat;
+   display: none;
+   position: absolute;
+   top: 0;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
min-width: @min-size-indicator;
width: @size-indicator;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
min-height: @min-size-indicator;
-   height: @size-indicator;
+   height: 100%;
}
 
.theme-oo-ui-indicatorElement();
diff --git a/src/styles/layouts/FieldsetLayout.less 
b/src/styles/layouts/FieldsetLayout.less
index aaee46b..8d8e8e1 100644
--- a/src/styles/layouts/FieldsetLayout.less
+++ b/src/styles/layouts/FieldsetLayout.less
@@ -11,11 +11,6 @@
display: table-cell; // Prevent overflowing content in Firefox 
(responsive layouts)
}
 
-   &.oo-ui-iconElement > .oo-ui-fieldsetLayout-header > 
.oo-ui-iconElement-icon {
-   display: block;
-   position: absolute;
-   }
-
&.oo-ui-labelElement > .oo-ui-fieldsetLayout-header {
color: inherit; // Correct the color inheritance from 
`fieldset` elements in IE
display: inline-table; // Correct the text wrapping in Edge and 
IE
diff --git a/src/styles/toolgroups/BarToolGroup.less

[MediaWiki-commits] [Gerrit] operations/puppet[production]: annualreport: rm module, merge into profile, fix style

2017-10-04 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382351 )

Change subject: annualreport: rm module, merge into profile, fix style
..

annualreport: rm module, merge into profile, fix style

Change-Id: I381a9714e2bcaf996072679d57de27dd1fec0404
---
D modules/annualreport/manifests/init.pp
R modules/profile/files/annualreport/15.wikipedia.org
R modules/profile/files/annualreport/annual.wikimedia.org
M modules/profile/manifests/microsites/annualreport.pp
4 files changed, 18 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/382351/1

diff --git a/modules/annualreport/manifests/init.pp 
b/modules/annualreport/manifests/init.pp
deleted file mode 100644
index bd82d14..000
--- a/modules/annualreport/manifests/init.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# sets up the WMF annual report site - https://annual.wikimedia.org/
-# T599 - https://15.wikipedia.org (aka. annual report 2015)
-class annualreport {
-
-include ::apache
-include ::apache::mod::headers
-
-apache::site { 'annual.wikimedia.org':
-source => 'puppet:///modules/annualreport/annual.wikimedia.org',
-}
-
-apache::site { '15.wikipedia.org':
-source => 'puppet:///modules/annualreport/15.wikipedia.org',
-}
-
-git::clone { 'wikimedia/annualreport':
-ensure=> 'latest',
-directory => '/srv/org/wikimedia/annualreport',
-branch=> 'master',
-}
-}
diff --git a/modules/annualreport/files/15.wikipedia.org 
b/modules/profile/files/annualreport/15.wikipedia.org
similarity index 100%
rename from modules/annualreport/files/15.wikipedia.org
rename to modules/profile/files/annualreport/15.wikipedia.org
diff --git a/modules/annualreport/files/annual.wikimedia.org 
b/modules/profile/files/annualreport/annual.wikimedia.org
similarity index 100%
rename from modules/annualreport/files/annual.wikimedia.org
rename to modules/profile/files/annualreport/annual.wikimedia.org
diff --git a/modules/profile/manifests/microsites/annualreport.pp 
b/modules/profile/manifests/microsites/annualreport.pp
index 232e361..3895a0e 100644
--- a/modules/profile/manifests/microsites/annualreport.pp
+++ b/modules/profile/manifests/microsites/annualreport.pp
@@ -1,9 +1,8 @@
+# sets up the WMF annual report site
 # https://annual.wikimedia.org/
-# microsite for the WMF annual report
 # http://wikimediafoundation.org/wiki/Annual_Report
+# T599 - https://15.wikipedia.org (aka. annual report 2015)
 class profile::microsites::annualreport {
-
-include ::annualreport
 
 include ::base::firewall
 
@@ -12,5 +11,21 @@
 port  => '80',
 }
 
+class { '::apache': }
+class { '::apache::mod::headers': }
+
+apache::site { 'annual.wikimedia.org':
+source => 'puppet:///modules/annualreport/annual.wikimedia.org',
+}
+
+apache::site { '15.wikipedia.org':
+source => 'puppet:///modules/annualreport/15.wikipedia.org',
+}
+
+git::clone { 'wikimedia/annualreport':
+ensure=> 'latest',
+directory => '/srv/org/wikimedia/annualreport',
+branch=> 'master',
+}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Parse linter-category-{name}-desc messages

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

Change subject: Parse linter-category-{name}-desc messages
..


Parse linter-category-{name}-desc messages

Bug: T177429
Change-Id: I3f36b27fee877122d3df3c68b3aa9515412f6869
---
M includes/SpecialLintErrors.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/SpecialLintErrors.php b/includes/SpecialLintErrors.php
index 5ff407a..2f33fab 100644
--- a/includes/SpecialLintErrors.php
+++ b/includes/SpecialLintErrors.php
@@ -47,7 +47,7 @@
];
$form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form->setWrapperLegend( true );
-   $form->addHeaderText( $this->msg( 
"linter-category-{$this->category}-desc" )->escaped() );
+   $form->addHeaderText( $this->msg( 
"linter-category-{$this->category}-desc" )->parse() );
$form->setMethod( 'get' );
$form->prepareForm()->displayForm( false );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f36b27fee877122d3df3c68b3aa9515412f6869
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Quiddity 
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] marvin[master]: Update: add initial page models and unmarshallers

2017-10-04 Thread Niedzielski (Code Review) 
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382350 )

Change subject: Update: add initial page models and unmarshallers
..

Update: add initial page models and unmarshallers

- Add page models and unmarshallers. These can and probably need to be
  tightened up more but we also need to iterate. The API is hairy.

- Stop linting *.test.json. MCS JSON responses may contain unescaped
  control characters which causes the JSON plugin to fail with "error:
  This character may get silently deleted by one or more browsers;
  bad-json". The plugin does not appear to respect the rule severity
  setting so it cannot be individually disabled.

- Update PageSummary model to leverage the common parts of Page.

- Rename summary input and expected result JSON files to conform to new
  convention.

- Update summary BASE_URL to conform to new convention.

Bug: T173321
Change-Id: Ide7ce6567ca188534b55786833f1889e2cee3dbf
---
M .eslintignore
M src/common/data-clients/page-summary-data-client.ts
A src/common/marshallers/page-body-expected.test.json
A src/common/marshallers/page-body-restbase.test.json
A src/common/marshallers/page-expected.test.json
A src/common/marshallers/page-lead-expected.test.json
A src/common/marshallers/page-lead-restbase.test.json
A src/common/marshallers/page-restbase.test.json
R src/common/marshallers/page-summary-expected.test.json
R src/common/marshallers/page-summary-restbase.test.json
M src/common/marshallers/page-unmarshaller.test.ts
M src/common/marshallers/page-unmarshaller.ts
M src/common/marshallers/restbase.ts
M src/common/models/page/image.ts
A src/common/models/page/page-base.ts
A src/common/models/page/page.ts
M src/common/models/page/summary.ts
A src/common/models/page/user.ts
18 files changed, 2,778 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/50/382350/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide7ce6567ca188534b55786833f1889e2cee3dbf
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Parse linter-category-{name}-desc messages

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382349 )

Change subject: Parse linter-category-{name}-desc messages
..

Parse linter-category-{name}-desc messages

Bug: T177429
Change-Id: I3f36b27fee877122d3df3c68b3aa9515412f6869
---
M includes/SpecialLintErrors.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/SpecialLintErrors.php b/includes/SpecialLintErrors.php
index 5ff407a..2f33fab 100644
--- a/includes/SpecialLintErrors.php
+++ b/includes/SpecialLintErrors.php
@@ -47,7 +47,7 @@
];
$form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form->setWrapperLegend( true );
-   $form->addHeaderText( $this->msg( 
"linter-category-{$this->category}-desc" )->escaped() );
+   $form->addHeaderText( $this->msg( 
"linter-category-{$this->category}-desc" )->parse() );
$form->setMethod( 'get' );
$form->prepareForm()->displayForm( false );
}

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump composer-package and mediawiki-phpcs images

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

Change subject: Bump composer-package and mediawiki-phpcs images
..


Bump composer-package and mediawiki-phpcs images

Change-Id: I38fd22405089bc4a7939d39129f1df6aec68e9f6
---
M jjb/mediawiki.yaml
M jjb/php.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index ee9f918..0a5f8db 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -404,7 +404,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/mediawiki-phpcs:v2017.10.02.17.12'
+image: 'wmfreleng/mediawiki-phpcs:v2017.10.05.02.56'
 logdir: '/log'
 publishers:
  - checkstyle:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 9f36cb8..d9b08ba 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -141,7 +141,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/composer-package:v2017.10.03.06.57'
+image: 'wmfreleng/composer-package:v2017.10.05.02.56'
 logdir: '/log'
 
 # Couple jobs with a {name} prefix

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Merge php-mediawiki image into php

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

Change subject: Merge php-mediawiki image into php
..


Merge php-mediawiki image into php

The only addition php-mediawiki has is some additional PHP extensions
which are cheap to include in the base image.

The only direct usage of the "php" image was for the composer image,
but even that was wrong since it didn't include the php-zip extension.

Change-Id: I0bb7ff9a6056d9e77430e65b61bb63b6fd80e3da
---
M dockerfiles/composer-package/Dockerfile
M dockerfiles/mediawiki-phan/Dockerfile
M dockerfiles/mediawiki-phpcs/Dockerfile
D dockerfiles/php-mediawiki/Dockerfile
M dockerfiles/php/Dockerfile
5 files changed, 8 insertions(+), 17 deletions(-)

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



diff --git a/dockerfiles/composer-package/Dockerfile 
b/dockerfiles/composer-package/Dockerfile
index b53b5a3..cba7caf 100644
--- a/dockerfiles/composer-package/Dockerfile
+++ b/dockerfiles/composer-package/Dockerfile
@@ -1,6 +1,6 @@
 FROM wmfreleng/composer:latest as composer
 
-FROM wmfreleng/php-mediawiki:latest
+FROM wmfreleng/php:latest
 
 USER root
 
diff --git a/dockerfiles/mediawiki-phan/Dockerfile 
b/dockerfiles/mediawiki-phan/Dockerfile
index bf8745a..4785271 100644
--- a/dockerfiles/mediawiki-phan/Dockerfile
+++ b/dockerfiles/mediawiki-phan/Dockerfile
@@ -1,6 +1,6 @@
 FROM wmfreleng/composer:latest as composer
 
-FROM wmfreleng/php-mediawiki:latest
+FROM wmfreleng/php:latest
 
 USER root
 
diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile 
b/dockerfiles/mediawiki-phpcs/Dockerfile
index 2f1edf1..526dc15 100644
--- a/dockerfiles/mediawiki-phpcs/Dockerfile
+++ b/dockerfiles/mediawiki-phpcs/Dockerfile
@@ -1,6 +1,6 @@
 FROM wmfreleng/composer:latest as composer
 
-FROM wmfreleng/php-mediawiki:latest
+FROM wmfreleng/php:latest
 
 USER root
 
diff --git a/dockerfiles/php-mediawiki/Dockerfile 
b/dockerfiles/php-mediawiki/Dockerfile
deleted file mode 100644
index 3dc5e11..000
--- a/dockerfiles/php-mediawiki/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM wmfreleng/php:latest
-
-USER root
-
-RUN apt-get update && \
-DEBIAN_FRONTEND=noninteractive apt-get install --yes 
--no-install-recommends \
-# Needed for composer to install things from dist
-php7.0-zip \
-# Needed for mediawiki
-php-ast php7.0-dba php7.0-mbstring php-redis php7.0-xml && \
-apt-get clean && rm -rf /var/lib/apt/lists/*
-
-USER nobody
diff --git a/dockerfiles/php/Dockerfile b/dockerfiles/php/Dockerfile
index 4aa62fc..47a60c6 100644
--- a/dockerfiles/php/Dockerfile
+++ b/dockerfiles/php/Dockerfile
@@ -2,7 +2,11 @@
 
 RUN apt-get update && \
 apt-get install --yes --no-install-recommends \
-php7.0-cli && \
+php7.0-cli \
+# Needed for composer to install things from dist
+php7.0-zip \
+# Needed by libraries/MediaWiki
+php-ast php7.0-dba php7.0-mbstring php-redis php7.0-xml && \
 apt-get clean && rm -rf /var/lib/apt/lists/*
 
 USER nobody

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bb7ff9a6056d9e77430e65b61bb63b6fd80e3da
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: Directly inherit from composer image

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

Change subject: docker: Directly inherit from composer image
..


docker: Directly inherit from composer image

Instead of inheriting from php and then copying in composer,
just inherit from the composer image. This also lets us take
advantage of the /usr/bin/composer symlink.

Change-Id: Iaff980df608779b986a4c626163b5659615cea49
---
M dockerfiles/composer-package/Dockerfile
M dockerfiles/composer/Dockerfile
M dockerfiles/mediawiki-phan/Dockerfile
M dockerfiles/mediawiki-phpcs/Dockerfile
M dockerfiles/mediawiki-phpcs/run.sh
5 files changed, 6 insertions(+), 22 deletions(-)

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



diff --git a/dockerfiles/composer-package/Dockerfile 
b/dockerfiles/composer-package/Dockerfile
index cba7caf..1af5c3e 100644
--- a/dockerfiles/composer-package/Dockerfile
+++ b/dockerfiles/composer-package/Dockerfile
@@ -1,11 +1,4 @@
-FROM wmfreleng/composer:latest as composer
-
-FROM wmfreleng/php:latest
-
-USER root
-
-COPY --from=composer /srv/composer /srv/composer
-RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
+FROM wmfreleng/composer:latest
 
 USER nobody
 COPY run.sh /run.sh
diff --git a/dockerfiles/composer/Dockerfile b/dockerfiles/composer/Dockerfile
index 925c585..b323a3d 100644
--- a/dockerfiles/composer/Dockerfile
+++ b/dockerfiles/composer/Dockerfile
@@ -6,6 +6,7 @@
 
 RUN git clone --depth 1 
https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \
 rm -rf /srv/composer/.git
+RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
 
 USER nobody
 ENTRYPOINT ["/srv/composer/vendor/bin/composer"]
diff --git a/dockerfiles/mediawiki-phan/Dockerfile 
b/dockerfiles/mediawiki-phan/Dockerfile
index 4785271..47fafa3 100644
--- a/dockerfiles/mediawiki-phan/Dockerfile
+++ b/dockerfiles/mediawiki-phan/Dockerfile
@@ -1,10 +1,6 @@
-FROM wmfreleng/composer:latest as composer
-
-FROM wmfreleng/php:latest
+FROM wmfreleng/composer:latest
 
 USER root
-
-COPY --from=composer /srv/composer /srv/composer
 
 RUN install -d /srv/phan -o nobody
 
@@ -13,7 +9,7 @@
 USER nobody
 
 RUN  cd /srv/phan && \
- /srv/composer/vendor/bin/composer require etsy/phan:0.8 && \
+ composer require etsy/phan:0.8 && \
  rm -rf /cache/*
 
 ENTRYPOINT ["/mediawiki/tests/phan/bin/phan"]
diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile 
b/dockerfiles/mediawiki-phpcs/Dockerfile
index 526dc15..1af5c3e 100644
--- a/dockerfiles/mediawiki-phpcs/Dockerfile
+++ b/dockerfiles/mediawiki-phpcs/Dockerfile
@@ -1,10 +1,4 @@
-FROM wmfreleng/composer:latest as composer
-
-FROM wmfreleng/php:latest
-
-USER root
-
-COPY --from=composer /srv/composer /srv/composer
+FROM wmfreleng/composer:latest
 
 USER nobody
 COPY run.sh /run.sh
diff --git a/dockerfiles/mediawiki-phpcs/run.sh 
b/dockerfiles/mediawiki-phpcs/run.sh
index 779cabb..60808be 100644
--- a/dockerfiles/mediawiki-phpcs/run.sh
+++ b/dockerfiles/mediawiki-phpcs/run.sh
@@ -6,5 +6,5 @@
 git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
 git checkout --quiet FETCH_HEAD
 
-/srv/composer/vendor/bin/composer install --no-progress
+composer install --no-progress
 ./vendor/bin/phpcs -p -s --report-full 
"--report-checkstyle=/log/checkstyle.xml"

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump composer-package and mediawiki-phpcs images

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382348 )

Change subject: Bump composer-package and mediawiki-phpcs images
..

Bump composer-package and mediawiki-phpcs images

Change-Id: I38fd22405089bc4a7939d39129f1df6aec68e9f6
---
M jjb/mediawiki.yaml
M jjb/php.yaml
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/48/382348/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index ee9f918..0a5f8db 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -404,7 +404,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/mediawiki-phpcs:v2017.10.02.17.12'
+image: 'wmfreleng/mediawiki-phpcs:v2017.10.05.02.56'
 logdir: '/log'
 publishers:
  - checkstyle:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 9f36cb8..d9b08ba 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -141,7 +141,7 @@
  - docker-log-dir
  - docker-cache-dir
  - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/composer-package:v2017.10.03.06.57'
+image: 'wmfreleng/composer-package:v2017.10.05.02.56'
 logdir: '/log'
 
 # Couple jobs with a {name} prefix

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: build.py: Improve "docker push" output

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382347 )

Change subject: build.py: Improve "docker push" output
..

build.py: Improve "docker push" output

Move it to the bottom of the script output so it's easily readable
and is only output after all the tests pass.

Change-Id: I765d4d6e0c683cc23763a9d8ca70d8039bcb3f73
---
M dockerfiles/build.py
1 file changed, 13 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/47/382347/1

diff --git a/dockerfiles/build.py b/dockerfiles/build.py
index 3edd273..5df8dfd 100755
--- a/dockerfiles/build.py
+++ b/dockerfiles/build.py
@@ -18,6 +18,9 @@
 
 class DockerBuilder(object):
 
+def __init__(self):
+self.pushes = []
+
 def run(self):
 self.parse_args()
 
@@ -33,7 +36,12 @@
 ]
 else:
 dockerfiles = self.find_docker_files()
-return all(map(self.build, dockerfiles))
+if not all(map(self.build, dockerfiles)):
+return False
+
+self.log.info('You can push the following images when ready: %s'
+  % ' && '.join('docker push %s'
+% name for name in self.pushes))
 
 def load_config(self):
 config = configparser.ConfigParser()
@@ -110,9 +118,6 @@
 cmd = ['docker', 'tag', tagged_img, '%s:latest' % img]
 self.log.info(' '.join(cmd))
 subprocess.check_call(cmd)
-self.log.info('You can push the images when ready: '
-  'docker push %s && docker push %s:latest'
-  % (tagged_img, img))
 finally:
 for f in glob(os.path.join(image_dir, ".cache-buster*")):
 os.remove(f)
@@ -122,6 +127,10 @@
 self.log.info('Running rests')
 subprocess.check_call(['bash', 'example-run.sh'], cwd=image_dir)
 
+self.pushes.append(tagged_img)
+self.pushes.append('%s:latest' % img)
+
+
 if self.args.update_jjb:
 self.update_jjb(img, tagged_img)
 

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

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

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

[MediaWiki-commits] [Gerrit] labs/striker[master]: Only allow RFC 1035 DNS_LABEL compatible tool names

2017-10-04 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382346 )

Change subject: Only allow RFC 1035 DNS_LABEL compatible tool names
..

Only allow RFC 1035 DNS_LABEL compatible tool names

Bug: T176681
Change-Id: I5b52853c6855685a4856d03c62f7bf95881c36ea
---
M striker/tools/forms.py
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/striker 
refs/changes/46/382346/1

diff --git a/striker/tools/forms.py b/striker/tools/forms.py
index ef359a8..190b104 100644
--- a/striker/tools/forms.py
+++ b/striker/tools/forms.py
@@ -227,12 +227,12 @@
 
 @parsleyfy
 class ToolCreateForm(forms.Form):
-# Unix username regex suggested by useradd(8).
-# We don't allow a leading '_' or trailing '$' however.
-RE_NAME = r'^[a-z][a-z0-9_-]{0,31}$'
+# Intersection of username regex suggested by useradd(8)
+# and the RFC 1035 definition of a DNS_LABEL
+RE_NAME = r'^[a-z][-a-z0-9]{0,30}[a-z0-9]?$'
 NAME_ERR_MSG = _(
 'Must start with a-z, and can only contain '
-'lowercase a-z, 0-9, _, and - characters.'
+'lowercase a-z, 0-9, and - characters.'
 )
 
 name = forms.CharField(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b52853c6855685a4856d03c62f7bf95881c36ea
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: RCFilters: Avoid adding raw filter and group objects to js vars

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

Change subject: RCFilters: Avoid adding raw filter and group objects to js vars
..


RCFilters: Avoid adding raw filter and group objects to js vars

Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
(cherry picked from commit dbc83d9c431f65da38e23170912e8a3f3f0ef3c3)
---
M includes/changes/ChangesListFilterGroup.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/changes/ChangesListFilterGroup.php 
b/includes/changes/ChangesListFilterGroup.php
index 5762752..e9140da 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -394,9 +394,9 @@
);
 
foreach ( $conflicts as $conflictInfo ) {
-   $output['conflicts'][] = $conflictInfo;
unset( $conflictInfo['filterObject'] );
unset( $conflictInfo['groupObject'] );
+   $output['conflicts'][] = $conflictInfo;
array_push(
$output['messageKeys'],
$conflictInfo['globalDescription'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: Directly inherit from composer image

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382345 )

Change subject: docker: Directly inherit from composer image
..

docker: Directly inherit from composer image

Instead of inheriting from php and then copying in composer,
just inherit from the composer image. This also lets us take
advantage of the /usr/bin/composer symlink.

Change-Id: Iaff980df608779b986a4c626163b5659615cea49
---
M dockerfiles/composer-package/Dockerfile
M dockerfiles/composer/Dockerfile
M dockerfiles/mediawiki-phan/Dockerfile
M dockerfiles/mediawiki-phpcs/Dockerfile
M dockerfiles/mediawiki-phpcs/run.sh
5 files changed, 6 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/45/382345/1

diff --git a/dockerfiles/composer-package/Dockerfile 
b/dockerfiles/composer-package/Dockerfile
index cba7caf..1af5c3e 100644
--- a/dockerfiles/composer-package/Dockerfile
+++ b/dockerfiles/composer-package/Dockerfile
@@ -1,11 +1,4 @@
-FROM wmfreleng/composer:latest as composer
-
-FROM wmfreleng/php:latest
-
-USER root
-
-COPY --from=composer /srv/composer /srv/composer
-RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
+FROM wmfreleng/composer:latest
 
 USER nobody
 COPY run.sh /run.sh
diff --git a/dockerfiles/composer/Dockerfile b/dockerfiles/composer/Dockerfile
index 925c585..b323a3d 100644
--- a/dockerfiles/composer/Dockerfile
+++ b/dockerfiles/composer/Dockerfile
@@ -6,6 +6,7 @@
 
 RUN git clone --depth 1 
https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \
 rm -rf /srv/composer/.git
+RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
 
 USER nobody
 ENTRYPOINT ["/srv/composer/vendor/bin/composer"]
diff --git a/dockerfiles/mediawiki-phan/Dockerfile 
b/dockerfiles/mediawiki-phan/Dockerfile
index 4785271..47fafa3 100644
--- a/dockerfiles/mediawiki-phan/Dockerfile
+++ b/dockerfiles/mediawiki-phan/Dockerfile
@@ -1,10 +1,6 @@
-FROM wmfreleng/composer:latest as composer
-
-FROM wmfreleng/php:latest
+FROM wmfreleng/composer:latest
 
 USER root
-
-COPY --from=composer /srv/composer /srv/composer
 
 RUN install -d /srv/phan -o nobody
 
@@ -13,7 +9,7 @@
 USER nobody
 
 RUN  cd /srv/phan && \
- /srv/composer/vendor/bin/composer require etsy/phan:0.8 && \
+ composer require etsy/phan:0.8 && \
  rm -rf /cache/*
 
 ENTRYPOINT ["/mediawiki/tests/phan/bin/phan"]
diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile 
b/dockerfiles/mediawiki-phpcs/Dockerfile
index 526dc15..1af5c3e 100644
--- a/dockerfiles/mediawiki-phpcs/Dockerfile
+++ b/dockerfiles/mediawiki-phpcs/Dockerfile
@@ -1,10 +1,4 @@
-FROM wmfreleng/composer:latest as composer
-
-FROM wmfreleng/php:latest
-
-USER root
-
-COPY --from=composer /srv/composer /srv/composer
+FROM wmfreleng/composer:latest
 
 USER nobody
 COPY run.sh /run.sh
diff --git a/dockerfiles/mediawiki-phpcs/run.sh 
b/dockerfiles/mediawiki-phpcs/run.sh
index 779cabb..60808be 100644
--- a/dockerfiles/mediawiki-phpcs/run.sh
+++ b/dockerfiles/mediawiki-phpcs/run.sh
@@ -6,5 +6,5 @@
 git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
 git checkout --quiet FETCH_HEAD
 
-/srv/composer/vendor/bin/composer install --no-progress
+composer install --no-progress
 ./vendor/bin/phpcs -p -s --report-full 
"--report-checkstyle=/log/checkstyle.xml"

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: RCFilters: Avoid adding raw filter and group objects to js vars

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382344 )

Change subject: RCFilters: Avoid adding raw filter and group objects to js vars
..

RCFilters: Avoid adding raw filter and group objects to js vars

Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
(cherry picked from commit dbc83d9c431f65da38e23170912e8a3f3f0ef3c3)
---
M includes/changes/ChangesListFilterGroup.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/382344/1

diff --git a/includes/changes/ChangesListFilterGroup.php 
b/includes/changes/ChangesListFilterGroup.php
index 5762752..e9140da 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -394,9 +394,9 @@
);
 
foreach ( $conflicts as $conflictInfo ) {
-   $output['conflicts'][] = $conflictInfo;
unset( $conflictInfo['filterObject'] );
unset( $conflictInfo['groupObject'] );
+   $output['conflicts'][] = $conflictInfo;
array_push(
$output['messageKeys'],
$conflictInfo['globalDescription'],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: requesttracker: apache resources vs include

2017-10-04 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382343 )

Change subject: requesttracker: apache resources vs include
..

requesttracker: apache resources vs include

Change-Id: I2961a2b2a14d372ab4cbf07cedf4f35b9da7a032
---
M modules/profile/manifests/requesttracker/server.pp
M modules/requesttracker/manifests/apache.pp
2 files changed, 7 insertions(+), 6 deletions(-)


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

diff --git a/modules/profile/manifests/requesttracker/server.pp 
b/modules/profile/manifests/requesttracker/server.pp
index 0c8ce66..75630f4 100644
--- a/modules/profile/manifests/requesttracker/server.pp
+++ b/modules/profile/manifests/requesttracker/server.pp
@@ -4,6 +4,13 @@
 
 include ::passwords::misc::rt
 
+class { '::apache': }
+class { '::apache::mod::ssl': }
+class { '::apache::mod::perl': }
+class { '::apache::mod::rewrite': }
+class { '::apache::mod::headers': }
+class { '::apache::mod::fastcgi': }
+
 class { '::requesttracker':
 apache_site => 'rt.wikimedia.org',
 dbhost  => 'm1-master.eqiad.wmnet',
diff --git a/modules/requesttracker/manifests/apache.pp 
b/modules/requesttracker/manifests/apache.pp
index 13deba8..83255d1 100644
--- a/modules/requesttracker/manifests/apache.pp
+++ b/modules/requesttracker/manifests/apache.pp
@@ -1,11 +1,5 @@
 # sets up Apache site for a WMF RT install
 class requesttracker::apache($apache_site) {
-include ::apache
-include ::apache::mod::ssl
-include ::apache::mod::perl
-include ::apache::mod::rewrite
-include ::apache::mod::headers
-include ::apache::mod::fastcgi
 
 if os_version('debian >= jessie') {
 $rt_apache_conf = 'requesttracker/rt4.apache.httponly.erb'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2961a2b2a14d372ab4cbf07cedf4f35b9da7a032
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...PageForms[master]: Made textarea editor option code more generic

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

Change subject: Made textarea editor option code more generic
..


Made textarea editor option code more generic

Change-Id: I7f3da1dc67abdcc062ace6c6df713aac0339a79e
---
M includes/forminputs/PF_TextAreaInput.php
1 file changed, 15 insertions(+), 16 deletions(-)

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



diff --git a/includes/forminputs/PF_TextAreaInput.php 
b/includes/forminputs/PF_TextAreaInput.php
index 280eaa9..3cdf39c 100644
--- a/includes/forminputs/PF_TextAreaInput.php
+++ b/includes/forminputs/PF_TextAreaInput.php
@@ -14,10 +14,10 @@
  */
 class PFTextAreaInput extends PFFormInput {
 
-   protected $mUseWikieditor = false;
+   protected $mEditor = null;
 
public static function getDefaultCargoTypes() {
-   return array( 'Text' => array() );
+   return array( 'Text' => array() );
}
 
public static function getDefaultCargoTypeLists() {
@@ -25,7 +25,7 @@
'Text' => array( 'field_type' => 'text', 'is_list' => 
'true' )
);
}
-   
+
/**
 * Constructor for the PFTextAreaInput class.
 *
@@ -43,26 +43,21 @@
 *  input definition.
 */
public function __construct( $input_number, $cur_value, $input_name, 
$disabled, $other_args ) {
-   
global $wgOut;
-   
+
parent::__construct( $input_number, $cur_value, $input_name, 
$disabled, $other_args );
-   
+
if (
array_key_exists( 'editor', $this->mOtherArgs ) &&
$this->mOtherArgs['editor'] == 'wikieditor' &&
-   
-   method_exists( $wgOut, 'getResourceLoader' ) &&
in_array( 'jquery.wikiEditor', 
$wgOut->getResourceLoader()->getModuleNames() ) &&
-   
class_exists( 'WikiEditorHooks' )
) {
-   $this->mUseWikieditor = true;
+   $this->mEditor = 'wikieditor';
$this->addJsInitFunctionData( 
'window.ext.wikieditor.init' );
}
}
 
-   
public static function getName() {
return 'textarea';
}
@@ -136,14 +131,18 @@
 
/**
 * Returns the names of the resource modules this input type uses.
-* 
-* Returns the names of the modules as an array or - if there is only 
one 
+*
+* Returns the names of the modules as an array or - if there is only 
one
 * module - as a string.
-* 
+*
 * @return null|string|array
 */
public function getResourceModuleNames() {
-   return $this->mUseWikieditor?'ext.pageforms.wikieditor':null;
+   if ( $this->mEditor == 'wikieditor' ) {
+   return 'ext.pageforms.wikieditor';
+   } else {
+   return null;
+   }
}
 
protected function getTextAreaAttributes() {
@@ -155,7 +154,7 @@
// useful for other stuff too.
$input_id = $this->mInputName == 'pf_free_text' ? 
'pf_free_text' : "input_$wgPageFormsFieldNum";
 
-   if ( $this->mUseWikieditor ) {
+   if ( $this->mEditor == 'wikieditor' ) {
// Load modules for all enabled WikiEditor features.
// The header for this function was changed in July
// 2014, and the function itself was changed

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f3da1dc67abdcc062ace6c6df713aac0339a79e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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]: phabricator: apache resources in profile vs include

2017-10-04 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382342 )

Change subject: phabricator: apache resources in profile vs include
..

phabricator: apache resources in profile vs include

Change-Id: Ifa03e1d06ca30ebb6c154aa94d60b3f82b41fb6e
---
M modules/phabricator/manifests/init.pp
M modules/profile/manifests/phabricator/main.pp
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/382342/1

diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index 05ad2a2..01acfd8 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -145,10 +145,6 @@
 ensure => present;
 }
 
-# common Apache modules
-include ::apache::mod::rewrite
-include ::apache::mod::headers
-
 $docroot = "${phabdir}/phabricator/webroot"
 
 $phab_servername = hiera('phabricator_servername', 
$phab_settings['phabricator.base-uri'])
diff --git a/modules/profile/manifests/phabricator/main.pp 
b/modules/profile/manifests/phabricator/main.pp
index a425f6e..26be576 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -185,6 +185,10 @@
 }
 # lint:endignore
 
+# common Apache modules
+class { '::apache::mod::rewrite': }
+class { '::apache::mod::headers': }
+
 class { '::phabricator::aphlict':
 ensure  => $aphlict_ensure,
 basedir => $phab_root_dir,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa03e1d06ca30ebb6c154aa94d60b3f82b41fb6e
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] integration/config[master]: Add --run-tests argument to build.py

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382340 )

Change subject: Add --run-tests argument to build.py
..

Add --run-tests argument to build.py

If an example-run.sh script exists, add the option to run it after
building a new version of the image.

Change-Id: I9d38f6a075af362f1b2c6a3d7c5928d22ccdb38d
---
M dockerfiles/build.py
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/382340/1

diff --git a/dockerfiles/build.py b/dockerfiles/build.py
index 1f2d6ca..22f4f2b 100755
--- a/dockerfiles/build.py
+++ b/dockerfiles/build.py
@@ -51,6 +51,10 @@
 '--no-cache', action='store_true',
 help='Do not use cache when building the image'
 )
+parser.add_argument(
+'--run-tests', action='store_true',
+help='Run tests in example-run.sh if it exists after building'
+)
 self.args = parser.parse_args()
 
 def find_docker_files(self):
@@ -93,6 +97,11 @@
 for f in glob(os.path.join(image_dir, ".cache-buster*")):
 os.remove(f)
 
+if self.args.run_tests and \
+os.path.exists(os.path.join(image_dir, 'example-run.sh')):
+self.log.info('Running rests')
+subprocess.check_call(['bash', 'example-run.sh'], cwd=image_dir)
+
 return True
 
 

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add --update-jjb argument to build.py

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382341 )

Change subject: Add --update-jjb argument to build.py
..

Add --update-jjb argument to build.py

After building a new image, automatically bump the tag in the
jjb yaml files to make it easier when pushing new images.

Change-Id: I853b2ff8b2c19352f2197d901d1e3c400a0d830c
---
M dockerfiles/build.py
1 file changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/41/382341/1

diff --git a/dockerfiles/build.py b/dockerfiles/build.py
index 22f4f2b..3edd273 100755
--- a/dockerfiles/build.py
+++ b/dockerfiles/build.py
@@ -5,11 +5,13 @@
 from datetime import datetime
 from glob import glob
 import logging
-import os.path
+import os
+import re
 import subprocess
 import sys
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+JJB_DIR = os.path.join(os.path.dirname(BASE_DIR), 'jjb')
 DOCKER_TAG_DATE = datetime.utcnow().strftime("v%Y.%m.%d.%H.%M")
 DOCKER_HUB_ACCOUNT = 'wmfreleng'
 
@@ -55,10 +57,28 @@
 '--run-tests', action='store_true',
 help='Run tests in example-run.sh if it exists after building'
 )
+parser.add_argument(
+'--update-jjb', action='store_true',
+help='Update tags in jjb yaml files'
+)
 self.args = parser.parse_args()
 
 def find_docker_files(self):
 return sorted(glob(os.path.join(BASE_DIR, '*/Dockerfile')))
+
+def update_jjb(self, img, tagged_img):
+regex = re.compile("'%s:v(.*?)'" % img)
+for fname in os.listdir(JJB_DIR):
+if not fname.endswith('.yaml'):
+continue
+full_fname = os.path.join(JJB_DIR, fname)
+with open(full_fname, 'r') as f:
+text = f.read()
+if regex.search(text):
+new_text = regex.sub("'%s'" % tagged_img, text)
+with open(full_fname, 'w') as f:
+f.write(new_text)
+self.log.info('Updated %s' % full_fname)
 
 def build(self, dockerfile):
 self.log.debug('Building %s' % dockerfile)
@@ -102,6 +122,9 @@
 self.log.info('Running rests')
 subprocess.check_call(['bash', 'example-run.sh'], cwd=image_dir)
 
+if self.args.update_jjb:
+self.update_jjb(img, tagged_img)
+
 return True
 
 

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add --no-cache argument to build.py

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382339 )

Change subject: Add --no-cache argument to build.py
..

Add --no-cache argument to build.py

This just passes --no-cache onto `docker build` to ensure
the image being built is fresh and not potentially using
an outdated cache.

Also add some output that contains the proper `docker push`
commands that need to be run.

Change-Id: Iea511507bc71f63e2a27ed3aaa9c8a3ef3734d39
---
M dockerfiles/build.py
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/39/382339/1

diff --git a/dockerfiles/build.py b/dockerfiles/build.py
index 69e0ea8..1f2d6ca 100755
--- a/dockerfiles/build.py
+++ b/dockerfiles/build.py
@@ -47,6 +47,10 @@
 parser.add_argument(
 '-v', '--verbose', action='store_const',
 const=logging.DEBUG, default=logging.INFO)
+parser.add_argument(
+'--no-cache', action='store_true',
+help='Do not use cache when building the image'
+)
 self.args = parser.parse_args()
 
 def find_docker_files(self):
@@ -73,6 +77,8 @@
 '--build-arg',
 'http_proxy=%s' % self.config.get('DEFAULT', 'http_proxy')
 ])
+if self.args.no_cache:
+cmd.extend(['--no-cache'])
 cmd.extend(['-t', tagged_img, os.path.dirname(dockerfile)])
 self.log.info(' '.join(cmd))
 subprocess.check_call(cmd)
@@ -80,6 +86,9 @@
 cmd = ['docker', 'tag', tagged_img, '%s:latest' % img]
 self.log.info(' '.join(cmd))
 subprocess.check_call(cmd)
+self.log.info('You can push the images when ready: '
+  'docker push %s && docker push %s:latest'
+  % (tagged_img, img))
 finally:
 for f in glob(os.path.join(image_dir, ".cache-buster*")):
 os.remove(f)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Made textarea editor option code more generic

2017-10-04 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382337 )

Change subject: Made textarea editor option code more generic
..

Made textarea editor option code more generic

Change-Id: I7f3da1dc67abdcc062ace6c6df713aac0339a79e
---
M includes/forminputs/PF_TextAreaInput.php
1 file changed, 14 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/37/382337/2

diff --git a/includes/forminputs/PF_TextAreaInput.php 
b/includes/forminputs/PF_TextAreaInput.php
index 280eaa9..733b62c 100644
--- a/includes/forminputs/PF_TextAreaInput.php
+++ b/includes/forminputs/PF_TextAreaInput.php
@@ -14,10 +14,10 @@
  */
 class PFTextAreaInput extends PFFormInput {
 
-   protected $mUseWikieditor = false;
+   protected $mEditor = null;
 
public static function getDefaultCargoTypes() {
-   return array( 'Text' => array() );
+   return array( 'Text' => array() );
}
 
public static function getDefaultCargoTypeLists() {
@@ -25,7 +25,7 @@
'Text' => array( 'field_type' => 'text', 'is_list' => 
'true' )
);
}
-   
+
/**
 * Constructor for the PFTextAreaInput class.
 *
@@ -43,26 +43,21 @@
 *  input definition.
 */
public function __construct( $input_number, $cur_value, $input_name, 
$disabled, $other_args ) {
-   
global $wgOut;
-   
+
parent::__construct( $input_number, $cur_value, $input_name, 
$disabled, $other_args );
-   
+
if (
array_key_exists( 'editor', $this->mOtherArgs ) &&
$this->mOtherArgs['editor'] == 'wikieditor' &&
-   
-   method_exists( $wgOut, 'getResourceLoader' ) &&
in_array( 'jquery.wikiEditor', 
$wgOut->getResourceLoader()->getModuleNames() ) &&
-   
class_exists( 'WikiEditorHooks' )
) {
-   $this->mUseWikieditor = true;
+   $this->mEditor = 'wikieditor';
$this->addJsInitFunctionData( 
'window.ext.wikieditor.init' );
}
}
 
-   
public static function getName() {
return 'textarea';
}
@@ -136,14 +131,18 @@
 
/**
 * Returns the names of the resource modules this input type uses.
-* 
-* Returns the names of the modules as an array or - if there is only 
one 
+*
+* Returns the names of the modules as an array or - if there is only 
one
 * module - as a string.
-* 
+*
 * @return null|string|array
 */
public function getResourceModuleNames() {
-   return $this->mUseWikieditor?'ext.pageforms.wikieditor':null;
+   if ( $this->mEditor == 'wikieditor' ) {
+   return 'ext.pageforms.wikieditor';
+   } else {
+   return null;
+   }
}
 
protected function getTextAreaAttributes() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f3da1dc67abdcc062ace6c6df713aac0339a79e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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]: otrs: apache resources in profile vs include

2017-10-04 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382338 )

Change subject: otrs: apache resources in profile vs include
..

otrs: apache resources in profile vs include

Change-Id: I63111ddf4abd1ac5ee557833647f34744121218e
---
M modules/otrs/manifests/web.pp
M modules/profile/manifests/otrs.pp
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/382338/1

diff --git a/modules/otrs/manifests/web.pp b/modules/otrs/manifests/web.pp
index 18b33c5..dfbb8c1 100644
--- a/modules/otrs/manifests/web.pp
+++ b/modules/otrs/manifests/web.pp
@@ -13,10 +13,6 @@
 #   include otrs::web
 #
 class otrs::web {
-include ::apache::mod::perl
-include ::apache::mod::remoteip
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 # We override the default mpm_prefork to set the apache setting for
 # MaxConnectionsPerChild. The chosen number is experimentally derived from
diff --git a/modules/profile/manifests/otrs.pp 
b/modules/profile/manifests/otrs.pp
index 2cb00ca..ae83cbd 100644
--- a/modules/profile/manifests/otrs.pp
+++ b/modules/profile/manifests/otrs.pp
@@ -15,6 +15,11 @@
 include network::constants
 include ::profile::prometheus::apache_exporter
 
+class { '::apache::mod::perl': }
+class { '::apache::mod::remoteip': }
+class { '::apache::mod::rewrite': }
+class { '::apache::mod::headers': }
+
 class { '::otrs':
 otrs_database_host => $otrs_database_host,
 otrs_database_name => $otrs_database_name,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63111ddf4abd1ac5ee557833647f34744121218e
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]: racktables: role/profile, remove style violations

2017-10-04 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382336 )

Change subject: racktables: role/profile, remove style violations
..

racktables: role/profile, remove style violations

Change-Id: I9278b84268feef8565d9a074cbdb8a664c5f4eaa
---
R hieradata/role/common/racktables.yaml
M manifests/site.pp
R modules/profile/manifests/racktables.pp
M modules/racktables/manifests/init.pp
A modules/role/manifests/racktables.pp
5 files changed, 23 insertions(+), 11 deletions(-)


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

diff --git a/hieradata/role/common/racktables/server.yaml 
b/hieradata/role/common/racktables.yaml
similarity index 100%
rename from hieradata/role/common/racktables/server.yaml
rename to hieradata/role/common/racktables.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 2d13568..ef42880 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1244,7 +1244,7 @@
 # Running this here because krypton is a 'misc' Jessie
 # monitoring host (not really, it's just misc apps)
 role(wikimania_scholarships, iegreview::app, grafana::production,
-kafka::analytics::burrow, racktables::server)
+kafka::analytics::burrow, racktables)
 include ::standard
 }
 
diff --git a/modules/role/manifests/racktables/server.pp 
b/modules/profile/manifests/racktables.pp
similarity index 73%
rename from modules/role/manifests/racktables/server.pp
rename to modules/profile/manifests/racktables.pp
index 4d0c82f..0eaa989 100644
--- a/modules/role/manifests/racktables/server.pp
+++ b/modules/profile/manifests/racktables.pp
@@ -1,17 +1,20 @@
-# https://racktables.wikimedia.org
-
 ## Please note that Racktables is a tarball extraction based installation
 ## into its web directory root.  This means that puppet cannot fully automate
 ## the installation at this time & the actual tarball must be downloaded from
 ## http://racktables.org/ and unzipped into /srv/org/wikimedia/racktables
 #
 # filtertags: labs-project-servermon
-class role::racktables::server {
-
-system::role { 'racktables::server': description => 'Racktables server' }
+class profile::racktables {
 
 include ::standard
 include ::base::firewall
+include ::mysql
+include ::passwords::racktables
+include ::apache
+include ::apache::mod::php5
+include ::apache::mod::ssl
+include ::apache::mod::rewrite
+include ::apache::mod::headers
 
 ferm::service { 'racktables-http':
 proto => 'tcp',
diff --git a/modules/racktables/manifests/init.pp 
b/modules/racktables/manifests/init.pp
index 3d9438a..3b13580 100644
--- a/modules/racktables/manifests/init.pp
+++ b/modules/racktables/manifests/init.pp
@@ -6,11 +6,6 @@
 class racktables ($racktables_host, $racktables_db_host, $racktables_db) {
 include ::mysql
 include ::passwords::racktables
-include ::apache
-include ::apache::mod::php5
-include ::apache::mod::ssl
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 require_package('php5-mysql', 'php5-gd')
 
diff --git a/modules/role/manifests/racktables.pp 
b/modules/role/manifests/racktables.pp
new file mode 100644
index 000..b0b7bbb
--- /dev/null
+++ b/modules/role/manifests/racktables.pp
@@ -0,0 +1,14 @@
+# https://racktables.wikimedia.org
+
+## Please note that Racktables is a tarball extraction based installation
+## into its web directory root.  This means that puppet cannot fully automate
+## the installation at this time & the actual tarball must be downloaded from
+## http://racktables.org/ and unzipped into /srv/org/wikimedia/racktables
+#
+# filtertags: labs-project-servermon
+class role::racktables {
+
+system::role { 'racktables': description => 'Racktables server' }
+
+include ::profile::racktables
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9278b84268feef8565d9a074cbdb8a664c5f4eaa
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]: wikistats (labs): profile/role, remove violations

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

Change subject: wikistats (labs): profile/role, remove violations
..


wikistats (labs): profile/role, remove violations

Change-Id: I381572c8f314c6219d243fab3ed5f6635f8c2833
---
A modules/profile/manifests/wikistats.pp
M modules/role/manifests/wikistats/instance.pp
M modules/wikistats/manifests/web.pp
3 files changed, 16 insertions(+), 10 deletions(-)

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



diff --git a/modules/profile/manifests/wikistats.pp 
b/modules/profile/manifests/wikistats.pp
new file mode 100644
index 000..dbbce5d
--- /dev/null
+++ b/modules/profile/manifests/wikistats.pp
@@ -0,0 +1,14 @@
+# this is labs-only - wikistats.wmflabs.org (dzahn)
+# NOT stats.wikimedia.org (analytics)
+# these projects are often confused
+#
+class profile::wikistats (
+$wikistats_host = hiera('profile::wikistats::wikistats_host'),
+) {
+
+class { '::apache::mod::rewrite': }
+
+class { '::wikistats':
+wikistats_host => $wikistats_host,
+}
+}
diff --git a/modules/role/manifests/wikistats/instance.pp 
b/modules/role/manifests/wikistats/instance.pp
index 4c48bf9..344a09c 100644
--- a/modules/role/manifests/wikistats/instance.pp
+++ b/modules/role/manifests/wikistats/instance.pp
@@ -1,6 +1,6 @@
 # wikistats host role class
 # this is labs-only - wikistats.wmflabs.org (dzahn)
-# NOT stats.wikimedia.org (analytics/ezachte)
+# NOT stats.wikimedia.org (analytics)
 # these projects are often confused
 #
 # filtertags: labs-project-wikistats
@@ -8,11 +8,5 @@
 
 system::role { 'wikistats': description => 'wikistats instance' }
 
-$wikistats_host = 'wikistats.wmflabs.org'
-
-class { '::wikistats':
-wikistats_host => $wikistats_host,
-}
-
+include ::profile::wikistats
 }
-
diff --git a/modules/wikistats/manifests/web.pp 
b/modules/wikistats/manifests/web.pp
index 0029121..f0944cc 100644
--- a/modules/wikistats/manifests/web.pp
+++ b/modules/wikistats/manifests/web.pp
@@ -14,8 +14,6 @@
 
 require_package($apache_php_package)
 
-include ::apache::mod::rewrite
-
 apache::site { $wikistats_host:
 content => template('wikistats/apache/wikistats.erb'),
 require => Package[$apache_php_package],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I381572c8f314c6219d243fab3ed5f6635f8c2833
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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]: wikistats (labs): resource-like declarations vs include

2017-10-04 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382335 )

Change subject: wikistats (labs): resource-like declarations vs include
..

wikistats (labs): resource-like declarations vs include

Change-Id: I381572c8f314c6219d243fab3ed5f6635f8c2833
---
M modules/wikistats/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/wikistats/manifests/web.pp 
b/modules/wikistats/manifests/web.pp
index 0029121..2d8ab27 100644
--- a/modules/wikistats/manifests/web.pp
+++ b/modules/wikistats/manifests/web.pp
@@ -14,7 +14,7 @@
 
 require_package($apache_php_package)
 
-include ::apache::mod::rewrite
+class { '::apache::mod::rewrite': }
 
 apache::site { $wikistats_host:
 content => template('wikistats/apache/wikistats.erb'),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I381572c8f314c6219d243fab3ed5f6635f8c2833
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...Wikibase[master]: Allow getting the sitelink to an arbitrary site with mw.wiki...

2017-10-04 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382334 )

Change subject: Allow getting the sitelink to an arbitrary site with 
mw.wikibase.sitelink
..

Allow getting the sitelink to an arbitrary site with mw.wikibase.sitelink

Bug: T142903
Change-Id: I5471e913a0352e3caf083f3d8054001cc825c006
---
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
M client/includes/DataAccess/Scribunto/mw.wikibase.lua
M client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
M 
client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindingsTest.php
M docs/lua.wiki
6 files changed, 53 insertions(+), 19 deletions(-)


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

diff --git 
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php 
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index 9dcc0df..3e4a6fe 100644
--- a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -462,12 +462,15 @@
 * Wrapper for getSiteLinkPageName in WikibaseLuaBindings
 *
 * @param string $prefixedEntityId
+* @param string|null $globalSiteId
 *
 * @return string[]
 */
-   public function getSiteLinkPageName( $prefixedEntityId ) {
+   public function getSiteLinkPageName( $prefixedEntityId, $globalSiteId = 
null ) {
$this->checkType( 'getSiteLinkPageName', 1, $prefixedEntityId, 
'string' );
-   return [ 
$this->getLanguageIndependentLuaBindings()->getSiteLinkPageName( 
$prefixedEntityId ) ];
+   $this->checkTypeOptional( 'getSiteLinkPageName', 1, 
$globalSiteId, 'string', null );
+
+   return [ 
$this->getLanguageIndependentLuaBindings()->getSiteLinkPageName( 
$prefixedEntityId, $globalSiteId ) ];
}
 
/**
diff --git 
a/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
 
b/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
index 5606142..951d01e 100644
--- 
a/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
+++ 
b/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
@@ -88,26 +88,32 @@
 
/**
 * @param string $prefixedEntityId
+* @param string|null $globalSiteId
 *
 * @return string|null Null if no site link found.
 */
-   public function getSiteLinkPageName( $prefixedEntityId ) {
+   public function getSiteLinkPageName( $prefixedEntityId, $globalSiteId = 
null ) {
+   $globalSiteId = $globalSiteId !== null ? $globalSiteId : 
$this->siteId;
+
try {
$itemId = new ItemId( $prefixedEntityId );
} catch ( InvalidArgumentException $e ) {
return null;
}
 
-   // @fixme the SiteLinks do not contain badges! but all we want 
here is page name.
+   if ( $globalSiteId === $this->siteId ) {
+   $this->usageAccumulator->addTitleUsage( $itemId );
+   } else {
+   $this->usageAccumulator->addSiteLinksUsage( $itemId );
+   }
+
$siteLinkRows = $this->siteLinkLookup->getLinks(
[ $itemId->getNumericId() ],
-   [ $this->siteId ]
+   [ $globalSiteId ]
);
 
foreach ( $siteLinkRows as $siteLinkRow ) {
$siteLink = new SiteLink( $siteLinkRow[0], 
$siteLinkRow[1] );
-
-   $this->usageAccumulator->addTitleUsage( $itemId );
return $siteLink->getPageName();
}
 
diff --git a/client/includes/DataAccess/Scribunto/mw.wikibase.lua 
b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
index 19a40d2..5aac57e 100644
--- a/client/includes/DataAccess/Scribunto/mw.wikibase.lua
+++ b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
@@ -245,10 +245,12 @@
-- Get the local sitelink title for the given entity id.
--
-- @param {string} id
-   wikibase.sitelink = function( id )
+   -- @param {string} [globalSiteId]
+   wikibase.sitelink = function( id, globalSiteId )
checkType( 'sitelink', 1, id, 'string' )
+   checkTypeMulti( 'sitelink', 2, globalSiteId, { 'string', 'nil' 
} )
 
-   return php.getSiteLinkPageName( id )
+   return php.getSiteLinkPageName( id, globalSiteId )
end
 
 
diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable structured change filters by default on all remaining...

2017-10-04 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382333 )

Change subject: Enable structured change filters by default on all remaining 
wikis
..

Enable structured change filters by default on all remaining wikis

It was still disabled on wikis with FlaggedRevs protection.

Bug: T177444
Change-Id: I8d675e06cfdac1289c9b52e0396d820e2bb8db95
---
M wmf-config/InitialiseSettings.php
M wmf-config/flaggedrevs.php
2 files changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 56fa1ad..47fc363 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19065,7 +19065,6 @@
 ],
 'wgStructuredChangeFiltersShowPreference' => [
'default' => true,
-   // Disabled on FlaggedRevs wikis with $wgFlaggedRevsProtection set in 
flaggedrevs.php (T177445)
 ],
 
 ### End (roughly) of general extensions 
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index c25cede..e288ff4 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -680,8 +680,3 @@
 }
 
 $wgFlaggedRevsStatsAge = false;
-
-if ( $wgFlaggedRevsProtection ) {
-   // Disable structured change filters on wikis with FR protection 
(T177445)
-   $wgStructuredChangeFiltersShowPreference = false;
-}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Hygiene: Extract additional methods from renderCoverAndToc

2017-10-04 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382331 )

Change subject: Hygiene: Extract additional methods from renderCoverAndToc
..

Hygiene: Extract additional methods from renderCoverAndToc

renderCoverAndToc is responsible for quite a lot of things. Long
term it should only be responsible for rendering.

This patch extracts some of the logic, long term the logic will
be moved into getBookTemplateData

Change-Id: I59965a7e5cf18230ef40f3a5193e634f3dd068de
---
M includes/BookRenderer.php
1 file changed, 99 insertions(+), 53 deletions(-)


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

diff --git a/includes/BookRenderer.php b/includes/BookRenderer.php
index f0e9c24..2d4d2e7 100644
--- a/includes/BookRenderer.php
+++ b/includes/BookRenderer.php
@@ -133,6 +133,93 @@
}
 
/**
+* Generate template data for outline chapter
+* @param Title $title for book
+* @param HeadingCounter $tocHeadingCounter
+* @return array
+*/
+   private function getBookChapterData( $title, $tocHeadingCounter ) {
+   return [
+   'text' => htmlspecialchars( $title, ENT_QUOTES ),
+   'type' => 'chapter',
+   'level' => -2,
+   'anchor' => 'mw-book-chapter-' . 
Sanitizer::escapeIdForAttribute( $title ),
+   'number' => $tocHeadingCounter->incrementAndGet( -2 ),
+   ];
+   }
+
+   /**
+* Generate template data for the chapters in the given article
+* @param Title $title to extract sections for
+* @param HeadingCounter $tocHeadingCounter
+* @param array[] &$sections Section data; each section is a triple
+*   [ title => ..., id => ..., level => ... ]. RemexCollectionMunger 
will update the id/level
+*   to keep in sync with document changes.
+* @param integer $articleCount number of articles in the book
+* @return array
+*/
+   private function getArticleChaptersData( $title, $tocHeadingCounter, 
$sections, $articleCount ) {
+   $chapters = [];
+   $dbkey = $title->getPrefixedDBkey();
+
+   if ( $articleCount > 1 ) {
+   $chapters[] = [
+   'text' => $metadata['displaytitle'][$dbkey],
+   'type' => 'article',
+   'level' => -1,
+   'anchor' => 'mw-book-article-' . $dbkey,
+   'number' => 
$tocHeadingCounter->incrementAndGet( -1 ),
+   ];
+   }
+   foreach ( $sections[$dbkey] as $section ) {
+   $chapters[] = [
+   'text' => $section['title'],
+   'type' => 'section',
+   'level' => $section['level'],
+   'anchor' => $section['id'],
+   'number' => 
$tocHeadingCounter->incrementAndGet( $section['level'] ),
+   ];
+   }
+   return $chapters;
+   }
+
+   /**
+* Generate template data for any additional chapters in the given 
article
+* @param HeadingCounter $tocHeadingCounter
+* @param integer the table of contents level for a given article
+* @param boolean $hasImages whether the book contains images section
+* @param boolean $hasLicense whether the book contains a license 
section
+* @return array
+*/
+   private function getAdditionalBookChapters( $tocHeadingCounter, 
$metadataLevel, $hasImages, $hasLicense ) {
+   $outline = [
+   'text' => wfMessage( 'coll-contributors-title' 
)->text(),
+   'type' => 'contributors',
+   'level' => $metadataLevel,
+   'anchor' => 'mw-book-contributors',
+   'number' => 
$tocHeadingCounter->incrementAndGetTopLevel(),
+   ];
+   if ( $hasImages ) {
+   $outline[] = [
+   'text' => wfMessage( 'coll-images-title' 
)->text(),
+   'type' => 'images',
+   'level' => $metadataLevel,
+   'anchor' => 'mw-book-images',
+   'number' => 
$tocHeadingCounter->incrementAndGetTopLevel(),
+   ];
+   }
+   if ( $hasLicense ) {
+   $outline[] = [
+   'text' => wfMessage( 'coll-license-title' 
)->text(),
+   'type' => 'license',
+   'level' => $metadataLevel,
+

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Hygiene: renderCoverAndToc contains no logic

2017-10-04 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382332 )

Change subject: Hygiene: renderCoverAndToc contains no logic
..

Hygiene: renderCoverAndToc contains no logic

Change-Id: Iec31d60df0dd3d42402e781b5b1e356bc7e88800
---
M includes/BookRenderer.php
1 file changed, 27 insertions(+), 41 deletions(-)


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

diff --git a/includes/BookRenderer.php b/includes/BookRenderer.php
index 2d4d2e7..901d2f1 100644
--- a/includes/BookRenderer.php
+++ b/includes/BookRenderer.php
@@ -38,6 +38,8 @@
private function getBookTemplateData( $items, $pages, $metadata, 
$hasChapters, $articleCount ) {
$headingCounter = new HeadingCounter();
$bookBodyHtml = '';
+   $tocHeadingCounter = new HeadingCounter();
+   $outline = [];
 
// First we need to render the articles as we can't know the 
TOC anchors for sure
// until we have resolved id conflicts.
@@ -49,12 +51,17 @@
] );
foreach ( $items as $item ) {
if ( $item['type'] === 'chapter' ) {
+   $outline[] = $this->getBookChapterData( $title, 
$tocHeadingCounter );
$bookBodyHtml .= Html::element( 'h1', [
'id' => 'mw-book-chapter-' . 
Sanitizer::escapeIdForAttribute( $item['title'] ),
'class' => 'mw-book-chapter',
'data-mw-sectionnumber' => 
$headingCounter->incrementAndGet( -2 ),
], $item['title'] ) . "\n";
} elseif ( $item['type'] === 'article' ) {
+   $outline = array_merge( $outline,
+   $this->getArticleChaptersData( $title, 
$tocHeadingCounter,
+   $metadata['sections'], 
$articleCount )
+   );
$title = Title::newFromText( $item['title'] );
$dbkey = $title->getPrefixedDBkey();
$html = $this->getBodyContents( $pages[$dbkey] 
);
@@ -89,9 +96,26 @@
$bookBodyHtml .= Html::openElement( 'article' )
. substr( $serializer->getResult(), 15 
) // strip ""
. Html::closeElement( 'article' );
+   } else {
+   throw new LogicException( 'Unknown collection 
item type: ' . $item['type'] );
}
}
+
+   if ( $hasChapters ) {
+   $metadataLevel = -2;
+   } elseif ( $articleCount > 1 ) {
+   $metadataLevel = -1;
+   } else {
+   $metadataLevel = 0;
+   }
+   $outline = array_merge( $outline,
+   $this->getAdditionalBookChapters( $tocHeadingCounter, 
$metadataLevel,
+   $metadata['images'], $metadata['license'] )
+   );
+   $metadata['outline'] = $outline;
+
return [
+   'outline' => $outline,
'html' => $bookBodyHtml,
];
}
@@ -119,7 +143,7 @@
$book = $this->getBookTemplateData( $collection['items'], 
$pages, $metadata,
$hasChapters, $articleCount );
 
-   $final = $this->renderCoverAndToc( $collection, $metadata, 
$hasChapters, $articleCount )
+   $final = $this->renderCoverAndToc( $collection, 
$book['outline'] )
. $book['html']
. $this->renderContributors( $metadata['contributors'], 
$contributorSectionNumber );
if ( $metadata['images'] ) {
@@ -222,48 +246,10 @@
/**
 * Generate HTML for book cover page and table of contents.
 * @param array $collection Collection, as returned by 
CollectionSession::getCollection().
-* @param array[] $metadata Map of prefixed DB key => metadata, as 
returned by fetchMetadata().
-*   An outline will be added which is similar to sections but flat and 
each item has the fields
-* - text: text of the outline item (article title, section title 
etc)
-* - type: 'chapter', 'article', 'section' or 'contributors'
-* - level: heading level or -2 for chapter, -1 for article
-* - anchor: id of the document node which the outline item refers 
to
-* - number: a hierarchical section number (something like "1.2.3")
-* @param boolean $hasChapters

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: [WIP] Make moderation action submission buttons destructive

2017-10-04 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382330 )

Change subject: [WIP] Make moderation action submission buttons destructive
..

[WIP] Make moderation action submission buttons destructive

Bug: T90323
Change-Id: Iaaddfb40f793d95c81e5bdac0063054e5bd5cc69
---
M handlebars/flow_moderate_post.partial.handlebars
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/handlebars/flow_moderate_post.partial.handlebars 
b/handlebars/flow_moderate_post.partial.handlebars
index 54d6939..98a3598 100644
--- a/handlebars/flow_moderate_post.partial.handlebars
+++ b/handlebars/flow_moderate_post.partial.handlebars
@@ -17,7 +17,7 @@


{{~l10n (concat "flow-moderation-confirm-" 
@root.submitted.moderationState "-post")~}}


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaaddfb40f793d95c81e5bdac0063054e5bd5cc69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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...PageForms[master]: Some changes to hierarchy validation wording

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

Change subject: Some changes to hierarchy validation wording
..


Some changes to hierarchy validation wording

Change-Id: Ic4c11813a1669eff2ea575d8c9602d1cd09a82a9
---
M libs/PF_CreateClass.js
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/libs/PF_CreateClass.js b/libs/PF_CreateClass.js
index 619a082..f477437 100644
--- a/libs/PF_CreateClass.js
+++ b/libs/PF_CreateClass.js
@@ -87,7 +87,7 @@
var nodes = structure.split(/\n/);
var matches = nodes[0].match(/^([*]*)[^*]*/i);
if (matches[1].length !== 1) {
-   alert("Error: First entry of hierarchy values 
should start with exact one \'*\', the entry \"" +
+   alert("Error: The first entry of hierarchy 
values should start with exactly one \'*\'; the entry \"" +
nodes[0] + "\" has " + 
matches[1].length + " \'*\'");
return false;
}
@@ -95,18 +95,18 @@
for (var j = 0; j < nodes.length; j++) {
matches = nodes[j].match(/^([*]*)( *)(.*)/i);
if (matches[1].length < 1) {
-   alert("Error: Each entry of hierarchy 
values should start with at least one \'*\', the entry \"" +
-   nodes[j] + "\" has 0 '*'");
+   alert("Error: Each entry of hierarchy 
values should start with at least one \'*\'; the entry \"" +
+   nodes[j] + "\" starts with 
none");
return false;
}
if (matches[1].length - level > 1) {
-   alert("Error: Level or count of '*' in 
hierarchy values should be increased only by count of 1, the entry \"" +
+   alert("Error: Level or count of '*' in 
hierarchy values should increase by no more than 1 at a time, so the entry \"" +
nodes[j] + "\" should have " + 
( level + 1 ) + " or fewer '*'");
return false;
}
level = matches[1].length;
if (matches[3].length === 0) {
-   alert("Error: The entry of hierarchy 
values cannot be empty.");
+   alert("Error: An entry in hierarchy 
values cannot be empty.");
return false;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4c11813a1669eff2ea575d8c9602d1cd09a82a9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: Some changes to hierarchy validation wording

2017-10-04 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382329 )

Change subject: Some changes to hierarchy validation wording
..

Some changes to hierarchy validation wording

Change-Id: Ic4c11813a1669eff2ea575d8c9602d1cd09a82a9
---
M libs/PF_CreateClass.js
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/29/382329/2

diff --git a/libs/PF_CreateClass.js b/libs/PF_CreateClass.js
index 619a082..f477437 100644
--- a/libs/PF_CreateClass.js
+++ b/libs/PF_CreateClass.js
@@ -87,7 +87,7 @@
var nodes = structure.split(/\n/);
var matches = nodes[0].match(/^([*]*)[^*]*/i);
if (matches[1].length !== 1) {
-   alert("Error: First entry of hierarchy values 
should start with exact one \'*\', the entry \"" +
+   alert("Error: The first entry of hierarchy 
values should start with exactly one \'*\'; the entry \"" +
nodes[0] + "\" has " + 
matches[1].length + " \'*\'");
return false;
}
@@ -95,18 +95,18 @@
for (var j = 0; j < nodes.length; j++) {
matches = nodes[j].match(/^([*]*)( *)(.*)/i);
if (matches[1].length < 1) {
-   alert("Error: Each entry of hierarchy 
values should start with at least one \'*\', the entry \"" +
-   nodes[j] + "\" has 0 '*'");
+   alert("Error: Each entry of hierarchy 
values should start with at least one \'*\'; the entry \"" +
+   nodes[j] + "\" starts with 
none");
return false;
}
if (matches[1].length - level > 1) {
-   alert("Error: Level or count of '*' in 
hierarchy values should be increased only by count of 1, the entry \"" +
+   alert("Error: Level or count of '*' in 
hierarchy values should increase by no more than 1 at a time, so the entry \"" +
nodes[j] + "\" should have " + 
( level + 1 ) + " or fewer '*'");
return false;
}
level = matches[1].length;
if (matches[3].length === 0) {
-   alert("Error: The entry of hierarchy 
values cannot be empty.");
+   alert("Error: An entry in hierarchy 
values cannot be empty.");
return false;
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4c11813a1669eff2ea575d8c9602d1cd09a82a9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: One more thing with language variants in WikiSite.

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

Change subject: One more thing with language variants in WikiSite.
..


One more thing with language variants in WikiSite.

This adds the other known variants of zhwiki, so that the domain name "zh"
is correctly extracted from the variant language code.  These must be
hardcoded, since there are other variations of Chinese such as "zh-yue"
which are their own subdomains instead of variants.

Change-Id: I683f0ad85ca05cbcbdb62e6aa17fb2ff2256f523
---
M app/src/main/java/org/wikipedia/dataclient/WikiSite.java
M app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
2 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java 
b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
index 0802c8e..7b04016 100644
--- a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
+++ b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
@@ -257,6 +257,11 @@
 switch (languageCode) {
 case AppLanguageLookUpTable.SIMPLIFIED_CHINESE_LANGUAGE_CODE:
 case AppLanguageLookUpTable.TRADITIONAL_CHINESE_LANGUAGE_CODE:
+case AppLanguageLookUpTable.CHINESE_CN_LANGUAGE_CODE:
+case AppLanguageLookUpTable.CHINESE_HK_LANGUAGE_CODE:
+case AppLanguageLookUpTable.CHINESE_MO_LANGUAGE_CODE:
+case AppLanguageLookUpTable.CHINESE_SG_LANGUAGE_CODE:
+case AppLanguageLookUpTable.CHINESE_TW_LANGUAGE_CODE:
 return AppLanguageLookUpTable.CHINESE_LANGUAGE_CODE;
 case AppLanguageLookUpTable.NORWEGIAN_BOKMAL_LANGUAGE_CODE:
 return AppLanguageLookUpTable.NORWEGIAN_LEGACY_LANGUAGE_CODE; 
// T114042
diff --git 
a/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java 
b/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
index 86dc0ec..96a048b 100644
--- a/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
+++ b/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
@@ -19,6 +19,11 @@
 public class AppLanguageLookUpTable {
 public static final String SIMPLIFIED_CHINESE_LANGUAGE_CODE = "zh-hans";
 public static final String TRADITIONAL_CHINESE_LANGUAGE_CODE = "zh-hant";
+public static final String CHINESE_CN_LANGUAGE_CODE = "zh-cn";
+public static final String CHINESE_HK_LANGUAGE_CODE = "zh-hk";
+public static final String CHINESE_MO_LANGUAGE_CODE = "zh-mo";
+public static final String CHINESE_SG_LANGUAGE_CODE = "zh-sg";
+public static final String CHINESE_TW_LANGUAGE_CODE = "zh-tw";
 public static final String CHINESE_LANGUAGE_CODE = "zh";
 public static final String NORWEGIAN_LEGACY_LANGUAGE_CODE = "no";
 public static final String NORWEGIAN_BOKMAL_LANGUAGE_CODE = "nb";

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Disable spellchecking for Firefox users on non-Mac systems

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

Change subject: Disable spellchecking for Firefox users on non-Mac systems
..


Disable spellchecking for Firefox users on non-Mac systems

Bug: T95104
Change-Id: I86dbee82def94a38156f090d519f969f221c72e1
---
M resources/ext.CodeMirror.js
1 file changed, 10 insertions(+), 3 deletions(-)

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



diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 7183450..a8139b6 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -1,6 +1,6 @@
 ( function ( mw, $ ) {
var origTextSelection, useCodeMirror, codeMirror, api, 
originHooksTextarea,
-   wikiEditorToolbarEnabled;
+   wikiEditorToolbarEnabled, enableContentEditable = true;
 
if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the 
CodeEditor is used then just exit;
return;
@@ -16,6 +16,13 @@
wikiEditorToolbarEnabled = !!mw.loader.getState( 'ext.wikiEditor' ) &&
// This can be the string "0" if the user disabled the 
preference - Bug T54542#555387
mw.user.options.get( 'usebetatoolbar' ) > 0;
+
+   // Disable spellchecking for Firefox users on non-Mac systems (Bug 
T95104)
+   if ( navigator.userAgent.indexOf( 'Firefox' ) > -1 &&
+   navigator.userAgent.indexOf( 'Mac' ) === -1
+   ) {
+   enableContentEditable = false;
+   }
 
// T174055: Do not redefine the browser history navigation keys 
(T175378: for PC only)
CodeMirror.keyMap.pcDefault[ 'Alt-Left' ] = false;
@@ -376,8 +383,8 @@
Home: 'goLineLeft',
End: 'goLineRight'
},
-   inputStyle: 'contenteditable',
-   spellcheck: true,
+   inputStyle: enableContentEditable ? 
'contenteditable' : 'textarea',
+   spellcheck: enableContentEditable,
viewportMargin: Infinity
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86dbee82def94a38156f090d519f969f221c72e1
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Turn on native CodeMirror spellcheck feature

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

Change subject: Turn on native CodeMirror spellcheck feature
..


Turn on native CodeMirror spellcheck feature

It's not fullproof. There's bugs where it forgets a string is misspelled
after re-rendering. But it's better than nothing.

Bug: T95104
Change-Id: I33718a71ff5734912ac59be2cd9575dd662ec2f7
---
M resources/ext.CodeMirror.js
1 file changed, 2 insertions(+), 0 deletions(-)

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

Objections:
  Fomafix: There's a problem with this change, please improve



diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 833fe86..7183450 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -376,6 +376,8 @@
Home: 'goLineLeft',
End: 'goLineRight'
},
+   inputStyle: 'contenteditable',
+   spellcheck: true,
viewportMargin: Infinity
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33718a71ff5734912ac59be2cd9575dd662ec2f7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Kaldari 
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[wmf/1.31.0-wmf.2]: Remove perf tracking code that was moved to WikimediaEvents ...

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

Change subject: Remove perf tracking code that was moved to WikimediaEvents in 
Ib300af5c
..


Remove perf tracking code that was moved to WikimediaEvents in Ib300af5c

Bug: T176652
Depends-On: Ib300af5caad5c6e0ca13554c20a2e4311743e176
Change-Id: I963431771556635ea3db28101470317ebd82906f
(cherry picked from commit be08b7aa186d15c341c8e59d49d6b80a11369c87)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
1 file changed, 0 insertions(+), 12 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 73259f6..da11973 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -84,18 +84,6 @@
filtersWidget.setTopSection( 
wlTopSection.$element );
} // end Special:WL
 
-   // Log performance data
-   if ( window.performance && window.performance.now ) {
-   mw.track(
-   
'timing.MediaWiki.timing.structuredChangeFilters.ready.' + specialPage,
-   window.performance.now()
-   );
-   mw.track(
-   
'timing.MediaWiki.timing.structuredChangeFilters.backendResponse.' + 
specialPage,
-   mw.config.get( 'wgBackendResponseTime' )
-   );
-   }
-
/**
 * Fired when initialization of the filtering interface 
for changes list is complete.
 *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I963431771556635ea3db28101470317ebd82906f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.2]: Move RCFilters performance logging to WikimediaEvents and al...

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

Change subject: Move RCFilters performance logging to WikimediaEvents and also 
log performance for old UI
..


Move RCFilters performance logging to WikimediaEvents and also log performance 
for old UI

For the ready time in the old UI, use the load time of makeCollapsible and 
$.ready
(whichever is later) as an approximation, at Krinkle's recommendation.

Bug: T176652
Change-Id: Ib300af5caad5c6e0ca13554c20a2e4311743e176
(cherry picked from commit 89c07bee016adf4afc88205e7807b2dbf2a3e4be)
---
M modules/ext.wikimediaEvents.recentChangesClicks.js
1 file changed, 41 insertions(+), 2 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index 9e35caf..d3efa9a 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -5,6 +5,46 @@
  * @author Roan Kattouw 
  */
 ( function ( $, mw ) {
+   var isNewUI,
+   metricName,
+   collapsiblePromise,
+   specialPage = mw.config.get( 'wgCanonicalSpecialPageName' );
+
+   function logReady() {
+   mw.track(
+   'timing.MediaWiki.timing.' + metricName + '.ready.' + 
specialPage,
+   window.performance.now()
+   );
+   mw.track(
+   'timing.MediaWiki.timing.' + metricName + 
'.backendResponse.' + specialPage,
+   mw.config.get( 'wgBackendResponseTime' )
+   );
+   }
+
+   if ( [ 'Recentchanges', 'Recentchangeslinked', 'Watchlist' ].indexOf( 
specialPage ) !== -1 ) {
+   // Log performance data
+   if ( window.performance && window.performance.now ) {
+   // HACK: if the rcfilters module is in the 'registered' 
state, it's not going to be loaded
+   // and we're in the old UI. If it's in the 'loading', 
'loaded' or 'ready' states,
+   // we're in the new UI.
+   isNewUI = mw.loader.getState( 
'mediawiki.rcfilters.filters.ui' ) !== 'registered';
+   metricName = isNewUI ? 'structuredChangeFilters' : 
'changesListSpecialPage';
+   if ( isNewUI ) {
+   mw.hook( 
'structuredChangeFilters.ui.initialized' ).add( logReady );
+   } else {
+   // HACK: to measure 'ready' time, wait for 
makeCollapsible to be loaded
+   // and for $.ready
+   if ( mw.loader.getState( 
'jquery.makeCollapsible' ) !== 'registered' ) {
+   collapsiblePromise = mw.loader.using( 
'jquery.makeCollapsible' );
+   } else {
+   // makeCollapsible isn't going to be 
loaded
+   collapsiblePromise = null;
+   }
+   $.when( $.ready, collapsiblePromise ).done( 
logReady );
+   }
+   }
+   }
+
$( function () {
var uri = new mw.Uri(),
linkTypes = {
@@ -42,7 +82,7 @@
return 'page';
}
 
-   if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'Recentchanges' ) {
+   if ( specialPage === 'Recentchanges' ) {
$( '.mw-changeslist' ).on( 'click', 'a[href]', function 
( e ) {
var selector, target,
type = 'unknown',
@@ -113,6 +153,5 @@
delete uri.query.fromrc;
history.replaceState( null, document.title, uri );
}
-
} );
 }( jQuery, mediaWiki ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib300af5caad5c6e0ca13554c20a2e4311743e176
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
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.2]: Remove perf tracking code that was moved to WikimediaEvents ...

2017-10-04 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382328 )

Change subject: Remove perf tracking code that was moved to WikimediaEvents in 
Ib300af5c
..

Remove perf tracking code that was moved to WikimediaEvents in Ib300af5c

Bug: T176652
Depends-On: Ib300af5caad5c6e0ca13554c20a2e4311743e176
Change-Id: I963431771556635ea3db28101470317ebd82906f
(cherry picked from commit be08b7aa186d15c341c8e59d49d6b80a11369c87)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/382328/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 73259f6..da11973 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -84,18 +84,6 @@
filtersWidget.setTopSection( 
wlTopSection.$element );
} // end Special:WL
 
-   // Log performance data
-   if ( window.performance && window.performance.now ) {
-   mw.track(
-   
'timing.MediaWiki.timing.structuredChangeFilters.ready.' + specialPage,
-   window.performance.now()
-   );
-   mw.track(
-   
'timing.MediaWiki.timing.structuredChangeFilters.backendResponse.' + 
specialPage,
-   mw.config.get( 'wgBackendResponseTime' )
-   );
-   }
-
/**
 * Fired when initialization of the filtering interface 
for changes list is complete.
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I963431771556635ea3db28101470317ebd82906f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.2]: Move RCFilters performance logging to WikimediaEvents and al...

2017-10-04 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382327 )

Change subject: Move RCFilters performance logging to WikimediaEvents and also 
log performance for old UI
..

Move RCFilters performance logging to WikimediaEvents and also log performance 
for old UI

For the ready time in the old UI, use the load time of makeCollapsible and 
$.ready
(whichever is later) as an approximation, at Krinkle's recommendation.

Bug: T176652
Change-Id: Ib300af5caad5c6e0ca13554c20a2e4311743e176
(cherry picked from commit 89c07bee016adf4afc88205e7807b2dbf2a3e4be)
---
M modules/ext.wikimediaEvents.recentChangesClicks.js
1 file changed, 41 insertions(+), 2 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index 9e35caf..d3efa9a 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -5,6 +5,46 @@
  * @author Roan Kattouw 
  */
 ( function ( $, mw ) {
+   var isNewUI,
+   metricName,
+   collapsiblePromise,
+   specialPage = mw.config.get( 'wgCanonicalSpecialPageName' );
+
+   function logReady() {
+   mw.track(
+   'timing.MediaWiki.timing.' + metricName + '.ready.' + 
specialPage,
+   window.performance.now()
+   );
+   mw.track(
+   'timing.MediaWiki.timing.' + metricName + 
'.backendResponse.' + specialPage,
+   mw.config.get( 'wgBackendResponseTime' )
+   );
+   }
+
+   if ( [ 'Recentchanges', 'Recentchangeslinked', 'Watchlist' ].indexOf( 
specialPage ) !== -1 ) {
+   // Log performance data
+   if ( window.performance && window.performance.now ) {
+   // HACK: if the rcfilters module is in the 'registered' 
state, it's not going to be loaded
+   // and we're in the old UI. If it's in the 'loading', 
'loaded' or 'ready' states,
+   // we're in the new UI.
+   isNewUI = mw.loader.getState( 
'mediawiki.rcfilters.filters.ui' ) !== 'registered';
+   metricName = isNewUI ? 'structuredChangeFilters' : 
'changesListSpecialPage';
+   if ( isNewUI ) {
+   mw.hook( 
'structuredChangeFilters.ui.initialized' ).add( logReady );
+   } else {
+   // HACK: to measure 'ready' time, wait for 
makeCollapsible to be loaded
+   // and for $.ready
+   if ( mw.loader.getState( 
'jquery.makeCollapsible' ) !== 'registered' ) {
+   collapsiblePromise = mw.loader.using( 
'jquery.makeCollapsible' );
+   } else {
+   // makeCollapsible isn't going to be 
loaded
+   collapsiblePromise = null;
+   }
+   $.when( $.ready, collapsiblePromise ).done( 
logReady );
+   }
+   }
+   }
+
$( function () {
var uri = new mw.Uri(),
linkTypes = {
@@ -42,7 +82,7 @@
return 'page';
}
 
-   if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'Recentchanges' ) {
+   if ( specialPage === 'Recentchanges' ) {
$( '.mw-changeslist' ).on( 'click', 'a[href]', function 
( e ) {
var selector, target,
type = 'unknown',
@@ -113,6 +153,5 @@
delete uri.query.fromrc;
history.replaceState( null, document.title, uri );
}
-
} );
 }( jQuery, mediaWiki ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib300af5caad5c6e0ca13554c20a2e4311743e176
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Catrope 

___
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.2]: RCFilters: Avoid adding raw filter and group objects to js vars

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

Change subject: RCFilters: Avoid adding raw filter and group objects to js vars
..


RCFilters: Avoid adding raw filter and group objects to js vars

Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
(cherry picked from commit dbc83d9c431f65da38e23170912e8a3f3f0ef3c3)
---
M includes/changes/ChangesListFilterGroup.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/changes/ChangesListFilterGroup.php 
b/includes/changes/ChangesListFilterGroup.php
index 5762752..e9140da 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -394,9 +394,9 @@
);
 
foreach ( $conflicts as $conflictInfo ) {
-   $output['conflicts'][] = $conflictInfo;
unset( $conflictInfo['filterObject'] );
unset( $conflictInfo['groupObject'] );
+   $output['conflicts'][] = $conflictInfo;
array_push(
$output['messageKeys'],
$conflictInfo['globalDescription'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Track all label/description languages as used on multilingua...

2017-10-04 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382326 )

Change subject: Track all label/description languages as used on multilingual 
wikis
..

Track all label/description languages as used on multilingual wikis

This will make the table on commons etc. significantly more
stable, as the usages wont depend on who viewed the pages.

For performance reasons I chose to only include the all language usage
in AffectedPagesFinder::getChangedLabelAspects when we're actually
on a multilingual wiki.

Bug: T173196
Change-Id: I647a418fcbce89a7ec66b0600ccee94321f36e90
---
M client/includes/Changes/AffectedPagesFinder.php
M client/includes/DataAccess/DataAccessSnakFormatterFactory.php
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/Usage/UsageTrackingLanguageFallbackLabelDescriptionLookup.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M 
client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
M 
client/tests/phpunit/includes/DataAccess/ParserFunctions/StatementGroupRendererFactoryTest.php
M 
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M 
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M 
client/tests/phpunit/includes/Usage/UsageTrackingLanguageFallbackLabelDescriptionLookupTest.php
12 files changed, 116 insertions(+), 34 deletions(-)


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

diff --git a/client/includes/Changes/AffectedPagesFinder.php 
b/client/includes/Changes/AffectedPagesFinder.php
index 92424af..ccd8d31 100644
--- a/client/includes/Changes/AffectedPagesFinder.php
+++ b/client/includes/Changes/AffectedPagesFinder.php
@@ -55,6 +55,11 @@
/**
 * @var bool
 */
+   private $allowDataAccessInUserLanguage;
+
+   /**
+* @var bool
+*/
private $checkPageExistence;
 
/**
@@ -62,6 +67,7 @@
 * @param TitleFactory $titleFactory
 * @param string $siteId
 * @param string $contentLanguageCode
+* @param bool $allowDataAccessInUserLanguage
 * @param bool $checkPageExistence
 *
 * @throws InvalidArgumentException
@@ -71,6 +77,7 @@
TitleFactory $titleFactory,
$siteId,
$contentLanguageCode,
+   $allowDataAccessInUserLanguage,
$checkPageExistence = true
) {
if ( !is_string( $siteId ) ) {
@@ -81,6 +88,10 @@
throw new InvalidArgumentException( 
'$contentLanguageCode must be a string' );
}
 
+   if ( !is_bool( $allowDataAccessInUserLanguage ) ) {
+   throw new InvalidArgumentException( 
'$allowDataAccessInUserLanguage must be a boolean' );
+   }
+
if ( !is_bool( $checkPageExistence ) ) {
throw new InvalidArgumentException( 
'$checkPageExistence must be a boolean' );
}
@@ -89,6 +100,7 @@
$this->titleFactory = $titleFactory;
$this->siteId = $siteId;
$this->contentLanguageCode = $contentLanguageCode;
+   $this->allowDataAccessInUserLanguage = 
$allowDataAccessInUserLanguage;
$this->checkPageExistence = $checkPageExistence;
}
 
@@ -169,6 +181,12 @@
$aspects[] = EntityUsage::makeAspectKey( 
EntityUsage::LABEL_USAGE, $lang );
}
 
+   if ( $this->allowDataAccessInUserLanguage ) {
+   // If data access in user language is allowed, we might 
also
+   // have an all language usages.
+   $aspects[] = EntityUsage::makeAspectKey( 
EntityUsage::LABEL_USAGE );
+   }
+
return $aspects;
}
 
diff --git a/client/includes/DataAccess/DataAccessSnakFormatterFactory.php 
b/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
index c0c3bab..c3ecf32 100644
--- a/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
+++ b/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
@@ -52,18 +52,29 @@
 */
private $languageFallbackLabelDescriptionLookupFactory;
 
+   /**
+* @var bool
+*/
+   private $allowDataAccessInUserLanguage;
+
public function __construct(
LanguageFallbackChainFactory $languageFallbackChainFactory,
OutputFormatSnakFormatterFactory $snakFormatterFactory,
PropertyDataTypeLookup $propertyDataTypeLookup,
EntityIdParser $repoItemUriParser,
-   LanguageFallbackLabelDescriptionLookupFactory

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Removing expired rules

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

Change subject: Removing expired rules
..


Removing expired rules

Change-Id: I4d15908f71d9716f8cc207722cbfe6d2b6108931
---
M wmf-config/throttle.php
1 file changed, 0 insertions(+), 32 deletions(-)

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



diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index 7d37497..62c29b0 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -28,36 +28,4 @@
 # ];
 ## Add throttling definitions below.
 
-$wmgThrottlingExceptions[] = [ // T175113
-   'from' => '2017-09-05T0:00 +2:00',
-   'to' => '2017-09-30T0:00 +2:00',
-   'IP' => '93.91.145.154',
-   'dbname' => [ 'cswiki', 'cswikiversity' ],
-   'value' => 70, // 50 expected
-];
-
-$wmgThrottlingExceptions[] = [
-   'from' => '2017-09-29T12:00 UTC',
-   'to' => '2017-09-30T02:00 UTC',
-   'range' => [ '186.67.125.0/24', '163.247.67.20/30', '163.247.67.24/29', 
'163.247.67.32/28', '163.247.67.48/29', '163.247.67.56/30', '163.247.67.60/31', 
'163.247.67.62/32' ],
-   'dbname' => [ 'eswiki', 'enwiki', 'commonswiki', 'wikidatawiki' ],
-   'value' => 120 // 100 expected
-];
-
-$wmgThrottlingExceptions[] = [ // T176287 - John Michael Kohler Art Center
-   'from'   => '2017-09-21T13:00-05:00', // Central
-   'to' => '2017-09-26T22:00-05:00',
-   'IP'  => [
-   '192.168.50.52',
-   ],
-   'dbname' => [ 'enwiki', 'commonswiki' ],
-   'value'  => 100, // 100 expected participants (not specified)
-];
-$wmgThrottlingExceptions[] = [ // T177370
-   'from' => '2017-10-04T15:00 +2:00',
-   'to' => '2017-10-04T17:00 +2:00',
-   'range' => [ '195.113.180.192/26', '2001:718:9::/48' ],
-   'dbname' => [ 'cswiki' ],
-   'value' => 20, // 16 expected
-];
 ## Add throttling definitions above.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d15908f71d9716f8cc207722cbfe6d2b6108931
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 
Gerrit-Reviewer: Catrope 
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.2]: RCFilters: Allows specifying default highlights from the server

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

Change subject: RCFilters: Allows specifying default highlights from the server
..


RCFilters: Allows specifying default highlights from the server

Bug: T172757
Change-Id: I0545b4e0222e14be99d567e7890ccf33722a5d1e
(cherry picked from commit 8937a72df713921e1287042feb610c4ded253f1e)
---
M includes/changes/ChangesListFilter.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
M tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
M tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
M tests/phpunit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
M tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
9 files changed, 63 insertions(+), 4 deletions(-)

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



diff --git a/includes/changes/ChangesListFilter.php 
b/includes/changes/ChangesListFilter.php
index 2fc1006..2546f2b 100644
--- a/includes/changes/ChangesListFilter.php
+++ b/includes/changes/ChangesListFilter.php
@@ -103,6 +103,12 @@
 */
protected $priority;
 
+   /**
+*
+* @var string $defaultHighlightColor
+*/
+   protected $defaultHighlightColor;
+
const RESERVED_NAME_CHAR = '_';
 
/**
@@ -368,6 +374,7 @@
'priority' => $this->priority,
'subset' => $this->subsetFilters,
'conflicts' => [],
+   'defaultHighlightColor' => $this->defaultHighlightColor
];
 
$output['messageKeys'] = [
@@ -494,4 +501,11 @@
}
);
}
+
+   /**
+* @param string $defaultHighlightColor
+*/
+   public function setDefaultHighlightColor( $defaultHighlightColor ) {
+   $this->defaultHighlightColor = $defaultHighlightColor;
+   }
 }
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 4dc86f6..037240e 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -93,6 +93,7 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.initializeFilters = function ( 
filterDefinition, groupDefault ) {
var defaultParam,
+   anyHighlighted,
supersetMap = {},
model = this,
items = [];
@@ -106,7 +107,8 @@
description: filter.description || '',
labelPrefixKey: model.labelPrefixKey,
cssClass: filter.cssClass,
-   identifiers: filter.identifiers
+   identifiers: filter.identifiers,
+   defaultHighlightColor: 
filter.defaultHighlightColor
} );
 
if ( filter.subset ) {
@@ -188,6 +190,18 @@
this.defaultParams[ this.getName() ] = defaultParam;
}
 
+   // add highlights to defaultParams
+   anyHighlighted = false;
+   this.getItems().forEach( function ( filterItem ) {
+   if ( filterItem.isHighlighted() ) {
+   anyHighlighted = true;
+   this.defaultParams[ filterItem.getName() + 
'_color' ] = filterItem.getHighlightColor();
+   }
+   }.bind( this ) );
+   if ( anyHighlighted ) {
+   this.defaultParams.highlight = '1';
+   }
+
// Store default filter state based on default params
this.defaultFilters = this.getFilterRepresentation( 
this.getDefaultParams() );
 
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index edb3d0f..7627f9f 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -410,6 +410,10 @@
 
this.currentView = 'default';
 
+   if ( this.getHighlightedItems().length > 0 ) {
+   this.toggleHighlight( true );
+   }
+
// Finish initialization
this.emit(

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.31.0-wmf.2]: RCFilters: highlight damaging levels

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

Change subject: RCFilters: highlight damaging levels
..


RCFilters: highlight damaging levels

Bug: T172757
Depends-On: I0545b4e0222e14be99d567e7890ccf33722a5d1e
Change-Id: I3ebd6ff2c5f69589c7d9b05e7a49118761fa8c80
(cherry picked from commit 7d6a685e5efc7fa7d5d567680380981f7f9752f3)
---
M includes/Hooks.php
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index c35b05f..ee11a4a 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -251,6 +251,19 @@
$newDamagingGroup->setDefault( 
self::getDamagingLevelPreference( $clsp->getUser() ) );
}
 
+   if ( $clsp->getUser()->getBoolOption( 
'oresHighlight' ) ) {
+   $levelsColors = [
+   'maybebad' => 'c3',
+   'likelybad' => 'c4',
+   'verylikelybad' => 'c5',
+   ];
+   foreach ( $levelsColors as $level => 
$color ) {
+   if ( isset( $filters[ $level ] 
) ) {
+   
$newDamagingGroup->getFilter( $level )->setDefaultHighlightColor( $color );
+   }
+   }
+   }
+
$clsp->registerFilterGroup( $newDamagingGroup );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ebd6ff2c5f69589c7d9b05e7a49118761fa8c80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: zuul: Same duration for mini graphs and link to Grafana

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

Change subject: zuul: Same duration for mini graphs and link to Grafana
..


zuul: Same duration for mini graphs and link to Grafana

* Some of the mini graphs were 8h, some 24h. Now all 24h.
* Make the mini graphs linked to the related Grafana dashboard
  so that it is easier to continue data exploration after initial
  contact.

Change-Id: I18f9f8d1402663946a3c9433051c81abc1d4e885
---
M org/wikimedia/integration/zuul/default.html
1 file changed, 14 insertions(+), 6 deletions(-)

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



diff --git a/org/wikimedia/integration/zuul/default.html 
b/org/wikimedia/integration/zuul/default.html
index ea26200..eac52e9 100644
--- a/org/wikimedia/integration/zuul/default.html
+++ b/org/wikimedia/integration/zuul/default.html
@@ -10,22 +10,27 @@
https://grafana.wikimedia.org/dashboard/db/nodepool;>Nodepool
https://grafana.wikimedia.org/dashboard/db/zuul;>Zuul

-   https://grafana.wikimedia.org/dashboard/db/zuul?from=now-24h=now=26;
 target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 areaMode=first
 lineMode=staircase
 
target=alias(summarize(sumSeries(zuul.pipeline.*.current_changes),'1h'),'Changes
 in pipelines per hour')
-title=Changes%20in%20Zuul%20pipelines%20per%20hour" title="Changes in 
Zuul (per hour)" />
-   
+   
+   https://grafana.wikimedia.org/dashboard/db/zuul-gearman?from=now-24h=now;
 target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 target=alias(color(zuul.geard.queue.running,'blue'),'Running')
 target=alias(color(zuul.geard.queue.waiting,'red'),'Waiting')
 target=alias(color(zuul.geard.queue.total,'88'),'Total')
-title=Gearman%20job%20queue%20(8%20hours)" />
+title=Gearman%20job%20queue%20" />
+   
 
-   https://grafana.wikimedia.org/dashboard/db/zuul?from=now-3d=now; 
target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 areaMode=first
@@ -35,7 +40,9 @@
 target=alias(summarize(zuul.pipeline.test.current_changes,'1min'),'1min 
avg')
 
target=alias(summarize(zuul.pipeline.test.current_changes,'1h','max'),'hourly
 max')
 title=Zuul%20test%20pipeline" />
-   https://grafana.wikimedia.org/dashboard/db/zuul?from=now-3d=now; 
target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 areaMode=first
@@ -45,3 +52,4 @@
 
target=alias(summarize(zuul.pipeline.gate-and-submit.current_changes,'1min'),'1min
 avg')
 
target=alias(summarize(zuul.pipeline.gate-and-submit.current_changes,'1h','max'),'hourly
 max')
 title=Zuul%20gate%20pipeline" />
+   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18f9f8d1402663946a3c9433051c81abc1d4e885
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: zuul: Same duration for mini graphs and link to Grafana

2017-10-04 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382325 )

Change subject: zuul: Same duration for mini graphs and link to Grafana
..

zuul: Same duration for mini graphs and link to Grafana

* Some of the mini graphs were 8h, some 24h. Now all 24h.
* Make the mini graphs linked to the related Grafana dashboard
  so that it is easier to continue data exploration after initial
  contact.

Change-Id: I18f9f8d1402663946a3c9433051c81abc1d4e885
---
M org/wikimedia/integration/zuul/default.html
1 file changed, 14 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/25/382325/1

diff --git a/org/wikimedia/integration/zuul/default.html 
b/org/wikimedia/integration/zuul/default.html
index ea26200..eac52e9 100644
--- a/org/wikimedia/integration/zuul/default.html
+++ b/org/wikimedia/integration/zuul/default.html
@@ -10,22 +10,27 @@
https://grafana.wikimedia.org/dashboard/db/nodepool;>Nodepool
https://grafana.wikimedia.org/dashboard/db/zuul;>Zuul

-   https://grafana.wikimedia.org/dashboard/db/zuul?from=now-24h=now=26;
 target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 areaMode=first
 lineMode=staircase
 
target=alias(summarize(sumSeries(zuul.pipeline.*.current_changes),'1h'),'Changes
 in pipelines per hour')
-title=Changes%20in%20Zuul%20pipelines%20per%20hour" title="Changes in 
Zuul (per hour)" />
-   
+   
+   https://grafana.wikimedia.org/dashboard/db/zuul-gearman?from=now-24h=now;
 target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 target=alias(color(zuul.geard.queue.running,'blue'),'Running')
 target=alias(color(zuul.geard.queue.waiting,'red'),'Waiting')
 target=alias(color(zuul.geard.queue.total,'88'),'Total')
-title=Gearman%20job%20queue%20(8%20hours)" />
+title=Gearman%20job%20queue%20" />
+   
 
-   https://grafana.wikimedia.org/dashboard/db/zuul?from=now-3d=now; 
target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 areaMode=first
@@ -35,7 +40,9 @@
 target=alias(summarize(zuul.pipeline.test.current_changes,'1min'),'1min 
avg')
 
target=alias(summarize(zuul.pipeline.test.current_changes,'1h','max'),'hourly
 max')
 title=Zuul%20test%20pipeline" />
-   https://grafana.wikimedia.org/dashboard/db/zuul?from=now-3d=now; 
target="_blank">
+   https://graphite.wikimedia.org/render/?from=-24hours
 height=180
 width=400
 areaMode=first
@@ -45,3 +52,4 @@
 
target=alias(summarize(zuul.pipeline.gate-and-submit.current_changes,'1min'),'1min
 avg')
 
target=alias(summarize(zuul.pipeline.gate-and-submit.current_changes,'1h','max'),'hourly
 max')
 title=Zuul%20gate%20pipeline" />
+   

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.31.0-wmf.2]: Correct feature phone threshold detection

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

Change subject: Correct feature phone threshold detection
..


Correct feature phone threshold detection

max-width should actually be one smaller than the threshold

Additional changes:
* Also rename to  @width-breakpoint-mobile and
rename @width-breakpoint-desktop for desktop variable in
anticipation of T171365

Bug: T176286
Change-Id: Ia37bceb46a6b780f473828ff38749543bdfcc9f6
---
M minerva.less/minerva.variables.less
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.content.styles/main.less
M resources/skins.minerva.tablet.styles/common.less
M skinStyles/mobile.languages.structured/LanguageOverlay.less
M skinStyles/mobile.pointerOverlay/minerva.less
M skinStyles/mobile.search/SearchOverlay.less
M skinStyles/mobile.startup/Overlay.less
8 files changed, 12 insertions(+), 10 deletions(-)

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



diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index 754b58d..f721b32 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -15,8 +15,10 @@
 @grayLight: @colorGray12;
 @grayLightest: @colorGray14;
 
-@wgMFDeviceWidthMobileSmall: 320px;
-@wgMFDeviceWidthDesktop: 1000px;
+@width-breakpoint-mobile: 320px;
+@width-breakpoint-desktop: 1000px;
+// For backwards compatibility with MobileFrontend skinStyles
+@wgMFDeviceWidthDesktop: @width-breakpoint-desktop;
 
 @skinContentBgColor: #fff;
 
@@ -85,7 +87,7 @@
 @contentPaddingTablet: 3.35em;
 
 // note since content does not use view border box we have to include padding.
-@contentMaxWidthTablet: @wgMFDeviceWidthDesktop - ( 2 * @contentPaddingTablet 
);
+@contentMaxWidthTablet: @width-breakpoint-desktop - ( 2 * 
@contentPaddingTablet );
 @contentTopPadding: 1.6em;
 
 // Wiki specific variables
diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 2e96bd9..0742202 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -112,7 +112,7 @@
 }
 
 // On small devices that don't support Javascript, hide the page actions bar
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
+@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
.client-nojs {
#page-actions {
display: none;
diff --git a/resources/skins.minerva.content.styles/main.less 
b/resources/skins.minerva.content.styles/main.less
index dc12d75..7e4b982 100644
--- a/resources/skins.minerva.content.styles/main.less
+++ b/resources/skins.minerva.content.styles/main.less
@@ -28,7 +28,7 @@
word-wrap: break-word;
 }
 
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
+@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
body {
font-size: 0.8em;
}
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index e5f4e6d..ba87302 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -119,7 +119,7 @@
}
 }
 
-@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @width-breakpoint-desktop ) {
// FIXME: Zero should use banner-container class or better - append to 
banner-container
#mw-mf-page-center .mw-mf-banner,
.banner-container,
diff --git a/skinStyles/mobile.languages.structured/LanguageOverlay.less 
b/skinStyles/mobile.languages.structured/LanguageOverlay.less
index f1fd903..6e96b07 100644
--- a/skinStyles/mobile.languages.structured/LanguageOverlay.less
+++ b/skinStyles/mobile.languages.structured/LanguageOverlay.less
@@ -1,6 +1,6 @@
 @import 'minerva.variables';
 
-@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @width-breakpoint-desktop ) {
.language-overlay {
.overlay-content {
margin: 0;
diff --git a/skinStyles/mobile.pointerOverlay/minerva.less 
b/skinStyles/mobile.pointerOverlay/minerva.less
index 9f1b5b0..47bea85 100644
--- a/skinStyles/mobile.pointerOverlay/minerva.less
+++ b/skinStyles/mobile.pointerOverlay/minerva.less
@@ -7,7 +7,7 @@
// can point to anything in the containing content area and avoid
// padding issues such as https://phabricator.wikimedia.org/F287611
#mw-mf-page-center .pointer-overlay {
-   max-width: @wgMFDeviceWidthDesktop;
+   max-width: @width-breakpoint-desktop;
}
 }
 
diff --git a/skinStyles/mobile.search/SearchOverlay.less 
b/skinStyles/mobile.search/SearchOverlay.less
index 8d3eb49..e0232f4 100644
--- a/skinStyles/mobile.search/SearchOverlay.less
+++

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable AbuseFilter runtime profile on Portuguese Wikipedia

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

Change subject: Enable AbuseFilter runtime profile on Portuguese Wikipedia
..


Enable AbuseFilter runtime profile on Portuguese Wikipedia

Bug: T177336
Change-Id: Ie0056fe3b24c9de7cedf461df0bd28374ed1ad72
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8be7f31..b8d8d87 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13002,6 +13002,7 @@
'enwiki' => true,
'mediawikiwiki' => true,
'metawiki' => true,
+   'ptwiki' => true,
'testwiki' => true,
'wikidatawiki' => true,
 ],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove unnecessary `id` attributes

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

Change subject: Remove unnecessary `id` attributes
..


Remove unnecessary `id` attributes

Bug: T175670
Change-Id: I81c36e631edebd91c6ddb32064ed7fa43bae014c
---
M static/images/mobile/copyright/wikipedia-wordmark-en.svg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/static/images/mobile/copyright/wikipedia-wordmark-en.svg 
b/static/images/mobile/copyright/wikipedia-wordmark-en.svg
index dbf091b..370cb15 100644
--- a/static/images/mobile/copyright/wikipedia-wordmark-en.svg
+++ b/static/images/mobile/copyright/wikipedia-wordmark-en.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg;>
\ No newline at end of file
+http://www.w3.org/2000/svg;>
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81c36e631edebd91c6ddb32064ed7fa43bae014c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Urbanecm 
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...Collection[master]: Hygiene: Make render functions dumber

2017-10-04 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382323 )

Change subject: Hygiene: Make render functions dumber
..

Hygiene: Make render functions dumber

Change-Id: I6356f694a98231e0cfd88d11624a6f65da767919
TODO: renderCoverAndToc
---
M includes/BookRenderer.php
1 file changed, 21 insertions(+), 18 deletions(-)


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

diff --git a/includes/BookRenderer.php b/includes/BookRenderer.php
index 0bc4bfc..0367ff6 100644
--- a/includes/BookRenderer.php
+++ b/includes/BookRenderer.php
@@ -96,11 +96,20 @@
}
}
 
+   $contributorSectionNumber = 
$headingCounter->incrementAndGetTopLevel();
+   $imageSectionNumber = 
$headingCounter->incrementAndGetTopLevel();
+   $licenseSectionNumber = 
$headingCounter->incrementAndGetTopLevel();
+
$final = $this->renderCoverAndToc( $collection, $metadata )
. $final
-   . $this->renderContributors( $metadata, 
$headingCounter->incrementAndGetTopLevel() )
-   . $this->renderImageInfos( $metadata, 
$headingCounter->incrementAndGetTopLevel() )
-   . $this->renderLicense( $metadata, 
$headingCounter->incrementAndGetTopLevel() );
+   . $this->renderContributors( $metadata['contributors'], 
$contributorSectionNumber )
+   if ( $metadata['images'] ) {
+   $final .= $this->renderImageInfos( $metadata['images'], 
$imageSectionNumber );
+   }
+   if ( $metadata['license'] ) {
+   $final .= $this->renderLicense( $metadata['license'], 
$licenseSectionNumber );
+   }
+
return $final;
}
 
@@ -204,14 +213,14 @@
 
/**
 * Generate HTML for the list of contributors.
-* @param array[] $metadata Map of prefixed DB key => metadata, as 
returned by fetchMetadata().
+* @param array[] $contributors
 * @param string $sectionNumber The section number for the contributors 
section, if any.
 * @return string HTML to append to the book.
 */
-   private function renderContributors( $metadata, $sectionNumber = null ) 
{
+   private function renderContributors( $contributors, $sectionNumber = 
null ) {
$list = array_map( function ( $name ) {
return Html::element( 'li', [], $name );
-   }, array_keys( $metadata['contributors'] ) );
+   }, array_keys( $contributors ) );
 
$attribs = [ 'id' => 'mw-book-contributors' ];
if ( $sectionNumber ) {
@@ -224,14 +233,11 @@
 
/**
 * Generate HTML for the images used in the book
-* @param array[] $metadata Map of prefixed DB key => metadata, as 
returned by fetchMetadata().
+* @param array[] $imageList
 * @param string $sectionNumber The section number for the images 
section, if any.
 * @return string HTML to append to the book.
 */
-   private function renderImageInfos( $metadata, $sectionNumber = null ) {
-   if ( !$metadata['images'] ) {
-   return '';
-   }
+   private function renderImageInfos( $imageList, $sectionNumber = null ) {
 
$messages = [
'sourceMsg' => wfMessage( 'coll-images-source' 
)->text(),
@@ -239,7 +245,7 @@
'artistMsg' => wfMessage( 'coll-images-original-artist' 
)->text()
];
$images = [];
-   foreach ( $metadata['images'] as $image ) {
+   foreach ( $imageList as $image ) {
$images[] = array_merge( $image, $messages );
}
return $this->templateParser->processTemplate( 'images', [
@@ -251,17 +257,14 @@
 
/**
 * Generate HTML for the content license of the book
-* @param array[] $metadata Map of prefixed DB key => metadata, as 
returned by fetchMetadata().
+* @param string $license html
 * @param string $sectionNumber The section number for the images 
section, if any.
 * @return string HTML to append to the book.
 */
-   private function renderLicense( $metadata, $sectionNumber = null ) {
-   if ( !$metadata['license'] ) {
-   return '';
-   }
+   private function renderLicense( $license, $sectionNumber = null ) {
return $this->templateParser->processTemplate( 'license', [
'sectionNumber' => $sectionNumber,
-   'license' => $metadata['license'],
+   'license' => $license,
'headingMsg' => wfMessage(

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: WIP: Refactor non-render logic out of render.

2017-10-04 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382324 )

Change subject: WIP: Refactor non-render logic out of render.
..

WIP: Refactor non-render logic out of render.

Change-Id: I3a2e000bc1e4dac5c1df2e3cdd97cb1dbccaaed1
---
M includes/BookRenderer.php
1 file changed, 59 insertions(+), 38 deletions(-)


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

diff --git a/includes/BookRenderer.php b/includes/BookRenderer.php
index 0367ff6..f35b183 100644
--- a/includes/BookRenderer.php
+++ b/includes/BookRenderer.php
@@ -24,6 +24,57 @@
$this->templateParser = $templateParser;
}
 
+   private function renderCollectionChapter( $item, $sectionNumber ) {
+   return Html::element( 'h1', [
+   'id' => 'mw-book-chapter-' . 
Sanitizer::escapeIdForAttribute( $item['title'] ),
+   'class' => 'mw-book-chapter',
+   'data-mw-sectionnumber' => $sectionNumber,
+   ], $item['title'] ) . "\n";
+   }
+
+   private function renderCollectionArticle( $headingText, $html, 
$headingId, $sectionNumber = false ) {
+   $headingAttribs = [
+   'id' => $headingId,
+   'class' => 'mw-book-article',
+   ];
+   if ( $sectionNumber ) {
+   $headingAttribs['data-mw-sectionnumber'] = 
$sectionNumber;
+   }
+
+   $final = Html::rawElement( 'h2', $headingAttribs, $headingText 
) . "\n";
+   return $final . Html::openElement( 'article' )
+   . substr( $html, 15 ) // strip ""
+   . Html::closeElement( 'article' );
+   }
+
+   // FIXME: Work out what sectionThing is.
+   private function prepareCollectionArticle( $munger, $title, $html, 
$sectionThing, $sectionNumber = false ) {
+   $title = Title::newFromText( $title );
+   $dbkey = $title->getPrefixedDBkey();
+   $html = $this->getBodyContents( $html );
+
+   $mungerOptions = [];
+   if ( $sectionNumber ) {
+   $mungerOptions['sectionNumberPrefix'] = $sectionNumber;
+   }
+
+   $munger->startCollectionSection( './' . $dbkey, $sectionThing,
+   $headingCounter );
+   $treeBuilder = new \RemexHtml\TreeBuilder\TreeBuilder( $munger, 
[] );
+   $dispatcher = new \RemexHtml\TreeBuilder\Dispatcher( 
$treeBuilder );
+   $tokenizer = new \RemexHtml\Tokenizer\Tokenizer( $dispatcher, 
$html, [
+   // HTML comes from Parsoid so we can skip validation
+   'ignoreErrors' => true,
+   'ignoreCharRefs' => true,
+   'ignoreNulls' => true,
+   'skipPreprocess' => true,
+   ] );
+   $tokenizer->execute( [
+   'fragmentNamespace' => \RemexHtml\HTMLData::NS_HTML,
+   'fragmentName' => 'body',
+   ] );
+   }
+
/**
 * Generate the concatenated page.
 * @param array[] $collection Collection, as returned by 
CollectionSession::getCollection().
@@ -54,45 +105,15 @@
] );
foreach ( $collection['items'] as $item ) {
if ( $item['type'] === 'chapter' ) {
-   $final .= Html::element( 'h1', [
-   'id' => 'mw-book-chapter-' . 
Sanitizer::escapeIdForAttribute( $item['title'] ),
-   'class' => 'mw-book-chapter',
-   'data-mw-sectionnumber' => 
$headingCounter->incrementAndGet( -2 ),
-   ], $item['title'] ) . "\n";
+   $sectionNumber = 
$headingCounter->incrementAndGet( -2 );
+   $final .= $this->renderCollectionChapter( 
$item, $sectionNumber );
} elseif ( $item['type'] === 'article' ) {
-   $title = Title::newFromText( $item['title'] );
-   $dbkey = $title->getPrefixedDBkey();
-   $html = $this->getBodyContents( $pages[$dbkey] 
);
-
-   $headingAttribs = [
-   'id' => 'mw-book-article-' . $dbkey,
-   'class' => 'mw-book-article',
-   ];
-   $mungerOptions = [];
-   if ( $articleCount > 1 ) {
-   $mungerOptions['sectionNumberPrefix'] = 
$headingAttribs['data-mw-sectionnumber']
-

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Account for instead of for inline fig...

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

Change subject: Account for  instead of  for inline figures
..


Account for  instead of  for inline figures

 * Note that there're a number of fixtures that might be prudent to
   update as well.

Bug: T177301
Change-Id: Ideccf1ee265ee2ff9caed4e1ef4d129a1698f0a7
---
M lib/transformations/anchorPopUpMediaTransforms.js
M lib/transforms.js
M test/lib/transforms/app-transforms-test.js
3 files changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/lib/transformations/anchorPopUpMediaTransforms.js 
b/lib/transformations/anchorPopUpMediaTransforms.js
index 80d468b..6feda15 100644
--- a/lib/transformations/anchorPopUpMediaTransforms.js
+++ b/lib/transformations/anchorPopUpMediaTransforms.js
@@ -26,9 +26,15 @@
 }
 
 // Look for an ancestor element 
-// or .
+// or .
 if (node.nodeType === 1
-&& (node.nodeName === 'FIGURE' || node.nodeName === 
'SPAN')) {
+&& (node.nodeName === 'FIGURE' ||
+node.nodeName === 'FIGURE-INLINE' ||
+// TODO:  is here for backwards compatibility.
+// This is now generated as  and should
+// be safe to remove when verion 1.5 content is no
+// longer acceptable.
+node.nodeName === 'SPAN')) {
 const typeOf = node.getAttribute('typeof');
 if (typeOf === 'mw:Video/Thumb' || typeOf === 'mw:Video') {
 return true;
diff --git a/lib/transforms.js b/lib/transforms.js
index 59d3651..dc24468 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -194,7 +194,7 @@
 // on all anchors around images
 // so the app knows to view these images in the gallery.
 // See also 
https://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
-_addClassTo(doc, 'figure > a, span[typeof^=mw:Image] > a', 'image');
+_addClassTo(doc, 'figure > a, *[typeof^=mw:Image] > a', 'image');
 }
 
 function _applyOptionalParsoidSpecificTransformations(doc) {
diff --git a/test/lib/transforms/app-transforms-test.js 
b/test/lib/transforms/app-transforms-test.js
index c3f5887..5b3ed53 100644
--- a/test/lib/transforms/app-transforms-test.js
+++ b/test/lib/transforms/app-transforms-test.js
@@ -9,7 +9,7 @@
 describe('lib:app-transforms', () => {
 it('fixVideoAnchor should skip video tags just holding audio', () => {
 const doc = domino.createDocument(`
-
+
 
@@ -17,7 +17,7 @@
 
src="https://upload.wikimedia.org/wikipedia/en/c/c4/Radiohead_-_Creep_%28sample%29.ogg;
 type='audio/ogg; codecs="vorbis"'/>
 
-`);
+`);
 a.fixVideoAnchor(doc);
 const videoThumbImgElements = doc.querySelectorAll('a.app_media');
 assert.equal(videoThumbImgElements.length, 0, 'Should not have marked 
the audio file');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ideccf1ee265ee2ff9caed4e1ef4d129a1698f0a7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Regenerate FancyCaptchas weekly rather than monthly

2017-10-04 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382322 )

Change subject: Regenerate FancyCaptchas weekly rather than monthly
..

Regenerate FancyCaptchas weekly rather than monthly

Performance improvements to the PHP and python code, means this takes less
than 20 minutes total

Should help combat spam further...

Bug: T157736
Change-Id: I5b078d4deb6dbdb28e53f965320fc9f5ae15b4ed
---
M modules/mediawiki/manifests/maintenance/generatecaptcha.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/382322/1

diff --git a/modules/mediawiki/manifests/maintenance/generatecaptcha.pp 
b/modules/mediawiki/manifests/maintenance/generatecaptcha.pp
index 7f01c2b..40ba005 100644
--- a/modules/mediawiki/manifests/maintenance/generatecaptcha.pp
+++ b/modules/mediawiki/manifests/maintenance/generatecaptcha.pp
@@ -40,7 +40,7 @@
 cron { 'generatecaptcha':
 ensure   => $ensure,
 user => $::mediawiki::users::web,
-monthday => 1,
+weekday  => 1,
 hour => 1,
 minute   => 0,
 require  => File['/etc/fancycaptcha/words', 
'/etc/fancycaptcha/badwords'],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[REL1_30]: Don't use deprecated function wfShellExecDisabled()

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

Change subject: Don't use deprecated function wfShellExecDisabled()
..


Don't use deprecated function wfShellExecDisabled()

Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
(cherry picked from commit 965ddd069ee96d366ee680c315843dce2071065b)
---
M SyntaxHighlight.class.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/SyntaxHighlight.class.php b/SyntaxHighlight.class.php
index c0fe27d..4674821 100644
--- a/SyntaxHighlight.class.php
+++ b/SyntaxHighlight.class.php
@@ -16,6 +16,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+use MediaWiki\Shell\Shell;
 use Symfony\Component\Process\ProcessBuilder;
 
 // @codingStandardsIgnoreStart
@@ -222,7 +223,7 @@
$lexer = null;
}
 
-   if ( wfShellExecDisabled() !== false ) {
+   if ( Shell::isDisabled() ) {
$status->warning( 
'syntaxhighlight-error-pygments-invocation-failure' );
wfWarn(
'MediaWiki determined that it cannot invoke 
Pygments. ' .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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[master]: Hard deprecate wfInitShellLocale()

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

Change subject: Hard deprecate wfInitShellLocale()
..


Hard deprecate wfInitShellLocale()

Soft deprecated since 1.30, no callers anywhere.

Change-Id: Ifec11eb3c2c25ea9d7e5ecb72c53127536ab6c30
---
M includes/GlobalFunctions.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 484dfe8..01569e1 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2350,6 +2350,7 @@
  * @see $wgShellLocale
  */
 function wfInitShellLocale() {
+   wfDeprecated( __FUNCTION__, '1.30' );
 }
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifec11eb3c2c25ea9d7e5ecb72c53127536ab6c30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Krinkle 
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...TimedMediaHandler[wmf/1.31.0-wmf.2]: Use prop(, false) instead of removeAttr() to change properties

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

Change subject: Use prop(, false) instead of removeAttr() to change properties
..


Use prop(, false) instead of removeAttr() to change properties

Fixes:

> JQMIGRATE: jQuery.fn.removeAttr no longer sets boolean properties
> https://github.com/jquery/jquery-migrate/blob/3.0.1/warnings.md

Bug: T169385
Change-Id: Ia37c1982c455d332341a24147b1437210ec79762
(cherry picked from commit b38e73a147af63135179a30f871c9ae8da75cf6e)
---
M MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js 
b/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
index 0ca4086..451e408 100644
--- a/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
+++ b/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
@@ -17,7 +17,7 @@
mw.loader.using( [ 'jquery.client', 'jquery.mwEmbedUtil', 
'mw.MwEmbedSupport' ], function() {
$( playerSet ).each( function( inx, playerElement ) {
// we have javascript ( disable controls )
-   $( playerElement ).removeAttr( 'controls' );
+   $( playerElement ).prop( 'controls', false );
// Add an overlay loader ( firefox has its own 
native loading spinner )
 
if ( $.client.profile().name !== 'firefox' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia37c1982c455d332341a24147b1437210ec79762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[REL1_30]: Don't use deprecated function wfShellExecDisabled()

2017-10-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382321 )

Change subject: Don't use deprecated function wfShellExecDisabled()
..

Don't use deprecated function wfShellExecDisabled()

Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
(cherry picked from commit 965ddd069ee96d366ee680c315843dce2071065b)
---
M SyntaxHighlight.class.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/SyntaxHighlight.class.php b/SyntaxHighlight.class.php
index c0fe27d..4674821 100644
--- a/SyntaxHighlight.class.php
+++ b/SyntaxHighlight.class.php
@@ -16,6 +16,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+use MediaWiki\Shell\Shell;
 use Symfony\Component\Process\ProcessBuilder;
 
 // @codingStandardsIgnoreStart
@@ -222,7 +223,7 @@
$lexer = null;
}
 
-   if ( wfShellExecDisabled() !== false ) {
+   if ( Shell::isDisabled() ) {
$status->warning( 
'syntaxhighlight-error-pygments-invocation-failure' );
wfWarn(
'MediaWiki determined that it cannot invoke 
Pygments. ' .

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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...SyntaxHighlight_GeSHi[master]: Don't use deprecated function wfShellExecDisabled()

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

Change subject: Don't use deprecated function wfShellExecDisabled()
..


Don't use deprecated function wfShellExecDisabled()

Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
---
M SyntaxHighlight.class.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/SyntaxHighlight.class.php b/SyntaxHighlight.class.php
index c0fe27d..4674821 100644
--- a/SyntaxHighlight.class.php
+++ b/SyntaxHighlight.class.php
@@ -16,6 +16,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+use MediaWiki\Shell\Shell;
 use Symfony\Component\Process\ProcessBuilder;
 
 // @codingStandardsIgnoreStart
@@ -222,7 +223,7 @@
$lexer = null;
}
 
-   if ( wfShellExecDisabled() !== false ) {
+   if ( Shell::isDisabled() ) {
$status->warning( 
'syntaxhighlight-error-pygments-invocation-failure' );
wfWarn(
'MediaWiki determined that it cannot invoke 
Pygments. ' .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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] wikimedia...golden[master]: pageviews that are search results pages

2017-10-04 Thread Chelsyx (Code Review) 
Chelsyx has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382320 )

Change subject: pageviews that are search results pages
..

pageviews that are search results pages

In T176464#3636190, @Jdlrobson mentioned that on some browsers, when you 
clicked on the search icon, it will take you to a blank Special:Search page and 
let you start from there. Therefore, we should exclude these blank SRP from our 
counts.

Change-Id: If4aef7521a3268da85e7a3498cce1b33a2ee43a4
---
M modules/metrics/search/search_result_pages
M modules/metrics/search/sister_search_traffic
2 files changed, 10 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/20/382320/1

diff --git a/modules/metrics/search/search_result_pages 
b/modules/metrics/search/search_result_pages
index 348de5f..5908f4e 100755
--- a/modules/metrics/search/search_result_pages
+++ b/modules/metrics/search/search_result_pages
@@ -26,13 +26,11 @@
   AND page_id IS NULL
   AND (
 uri_path = '/wiki/Special:Search'
-OR (
-  uri_path = '/w/index.php'
-  AND (
-LENGTH(PARSE_URL(CONCAT('http://', uri_host, uri_path, uri_query), 
'QUERY', 'search')) > 0
-OR LENGTH(PARSE_URL(CONCAT('http://', uri_host, uri_path, 
uri_query), 'QUERY', 'searchToken')) > 0
-  )
-)
+OR uri_path = '/w/index.php'
+  )
+  AND (
+LENGTH(PARSE_URL(CONCAT('http://', uri_host, uri_path, uri_query), 
'QUERY', 'search')) > 0
+OR LENGTH(PARSE_URL(CONCAT('http://', uri_host, uri_path, uri_query), 
'QUERY', 'searchToken')) > 0
   )
   ) AS serp
   GROUP BY date, access_method, agent_type;
diff --git a/modules/metrics/search/sister_search_traffic 
b/modules/metrics/search/sister_search_traffic
index 0e5b7c6..3e40bc0 100755
--- a/modules/metrics/search/sister_search_traffic
+++ b/modules/metrics/search/sister_search_traffic
@@ -23,13 +23,11 @@
   page_id IS NULL
   AND (
 uri_path = '/wiki/Special:Search'
-OR (
-  uri_path = '/w/index.php'
-  AND (
-PARSE_URL(CONCAT('http://', uri_host, uri_path, uri_query), 
'QUERY', 'search') IS NOT NULL
-OR PARSE_URL(CONCAT('http://', uri_host, uri_path, uri_query), 
'QUERY', 'searchToken') IS NOT NULL
-  )
-)
+OR uri_path = '/w/index.php'
+  )
+  AND (
+LENGTH(PARSE_URL(CONCAT('http://', uri_host, uri_path, uri_query), 
'QUERY', 'search')) > 0
+OR LENGTH(PARSE_URL(CONCAT('http://', uri_host, uri_path, uri_query), 
'QUERY', 'searchToken')) > 0
   )
 ) AS is_serp
   FROM webrequest

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4aef7521a3268da85e7a3498cce1b33a2ee43a4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make Database::rollback() also suppress callback errors

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

Change subject: Make Database::rollback() also suppress callback errors
..


Make Database::rollback() also suppress callback errors

This is consistent with query error suppression, let the
listener callbacks have a chance to run. This also makes
LoadBalancer::rollbackMasterChanges move on to the other
connections.

Change-Id: Ic8b9dd4b868bfe69b04fb20f7be5fce11d864fc4
---
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/IDatabase.php
2 files changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 3c0a2ad..bc1454b 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -3078,8 +3078,16 @@
 
$this->mTrxIdleCallbacks = []; // clear
$this->mTrxPreCommitCallbacks = []; // clear
-   $this->runOnTransactionIdleCallbacks( self::TRIGGER_ROLLBACK );
-   $this->runTransactionListenerCallbacks( self::TRIGGER_ROLLBACK 
);
+   try {
+   $this->runOnTransactionIdleCallbacks( 
self::TRIGGER_ROLLBACK );
+   } catch ( Exception $e ) {
+   // already logged; finish and let LoadBalancer move on 
during mass-rollback
+   }
+   try {
+   $this->runTransactionListenerCallbacks( 
self::TRIGGER_ROLLBACK );
+   } catch ( Exception $e ) {
+   // already logged; let LoadBalancer move on during 
mass-rollback
+   }
}
 
/**
diff --git a/includes/libs/rdbms/database/IDatabase.php 
b/includes/libs/rdbms/database/IDatabase.php
index 5d0e03f..67e8e85 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -1594,6 +1594,8 @@
 * throwing an Exception is preferrable, using a pre-installed error 
handler to trigger
 * rollback (in any case, failure to issue COMMIT will cause rollback 
server-side).
 *
+* Query, connection, and onTransaction* callback errors will be 
suppressed and logged.
+*
 * @param string $fname Calling function name
 * @param string $flush Flush flag, set to a situationally valid 
IDatabase::FLUSHING_*
 *   constant to disable warnings about calling rollback when no 
transaction is in

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8b9dd4b868bfe69b04fb20f7be5fce11d864fc4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[wmf/1.31.0-wmf.2]: Use prop(, false) instead of removeAttr() to change properties

2017-10-04 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382319 )

Change subject: Use prop(, false) instead of removeAttr() to change properties
..

Use prop(, false) instead of removeAttr() to change properties

Fixes:

> JQMIGRATE: jQuery.fn.removeAttr no longer sets boolean properties
> https://github.com/jquery/jquery-migrate/blob/3.0.1/warnings.md

Bug: T169385
Change-Id: Ia37c1982c455d332341a24147b1437210ec79762
(cherry picked from commit b38e73a147af63135179a30f871c9ae8da75cf6e)
---
M MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js 
b/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
index 0ca4086..451e408 100644
--- a/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
+++ b/MwEmbedModules/EmbedPlayer/resources/jquery.embedPlayer.js
@@ -17,7 +17,7 @@
mw.loader.using( [ 'jquery.client', 'jquery.mwEmbedUtil', 
'mw.MwEmbedSupport' ], function() {
$( playerSet ).each( function( inx, playerElement ) {
// we have javascript ( disable controls )
-   $( playerElement ).removeAttr( 'controls' );
+   $( playerElement ).prop( 'controls', false );
// Add an overlay loader ( firefox has its own 
native loading spinner )
 
if ( $.client.profile().name !== 'firefox' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia37c1982c455d332341a24147b1437210ec79762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labweb: add hiera host files.

2017-10-04 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382318 )

Change subject: labweb: add hiera host files.
..


labweb: add hiera host files.

In particular, turn off tls since this will be behind a misc-web varnish.

Change-Id: I19b3d02ef20e897b42ad8ec16114de0b9dc0721a
---
A hieradata/hosts/labweb1001.yaml
A hieradata/hosts/labweb1002.yaml
2 files changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/labweb1001.yaml b/hieradata/hosts/labweb1001.yaml
new file mode 100644
index 000..11bd2fa
--- /dev/null
+++ b/hieradata/hosts/labweb1001.yaml
@@ -0,0 +1,8 @@
+cluster: labs
+admin::groups:
+  - deployment
+
+apache::logrotate::period: 'daily'
+apache::logrotate::rotate: 30
+
+role::mediawiki::webserver::tls: false
diff --git a/hieradata/hosts/labweb1002.yaml b/hieradata/hosts/labweb1002.yaml
new file mode 100644
index 000..11bd2fa
--- /dev/null
+++ b/hieradata/hosts/labweb1002.yaml
@@ -0,0 +1,8 @@
+cluster: labs
+admin::groups:
+  - deployment
+
+apache::logrotate::period: 'daily'
+apache::logrotate::rotate: 30
+
+role::mediawiki::webserver::tls: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19b3d02ef20e897b42ad8ec16114de0b9dc0721a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: labweb: add hiera host files.

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

Change subject: labweb: add hiera host files.
..

labweb: add hiera host files.

In particular, turn off tls since this will be behind a misc-web varnish.

Change-Id: I19b3d02ef20e897b42ad8ec16114de0b9dc0721a
---
A hieradata/hosts/labweb1001.yaml
A hieradata/hosts/labweb1002.yaml
2 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/382318/1

diff --git a/hieradata/hosts/labweb1001.yaml b/hieradata/hosts/labweb1001.yaml
new file mode 100644
index 000..11bd2fa
--- /dev/null
+++ b/hieradata/hosts/labweb1001.yaml
@@ -0,0 +1,8 @@
+cluster: labs
+admin::groups:
+  - deployment
+
+apache::logrotate::period: 'daily'
+apache::logrotate::rotate: 30
+
+role::mediawiki::webserver::tls: false
diff --git a/hieradata/hosts/labweb1002.yaml b/hieradata/hosts/labweb1002.yaml
new file mode 100644
index 000..11bd2fa
--- /dev/null
+++ b/hieradata/hosts/labweb1002.yaml
@@ -0,0 +1,8 @@
+cluster: labs
+admin::groups:
+  - deployment
+
+apache::logrotate::period: 'daily'
+apache::logrotate::rotate: 30
+
+role::mediawiki::webserver::tls: false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ParserFunctions[master]: Adding Urdu translations of magic words related to Parser fu...

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

Change subject: Adding Urdu translations of magic words related to Parser 
function extension.
..


Adding Urdu translations of magic words related to Parser function extension.

Change-Id: Icfe2309939ea72d27f62723ca3fe5d2efbc452ae
---
M ParserFunctions.i18n.magic.php
1 file changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/ParserFunctions.i18n.magic.php b/ParserFunctions.i18n.magic.php
index 1a23411..36892ce 100644
--- a/ParserFunctions.i18n.magic.php
+++ b/ParserFunctions.i18n.magic.php
@@ -655,7 +655,26 @@
 
 /** Urdu (اردو) */
 $magicWords['ur'] = [
+   'expr' => [ 0, 'اظہار' ],
'if' => [ 0, 'اگر' ],
+   'ifeq' => [ 0, 'اگربرابر' ],
+   'ifexpr' => [ 0, 'اگراظہار' ],
+   'iferror' => [ 0, 'اگرنقص' ],
+   'switch' => [ 0, 'منتقل' ],
+   'default' => [ 0, '#ابتدائی' ],
+   'ifexist' => [ 0, 'اگرموجود' ],
+   'time' => [ 0, 'وقت' ],
+   'timel' => [ 0, 'وقت_لمبائی' ],
+   'rel2abs' => [ 0, 'اضافی_تا_مطلق' ],
+   'titleparts' => [ 0, 'اجزاء_عنوان' ],
+   'len' => [ 0, 'لمبائی' ],
+   'pos' => [ 0, 'جگہ' ],
+   'rpos' => [ 0, 'جگہ_واپس' ],
+   'sub' => [ 0, 'ذیلی' ],
+   'count' => [ 0, 'شمار' ],
+   'replace' => [ 0, 'تبدیلی' ],
+   'explode' => [ 0, 'انتشار' ],
+   'urldecode' => [ 0, 'بلاکوڈیوآرایل' ],
 ];
 
 /** Uzbek (oʻzbekcha/ўзбекча) */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfe2309939ea72d27f62723ca3fe5d2efbc452ae
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: محمد شعیب 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: محمد شعیب 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: TitleWidget: Perform diacritic-insensitive highlighting

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

Change subject: TitleWidget: Perform diacritic-insensitive highlighting
..


TitleWidget: Perform diacritic-insensitive highlighting

Change-Id: Ib92877e4afa45f73bb086c04946f5c1d0c99ed6f
---
M resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
index 638f461..7d49a09 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
@@ -23,6 +23,7 @@
 * @cfg {boolean} [redirect] Page is a redirect
 * @cfg {boolean} [disambiguation] Page is a disambiguation page
 * @cfg {string} [query] Matching query string to highlight
+* @cfg {string} [compare] String comparison function for query 
highlighting
 */
mw.widgets.TitleOptionWidget = function MwWidgetsTitleOptionWidget( 
config ) {
var icon;
@@ -69,7 +70,7 @@
 
// Highlight matching parts of link suggestion
if ( config.query ) {
-   this.setHighlightedQuery( config.data, config.query );
+   this.setHighlightedQuery( config.data, config.query, 
config.compare );
}
this.$label.attr( 'title', config.data );
 
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 5fe094f..db56bd3 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -48,6 +48,10 @@
this.validateTitle = config.validateTitle !== undefined ? 
config.validateTitle : true;
this.cache = config.cache;
this.api = config.api || new mw.Api();
+   // Supports: IE10, FF28, Chrome23
+   this.compare = window.Intl && Intl.Collator ?
+   new Intl.Collator( mw.config.get( 'wgContentLanguage' 
), { sensitivity: 'base' } ).compare :
+   null;
 
// Initialization
this.$element.addClass( 'mw-widget-titleWidget' );
@@ -335,7 +339,8 @@
missing: data.missing,
redirect: data.redirect,
disambiguation: data.disambiguation,
-   query: this.getQueryValue()
+   query: this.getQueryValue(),
+   compare: this.compare
};
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib92877e4afa45f73bb086c04946f5c1d0c99ed6f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jack Phoenix 
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/core[master]: Hard deprecate wfInitShellLocale()

2017-10-04 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382317 )

Change subject: Hard deprecate wfInitShellLocale()
..

Hard deprecate wfInitShellLocale()

Soft deprecated since 1.30, no callers anywhere.

Change-Id: Ifec11eb3c2c25ea9d7e5ecb72c53127536ab6c30
---
M includes/GlobalFunctions.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 484dfe8..01569e1 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2350,6 +2350,7 @@
  * @see $wgShellLocale
  */
 function wfInitShellLocale() {
+   wfDeprecated( __FUNCTION__, '1.30' );
 }
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifec11eb3c2c25ea9d7e5ecb72c53127536ab6c30
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] operations/puppet[production]: labweb: I don't think we need a local db anymore

2017-10-04 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382316 )

Change subject: labweb: I don't think we need a local db anymore
..


labweb: I don't think we need a local db anymore

Change-Id: I312a2cefe0c03bdca575c751940e690eb7931087
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index ec55f82..2d13568 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1136,7 +1136,7 @@
 }
 
 node /labweb100[12]\.eqiad\.wmnet/ {
-role(mediawiki::appserver, mariadb::wikitech)
+role(mediawiki::appserver)
 
 include ::base::firewall
 include ::ldap::role::client::labs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I312a2cefe0c03bdca575c751940e690eb7931087
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: labweb: I don't think we need a local db anymore

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

Change subject: labweb: I don't think we need a local db anymore
..

labweb: I don't think we need a local db anymore

Change-Id: I312a2cefe0c03bdca575c751940e690eb7931087
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/382316/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ec55f82..2d13568 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1136,7 +1136,7 @@
 }
 
 node /labweb100[12]\.eqiad\.wmnet/ {
-role(mediawiki::appserver, mariadb::wikitech)
+role(mediawiki::appserver)
 
 include ::base::firewall
 include ::ldap::role::client::labs

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.notification: Move offset() computation to next frame

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

Change subject: mediawiki.notification: Move offset() computation to next frame
..


mediawiki.notification: Move offset() computation to next frame

Crrently on all page views in WMF production, the $.ready handler
is inserting the notif $area and subsequently doing a forced
style calculation due to getBoundingClientRect() from offset().

Move this to an animation frame instead and re-order the statements
so that DOM reads go before DOM writes.

Change-Id: I7c6201dc8d4e3227e01b75e853b6e4dc9a734031
---
M resources/src/mediawiki/mediawiki.notification.js
1 file changed, 21 insertions(+), 11 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.notification.js 
b/resources/src/mediawiki/mediawiki.notification.js
index d5289bd..20f8b8d 100644
--- a/resources/src/mediawiki/mediawiki.notification.js
+++ b/resources/src/mediawiki/mediawiki.notification.js
@@ -280,6 +280,7 @@
.toggleClass( 'mw-notification-area-layout', 
!isFloating );
}
 
+   // Write to the DOM:
// Prepend the notification area to the content area and save 
its object.
$area = $( '' )
// Pause auto-hide timers when the mouse is in the 
notification area.
@@ -301,20 +302,29 @@
} );
 
mw.util.$content.prepend( $area );
-   offset = $area.offset();
-   $area.css( 'display', 'none' );
 
-   $( window ).on( 'scroll', updateAreaMode );
+   // Read from the DOM:
+   // Must be in the next frame to avoid synchronous layout
+   // computation from offset()/getBoundingClientRect().
+   rAF( function () {
+   offset = $area.offset();
 
-   // Initial mode
-   updateAreaMode();
+   // Initial mode (reads, and then maybe writes)
+   updateAreaMode();
 
-   // Handle pre-ready queue.
-   isPageReady = true;
-   while ( preReadyNotifQueue.length ) {
-   notif = preReadyNotifQueue.shift();
-   notif.start();
-   }
+   // Once we have the offset for where it would normally 
render, set the
+   // initial state of the (currently empty) notification 
area to be hidden.
+   $area.css( 'display', 'none' );
+
+   $( window ).on( 'scroll', updateAreaMode );
+
+   // Handle pre-ready queue.
+   isPageReady = true;
+   while ( preReadyNotifQueue.length ) {
+   notif = preReadyNotifQueue.shift();
+   notif.start();
+   }
+   } );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c6201dc8d4e3227e01b75e853b6e4dc9a734031
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: Don't use deprecated function wfShellExecDisabled()

2017-10-04 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382315 )

Change subject: Don't use deprecated function wfShellExecDisabled()
..

Don't use deprecated function wfShellExecDisabled()

Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
---
M SyntaxHighlight.class.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/SyntaxHighlight.class.php b/SyntaxHighlight.class.php
index c0fe27d..4674821 100644
--- a/SyntaxHighlight.class.php
+++ b/SyntaxHighlight.class.php
@@ -16,6 +16,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+use MediaWiki\Shell\Shell;
 use Symfony\Component\Process\ProcessBuilder;
 
 // @codingStandardsIgnoreStart
@@ -222,7 +223,7 @@
$lexer = null;
}
 
-   if ( wfShellExecDisabled() !== false ) {
+   if ( Shell::isDisabled() ) {
$status->warning( 
'syntaxhighlight-error-pygments-invocation-failure' );
wfWarn(
'MediaWiki determined that it cannot invoke 
Pygments. ' .

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dad6068c1691df4b49824b72af01d8508bfe9a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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...MinervaNeue[master]: Correct feature phone threshold detection

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

Change subject: Correct feature phone threshold detection
..


Correct feature phone threshold detection

max-width should actually be one smaller than the threshold

Additional changes:
* Also rename to  @width-breakpoint-mobile and
rename @width-breakpoint-desktop for desktop variable in
anticipation of T171365

Bug: T176286
Change-Id: Ia37bceb46a6b780f473828ff38749543bdfcc9f6
---
M minerva.less/minerva.variables.less
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.content.styles/main.less
M resources/skins.minerva.tablet.styles/common.less
M skinStyles/mobile.languages.structured/LanguageOverlay.less
M skinStyles/mobile.pointerOverlay/minerva.less
M skinStyles/mobile.search/SearchOverlay.less
M skinStyles/mobile.startup/Overlay.less
8 files changed, 12 insertions(+), 10 deletions(-)

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



diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index 754b58d..f721b32 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -15,8 +15,10 @@
 @grayLight: @colorGray12;
 @grayLightest: @colorGray14;
 
-@wgMFDeviceWidthMobileSmall: 320px;
-@wgMFDeviceWidthDesktop: 1000px;
+@width-breakpoint-mobile: 320px;
+@width-breakpoint-desktop: 1000px;
+// For backwards compatibility with MobileFrontend skinStyles
+@wgMFDeviceWidthDesktop: @width-breakpoint-desktop;
 
 @skinContentBgColor: #fff;
 
@@ -85,7 +87,7 @@
 @contentPaddingTablet: 3.35em;
 
 // note since content does not use view border box we have to include padding.
-@contentMaxWidthTablet: @wgMFDeviceWidthDesktop - ( 2 * @contentPaddingTablet 
);
+@contentMaxWidthTablet: @width-breakpoint-desktop - ( 2 * 
@contentPaddingTablet );
 @contentTopPadding: 1.6em;
 
 // Wiki specific variables
diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 2e96bd9..0742202 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -112,7 +112,7 @@
 }
 
 // On small devices that don't support Javascript, hide the page actions bar
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
+@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
.client-nojs {
#page-actions {
display: none;
diff --git a/resources/skins.minerva.content.styles/main.less 
b/resources/skins.minerva.content.styles/main.less
index dc12d75..7e4b982 100644
--- a/resources/skins.minerva.content.styles/main.less
+++ b/resources/skins.minerva.content.styles/main.less
@@ -28,7 +28,7 @@
word-wrap: break-word;
 }
 
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
+@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
body {
font-size: 0.8em;
}
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index e5f4e6d..ba87302 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -119,7 +119,7 @@
}
 }
 
-@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @width-breakpoint-desktop ) {
// FIXME: Zero should use banner-container class or better - append to 
banner-container
#mw-mf-page-center .mw-mf-banner,
.banner-container,
diff --git a/skinStyles/mobile.languages.structured/LanguageOverlay.less 
b/skinStyles/mobile.languages.structured/LanguageOverlay.less
index f1fd903..6e96b07 100644
--- a/skinStyles/mobile.languages.structured/LanguageOverlay.less
+++ b/skinStyles/mobile.languages.structured/LanguageOverlay.less
@@ -1,6 +1,6 @@
 @import 'minerva.variables';
 
-@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @width-breakpoint-desktop ) {
.language-overlay {
.overlay-content {
margin: 0;
diff --git a/skinStyles/mobile.pointerOverlay/minerva.less 
b/skinStyles/mobile.pointerOverlay/minerva.less
index 9f1b5b0..47bea85 100644
--- a/skinStyles/mobile.pointerOverlay/minerva.less
+++ b/skinStyles/mobile.pointerOverlay/minerva.less
@@ -7,7 +7,7 @@
// can point to anything in the containing content area and avoid
// padding issues such as https://phabricator.wikimedia.org/F287611
#mw-mf-page-center .pointer-overlay {
-   max-width: @wgMFDeviceWidthDesktop;
+   max-width: @width-breakpoint-desktop;
}
 }
 
diff --git a/skinStyles/mobile.search/SearchOverlay.less 
b/skinStyles/mobile.search/SearchOverlay.less
index 8d3eb49..e0232f4 100644
--- a/skinStyles/mobile.search/SearchOverlay.less
+++

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.notification: Refactor $.ready handler and init()

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

Change subject: mediawiki.notification: Refactor $.ready handler and init()
..


mediawiki.notification: Refactor $.ready handler and init()

* Merge code from $.ready handler into init().
  This makes it more obvious in which order the code runs, and
  makes it easier to make perf fixes in the next commit.

* Move updateAreaMode() to the start of the init() function.

Change-Id: I088446e17c2dc8ed88742bfeae80352444126e88
---
M resources/src/mediawiki/mediawiki.notification.js
1 file changed, 21 insertions(+), 25 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.notification.js 
b/resources/src/mediawiki/mediawiki.notification.js
index c213cd2..d5289bd 100644
--- a/resources/src/mediawiki/mediawiki.notification.js
+++ b/resources/src/mediawiki/mediawiki.notification.js
@@ -266,9 +266,21 @@
 * @ignore
 */
function init() {
-   var offset,
+   var offset, notif,
isFloating = false;
 
+   function updateAreaMode() {
+   var shouldFloat = window.pageYOffset > offset.top;
+   if ( isFloating === shouldFloat ) {
+   return;
+   }
+   isFloating = shouldFloat;
+   $area
+   .toggleClass( 'mw-notification-area-floating', 
isFloating )
+   .toggleClass( 'mw-notification-area-layout', 
!isFloating );
+   }
+
+   // Prepend the notification area to the content area and save 
its object.
$area = $( '' )
// Pause auto-hide timers when the mouse is in the 
notification area.
.on( {
@@ -288,26 +300,21 @@
e.stopPropagation();
} );
 
-   // Prepend the notification area to the content area and save 
it's object.
mw.util.$content.prepend( $area );
offset = $area.offset();
$area.css( 'display', 'none' );
-
-   function updateAreaMode() {
-   var shouldFloat = window.pageYOffset > offset.top;
-   if ( isFloating === shouldFloat ) {
-   return;
-   }
-   isFloating = shouldFloat;
-   $area
-   .toggleClass( 'mw-notification-area-floating', 
isFloating )
-   .toggleClass( 'mw-notification-area-layout', 
!isFloating );
-   }
 
$( window ).on( 'scroll', updateAreaMode );
 
// Initial mode
updateAreaMode();
+
+   // Handle pre-ready queue.
+   isPageReady = true;
+   while ( preReadyNotifQueue.length ) {
+   notif = preReadyNotifQueue.shift();
+   notif.start();
+   }
}
 
/**
@@ -423,18 +430,7 @@
autoHideLimit: 3
};
 
-   $( function () {
-   var notif;
-
-   init();
-
-   // Handle pre-ready queue.
-   isPageReady = true;
-   while ( preReadyNotifQueue.length ) {
-   notif = preReadyNotifQueue.shift();
-   notif.start();
-   }
-   } );
+   $( init );
 
mw.notification = notification;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I088446e17c2dc8ed88742bfeae80352444126e88
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Jack Phoenix 
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/core[master]: mediawiki.notification: Use css() instead of slow show()/hide()

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

Change subject: mediawiki.notification: Use css() instead of slow show()/hide()
..


mediawiki.notification: Use css() instead of slow show()/hide()

There is a lot of complexity and overhead involved with show()
and hide() methods for back-compat and edge cases that we don't
want to involve here (such as storing the last known display,
figuring out the default display, dealing with elements hidden
by default via CSS rules etc.).

We know the stylesheet does not hide the element by default, so
we merely need to set or unset the 'display: none;' inline style.

Ref T159911.

Change-Id: Ia22a2adf8514368124d93e3a753440814d97
---
M resources/src/mediawiki/mediawiki.notification.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.notification.js 
b/resources/src/mediawiki/mediawiki.notification.js
index dfacfc6..c213cd2 100644
--- a/resources/src/mediawiki/mediawiki.notification.js
+++ b/resources/src/mediawiki/mediawiki.notification.js
@@ -102,7 +102,7 @@
Notification.prototype.start = function () {
var options, $notification, $tagMatches, autohideCount;
 
-   $area.show();
+   $area.css( 'display', '' );
 
if ( this.isOpen ) {
return;
@@ -230,7 +230,7 @@
if ( openNotificationCount === 0 ) {
// Hide the area after the last 
notification closes. Otherwise, the padding on
// the area can be obscure content, 
despite the area being empty/invisible (T54659). // FIXME
-   $area.hide();
+   $area.css( 'display', 'none' );
notif.$notification.remove();
} else {
notif.$notification.slideUp( 'fast', 
function () {
@@ -291,7 +291,7 @@
// Prepend the notification area to the content area and save 
it's object.
mw.util.$content.prepend( $area );
offset = $area.offset();
-   $area.hide();
+   $area.css( 'display', 'none' );
 
function updateAreaMode() {
var shouldFloat = window.pageYOffset > offset.top;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia22a2adf8514368124d93e3a753440814d97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Jack Phoenix 
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]: diskspace.py: add some new flavors

2017-10-04 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382314 )

Change subject: diskspace.py: add some new flavors
..


diskspace.py: add some new flavors

Change-Id: I4e8ddced82746eb68d2038153d6087e3f3c86546
---
M modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git 
a/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py 
b/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
index c8af341..017c70f 100755
--- a/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
+++ b/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
@@ -27,8 +27,8 @@
 import collections
 
 
-ONEGIG = 1024*1024*1024
-ONEMEG = 1024*1024
+ONEGIG = 1024 * 1024 * 1024
+ONEMEG = 1024 * 1024
 
 clients = mwopenstackclients.clients()
 
@@ -44,8 +44,11 @@
 flavordict['bb5bf060-cdbb-4448-b436-a015ae2d4aaf'] = '160'
 flavordict['8af1f1cc-d95f-4380-bf10-bcfa0321b10f'] = '60'
 flavordict['2d59cc0d-538c-4bbd-b975-8e696a4f7207'] = '80'
-flavordict['cc0f1723-38d7-42da-aa2c-cef28d5f4250'] = '300'
 flavordict['deea3460-069e-44c7-98ca-ae30bb0de772'] = '80'
+flavordict['cc0f1723-38d7-42da-aa2c-cef28d5f4250'] = '300'
+flavordict['7447b146-eb66-4ecd-b8c9-ecf480fc6fd1'] = '300'
+flavordict['6f43bc6c-c91e-4b4a-8981-dd1d06ec1bb7'] = '300'
+flavordict['21e9047d-a60f-499d-b7f5-51f83ddf3611'] = '300'
 
 
 def printstat(string, alert=False):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e8ddced82746eb68d2038153d6087e3f3c86546
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: diskspace.py: add some new flavors

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

Change subject: diskspace.py: add some new flavors
..

diskspace.py: add some new flavors

Change-Id: I4e8ddced82746eb68d2038153d6087e3f3c86546
---
M modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/382314/1

diff --git 
a/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py 
b/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
index c8af341..017c70f 100755
--- a/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
+++ b/modules/openstack2/files/liberty/admin_scripts/novastats/diskspace.py
@@ -27,8 +27,8 @@
 import collections
 
 
-ONEGIG = 1024*1024*1024
-ONEMEG = 1024*1024
+ONEGIG = 1024 * 1024 * 1024
+ONEMEG = 1024 * 1024
 
 clients = mwopenstackclients.clients()
 
@@ -44,8 +44,11 @@
 flavordict['bb5bf060-cdbb-4448-b436-a015ae2d4aaf'] = '160'
 flavordict['8af1f1cc-d95f-4380-bf10-bcfa0321b10f'] = '60'
 flavordict['2d59cc0d-538c-4bbd-b975-8e696a4f7207'] = '80'
-flavordict['cc0f1723-38d7-42da-aa2c-cef28d5f4250'] = '300'
 flavordict['deea3460-069e-44c7-98ca-ae30bb0de772'] = '80'
+flavordict['cc0f1723-38d7-42da-aa2c-cef28d5f4250'] = '300'
+flavordict['7447b146-eb66-4ecd-b8c9-ecf480fc6fd1'] = '300'
+flavordict['6f43bc6c-c91e-4b4a-8981-dd1d06ec1bb7'] = '300'
+flavordict['21e9047d-a60f-499d-b7f5-51f83ddf3611'] = '300'
 
 
 def printstat(string, alert=False):

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

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

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

[MediaWiki-commits] [Gerrit] operations...libvmod-netmapper[debian]: Update debian changelog for version 1.5

2017-10-04 Thread Ayounsi (Code Review) 
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382312 )

Change subject: Update debian changelog for version 1.5
..

Update debian changelog for version 1.5

Change-Id: I0e6fdca4cf97a01578a48f1cdec80ed2f237e412
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/12/382312/1

diff --git a/debian/changelog b/debian/changelog
index 9c4de4e..b204d73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libvmod-netmapper (1.5-1) unstable; urgency=medium
+
+  * Varnish 5 compatibility update
+
+ -- Arzhel Younsi   Wed, 23 Aug 2017 16:52:51 +
+
 libvmod-netmapper (1.4-1) unstable; urgency=medium
 
   * New upstream release fixing NULL ip_string handling

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e6fdca4cf97a01578a48f1cdec80ed2f237e412
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] operations...libvmod-netmapper[debian]: Bump version to 1.5

2017-10-04 Thread Ayounsi (Code Review) 
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382311 )

Change subject: Bump version to 1.5
..

Bump version to 1.5

Change-Id: I6f6979fdad1a9150da5501ac7aa7f5c40a3a40dc
---
M NEWS
M configure.ac
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/11/382311/1

diff --git a/NEWS b/NEWS
index a864afd..4763abd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+1.5 - 2017-08-23
+   Varnish 5 compatibility update
+
 1.4 - 2016-09-12
Bugfix for varnish4 sending NULL ip_string
 
diff --git a/configure.ac b/configure.ac
index 5a9f58e..7bda489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2013-2016 Brandon Black ])
-AC_INIT([libvmod-netmapper],[1.4],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
+AC_COPYRIGHT([Copyright (c) 2013-2017 Brandon Black ])
+AC_INIT([libvmod-netmapper],[1.5],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
 AC_CONFIG_MACRO_DIR([m4])
 m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4]))
 AC_CONFIG_AUX_DIR([acaux])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f6979fdad1a9150da5501ac7aa7f5c40a3a40dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] operations...libvmod-netmapper[debian]: Bump libvarnishapi-dev dependency to version 5.1.3

2017-10-04 Thread Ayounsi (Code Review) 
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382313 )

Change subject: Bump libvarnishapi-dev dependency to version 5.1.3
..

Bump libvarnishapi-dev dependency to version 5.1.3

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


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/13/382313/1

diff --git a/debian/control b/debian/control
index f0e26a3..61d44dd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Brandon Black 
 Uploaders: Emanuele Rocca 
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev, pkg-config, 
python-docutils
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 5.1.3), libjansson-dev, liburcu-dev, pkg-config, 
python-docutils
 Standards-Version: 3.9.6
 Homepage: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
 #Vcs-Git: 
https://gerrit.wikimedia.org/r/operations/software/varnish/libvmod-netmapper

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4da6b06ba6c193bc3238453fee225674cfe84088
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] operations...libvmod-netmapper[debian]: Add description to vmod_netmapper.vcc

2017-10-04 Thread Ayounsi (Code Review) 
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382310 )

Change subject: Add description to vmod_netmapper.vcc
..

Add description to vmod_netmapper.vcc

Change-Id: I7b7a7a39da6faf7b081fb068dcdbf3d2c4126be3
---
M src/vmod_netmapper.vcc
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/10/382310/1

diff --git a/src/vmod_netmapper.vcc b/src/vmod_netmapper.vcc
index 63102be..dfd799c 100644
--- a/src/vmod_netmapper.vcc
+++ b/src/vmod_netmapper.vcc
@@ -1,3 +1,3 @@
-$Module netmapper 3
+$Module netmapper 3 Varnish module to map an IP address to a string 
 $Function VOID init(PRIV_VCL, STRING, STRING, INT)
 $Function STRING map(PRIV_VCL, STRING, STRING)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b7a7a39da6faf7b081fb068dcdbf3d2c4126be3
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] operations...libvmod-netmapper[debian]: Fix vmod_abi.h version parsing

2017-10-04 Thread Ayounsi (Code Review) 
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382309 )

Change subject: Fix vmod_abi.h version parsing
..

Fix vmod_abi.h version parsing

Change-Id: Ic6c94411b2520c24d67c9abaa08fca3747121f2e
---
M configure.ac
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/09/382309/1

diff --git a/configure.ac b/configure.ac
index 1f820e3..5a9f58e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@
 [
 AC_MSG_CHECKING([varnish ABI version])
 AC_SUBST([VMOD_ABI_VERSION],
- [`cut -d ' ' -f 4 "${VAPI_INCLUDE_DIR}/vmod_abi.h"`])
+ [`cat "${VAPI_INCLUDE_DIR}/vmod_abi.h" | grep "#define" | cut -d ' ' 
-f 4`])
 AC_MSG_RESULT([${VMOD_ABI_VERSION}])
 ], [
 AC_MSG_ERROR([Could not find vmod_abi.h. Need Varnish4 or higher])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6c94411b2520c24d67c9abaa08fca3747121f2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: globalusage: iterate over all entries

2017-10-04 Thread Mpaa (Code Review) 
Mpaa has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382308 )

Change subject: globalusage: iterate over all entries
..

globalusage: iterate over all entries

Avoid to use self._update_page() in site.globalusage.

With page continuation, all batches will be consumed by the ieration
inside self._update_page().
And only the ast portion of results would be yielded.

Do only one iteration over query instead.

Bug: T177362
Change-Id: I8ad5e203cbabba26bd3c3971fd27982935350509
---
M pywikibot/site.py
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/pywikibot/site.py b/pywikibot/site.py
index 1f8f534..5dff0df 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3028,9 +3028,13 @@
 total=total,  # will set gulimit=total in api,
 **args)
 
-self._update_page(page, query)
-
 for pageitem in query:
+if not self.sametitle(pageitem['title'],
+  page.title(withSection=False)):
+raise InconsistentTitleReceived(page, pageitem['title'])
+
+api.update_page(page, pageitem, query.props)
+
 assert 'globalusage' in pageitem, \
"API globalusage response lacks 'globalusage' key"
 for entry in pageitem['globalusage']:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Improve some parameter docs

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: I1a7f25f6d4bdeb5994798a8c939cc94bfbe723a7
---
M includes/Api/ConfigDump.php
M includes/Api/MappingDump.php
M includes/Api/SettingsDump.php
M includes/BuildDocument/Completion/DefaultSortSuggestionsBuilder.php
M includes/BuildDocument/Completion/NaiveSubphrasesSuggestionsBuilder.php
M includes/BuildDocument/Completion/SuggestBuilder.php
M includes/BuildDocument/Completion/SuggestScoring.php
M includes/CirrusConfigInterwikiResolver.php
M includes/Extra/Query/SourceRegex.php
M includes/Extra/Query/TokenCountRouter.php
M includes/Hooks.php
M includes/Job/CheckerJob.php
M includes/Job/ElasticaWrite.php
M includes/Job/Job.php
M includes/Maintenance/MetaStoreIndex.php
M includes/Query/FullTextQueryStringQueryBuilder.php
M includes/Query/FullTextSimpleMatchQueryBuilder.php
M includes/Search/CrossProjectBlockScorer.php
M includes/Search/SearchContext.php
M includes/Search/TextIndexField.php
M includes/SearchRequestLog.php
M includes/SiteMatrixInterwikiResolver.php
M phpcs.xml
M tests/jenkins/Jenkins.php
24 files changed, 43 insertions(+), 41 deletions(-)

Approvals:
  Tjones: Looks good to me, but someone else must approve
  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/includes/Api/ConfigDump.php b/includes/Api/ConfigDump.php
index a35af08..06d6fbd 100644
--- a/includes/Api/ConfigDump.php
+++ b/includes/Api/ConfigDump.php
@@ -148,6 +148,7 @@
 
/**
 * @see ApiBase::getExamplesMessages
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git a/includes/Api/MappingDump.php b/includes/Api/MappingDump.php
index 9c1d8d2..fc180d4 100644
--- a/includes/Api/MappingDump.php
+++ b/includes/Api/MappingDump.php
@@ -48,6 +48,7 @@
 
/**
 * @see ApiBase::getExamplesMessages
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git a/includes/Api/SettingsDump.php b/includes/Api/SettingsDump.php
index 310a3a4..c18baa6 100644
--- a/includes/Api/SettingsDump.php
+++ b/includes/Api/SettingsDump.php
@@ -48,6 +48,7 @@
 
/**
 * @see ApiBase::getExamplesMessages
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git 
a/includes/BuildDocument/Completion/DefaultSortSuggestionsBuilder.php 
b/includes/BuildDocument/Completion/DefaultSortSuggestionsBuilder.php
index f2b6935..a859d1f 100644
--- a/includes/BuildDocument/Completion/DefaultSortSuggestionsBuilder.php
+++ b/includes/BuildDocument/Completion/DefaultSortSuggestionsBuilder.php
@@ -10,7 +10,7 @@
const FIELD = 'defaultsort';
 
/**
-* {@inheritDoc}
+* @inheritDoc
 */
public function getRequiredFields() {
return [ self::FIELD ];
diff --git 
a/includes/BuildDocument/Completion/NaiveSubphrasesSuggestionsBuilder.php 
b/includes/BuildDocument/Completion/NaiveSubphrasesSuggestionsBuilder.php
index 21c4cb6..713eb99 100644
--- a/includes/BuildDocument/Completion/NaiveSubphrasesSuggestionsBuilder.php
+++ b/includes/BuildDocument/Completion/NaiveSubphrasesSuggestionsBuilder.php
@@ -79,7 +79,7 @@
}
 
/**
-* {@inheritDoc}
+* @inheritDoc
 */
public function getRequiredFields() {
// This builder needs the language field
diff --git a/includes/BuildDocument/Completion/SuggestBuilder.php 
b/includes/BuildDocument/Completion/SuggestBuilder.php
index e7b93bd..fd4cbf2 100644
--- a/includes/BuildDocument/Completion/SuggestBuilder.php
+++ b/includes/BuildDocument/Completion/SuggestBuilder.php
@@ -437,8 +437,8 @@
 
/**
 * Encode the suggestion doc id
-* @param string $docId
 * @param string $suggestionType
+* @param string $docId
 * @return string
 */
public static function encodeDocId( $suggestionType, $docId ) {
diff --git a/includes/BuildDocument/Completion/SuggestScoring.php 
b/includes/BuildDocument/Completion/SuggestScoring.php
index 2105454..80ae5e0 100644
--- a/includes/BuildDocument/Completion/SuggestScoring.php
+++ b/includes/BuildDocument/Completion/SuggestScoring.php
@@ -71,14 +71,14 @@
  */
 class IncomingLinksScoringMethod implements SuggestScoringMethod {
/**
-* {@inheritDoc}
+* @inheritDoc
 */
public function score( array $doc ) {
return isset( $doc['incoming_links'] ) ? $doc['incoming_links'] 
: 0;
}
 
/**
-* {@inheritDoc}
+* @inheritDoc
 */
public function getRequiredFields() {

[MediaWiki-commits] [Gerrit] operations/puppet[production]: releases-jenkins: fix prefix for proxy setup, pt.2

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

Change subject: releases-jenkins: fix prefix for proxy setup, pt.2
..


releases-jenkins: fix prefix for proxy setup, pt.2

Follow-up to Ib41ca5763b6ce82a3e which fixed Apache
syntax error but didn't make it work.

Prefix _should_ contain leading slash, compare to contint module
where this originally comes from. So if it's "nothing" we still enter
"/". Adjust template accordingly. We want to avoid having inconsistent
prefix setting between jenkins and Apache classes.

Bug: T164030
Change-Id: I84ccb5c63759441e4dffa562fc988fe73e96125e
---
M hieradata/role/common/releases.yaml
M modules/profile/manifests/releases/mediawiki.pp
M modules/releases/templates/apache-jenkins.conf.erb
3 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/hieradata/role/common/releases.yaml 
b/hieradata/role/common/releases.yaml
index 469f8f2..92ac574 100644
--- a/hieradata/role/common/releases.yaml
+++ b/hieradata/role/common/releases.yaml
@@ -5,5 +5,5 @@
 profile::releases::mediawiki::sitename: 'releases.wikimedia.org'
 profile::releases::mediawiki::sitename_jenkins: 
'releases-jenkins.wikimedia.org'
 profile::releases::mediawiki::server_admin: 'n...@wikimedia.org'
-profile::releases::mediawiki::prefix: ''
+profile::releases::mediawiki::prefix: '/'
 profile::releases::mediawiki::http_port: '8080'
diff --git a/modules/profile/manifests/releases/mediawiki.pp 
b/modules/profile/manifests/releases/mediawiki.pp
index f68ce91..14daee1 100644
--- a/modules/profile/manifests/releases/mediawiki.pp
+++ b/modules/profile/manifests/releases/mediawiki.pp
@@ -11,16 +11,16 @@
 ){
 class { '::jenkins':
 access_log => true,
-http_port  => '8080',
-prefix => '/',
+http_port  => $http_port,
+prefix => $prefix,
 umask  => '0002',
 }
 
 class { '::releases':
 sitename => $sitename,
 sitename_jenkins => $sitename_jenkins,
-http_port=> '8080',
-prefix   => '/',
+http_port=> $http_port,
+prefix   => $prefix,
 }
 
 class { '::apache::mod::rewrite': }
diff --git a/modules/releases/templates/apache-jenkins.conf.erb 
b/modules/releases/templates/apache-jenkins.conf.erb
index 1d73e51..8853f3a 100644
--- a/modules/releases/templates/apache-jenkins.conf.erb
+++ b/modules/releases/templates/apache-jenkins.conf.erb
@@ -16,8 +16,8 @@
 ProxyRequests Off
 ProxyVia Off
 ProxyPreserveHost On
-ProxyPass /<%= @prefix -%> http://127.0.0.1:<%= @http_port -%><%= @prefix 
-%>/ retry=0 nocanon
-ProxyPassReverse /<%= @prefix -%> http://localhost:<%= @http_port -%><%= 
@prefix -%>
+ProxyPass <%= @prefix -%> http://127.0.0.1:<%= @http_port -%><%= @prefix 
-%>/ retry=0 nocanon
+ProxyPassReverse <%= @prefix -%> http://localhost:<%= @http_port -%><%= 
@prefix -%>
 
 ErrorLog /var/log/apache2/<%= @sitename_jenkins %>.error.log
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84ccb5c63759441e4dffa562fc988fe73e96125e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove perf tracking code that was moved to WikimediaEvents ...

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

Change subject: Remove perf tracking code that was moved to WikimediaEvents in 
Ib300af5c
..


Remove perf tracking code that was moved to WikimediaEvents in Ib300af5c

Bug: T176652
Depends-On: Ib300af5caad5c6e0ca13554c20a2e4311743e176
Change-Id: I963431771556635ea3db28101470317ebd82906f
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
1 file changed, 0 insertions(+), 12 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 73259f6..da11973 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -84,18 +84,6 @@
filtersWidget.setTopSection( 
wlTopSection.$element );
} // end Special:WL
 
-   // Log performance data
-   if ( window.performance && window.performance.now ) {
-   mw.track(
-   
'timing.MediaWiki.timing.structuredChangeFilters.ready.' + specialPage,
-   window.performance.now()
-   );
-   mw.track(
-   
'timing.MediaWiki.timing.structuredChangeFilters.backendResponse.' + 
specialPage,
-   mw.config.get( 'wgBackendResponseTime' )
-   );
-   }
-
/**
 * Fired when initialization of the filtering interface 
for changes list is complete.
 *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I963431771556635ea3db28101470317ebd82906f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

  1   2   3   4   >