[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2049 and db2041

[jenkins-bot (Code Review)]

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

Change subject: db-codfw.php: Depool db2049 and db2041
..


db-codfw.php: Depool db2049 and db2041

Going to optimize templatelinks and pagelinks tables

Bug: T174509
Change-Id: Id9aa28094202b0e8d7fe9c01356e6ab338c5a2fb
---
M wmf-config/db-codfw.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 7d06c4b..d7579c3 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -115,8 +115,8 @@
's2' => [
'db2017' => 0,   # B6 2.9TB  96GB, master
'db2035' => 50,  # C6 2.9TB 160GB, rc, log
-   'db2041' => 100, # C6 2.9TB 160GB, api
-   'db2049' => 400, # C6 2.9TB 160GB,
+   # 'db2041' => 100, # C6 2.9TB 160GB, api #T174509
+   # 'db2049' => 400, # C6 2.9TB 160GB, #T174509
'db2056' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#innodb compressed
'db2063' => 100, # D6 3.3TB 160GB, api
'db2064' => 400, # D6 3.3TB 160GB
@@ -295,7 +295,7 @@
'db2056' => 1,
],
'api' => [
-   'db2041' => 1,
+   # 'db2041' => 1,
'db2063' => 1,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.init.mw.DesktopArticleTarget: Remove hack for reversed ta...

[Code Review]

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

Change subject: ve.init.mw.DesktopArticleTarget: Remove hack for reversed tabs 
in RTL in Vector
..

ve.init.mw.DesktopArticleTarget: Remove hack for reversed tabs in RTL in Vector

Vector no longer does the silly thing where the tabs are reversed in
the HTML in RTL languages, so we must remove our hack to do the same,
since otherwise it reintroduces the issue it was intended to prevent.

This essentially reverts 2efd4f00610bc322e493deac1446c4dc050b9347.

Bug: T50017
Change-Id: Ibeaa55bc34899bffab849ea8ad8b127fb5184d43
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 2 insertions(+), 5 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 811f8d2..89a8038 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -426,10 +426,8 @@
$caVeEdit = $( '#ca-ve-edit' ),
$caEditLink = $caEdit.find( 'a' ),
$caVeEditLink = $caVeEdit.find( 'a' ),
-   reverseTabOrder = $( 'body' ).hasClass( 'rtl' ) 
&& pTabsId === 'p-views',
caVeEditNextnode =
-   // eslint-disable-next-line no-bitwise
-   ( reverseTabOrder ^ conf.tabPosition 
=== 'before' ) ?
+   ( conf.tabPosition === 'before' ) ?
$caEdit.get( 0 ) :
$caEdit.next().get( 0 );
 
@@ -468,8 +466,7 @@
}
} else if ( $caEdit.length && $caVeEdit.length ) {
// Make the state of the page consistent with 
the config if needed
-   // eslint-disable-next-line no-bitwise
-   if ( reverseTabOrder ^ conf.tabPosition === 
'before' ) {
+   if ( conf.tabPosition === 'before' ) {
if ( $caEdit[ 0 ].nextSibling === 
$caVeEdit[ 0 ] ) {
$caVeEdit.after( $caEdit );
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2049 and db2041

[Marostegui (Code Review)]

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

Change subject: db-codfw.php: Depool db2049 and db2041
..

db-codfw.php: Depool db2049 and db2041

Going to optimize templatelinks and pagelinks tables

Bug: T174509
Change-Id: Id9aa28094202b0e8d7fe9c01356e6ab338c5a2fb
---
M wmf-config/db-codfw.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 7d06c4b..d7579c3 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -115,8 +115,8 @@
's2' => [
'db2017' => 0,   # B6 2.9TB  96GB, master
'db2035' => 50,  # C6 2.9TB 160GB, rc, log
-   'db2041' => 100, # C6 2.9TB 160GB, api
-   'db2049' => 400, # C6 2.9TB 160GB,
+   # 'db2041' => 100, # C6 2.9TB 160GB, api #T174509
+   # 'db2049' => 400, # C6 2.9TB 160GB, #T174509
'db2056' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#innodb compressed
'db2063' => 100, # D6 3.3TB 160GB, api
'db2064' => 400, # D6 3.3TB 160GB
@@ -295,7 +295,7 @@
'db2056' => 1,
],
'api' => [
-   'db2041' => 1,
+   # 'db2041' => 1,
'db2063' => 1,
],
],

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Revert "db-codfw.php: Depool db2064 and db2063"
..


Revert "db-codfw.php: Depool db2064 and db2063"

This reverts commit 15cffe9a7631b0e72c1203051c07755864deb2d7.

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

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 8c2a985..7d06c4b 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -118,8 +118,8 @@
'db2041' => 100, # C6 2.9TB 160GB, api
'db2049' => 400, # C6 2.9TB 160GB,
'db2056' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#innodb compressed
-   # 'db2063' => 100, # D6 3.3TB 160GB, api #T174509
-   # 'db2064' => 400, # D6 3.3TB 160GB #T174509
+   'db2063' => 100, # D6 3.3TB 160GB, api
+   'db2064' => 400, # D6 3.3TB 160GB
],
/* s3 */ 'DEFAULT' => [
'db2018' => 0,   # B6 2.9TB  96GB, master
@@ -296,7 +296,7 @@
],
'api' => [
'db2041' => 1,
-   # 'db2063' => 1,
+   'db2063' => 1,
],
],
/* s3 */ 'DEFAULT' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f4449360f8f3213fee59105f7acbe339c28ba62
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: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: update rabbitmq drain_queue script

[BryanDavis (Code Review)]

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

Change subject: wmcs: update rabbitmq drain_queue script
..

wmcs: update rabbitmq drain_queue script

* Move the script file to an OpenStack version neutral location
* Port to Python3
* Update to chunk message downloads so large queues can be drained
  without crashing rabbitmq
* Add optimization for --quiet purges

With these changes it should be safe to cron this script to dump the
notifications.error queue to a log file once an hour to keep that queue
from backing up and also to make it something that we can actually
examine for useful information. I'll leave that cron for another patch
in part because I'm not sure where to put it in the module/profile
hierarchy.

Bug: T170492
Change-Id: Ia1a54d1cfe60abc8ce1429dbd2fa8b9530d68050
---
D modules/openstack2/files/liberty/admin_scripts/drain_queue
A modules/openstack2/files/util/drain_queue
M modules/openstack2/manifests/util/admin_scripts.pp
3 files changed, 121 insertions(+), 99 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/381165/1

diff --git a/modules/openstack2/files/liberty/admin_scripts/drain_queue 
b/modules/openstack2/files/liberty/admin_scripts/drain_queue
deleted file mode 100644
index 0c48b7b..000
--- a/modules/openstack2/files/liberty/admin_scripts/drain_queue
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/python
-# Drain an oslo.message rabbitmq queue
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the 'License'); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an 'AS IS'
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is RabbitMQ Management Plugin.
-#
-# The Initial Developer of the Original Code is GoPivotal, Inc.
-# Copyright (c) 2010-2015 Pivotal Software, Inc.  All rights reserved.
-#
-# Modified by Bryan Davis 
-# Copyright (c) 2017 Wikimedia Foundation and contributors
-from __future__ import print_function
-
-import argparse
-import base64
-import httplib
-import json
-import socket
-import sys
-import urlparse
-
-
-def die(s):
-print('*** {}'.format(s), file=sys.stderr)
-exit(1)
-
-
-def http(verb, path, body=None):
-path = '/api%s' % path
-conn = httplib.HTTPConnection('localhost', 15672)
-headers = {
-'Authorization': 'Basic ' + base64.b64encode('guest:guest'),
-}
-if body:
-headers['Content-Type'] = 'application/json'
-try:
-conn.request(verb, path, body, headers)
-except socket.error as e:
-die('Could not connect: {0}'.format(e))
-resp = conn.getresponse()
-if resp.status == 400:
-die(json.loads(resp.read())['reason'])
-if resp.status == 401:
-die('Access refused: {0}'.format(path))
-if resp.status == 404:
-die('Not found: {0}'.format(path))
-if resp.status == 301:
-url = urlparse.urlparse(resp.getheader('location'))
-[host, port] = url.netloc.split(':')
-return post(url.path + '?' + url.query, body)
-if resp.status < 200 or resp.status > 400:
-raise Exception('Received %d %s for path %s\n%s'
-% (resp.status, resp.reason, path, resp.read()))
-return json.loads(resp.read().decode('utf-8'))
-
-def main():
-parser = argparse.ArgumentParser(
-description='Drain an oslo.message rabbitmq queue')
-parser.add_argument(
-'--dry-run', dest='requeue', action='store_true',
-help='return messages to the queue after printing')
-parser.add_argument(
-'--silent', dest='print', action='store_false',
-help='silent mode')
-parser.add_argument(
-'queue', metavar='QUEUE', nargs=1,
-help='queue to read messages from')
-args = parser.parse_args()
-
-info = http('GET', '/queues/%2F/{}'.format(args.queue[0]))
-
-res = http(
-'POST',
-'/queues/%2F/{}/get'.format(args.queue[0]),
-json.dumps({
-'count': info['messages_ready'],
-'requeue': args.requeue,
-'encoding': 'auto'
-})
-)
-
-if args.print:
-for r in res:
-payload = json.loads(r['payload'])
-msg = json.loads(payload['oslo.message'])
-print(json.dumps(msg))
-
-if __name__ == '__main__':
-main()
diff --git a/modules/openstack2/files/util/drain_queue 
b/modules/openstack2/files/util/drain_queue
new file mode 100644
index 000..bd14e4e
--- /dev/null
+++ b/modules/openstack2/files/util/drain_queue
@@ -0,0 +1,120 @@
+#!/usr/bin/python3 -Es
+# Drain an oslo.message 

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

[Marostegui (Code Review)]

Hello jenkins-bot, Jcrespo,

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

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

to review the following change.


Change subject: Revert "db-codfw.php: Depool db2064 and db2063"
..

Revert "db-codfw.php: Depool db2064 and db2063"

This reverts commit 15cffe9a7631b0e72c1203051c07755864deb2d7.

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 69e81ee..ba63b2f 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -118,8 +118,8 @@
'db2041' => 100, # C6 2.9TB 160GB, api
'db2049' => 400, # C6 2.9TB 160GB,
'db2056' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#innodb compressed
-   # 'db2063' => 100, # D6 3.3TB 160GB, api #T174509
-   # 'db2064' => 400, # D6 3.3TB 160GB #T174509
+   'db2063' => 100, # D6 3.3TB 160GB, api
+   'db2064' => 400, # D6 3.3TB 160GB
],
/* s3 */ 'DEFAULT' => [
'db2018' => 0,   # B6 2.9TB  96GB, master
@@ -296,7 +296,7 @@
],
'api' => [
'db2041' => 1,
-   # 'db2063' => 1,
+   'db2063' => 1,
],
],
/* s3 */ 'DEFAULT' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f4449360f8f3213fee59105f7acbe339c28ba62
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
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 db2076, db2067, db2060"

[jenkins-bot (Code Review)]

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

Change subject: Revert "db-codfw.php: Depool db2076, db2067, db2060"
..


Revert "db-codfw.php: Depool db2076, db2067, db2060"

This reverts commit 7257d466954a54a895b122ef5f418b8115e480cf.

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

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 050cccf..8c2a985 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -150,11 +150,11 @@
's6' => [
'db2028' => 0,   # B6  2.9TB  96GB, master
'db2039' => 50,  # C6 2.9TB 160GB, rc, log
-   'db2046' => 400, # C6 2.9TB 160GB #temporary api
+   'db2046' => 400, # C6 2.9TB 160GB
'db2053' => 100, # D6 2.9TB 160GB, dump (inactive), vslow
-   # 'db2060' => 100, # D6 3.3TB 160GB, api #T174509
-   # 'db2067' => 400, # D6 3.3TB 160GB #T174509
-   # 'db2076' => 400, # B1 3.3TB 512GB #T174509
+   'db2060' => 100, # D6 3.3TB 160GB, api
+   'db2067' => 400, # D6 3.3TB 160GB
+   'db2076' => 400, # B1 3.3TB 512GB
],
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
@@ -405,7 +405,7 @@
'db2053' => 1,
],
'api' => [
-   'db2046' => 1,
+   'db2060' => 1,
],
],
's7' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c2e94076e6ccdbb185354db5034c48e1f4f5aa8
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: 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 db2076, db2067, db2060"

[Marostegui (Code Review)]

Hello Urbanecm, jenkins-bot, Jcrespo,

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

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

to review the following change.


Change subject: Revert "db-codfw.php: Depool db2076, db2067, db2060"
..

Revert "db-codfw.php: Depool db2076, db2067, db2060"

This reverts commit 7257d466954a54a895b122ef5f418b8115e480cf.

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index ba63b2f..3eea06d 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -150,11 +150,11 @@
's6' => [
'db2028' => 0,   # B6  2.9TB  96GB, master
'db2039' => 50,  # C6 2.9TB 160GB, rc, log
-   'db2046' => 400, # C6 2.9TB 160GB #temporary api
+   'db2046' => 400, # C6 2.9TB 160GB
'db2053' => 100, # D6 2.9TB 160GB, dump (inactive), vslow
-   # 'db2060' => 100, # D6 3.3TB 160GB, api #T174509
-   # 'db2067' => 400, # D6 3.3TB 160GB #T174509
-   # 'db2076' => 400, # B1 3.3TB 512GB #T174509
+   'db2060' => 100, # D6 3.3TB 160GB, api
+   'db2067' => 400, # D6 3.3TB 160GB
+   'db2076' => 400, # B1 3.3TB 512GB
],
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
@@ -405,7 +405,7 @@
'db2053' => 1,
],
'api' => [
-   'db2046' => 1,
+   'db2060' => 1,
],
],
's7' => [

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: WmfDatabase: Rollback all if Civi txn marked for rollback

[jenkins-bot (Code Review)]

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

Change subject: WmfDatabase: Rollback all if Civi txn marked for rollback
..


WmfDatabase: Rollback all if Civi txn marked for rollback

This will avoid cross-database inconsistencies.

Bug: T171349
Change-Id: I4c0947cb828c1e4558fdf4b96dea0925cca051fb
---
M sites/all/modules/wmf_common/WmfDatabase.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/wmf_common/WmfDatabase.php 
b/sites/all/modules/wmf_common/WmfDatabase.php
index 44e5c4a..6b6758c 100644
--- a/sites/all/modules/wmf_common/WmfDatabase.php
+++ b/sites/all/modules/wmf_common/WmfDatabase.php
@@ -25,6 +25,14 @@
 try {
 // Do the thing itself
 $result = call_user_func_array( $callback, $params );
+
+// Detect if anything has marked the native Civi transaction for
+   // rollback, and do not proceed if so.
+if 
(\Civi\Core\Transaction\Manager::singleton()->getFrame()->isRollbackOnly()) {
+   throw new RuntimeException(
+   'Civi Transaction was marked for rollback and Exception 
was suppressed'
+   );
+   }
 }
 catch ( Exception $ex ) {
 watchdog( 'wmf_common', "Aborting DB transaction.", NULL, 
WATCHDOG_INFO );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c0947cb828c1e4558fdf4b96dea0925cca051fb
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add test for Exception Rollback

[Eileen (Code Review)]

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

Change subject: Add test for Exception Rollback
..

Add test for Exception Rollback

Bug: T171349
Change-Id: Ibd08450f1223c12b9e285da944fdfeb3cbd4683d
---
M sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
1 file changed, 59 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/62/381162/1

diff --git a/sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php 
b/sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
index b01483c..d884430 100644
--- a/sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
+++ b/sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
@@ -111,6 +111,7 @@
 }
 
 function testExistsNone() {
+civicrm_initialize();
 $transaction = WmfTransaction::from_unique_id( 'TEST_GATEWAY ' . 
mt_rand() );
 $this->assertEquals( false, $transaction->exists() );
 }
@@ -159,4 +160,62 @@
 $transaction = WmfTransaction::from_unique_id( 'TEST_GATEWAY ' . 
$gateway_txn_id );
 $transaction->getContribution();
 }
+
+  /**
+   * Test that when an exception is thrown without our wrapper no further 
rollback happens.
+   *
+   * (this is really just the 'control' for the following test.
+   */
+public function testNoRollBack() {
+  civicrm_initialize();
+  CRM_Core_DAO::executeQuery("UPDATE civicrm_domain SET description = 
'WMF'");
+
+  $this->callbackFunction(1);
+
+  $this->assertEquals('Cool planet', 
CRM_Core_DAO::singleValueQuery('SELECT description FROM civicrm_domain LIMIT 
1'));
+  $contact = $this->callAPISuccess('Contact', 'get', 
array('external_identifier' => 'oh so strange'));
+  $this->assertEquals(1, $contact['count']);
+
+  // Cleanup
+  $this->callAPISuccess('Contact', 'delete', array('id' => 
$contact['id']));
+  CRM_Core_DAO::executeQuery("UPDATE civicrm_domain SET description = 
'WMF'");
+}
+
+  /**
+   * Test that when an exception is thrown with our wrapper the whole lot 
rolls back.
+   */
+  public function testFullRollBack() {
+civicrm_initialize();
+CRM_Core_DAO::executeQuery("UPDATE civicrm_domain SET description = 
'WMF'");
+
+try {
+  WmfDatabase::transactionalCall(array($this, 'callbackFunction'), 
array());
+}
+catch (RuntimeException $e) {
+  // We were expecting this :-)
+}
+
+$this->assertEquals('WMF', CRM_Core_DAO::singleValueQuery('SELECT 
description FROM civicrm_domain LIMIT 1'));
+$contact = $this->callAPISuccess('Contact', 'getcount', 
array('external_identifier' => 'oh so strange'));
+$this->assertEquals(0, $contact['count']);
+  }
+
+public function callbackFunction() {
+  CRM_Core_DAO::executeQuery("UPDATE civicrm_domain SET description = 
'Cool planet'");
+  $contact = array(
+'contact_type' => 'Individual',
+'first_name' => 'Dr',
+'last_name' => 'Strange',
+'external_identifier' => 'oh so strange',
+  );
+  $this->callAPISuccess('Contact', 'create', $contact);
+  try {
+civicrm_api3('Contact', 'create', $contact);
+  }
+  catch (Exception $e) {
+// We have done nothing to roll back.
+return;
+  }
+}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[wmf/1.31.0-wmf.1]: [1.31.0-wmf.1] Fix reversed nav elements when viewing cached...

[jenkins-bot (Code Review)]

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

Change subject: [1.31.0-wmf.1] Fix reversed nav elements when viewing cached 
HTML
..


[1.31.0-wmf.1] Fix reversed nav elements when viewing cached HTML

Follow-up to 5d0a07bf9dac66a9b705865b5c675f2be960e4e6.
See T48947#3641618 for a detailed explanation of the
problem this is fixing. Essentially, our CSS has to be
compatible with both new and old HTML to avoid problems
with cached pages on Wikimedia wikis. To do this, we
add a CSS class to the body and make the new CSS only
apply on pages that have this class. This patch should
be reverted when the caches expire.

Bug: T48947
Change-Id: Icf26e6690b59f470765b2634534d18d2df25ee2a
---
M SkinVector.php
M components/personalMenu.less
M components/tabs.less
3 files changed, 38 insertions(+), 0 deletions(-)

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



diff --git a/SkinVector.php b/SkinVector.php
index f684891..23dd944 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -47,6 +47,7 @@
if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
$className .= ' vector-experimental-print-styles';
}
+   $className .= ' vector-nav-directionality';
return $className;
}
 
diff --git a/components/personalMenu.less b/components/personalMenu.less
index 979831f..a91b7b3 100644
--- a/components/personalMenu.less
+++ b/components/personalMenu.less
@@ -19,11 +19,16 @@
 
li {
line-height: 1.125em;
+   /* @noflip */
float: left;
margin-left: 0.75em;
margin-top: 0.5em;
font-size: @menu-personal-font-size;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 }
 
diff --git a/components/tabs.less b/components/tabs.less
index 211d1fd..1b78203 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -9,6 +9,7 @@
 
 /* Namespaces and Views */
 div.vectorTabs {
+   /* @noflip */
float: left;
height: 2.5em;
.background-image('images/tab-break.png');
@@ -16,7 +17,12 @@
background-repeat: no-repeat;
padding-left: 1px;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
ul {
+   /* @noflip */
float: left;
height: 100%;
list-style-type: none;
@@ -27,7 +33,12 @@
background-position: right bottom;
background-repeat: no-repeat;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
li {
+   /* @noflip */
float: left;
line-height: 1.125em;
/* For IE6, overridden later to display:block by modern 
browsers */
@@ -40,6 +51,10 @@
background-position: bottom left;
background-repeat: repeat-x;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 
/* IGNORED BY IE6 which doesn't support child selector */
@@ -104,19 +119,31 @@
 
/* Ignored by IE6 which doesn't support child selector */
> a {
+   /* @noflip */
float: left;
display: block;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
}
 }
 
 /* Variants and Actions */
 div.vectorMenu {
+   /* @noflip */
direction: ltr;
+   /* @noflip */
float: left;
cursor: pointer;
position: relative;
line-height: 1.125em;
+
+   .vector-nav-directionality & {
+   direction: ltr;
+   float: left;
+   }
 }
 
 body.rtl div.vectorMenu {
@@ -125,6 +152,7 @@
 }
 
 div#mw-head div.vectorMenu h3 {
+   /* @noflip */
float: left;
.background-image('images/tab-break.png');
background-repeat: no-repeat;
@@ -135,6 +163,10 @@
// border. It is necessary for the dropdown (div.vectorMenu div.menu) 
to align well.
padding-right: 1px;
margin-right: -1px;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
 }
 
 div.vectorMenu h3 span {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf26e6690b59f470765b2634534d18d2df25ee2a
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Fix reversed nav elements when viewing cached HTML

[jenkins-bot (Code Review)]

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

Change subject: Fix reversed nav elements when viewing cached HTML
..


Fix reversed nav elements when viewing cached HTML

Follow-up to 5d0a07bf9dac66a9b705865b5c675f2be960e4e6.
See T48947#3641618 for a detailed explanation of the
problem this is fixing. Essentially, our CSS has to be
compatible with both new and old HTML to avoid problems
with cached pages on Wikimedia wikis. To do this, we
add a CSS class to the body and make the new CSS only
apply on pages that have this class. This patch should
be reverted when the caches expire.

Bug: T48947
Change-Id: Icf26e6690b59f470765b2634534d18d2df25ee2a
---
M SkinVector.php
M components/personalMenu.less
M components/tabs.less
3 files changed, 38 insertions(+), 0 deletions(-)

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



diff --git a/SkinVector.php b/SkinVector.php
index f684891..23dd944 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -47,6 +47,7 @@
if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
$className .= ' vector-experimental-print-styles';
}
+   $className .= ' vector-nav-directionality';
return $className;
}
 
diff --git a/components/personalMenu.less b/components/personalMenu.less
index 979831f..a91b7b3 100644
--- a/components/personalMenu.less
+++ b/components/personalMenu.less
@@ -19,11 +19,16 @@
 
li {
line-height: 1.125em;
+   /* @noflip */
float: left;
margin-left: 0.75em;
margin-top: 0.5em;
font-size: @menu-personal-font-size;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 }
 
diff --git a/components/tabs.less b/components/tabs.less
index 211d1fd..1b78203 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -9,6 +9,7 @@
 
 /* Namespaces and Views */
 div.vectorTabs {
+   /* @noflip */
float: left;
height: 2.5em;
.background-image('images/tab-break.png');
@@ -16,7 +17,12 @@
background-repeat: no-repeat;
padding-left: 1px;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
ul {
+   /* @noflip */
float: left;
height: 100%;
list-style-type: none;
@@ -27,7 +33,12 @@
background-position: right bottom;
background-repeat: no-repeat;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
li {
+   /* @noflip */
float: left;
line-height: 1.125em;
/* For IE6, overridden later to display:block by modern 
browsers */
@@ -40,6 +51,10 @@
background-position: bottom left;
background-repeat: repeat-x;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 
/* IGNORED BY IE6 which doesn't support child selector */
@@ -104,19 +119,31 @@
 
/* Ignored by IE6 which doesn't support child selector */
> a {
+   /* @noflip */
float: left;
display: block;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
}
 }
 
 /* Variants and Actions */
 div.vectorMenu {
+   /* @noflip */
direction: ltr;
+   /* @noflip */
float: left;
cursor: pointer;
position: relative;
line-height: 1.125em;
+
+   .vector-nav-directionality & {
+   direction: ltr;
+   float: left;
+   }
 }
 
 body.rtl div.vectorMenu {
@@ -125,6 +152,7 @@
 }
 
 div#mw-head div.vectorMenu h3 {
+   /* @noflip */
float: left;
.background-image('images/tab-break.png');
background-repeat: no-repeat;
@@ -135,6 +163,10 @@
// border. It is necessary for the dropdown (div.vectorMenu div.menu) 
to align well.
padding-right: 1px;
margin-right: -1px;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
 }
 
 div.vectorMenu h3 span {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf26e6690b59f470765b2634534d18d2df25ee2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master

[MediaWiki-commits] [Gerrit] mediawiki...Vector[wmf/1.31.0-wmf.1]: [1.31.0-wmf.1] Fix reversed nav elements when viewing cached...

[Tim Starling (Code Review)]

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

Change subject: [1.31.0-wmf.1] Fix reversed nav elements when viewing cached 
HTML
..

[1.31.0-wmf.1] Fix reversed nav elements when viewing cached HTML

Follow-up to 5d0a07bf9dac66a9b705865b5c675f2be960e4e6.
See T48947#3641618 for a detailed explanation of the
problem this is fixing. Essentially, our CSS has to be
compatible with both new and old HTML to avoid problems
with cached pages on Wikimedia wikis. To do this, we
add a CSS class to the body and make the new CSS only
apply on pages that have this class. This patch should
be reverted when the caches expire.

Bug: T48947
Change-Id: Icf26e6690b59f470765b2634534d18d2df25ee2a
---
M SkinVector.php
M components/personalMenu.less
M components/tabs.less
3 files changed, 38 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/61/381161/1

diff --git a/SkinVector.php b/SkinVector.php
index f684891..23dd944 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -47,6 +47,7 @@
if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
$className .= ' vector-experimental-print-styles';
}
+   $className .= ' vector-nav-directionality';
return $className;
}
 
diff --git a/components/personalMenu.less b/components/personalMenu.less
index 979831f..a91b7b3 100644
--- a/components/personalMenu.less
+++ b/components/personalMenu.less
@@ -19,11 +19,16 @@
 
li {
line-height: 1.125em;
+   /* @noflip */
float: left;
margin-left: 0.75em;
margin-top: 0.5em;
font-size: @menu-personal-font-size;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 }
 
diff --git a/components/tabs.less b/components/tabs.less
index 211d1fd..1b78203 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -9,6 +9,7 @@
 
 /* Namespaces and Views */
 div.vectorTabs {
+   /* @noflip */
float: left;
height: 2.5em;
.background-image('images/tab-break.png');
@@ -16,7 +17,12 @@
background-repeat: no-repeat;
padding-left: 1px;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
ul {
+   /* @noflip */
float: left;
height: 100%;
list-style-type: none;
@@ -27,7 +33,12 @@
background-position: right bottom;
background-repeat: no-repeat;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
li {
+   /* @noflip */
float: left;
line-height: 1.125em;
/* For IE6, overridden later to display:block by modern 
browsers */
@@ -40,6 +51,10 @@
background-position: bottom left;
background-repeat: repeat-x;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 
/* IGNORED BY IE6 which doesn't support child selector */
@@ -104,19 +119,31 @@
 
/* Ignored by IE6 which doesn't support child selector */
> a {
+   /* @noflip */
float: left;
display: block;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
}
 }
 
 /* Variants and Actions */
 div.vectorMenu {
+   /* @noflip */
direction: ltr;
+   /* @noflip */
float: left;
cursor: pointer;
position: relative;
line-height: 1.125em;
+
+   .vector-nav-directionality & {
+   direction: ltr;
+   float: left;
+   }
 }
 
 body.rtl div.vectorMenu {
@@ -125,6 +152,7 @@
 }
 
 div#mw-head div.vectorMenu h3 {
+   /* @noflip */
float: left;
.background-image('images/tab-break.png');
background-repeat: no-repeat;
@@ -135,6 +163,10 @@
// border. It is necessary for the dropdown (div.vectorMenu div.menu) 
to align well.
padding-right: 1px;
margin-right: -1px;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
 }
 
 div.vectorMenu h3 span {

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix CreditsAction when user has no real name set but real na...

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381160 )

Change subject: Fix CreditsAction when user has no real name set but real names 
enabled
..

Fix CreditsAction when user has no real name set but real names enabled

Change-Id: Ief347739a1231fa8bd814694bdb5b4f44ba41a77
---
M includes/actions/CreditsAction.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/381160/1

diff --git a/includes/actions/CreditsAction.php 
b/includes/actions/CreditsAction.php
index 7025477..ed58686 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -198,6 +198,9 @@
protected function link( User $user ) {
if ( $this->canShowRealUserName() && !$user->isAnon() ) {
$real = $user->getRealName();
+   if ( $real === '' ) {
+   $real = $user->getName();
+   }
} else {
$real = $user->getName();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief347739a1231fa8bd814694bdb5b4f44ba41a77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...Empty[master]: Initial commit

[Pastakhov (Code Review)]

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

Change subject: Initial commit
..

Initial commit

Change-Id: I44454bc0a2a1f85feec83566ed9469e4c9d19e30
---
A .eslintrc.json
A .gitignore
A .stylelintrc.json
A Empty.php
A EmptyHooks.php
A EmptyTemplate.php
A Gruntfile.js
A SkinEmpty.php
A composer.json
A i18n/en.json
A i18n/qqq.json
A includes/Empty.json
A includes/Skin.php
A package.json
A phpcs.xml
A skin.json
16 files changed, 857 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Empty 
refs/changes/59/381159/1

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..4843240
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true
+   },
+   "globals": {
+   "mediaWiki": false
+   }
+}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..6cf4eed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+# Building & testing
+node_modules/
+package-lock.json
+
+# Composer
+/vendor
+/composer.lock
+
+# Operating systems
+## Mac OS X
+.DS_Store
+## Windows
+Thumbs.db
+## Linux
+.directory
+
diff --git a/.stylelintrc.json b/.stylelintrc.json
new file mode 100644
index 000..2c90730
--- /dev/null
+++ b/.stylelintrc.json
@@ -0,0 +1,3 @@
+{
+   "extends": "stylelint-config-wikimedia"
+}
diff --git a/Empty.php b/Empty.php
new file mode 100644
index 000..5d741f5
--- /dev/null
+++ b/Empty.php
@@ -0,0 +1,13 @@
+https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the Empty skin requires MediaWiki 1.25+' );
+}
diff --git a/EmptyHooks.php b/EmptyHooks.php
new file mode 100644
index 000..024b615
--- /dev/null
+++ b/EmptyHooks.php
@@ -0,0 +1,33 @@
+
+ * @licence GNU General Public Licence 2.0 or later
+ */
+class EmptyHooks {
+
+   public static function onParserFirstCallInit() {
+   if ( !defined( 'PHPTAGS_VERSION' ) ) {
+   throw new MWException( "\n\nYou need to have the 
PhpTags extension installed in order to use the Empty skin." );
+   }
+   $needVersion = '5.3.0';
+   if ( version_compare( PHPTAGS_VERSION, $needVersion, '<' ) ) {
+   throw new MWException( "\n\nThis version of the Empty 
skin requires the PhpTags extension $needVersion or above.\n You have " . 
PHPTAGS_VERSION . ". Please update it." );
+   }
+   if ( PHPTAGS_HOOK_RELEASE != 8 ) {
+   throw new MWException( "\n\nThis version of the Empty 
skin is outdated and not compatible with current version of the PhpTags 
extension.\n Please update it." );
+   }
+   return true;
+   }
+
+   public static function onPhpTagsRuntimeFirstInit() {
+   \PhpTags\Hooks::addJsonFile( __DIR__ . '/includes/Empty.json', 
EMPTY_SKIN_VERSION );
+   return true;
+   }
+
+}
diff --git a/EmptyTemplate.php b/EmptyTemplate.php
new file mode 100644
index 000..07cc17c
--- /dev/null
+++ b/EmptyTemplate.php
@@ -0,0 +1,169 @@
+html( 'headelement' );
+   ?>
+
+html( 'title' ) ?>
+   html( 'prebodyhtml' ) ?>
+
+   
+   data['isarticle'] ) {
+   ?>
+   msg( 
'tagline' ) ?>
+   
+   html( 'userlangattributes' )
+   ?>>html( 'subtitle' ) ?>
+   data['undelete'] ) {
+   ?>
+   html( 'undelete' ) ?>
+   
+   data['newtalk'] ) {
+   ?>
+   html( 'newtalk' ) ?>
+   
+   
+   msg( 'jumpto' ) ?>
+   msg( 'jumptonavigation' )
+   ?>msg( 'comma-separator' )
+   ?>
+   msg( 
'jumptosearch' ) ?>
+   
+   html( 'bodycontent' ) ?>
+   data['printfooter'] ) {
+   ?>
+   
+   html( 
'printfooter' ); ?>
+   
+   
+   data['catlinks'] ) {
+   ?>
+ 

[MediaWiki-commits] [Gerrit] operations/dns[master]: depool ulsfo

[BBlack (Code Review)]

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

Change subject: depool ulsfo
..


depool ulsfo

Change-Id: I9aec67a514f81059e23d9cb7aa4b976e91c081ed
---
M admin_state
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/admin_state b/admin_state
index 54ee433..6a6dda1 100644
--- a/admin_state
+++ b/admin_state
@@ -72,3 +72,5 @@
 ### v T164610 - semi-permanent to avoid confusion until T164609
 geoip/misc-addrs/ulsfo => DOWN
 ### ^ T164610 - semi-permanent to avoid confusion until T164609
+
+geoip/generic-map/ulsfo => DOWN

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: depool ulsfo

[BBlack (Code Review)]

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

Change subject: depool ulsfo
..

depool ulsfo

Change-Id: I9aec67a514f81059e23d9cb7aa4b976e91c081ed
---
M admin_state
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/58/381158/1

diff --git a/admin_state b/admin_state
index 54ee433..6a6dda1 100644
--- a/admin_state
+++ b/admin_state
@@ -72,3 +72,5 @@
 ### v T164610 - semi-permanent to avoid confusion until T164609
 geoip/misc-addrs/ulsfo => DOWN
 ### ^ T164610 - semi-permanent to avoid confusion until T164609
+
+geoip/generic-map/ulsfo => DOWN

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: docs/uidesign/monospace.html: Add textareas to the demo

[Code Review]

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

Change subject: docs/uidesign/monospace.html: Add textareas to the demo
..

docs/uidesign/monospace.html: Add textareas to the demo

It seems that textareas have their own font-size set in Chrome (but not
Firefox and other browsers), making them unaffected by this behavior.

Change-Id: I811245ea26b4d90ad252fe8f6d2e096e27cb9073
---
M docs/uidesign/monospace.html
1 file changed, 104 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/381157/1

diff --git a/docs/uidesign/monospace.html b/docs/uidesign/monospace.html
index f2b988e2..cdaf580 100644
--- a/docs/uidesign/monospace.html
+++ b/docs/uidesign/monospace.html
@@ -2,15 +2,24 @@
 
 

-   pre {
+   pre,
+   textarea {
border: 1px dashed #AAA;
background-color: #E0E0E0;
color: #00;
-   margin: 1em 10%;
padding: 0.5em;
+   height: 1em;
+   width: 90%;
}
blockquote {
font-style: italic;
+   }
+   table {
+   width: 100%;
+   table-layout: fixed;
+   }
+   td {
+   padding: 0.5em;
}

 
@@ -33,45 +42,138 @@
 monospace and use 0.8 x 16px = 13px instead.
 
 
+Additionally, it seems that textareas have their own font-size set in Chrome
+(but not Firefox and other browsers), making them unaffected by this behavior.
+
+
 Below are various rendering:
 
 
+
+
+
+pre
+textarea
+
+
+
+
 
 font-family: monospace;
 
+
+
+
+font-family: monospace;
+
+
+
 
+
+
 
 font-family: "Courier New";
 
+
+
+
+font-family: "Courier New";
+
+
+
 
+
+
 
 font-family: Courier;
 
+
+
+
+font-family: Courier;
+
+
+
 
+
+
 
 font-family: monospace, monospace;
 
+
+
+
+font-family: monospace, monospace;
+
+
+
 
+
+
 
 font-family: monospace, "Courier New";
 
+
+
+
+font-family: monospace, "Courier New";
+
+
+
 
+
+
 
 font-family: monospace, Courier;
 
+
+
+
+font-family: monospace, Courier;
+
+
+
 
+
+
 
 font-family: monospace, Verdana;
 
+
+
+
+font-family: monospace, Verdana;
+
+
+
 
+
+
 
 font-family: monospace, DOESNOTEXISTREALLY;
 
+
+
+
+font-family: monospace, DOESNOTEXISTREALLY;
+
+
+
+
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I811245ea26b4d90ad252fe8f6d2e096e27cb9073
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...CategoryTree[master]: Remove hack and check for existent of message rootcategory

[jenkins-bot (Code Review)]

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

Change subject: Remove hack and check for existent of message rootcategory
..


Remove hack and check for existent of message rootcategory

Since 184658eb included in MediaWiki 1.28 not existing messages return
⧼rootcategory⧽ instead of .

Bug: T176904
Change-Id: I56b2f4f767abaa20fa2910ca8c40113de72785be
---
M CategoryTreePage.php
1 file changed, 7 insertions(+), 6 deletions(-)

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



diff --git a/CategoryTreePage.php b/CategoryTreePage.php
index 864cff9..c6501d9 100644
--- a/CategoryTreePage.php
+++ b/CategoryTreePage.php
@@ -49,15 +49,16 @@
if ( $par ) {
$this->target = $par;
} else {
-   $this->target = $request->getVal( 'target', $this->msg( 
'rootcategory' )->text() );
+   $this->target = $request->getVal( 'target' );
+   if ( $this->target === null ) {
+   $rootcategory = $this->msg( 'rootcategory' );
+   if ( $rootcategory->exists() ) {
+   $this->target = $rootcategory->text();
+   }
+   }
}
 
$this->target = trim( $this->target );
-
-   # HACK for undefined root category
-   if ( $this->target == '' || $this->target == 
'rootcategory' ) {
-   $this->target = null;
-   }
 
$options = [];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56b2f4f767abaa20fa2910ca8c40113de72785be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
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...Vector[master]: Remove some unnecessary direction-specific CSS

[Code Review]

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

Change subject: Remove some unnecessary direction-specific CSS
..

Remove some unnecessary direction-specific CSS

Both of these survived across many rewrites, I tracked down the
original commits that added them:

* footer.less: Added in 6d5dca5a899d45512c1031c4235f26cc755b933b in
  MediaWiki core (rSVN62030) as a workaround for "weirdness" in IE 7.
  Users of IE 7 experience much worse weirdnesses when viewing pages
  these days.

* tabs.less: Added in 299d1f328c2ad1475c8a1ac19b4fa07fc087d239 in
  MediaWiki core (rSVN53247) under a generic label of "RTL fixes".
  After change 5d0a07bf9dac66a9b705865b5c675f2be960e4e6 this is
  actually a no-op.

Change-Id: Iac3d2a26438226a3e23e067780c4b2810ac4903f
---
M components/footer.less
M components/tabs.less
2 files changed, 0 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/56/381156/1

diff --git a/components/footer.less b/components/footer.less
index 3d61b66..737bc9d 100644
--- a/components/footer.less
+++ b/components/footer.less
@@ -46,12 +46,3 @@
}
}
 }
-
-body.ltr {
-   div#footer {
-   #footer-places {
-   /* @noflip */
-   float: left;
-   }
-   }
-}
diff --git a/components/tabs.less b/components/tabs.less
index 211d1fd..b04cf18 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -119,11 +119,6 @@
line-height: 1.125em;
 }
 
-body.rtl div.vectorMenu {
-   /* @noflip */
-   direction: rtl;
-}
-
 div#mw-head div.vectorMenu h3 {
float: left;
.background-image('images/tab-break.png');

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac3d2a26438226a3e23e067780c4b2810ac4903f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: ApiMobileView: Support queries for titles in any language va...

[Mholloway (Code Review)]

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

Change subject: ApiMobileView: Support queries for titles in any language 
variant
..

ApiMobileView: Support queries for titles in any language variant

Adds a call to Language::findVariantLink in makeTitle so that results
will be returned for any title with content available, regardless of the
language variant the title is provided in.

Bug: T176678
Change-Id: I8a6042e8603a5a8927c90a56b82958d15b499772
---
M includes/api/ApiMobileView.php
A tests/phpunit/api/ApiMobileViewConvertTitleTest.php
2 files changed, 68 insertions(+), 0 deletions(-)


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

diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 0e1c2d4..001733b 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -286,10 +286,17 @@
 * @return Title
 */
protected function makeTitle( $name ) {
+   global $wgContLang;
$title = Title::newFromText( $name );
if ( !$title ) {
$this->dieWithError( [ 'apierror-invalidtitle', 
wfEscapeWikiText( $name ) ] );
}
+   $unconvertedTitle = $title->getPrefixedText();
+   $wgContLang->findVariantLink( $name, $title );
+   if ( $unconvertedTitle !== $title->getPrefixedText() ) {
+   $values = [ 'from' => $unconvertedTitle, 'to' => 
$title->getPrefixedText() ];
+   $this->getResult()->addValue( 'mobileview', 
'converted', $values );
+   }
if ( $title->inNamespace( NS_FILE ) ) {
$this->file = $this->findFile( $title );
}
diff --git a/tests/phpunit/api/ApiMobileViewConvertTitleTest.php 
b/tests/phpunit/api/ApiMobileViewConvertTitleTest.php
new file mode 100644
index 000..bbac27c
--- /dev/null
+++ b/tests/phpunit/api/ApiMobileViewConvertTitleTest.php
@@ -0,0 +1,61 @@
+setMwGlobals( 'wgLangObjCacheSize', 0 );
+   $this->setMwGlobals( 'wgUsePigLatinVariant', true );
+   parent::setUp();
+
+   $this->setUserLang( 'en' );
+
+   $newPage = WikiPage::factory( Title::newFromText( 
$this->pigLatinTitle ) );
+   $newPage->doEditContent(
+   ContentHandler::makeContent( "Arbay", 
$newPage->getTitle() ), 'test page'
+   );
+   }
+
+   public function testRequestConverted() {
+
+   $result = $this->doApiRequest( [
+   'action' => 'mobileview',
+   'page' => $this->englishTitle,
+   'prop' => 'text',
+   'sections' => 'all',
+   'noheadings' => '',
+   ] );
+
+   $this->assertArrayHasKey( 'mobileview', $result[0] );
+   $this->assertArrayHasKey( 'converted', $result[0]['mobileview'] 
);
+   $convertedFrom = $result[0]['mobileview']['converted']['from'];
+   $convertedTo = $result[0]['mobileview']['converted']['to'];
+   $this->assertEquals( $convertedTo, $this->pigLatinTitle );
+   $this->assertEquals( $convertedFrom, $this->englishTitle );
+   }
+
+   public function testRequestNotConverted() {
+
+   $result = $this->doApiRequest( [
+   'action' => 'mobileview',
+   'page' => $this->pigLatinTitle,
+   'prop' => 'text',
+   'sections' => 'all',
+   'noheadings' => '',
+   ] );
+
+   $this->assertArrayHasKey( 'mobileview', $result[0] );
+   $this->assertArrayNotHasKey( 'converted', 
$result[0]['mobileview'] );
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a6042e8603a5a8927c90a56b82958d15b499772
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Fix reversed nav elements when viewing cached HTML

[Code Review]

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

Change subject: Fix reversed nav elements when viewing cached HTML
..

Fix reversed nav elements when viewing cached HTML

Follow-up to 5d0a07bf9dac66a9b705865b5c675f2be960e4e6.
See T48947#3641618 for a detailed explanation of the
problem this is fixing. Essentially, our CSS has to be
compatible with both new and old HTML to avoid problems
with cached pages on Wikimedia wikis. To do this, we
add a CSS class to the body and make the new CSS only
apply on pages that have this class. This patch should
be reverted when the caches expire.

Bug: T48947
Change-Id: Icf26e6690b59f470765b2634534d18d2df25ee2a
---
M SkinVector.php
M components/personalMenu.less
M components/tabs.less
3 files changed, 38 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/53/381153/1

diff --git a/SkinVector.php b/SkinVector.php
index f684891..23dd944 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -47,6 +47,7 @@
if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
$className .= ' vector-experimental-print-styles';
}
+   $className .= ' vector-nav-directionality';
return $className;
}
 
diff --git a/components/personalMenu.less b/components/personalMenu.less
index 979831f..a91b7b3 100644
--- a/components/personalMenu.less
+++ b/components/personalMenu.less
@@ -19,11 +19,16 @@
 
li {
line-height: 1.125em;
+   /* @noflip */
float: left;
margin-left: 0.75em;
margin-top: 0.5em;
font-size: @menu-personal-font-size;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 }
 
diff --git a/components/tabs.less b/components/tabs.less
index 211d1fd..1b78203 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -9,6 +9,7 @@
 
 /* Namespaces and Views */
 div.vectorTabs {
+   /* @noflip */
float: left;
height: 2.5em;
.background-image('images/tab-break.png');
@@ -16,7 +17,12 @@
background-repeat: no-repeat;
padding-left: 1px;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
ul {
+   /* @noflip */
float: left;
height: 100%;
list-style-type: none;
@@ -27,7 +33,12 @@
background-position: right bottom;
background-repeat: no-repeat;
 
+   .vector-nav-directionality & {
+   float: left;
+   }
+
li {
+   /* @noflip */
float: left;
line-height: 1.125em;
/* For IE6, overridden later to display:block by modern 
browsers */
@@ -40,6 +51,10 @@
background-position: bottom left;
background-repeat: repeat-x;
white-space: nowrap;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
 
/* IGNORED BY IE6 which doesn't support child selector */
@@ -104,19 +119,31 @@
 
/* Ignored by IE6 which doesn't support child selector */
> a {
+   /* @noflip */
float: left;
display: block;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
}
}
 }
 
 /* Variants and Actions */
 div.vectorMenu {
+   /* @noflip */
direction: ltr;
+   /* @noflip */
float: left;
cursor: pointer;
position: relative;
line-height: 1.125em;
+
+   .vector-nav-directionality & {
+   direction: ltr;
+   float: left;
+   }
 }
 
 body.rtl div.vectorMenu {
@@ -125,6 +152,7 @@
 }
 
 div#mw-head div.vectorMenu h3 {
+   /* @noflip */
float: left;
.background-image('images/tab-break.png');
background-repeat: no-repeat;
@@ -135,6 +163,10 @@
// border. It is necessary for the dropdown (div.vectorMenu div.menu) 
to align well.
padding-right: 1px;
margin-right: -1px;
+
+   .vector-nav-directionality & {
+   float: left;
+   }
 }
 
 div.vectorMenu h3 span {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf26e6690b59f470765b2634534d18d2df25ee2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Remove stray unnecessary @noflip

[Code Review]

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

Change subject: Remove stray unnecessary @noflip
..

Remove stray unnecessary @noflip

Follow-up to 5d0a07bf9dac66a9b705865b5c675f2be960e4e6.
As it happens, it actually doesn't matter whether this
element has 'float: left' or 'float: right', the
rendering is exactly the same. Let's remove the @noflip
for consistency with .vectorTabs, .vectorMenu etc.

Change-Id: I167c5f6cab7fb85344a558b632b38cbca85fa37c
---
M components/search.less
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/54/381154/1

diff --git a/components/search.less b/components/search.less
index 50bfe13..f66c839 100644
--- a/components/search.less
+++ b/components/search.less
@@ -3,7 +3,6 @@
 
 /* Search */
 #p-search {
-   /* @noflip */
float: left;
margin-right: 0.5em;
margin-left: 0.5em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I167c5f6cab7fb85344a558b632b38cbca85fa37c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: BadImageRemover: Also look for nodes, and mw:Image/...

[jenkins-bot (Code Review)]

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

Change subject: BadImageRemover: Also look for  nodes, and mw:Image/* 
types
..


BadImageRemover: Also look for  nodes, and mw:Image/* types

Change-Id: I1548fe1f84a6644c06045e9baf17234701944d14
---
M includes/Parsoid/Fixer/BadImageRemover.php
M tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php
2 files changed, 30 insertions(+), 6 deletions(-)

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



diff --git a/includes/Parsoid/Fixer/BadImageRemover.php 
b/includes/Parsoid/Fixer/BadImageRemover.php
index 3fedf06..c5ba75e 100644
--- a/includes/Parsoid/Fixer/BadImageRemover.php
+++ b/includes/Parsoid/Fixer/BadImageRemover.php
@@ -41,7 +41,7 @@
 * @return string
 */
public function getXPath() {
-   return '//figure-inline[@typeof="mw:Image"]//img[@resource] | 
//span[@typeof="mw:Image"]//img[@resource]';
+   return 
'//figure[starts-with(@typeof,"mw:Image")]//img[@resource] | 
//figure-inline[starts-with(@typeof,"mw:Image")]//img[@resource] | 
//span[starts-with(@typeof,"mw:Image")]//img[@resource]';
}
 
/**
@@ -74,7 +74,7 @@
 
// Move up the DOM and remove the typeof="mw:Image" node
$nodeToRemove = $node->parentNode;
-   while ( $nodeToRemove instanceof DOMElement && 
$nodeToRemove->getAttribute( 'typeof' ) !== 'mw:Image' ) {
+   while ( $nodeToRemove instanceof DOMElement && strpos( 
$nodeToRemove->getAttribute( 'typeof' ), 'mw:Image' ) !== 0 ) {
$nodeToRemove = $nodeToRemove->parentNode;
}
if ( !$nodeToRemove ) {
diff --git a/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php 
b/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php
index 251f36a..7108d1c 100644
--- a/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php
+++ b/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php
@@ -19,7 +19,7 @@
public static function imageRemovalProvider() {
return [
[
-   'Passes through allowed good images',
+   'Passes through allowed good inline images',
// expected html after filtering
' and other stuff',
// input html
@@ -31,11 +31,23 @@
],
 
[
-   'Passes through allowed good images (with 
legacy span markup)',
+   'Passes through allowed good inline images 
(with legacy span markup)',
// expected html after filtering
' and other stuff',
// input html
' and other stuff',
+   // accept/decline callback
+   function () {
+   return false;
+   }
+   ],
+
+   [
+   'Passes through allowed good block images',
+   // expected html after filtering
+   'Blah blah',
+   // input html
+   'Blah blah',
// accept/decline callback
function () {
return false;
@@ -55,7 +67,7 @@
],
 
[
-   'Strips declined images',
+   'Strips declined inline images',
// expected html after filtering
' and other stuff',
// input html
@@ -67,7 +79,7 @@
],
 
[
-   'Strips declined images (with legacy span 
markup)',
+   'Strips declined inline images (with legacy 
span markup)',
// expected html after filtering
' and other stuff',
// input html
@@ -77,6 +89,18 @@
return true;
}
],
+
+   [
+   'Strips declined block images',
+   // expected html after filtering
+   '',
+   // input html
+   'Blah blah',
+   // accept/decline callback
+ 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Delete redundant logging module

[Ejegg (Code Review)]

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

Change subject: Delete redundant logging module
..

Delete redundant logging module

DEPLOYMENT NOTE: drush dis wmf_logging

Looks like a copy of the built-in drupal syslog module. Did we copy
this over when we were running on a super early version?

Bug: T121799
Change-Id: I3421a9c57de719a051ef7f99f2acf921c18b8e29
---
D sites/all/modules/wmf_logging/wmf_logging.info
D sites/all/modules/wmf_logging/wmf_logging.module
M sites/default/enabled_modules
3 files changed, 0 insertions(+), 171 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/52/381152/1

diff --git a/sites/all/modules/wmf_logging/wmf_logging.info 
b/sites/all/modules/wmf_logging/wmf_logging.info
deleted file mode 100644
index d48a5ae..000
--- a/sites/all/modules/wmf_logging/wmf_logging.info
+++ /dev/null
@@ -1,5 +0,0 @@
-name = WMF Logging
-description = WMF specific log framework. Hooks into Watchdog.
-core = 7.x
-package = Wikimedia
-configure = admin/config/logging/wmf_logging
diff --git a/sites/all/modules/wmf_logging/wmf_logging.module 
b/sites/all/modules/wmf_logging/wmf_logging.module
deleted file mode 100644
index 0280a56..000
--- a/sites/all/modules/wmf_logging/wmf_logging.module
+++ /dev/null
@@ -1,165 +0,0 @@
- 'Logging',
-'page callback' => 'system_admin_menu_block_page',
-'file' => 'system.admin.inc',
-'file path' => drupal_get_path('module', 'system'),
-'access arguments' => array( 'administer site configuration' ),
-  );
-
-  $items[ 'admin/config/logging/wmf_logging' ] = array(
-'title'=> 'WMF Logging',
-'description'  => 'Settings for the WMF logging module.',
-'page callback'=> 'drupal_get_form',
-'page arguments'   => array( 'wmf_logging_settings' ),
-'access arguments' => array( 'administer site configuration' ),
-  );
-
-  return $items;
-}
-
-/**
- * Settings form linked to from @see wmf_logging_menu
- *
- * @return array Settings form
- */
-function wmf_logging_settings() {
-  $form = array();
-
-  $form[ 'wmf_logging_syslog_identity' ] = array(
-'#type'  => 'textfield',
-'#title' => t('Syslog identity'),
-'#default_value' => variable_get('wmf_logging_syslog_identity', 
DEFAULT_WMF_LOGGING_IDENTITY),
-'#description'   => t('String that will be prepended to the Syslog 
output'),
-  );
-
-  $form[ 'wmf_logging_syslog_facility' ] = array(
-'#type'  => 'select',
-'#title' => t('Send events to this syslog facility'),
-'#default_value' => variable_get('wmf_logging_syslog_facility', 
DEFAULT_WMF_LOGGING_FACILITY),
-'#options'   => wmf_logging_syslog_facility_list(),
-'#description'   => t('Select the syslog facility code under which 
Drupal\'s messages should be sent. On UNIX/Linux systems, Drupal can flag its 
messages with the code LOG_LOCAL0 through LOG_LOCAL7; for Microsoft Windows, 
all messages are flagged with the code LOG_USER.'),
-  );
-
-  $form[ 'wmf_logging_syslog_pid' ] = array(
-'#type'  => 'checkbox',
-'#title' => t('Add process ID to log message string'),
-'#default_value' => variable_get('wmf_logging_syslog_pid', 
DEFAULT_WMF_LOGGING_PID),
-'#description'   => t('The process identifier can be used to differentiate 
different requests.'),
-  );
-
-  $form[ 'wmf_logging_syslog_persistent' ] = array(
-'#type'  => 'checkbox',
-'#title' => t('Use persistent Syslog connection'),
-'#default_value' => variable_get('wmf_logging_syslog_persistent', 
DEFAULT_WMF_LOGGING_PERSISTENT),
-'#description'   => t('Some webserver configurations may require the 
Syslog connection to be closed after a log message is written to avoid logging 
webserver errors as Drupal errors. http://www.php.net/manual/en/function.syslog.php#97843;>Details.'),
-  );
-
-  return system_settings_form($form);
-}
-
-/**
- * Provides the list of available Syslog facilities
- *
- * @return array of facilities
- */
-function wmf_logging_syslog_facility_list() {
-  $facility_list = array(
-LOG_USER   => t('LOG_USER - User level messages. Use this for Windows.'),
-  );
-  if (defined('LOG_LOCAL0')) {
-$facility_list += array(
-  LOG_LOCAL0 => t('LOG_LOCAL0 - Local 0'),
-  LOG_LOCAL1 => t('LOG_LOCAL1 - Local 1'),
-  LOG_LOCAL2 => t('LOG_LOCAL2 - Local 2'),
-  LOG_LOCAL3 => t('LOG_LOCAL3 - Local 3'),
-  LOG_LOCAL4 => t('LOG_LOCAL4 - Local 4'),
-  LOG_LOCAL5 => t('LOG_LOCAL5 - Local 5'),
-  LOG_LOCAL6 => t('LOG_LOCAL6 - Local 6'),
-  LOG_LOCAL7 => t('LOG_LOCAL7 - Local 7'),
-);
-  }
-  return $facility_list;
-}
-
-/**
- * Hook into the drupal watchdog dispatcher. Implements the custom log handler.
- *
- * @param $entry
- */
-function wmf_logging_watchdog($entry) {
-  global $base_url;
-
-  static $log_init = FALSE;
-
-  if 

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Session counts by volume for mobile web search

[Bearloga (Code Review)]

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

Change subject: Session counts by volume for mobile web search
..


Session counts by volume for mobile web search

Bug: T176811
Change-Id: I545a80a5f4214e3f170d6a104a48e6d30dddecc9
---
M docs/README.md
M modules/metrics/search/config.yaml
A modules/metrics/search/mobile_session_counts
A modules/metrics/search/mobile_session_counts.R
4 files changed, 82 insertions(+), 1 deletion(-)

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



diff --git a/docs/README.md b/docs/README.md
index e5cc336..2053bcf 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,7 +8,7 @@
 infrastructure. These datasets provide the metrics that are used by
 [Discovery's Dashboards](https://discovery.wmflabs.org/)
 
-Last updated on 22 September 2017
+Last updated on 27 September 2017
 
 Daily Metrics
 -
@@ -204,6 +204,8 @@
 after clickthrough; Number of sessions with at least a click and the
 number of sessions that return to search for different things after
 clickthrough.
+-   **mobile\_session\_counts.tsv**: Number of user sessions on mobile
+web, broken down by high, medium and low volume.
 
 wdqs/
 -
diff --git a/modules/metrics/search/config.yaml 
b/modules/metrics/search/config.yaml
index 2181168..4b3f099 100644
--- a/modules/metrics/search/config.yaml
+++ b/modules/metrics/search/config.yaml
@@ -233,3 +233,8 @@
 granularity: days
 starts: 2017-04-01
 type: script
+mobile_session_counts:
+description: Number of user sessions on mobile web, broken down by 
high, medium and low volume.
+granularity: days
+starts: 2017-04-01
+type: script
diff --git a/modules/metrics/search/mobile_session_counts 
b/modules/metrics/search/mobile_session_counts
new file mode 100755
index 000..e88dc7e
--- /dev/null
+++ b/modules/metrics/search/mobile_session_counts
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+Rscript modules/metrics/search/mobile_session_counts.R -d $1
diff --git a/modules/metrics/search/mobile_session_counts.R 
b/modules/metrics/search/mobile_session_counts.R
new file mode 100644
index 000..dcb44a0
--- /dev/null
+++ b/modules/metrics/search/mobile_session_counts.R
@@ -0,0 +1,71 @@
+#!/usr/bin/env Rscript
+
+source("config.R")
+.libPaths(r_library)
+suppressPackageStartupMessages(library("optparse"))
+
+option_list <- list(
+  make_option(c("-d", "--date"), default = NA, action = "store", type = 
"character")
+)
+
+# Get command line options, if help option encountered print help and exit,
+# otherwise if options not found on command line then set defaults:
+opt <- parse_args(OptionParser(option_list = option_list))
+
+if (is.na(opt$date)) {
+  quit(save = "no", status = 1)
+}
+
+# Build query:
+date_clause <- as.character(as.Date(opt$date), format = "LEFT(timestamp, 8) = 
'%Y%m%d'")
+
+query <- paste0("SELECT
+  DATE('", opt$date, "') AS date,
+  event_userSessionToken AS user_session_token,
+  COUNT(DISTINCT event_searchSessionToken) AS n_search_session
+  FROM MobileWebSearch_12054448
+  WHERE ", date_clause, "
+  GROUP BY date, event_userSessionToken;")
+
+# Fetch data from MySQL database:
+results <- tryCatch(
+  suppressMessages(data.table::as.data.table(wmf::mysql_read(query, "log"))),
+  error = function(e) {
+return(data.frame())
+  }
+)
+
+if (nrow(results) == 0) {
+  # Here we make the script output tab-separated
+  # column names, as required by Reportupdater:
+  output <- data.frame(
+date = character(),
+user_sessions = numeric(),
+search_sessions = numeric(),
+high_volume = numeric(),
+medium_volume = numeric(),
+low_volume = numeric(),
+threshold_high = numeric(),
+threshold_low = numeric()
+  )
+} else {
+  # Split session counts:
+  `90th percentile` <- floor(quantile(results$n_search_session, 0.9))
+  `10th percentile` <- ceiling(quantile(results$n_search_session, 0.1))
+  results$session_type <- dplyr::case_when(
+results$n_search_session > `90th percentile` ~ "high_volume",
+results$n_search_session < `10th percentile` ~ "low_volume",
+TRUE ~ "medium_volume"
+  )
+  output <- cbind(
+  date = opt$date,
+  user_sessions = nrow(results),
+  search_sessions = sum(results$n_search_session, na.rm = TRUE),
+  tidyr::spread(results[, list(user_session = 
length(user_session_token)), by = "session_type"],
+session_type, user_session),
+  threshold_high = `90th percentile`,
+  threshold_low = `10th percentile`
+)
+}
+
+write.table(output, file = "", append = FALSE, sep = "\t", row.names = FALSE, 
quote = FALSE)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] wikimedia...wetzel[develop]: Add maplink & mapframe prevalence graphs and modularize

[Chelsyx (Code Review)]

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

Change subject: Add maplink & mapframe prevalence graphs and modularize
..


Add maplink & mapframe prevalence graphs and modularize

- Splits up server.R into modules (like Search & Portal dashboards)
- Adds maplink & mapframe prevalence graphs
  - Overall prevalence
  - Language-project breakdown of prevalence

Bug: T170022
Change-Id: If1f1efa619037ce8adea873c148f9a1f78376506
---
M CHANGELOG.md
A modules/feature_usage.R
A modules/geographic_breakdown.R
A modules/kartographer/language-project_breakdown.R
A modules/kartographer/overall_prevalence.R
A modules/kartotherian.R
M server.R
A tab_documentation/overall_prevalence.md
A tab_documentation/prevalence_langproj.md
M tab_documentation/tiles_summary.md
M ui.R
M utils.R
12 files changed, 586 insertions(+), 160 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index 208e2ab..f3e77ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log (Patch Notes)
 All notable changes to this project will be documented in this file.
 
+## 2017/09/18
+- Modularized the dashboard source code
+- Added maplink & mapframe prevalence graphs 
([T170022](https://phabricator.wikimedia.org/T170022))
+
 ## 2017/06/20
 - Added licensing info ([T167930](https://phabricator.wikimedia.org/T167930))
 
diff --git a/modules/feature_usage.R b/modules/feature_usage.R
new file mode 100644
index 000..ec2460e
--- /dev/null
+++ b/modules/feature_usage.R
@@ -0,0 +1,55 @@
+output$users_per_platform <- renderDygraph({
+  user_data %>%
+polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_users_per_platform)) %>%
+polloi::make_dygraph("Date", "Events", "Unique users by platform, by day") 
%>%
+dyAxis("y", logscale = input$users_per_platform_logscale) %>%
+dyLegend(labelsDiv = "users_per_platform_legend", show = "always") %>%
+dyRangeSelector %>%
+dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") %>%
+dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+})
+
+output$geohack_feature_usage <- renderDygraph({
+  usage_data$GeoHack %>%
+polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_geohack_feature_usage)) %>%
+polloi::make_dygraph("Date", "Events", "Feature usage for GeoHack") %>%
+dyRangeSelector %>%
+dyAxis("y", logscale = input$geohack_feature_usage_logscale) %>%
+dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") %>%
+dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+})
+
+output$wikiminiatlas_feature_usage <- renderDygraph({
+  usage_data$WikiMiniAtlas %>%
+polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_wikiminiatlas_feature_usage)) %>%
+polloi::make_dygraph("Date", "Events", "Feature usage for WikiMiniAtlas") 
%>%
+dyRangeSelector %>%
+dyAxis("y", logscale = input$wikiminiatlas_feature_usage_logscale) %>%
+dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") %>%
+dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+})
+
+output$wikivoyage_feature_usage <- renderDygraph({
+  usage_data$Wikivoyage %>%
+polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_wikivoyage_feature_usage)) %>%
+polloi::make_dygraph("Date", "Events", "Feature usage for Wikivoyage") %>%
+dyRangeSelector %>%
+dyAxis("y", logscale = input$wikivoyage_feature_usage_logscale) %>%
+dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") %>%
+dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+})
+
+output$wiwosm_feature_usage <- renderDygraph({
+  usage_data$WIWOSM %>%
+polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_wiwosm_feature_usage)) %>%
+polloi::make_dygraph("Date", "Events", "Feature usage for WIWOSM") %>%
+dyRangeSelector %>%
+dyAxis("y", logscale = input$wiwosm_feature_usage_logscale) %>%
+dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") %>%
+dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+})
diff --git a/modules/geographic_breakdown.R b/modules/geographic_breakdown.R
new file mode 100644
index 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make the RC/Watchlist legend not jump when initially collapsed

[Catrope (Code Review)]

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

Change subject: Make the RC/Watchlist legend not jump when initially collapsed
..

Make the RC/Watchlist legend not jump when initially collapsed

Look at the collapsed/expanded cookie and add class="mw-collapsed"
if it's going to be collapsed.

This is kind of a prelude to T42812.

Change-Id: Icaca762a9d7b000c973d9275f395623129f67979
---
M includes/specialpage/ChangesListSpecialPage.php
M resources/src/mediawiki.special/mediawiki.special.changeslist.css
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/381151/1

diff --git a/includes/specialpage/ChangesListSpecialPage.php 
b/includes/specialpage/ChangesListSpecialPage.php
index 88ec327..f3ace6f 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -1467,8 +1467,11 @@
$context->msg( 'recentchanges-legend-heading' 
)->parse();
 
# Collapsible
+   $collapsedState = $this->getRequest()->getCookie( 
'changeslist-state' );
+   // Note that an empty/unset cookie means collapsed, so check 
for !== 'expanded'
+   $collapsedClass = $collapsedState !== 'expanded' ? ' 
mw-collapsed' : '';
$legend =
-   '' .
+   '' .
$legendHeading .
'' . 
$legend . '' .
'';
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.css 
b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
index 3e1bd4e..532ca86 100644
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
@@ -39,3 +39,8 @@
unicode-bidi: -moz-isolate;
unicode-bidi: isolate;
 }
+
+/* Prevent FOUC if legend is initially collapsed */
+.mw-changeslist-legend.mw-collapsed .mw-collapsible-content {
+   display: none;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaca762a9d7b000c973d9275f395623129f67979
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] wikimedia...tools[master]: Alter definition of silverpop_countrylangs to match actual

[jenkins-bot (Code Review)]

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

Change subject: Alter definition of silverpop_countrylangs to match actual
..


Alter definition of silverpop_countrylangs to match actual

I have been hitting
_mysql_exceptions.OperationalError: (1267, Illegal mix of collations 
(utf8_unicode_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation '=')

so I figured the table definition should be updated to match what is actually 
in use. It turned out to be a little
surprising - ie. varbinary & charset=binary, but I guess that is what the 
actual DB is using so it should be what
is in our code

Change-Id: Ic79e745028f32542de900f4819529a86124a648b
---
M silverpop_export/silverpop_countrylangs.sql
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/silverpop_export/silverpop_countrylangs.sql 
b/silverpop_export/silverpop_countrylangs.sql
index 41e1c0f..ce0d918 100644
--- a/silverpop_export/silverpop_countrylangs.sql
+++ b/silverpop_export/silverpop_countrylangs.sql
@@ -1,11 +1,11 @@
 DROP TABLE IF EXISTS silverpop_countrylangs;
-CREATE TABLE IF NOT EXISTS silverpop_countrylangs(
-  id int unsigned PRIMARY KEY AUTO_INCREMENT,
-  country varchar(2),
-  lang varchar(20),
-
-  INDEX spcl_country (country)
-);
+ CREATE TABLE `silverpop_countrylangs` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `country` varbinary(2) DEFAULT NULL,
+  `lang` varbinary(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `spcl_country` (`country`)
+) ENGINE=InnoDB DEFAULT CHARSET=binary;
 
 INSERT INTO silverpop_countrylangs (country, lang) VALUES
   ('AF', 'prs'),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic79e745028f32542de900f4819529a86124a648b
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add 'first_donation_date' column to Silverpop export

[jenkins-bot (Code Review)]

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

Change subject: Add 'first_donation_date' column to Silverpop export
..


Add 'first_donation_date' column to Silverpop export

Just need the date, so it's pretty cheap.

Bug: T150467
Change-Id: I5dc8f1be47442d88674d06431bc5295d71787ece
---
M silverpop_export/tests/test_update.py
M silverpop_export/update_table.sql
2 files changed, 41 insertions(+), 5 deletions(-)

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



diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
index 53dae36..8d951a7 100644
--- a/silverpop_export/tests/test_update.py
+++ b/silverpop_export/tests/test_update.py
@@ -120,6 +120,36 @@
 assert cursor.fetchone() == expected
 
 
+def test_first_donation():
+"""
+Test that we correctly calculate the first donation date,
+not counting refunded donations.
+"""
+
+run_update_with_fixtures(fixture_queries=["""
+insert into civicrm_email (contact_id, email, is_primary, on_hold) values
+(1, 'person1@localhost', 1, 0);
+""", """
+insert into civicrm_contact (id) values
+(1);
+""", """
+insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
+(1, 1, '2015-01-03', 15.25, 'xyz123', 9),
+(2, 1, '2016-05-05', 25.25, 'abc456', 1),
+(3, 1, '2017-05-05', 35.35, 'def789', 1);
+""", """
+insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
+(1, 20.15, 'CAD'),
+(2, 35.15, 'CAD'),
+(3, 45.25, 'CAD');
+"""])
+
+cursor = conn.db_conn.cursor()
+cursor.execute("select first_donation_date from silverpop_export")
+expected = (datetime.datetime(2016, 5, 5),)
+assert cursor.fetchone() == expected
+
+
 def test_timezone():
 '''
 Test that we export timezone records where they exist
diff --git a/silverpop_export/update_table.sql 
b/silverpop_export/update_table.sql
index ab6932f..9ae49bd 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -38,6 +38,7 @@
   latest_native_amount decimal(20,2) not null default 0,
   latest_usd_amount decimal(20,2) not null default 0,
   latest_donation datetime null,
+  first_donation_date datetime null,
   highest_donation_date datetime null,
 
   -- Address information
@@ -208,15 +209,17 @@
   has_recurred_donation tinyint(1),
   total_usd decimal(20,2),
   cnt_total int unsigned,
+  first_donation_date datetime,
   INDEX stat_exid (exid)
 ) COLLATE 'utf8_unicode_ci';
 
 
 INSERT INTO silverpop_export_stat
-  (email, exid, total_usd, cnt_total, has_recurred_donation)
+  (email, exid, total_usd, cnt_total, has_recurred_donation, 
first_donation_date)
   SELECT
 e.email, MAX(ex.id), SUM(ct.total_amount), COUNT(*),
-MAX(IF(SUBSTRING(ct.trxn_id, 1, 9) = 'RECURRING', 1, 0))
+MAX(IF(SUBSTRING(ct.trxn_id, 1, 9) = 'RECURRING', 1, 0)),
+MIN(ct.receive_date)
   FROM civicrm.civicrm_email e FORCE INDEX(UI_email)
   JOIN silverpop_export_staging ex ON e.email=ex.email
   JOIN civicrm.civicrm_contribution ct ON e.contact_id=ct.contact_id
@@ -264,6 +267,7 @@
 ex.lifetime_usd_total = exs.total_usd,
 ex.donation_count = exs.cnt_total,
 ex.has_recurred_donation = exs.has_recurred_donation,
+ex.first_donation_date = exs.first_donation_date,
 ex.latest_currency = lt.latest_currency,
 ex.latest_native_amount = lt.latest_native_amount,
 ex.latest_usd_amount = lt.latest_usd_amount,
@@ -355,6 +359,7 @@
   latest_native_amount decimal(20,2),
   latest_usd_amount decimal(20,2),
   latest_donation datetime,
+  first_donation_date datetime,
 
   -- Address information
   city varchar(128),
@@ -378,12 +383,12 @@
   has_recurred_donation,highest_usd_amount,highest_native_amount,
   
highest_native_currency,highest_donation_date,lifetime_usd_total,donation_count,
   latest_currency,latest_native_amount,latest_usd_amount,latest_donation,
-  city,country,state,postal_code,timezone )
+  first_donation_date,city,country,state,postal_code,timezone )
 SELECT id,contact_id,first_name,last_name,preferred_language,email,
   has_recurred_donation,highest_usd_amount,highest_native_amount,
   
highest_native_currency,highest_donation_date,lifetime_usd_total,donation_count,
   latest_currency,latest_native_amount,latest_usd_amount,latest_donation,
-  city,country,state,postal_code,timezone
+  first_donation_date,city,country,state,postal_code,timezone
 FROM silverpop_export_staging
 WHERE opted_out=0;
 
@@ -409,5 +414,6 @@
 latest_usd_amount,
 latest_currency,
 latest_native_amount,
-donation_count
+donation_count,
+IFNULL(DATE_FORMAT(first_donation_date, '%m/%d/%Y'), '') 
first_donation_date
   FROM silverpop_export;

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Increase MFDeviceWidthMobileSmall to 320 elsewhere

[VolkerE (Code Review)]

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

Change subject: Increase MFDeviceWidthMobileSmall to 320 elsewhere
..

Increase MFDeviceWidthMobileSmall to 320 elsewhere

Increasing `MFDeviceWidthMobileSmall` from outdated `280` to
pseudo-standard `320` used across our products.

Bug: T176921
Change-Id: I4c407c0e3983f88f032d2d7b01722c2a15fea32c
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index 585f996..aff6904 100644
--- a/extension.json
+++ b/extension.json
@@ -1314,7 +1314,7 @@
"MFAutodetectMobileView": false,
"MFVaryOnUA": false,
"MFShowMobileViewToTablets": true,
-   "MFDeviceWidthMobileSmall": 280,
+   "MFDeviceWidthMobileSmall": 320,
"MobileUrlTemplate": "",
"MobileFrontendFormatCookieExpiry": null,
"MFNoindexPages": true,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert Message dependency from DB exception classes

[jenkins-bot (Code Review)]

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

Change subject: Revert Message dependency from DB exception classes
..


Revert Message dependency from DB exception classes

This was added in a90bbf1a.

These classes are in /libs and should not depend on all of MediaWiki.

Change-Id: I67bc818b0c674f1aa3e0dde27a38a9f385fcab75
---
M includes/api/ApiErrorFormatter.php
M includes/api/ApiMain.php
M includes/libs/rdbms/exception/DBExpectedError.php
3 files changed, 12 insertions(+), 18 deletions(-)

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



diff --git a/includes/api/ApiErrorFormatter.php 
b/includes/api/ApiErrorFormatter.php
index 7fb1352..183f7e2 100644
--- a/includes/api/ApiErrorFormatter.php
+++ b/includes/api/ApiErrorFormatter.php
@@ -160,6 +160,9 @@
if ( $exception instanceof ILocalizedException ) {
$msg = $exception->getMessageObject();
$params = [];
+   } elseif ( $exception instanceof MessageSpecifier ) {
+   $msg = Message::newFromSpecifier( $exception );
+   $params = [];
} else {
// Extract code and data from the exception, if 
applicable
if ( $exception instanceof UsageException ) {
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 1415640..aea441b 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1054,13 +1054,14 @@
if ( ( $e instanceof DBQueryError ) && !$config->get( 
'ShowSQLErrors' ) ) {
$params = [ 'apierror-databaseerror', 
WebRequest::getRequestId() ];
} else {
-   $params = [
-   'apierror-exceptioncaught',
-   WebRequest::getRequestId(),
-   $e instanceof ILocalizedException
-   ? $e->getMessageObject()
-   : wfEscapeWikiText( 
$e->getMessage() )
-   ];
+   if ( $e instanceof ILocalizedException ) {
+   $msg = $e->getMessageObject();
+   } elseif ( $e instanceof MessageSpecifier ) {
+   $msg = Message::newFromSpecifier( $e );
+   } else {
+   $msg = wfEscapeWikiText( 
$e->getMessage() );
+   }
+   $params = [ 'apierror-exceptioncaught', 
WebRequest::getRequestId(), $msg ];
}
$messages[] = ApiMessage::create( $params, $code );
}
diff --git a/includes/libs/rdbms/exception/DBExpectedError.php 
b/includes/libs/rdbms/exception/DBExpectedError.php
index 31d8c27..cae7f3e 100644
--- a/includes/libs/rdbms/exception/DBExpectedError.php
+++ b/includes/libs/rdbms/exception/DBExpectedError.php
@@ -22,8 +22,6 @@
 namespace Wikimedia\Rdbms;
 
 use MessageSpecifier;
-use ILocalizedException;
-use Message;
 
 /**
  * Base class for the more common types of database errors. These are known to 
occur
@@ -32,7 +30,7 @@
  * @ingroup Database
  * @since 1.23
  */
-class DBExpectedError extends DBError implements MessageSpecifier, 
ILocalizedException {
+class DBExpectedError extends DBError implements MessageSpecifier {
/** @var string[] Message parameters */
protected $params;
 
@@ -47,14 +45,6 @@
 
public function getParams() {
return $this->params;
-   }
-
-   /**
-* @inheritDoc
-* @since 1.29
-*/
-   public function getMessageObject() {
-   return Message::newFromSpecifier( $this );
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67bc818b0c674f1aa3e0dde27a38a9f385fcab75
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Anomie 
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] operations/mediawiki-config[master]: Make using CirrusSearch engine default for wbsearchentities ...

[jenkins-bot (Code Review)]

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

Change subject: Make using CirrusSearch engine default for wbsearchentities on 
test.wikidata.org
..


Make using CirrusSearch engine default for wbsearchentities on test.wikidata.org

Bug: T175741
Change-Id: I3a610619efcdade470b330ce6cccd81a2c030619
---
M wmf-config/Wikibase.php
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Lydia Pintscher: Looks good to me, but someone else must approve
  Daniel Kinzler: Looks good to me, but someone else must approve
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index c97a157..4631797 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -132,9 +132,14 @@
// on either Item or Property pages. T86453
$wgCaptchaTriggersOnNamespace[NS_MAIN]['addurl'] = false;
$wgCaptchaTriggersOnNamespace[WB_NS_PROPERTY]['addurl'] = false;
-   // Soft-enable Cirrus usage for wbsearchentities
-   // Cirrus search will be used if useCirrus=1 parameter is set
-   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   if ( $wgDBname === 'testwikidatawiki' ) {
+   // Enable Cirrus on test.wikidata.org
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = true;
+   } else {
+   // Soft-enable Cirrus usage for wbsearchentities
+   // Cirrus search will be used if useCirrus=1 parameter is set
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   }
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a610619efcdade470b330ce6cccd81a2c030619
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Lydia Pintscher (WMDE) 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Urbanecm 
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.1]: Revert "Revert "Add logging for Unicode check failures in Ed...

[jenkins-bot (Code Review)]

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

Change subject: Revert "Revert "Add logging for Unicode check failures in 
EditPage""
..


Revert "Revert "Add logging for Unicode check failures in EditPage""

Too hasty.

This reverts commit 35e7ebc24e63cf17a0e6ab7d588ceba6bd0a62ff.

Change-Id: I50ce7887935d1c1d657c078a4e85ad0a1620b3d6
---
M includes/EditPage.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index f49157f..d742298 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -918,7 +918,7 @@
}
}
 
-   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck' );
+   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck', '' );
 
$this->summary = $request->getText( 'wpSummary' );
 
@@ -1788,6 +1788,10 @@
}
 
if ( $this->unicodeCheck !== self::UNICODE_CHECK ) {
+   wfDebugLog( 'AdHocDebug', "Unicode check failed: 
value={$this->unicodeCheck}, expected "
+   . self::UNICODE_CHECK
+   . " UA: 
{$this->getContext()->getRequest()->getHeader( 'User-Agent' )}"
+   );
$status->fatal( 'unicode-support-fail' );
$status->value = self::AS_UNICODE_NOT_SUPPORTED;
return $status;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50ce7887935d1c1d657c078a4e85ad0a1620b3d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.1
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Tpt 
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]: user: Unregister hooks that interfere with unit testing

[jenkins-bot (Code Review)]

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

Change subject: user: Unregister hooks that interfere with unit testing
..


user: Unregister hooks that interfere with unit testing

testExecute_email() should unregister the hooks
mailPasswordInternal and SpecialPasswordResetOnSubmit
for proper unit testing.

Bug: T176102
Change-Id: Id7403f57cc9d751ada85b611193c1d8f3503e713
---
M tests/phpunit/includes/user/PasswordResetTest.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/user/PasswordResetTest.php 
b/tests/phpunit/includes/user/PasswordResetTest.php
index 53f02df..feae26a 100644
--- a/tests/phpunit/includes/user/PasswordResetTest.php
+++ b/tests/phpunit/includes/user/PasswordResetTest.php
@@ -5,7 +5,7 @@
 /**
  * @group Database
  */
-class PasswordResetTest extends PHPUnit_Framework_TestCase {
+class PasswordResetTest extends MediaWikiTestCase {
/**
 * @dataProvider provideIsAllowed
 */
@@ -150,6 +150,12 @@
'EnableEmail' => true,
] );
 
+   // Unregister the hooks for proper unit testing
+   $this->mergeMwGlobalArrayValue( 'wgHooks', [
+   'mailPasswordInternal' => [],
+   'SpecialPasswordResetOnSubmit' => [],
+   ] );
+
$authManager = $this->getMockBuilder( AuthManager::class 
)->disableOriginalConstructor()
->getMock();
$authManager->expects( $this->any() )->method( 
'allowsAuthenticationDataChange' )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7403f57cc9d751ada85b611193c1d8f3503e713
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Huji 
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/core[master]: Remove perf tracking code that was moved to WikimediaEvents ...

[Catrope (Code Review)]

Catrope has uploaded a new change for review. ( 
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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/49/381149/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/381149
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: 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...WikimediaEvents[master]: Move RCFilters performance logging to WikimediaEvents and al...

[Catrope (Code Review)]

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

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

The old UI doesn't have a nice hook for when it's done loading like the new one 
does,
but we can use RL module loads as a proxy. In my local testing this works quite 
well.

Change-Id: Ib300af5caad5c6e0ca13554c20a2e4311743e176
---
M modules/ext.wikimediaEvents.recentChangesClicks.js
1 file changed, 35 insertions(+), 2 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index 9e35caf..3be5b89 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -6,7 +6,11 @@
  */
 ( function ( $, mw ) {
$( function () {
-   var uri = new mw.Uri(),
+   var isNewUI,
+   metricName,
+   rlModules,
+   uri = new mw.Uri(),
+   specialPage = mw.config.get( 
'wgCanonicalSpecialPageName' ),
linkTypes = {
'.mw-changeslist-diff': 'diff',
'.mw-changeslist-history': 'history',
@@ -42,7 +46,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',
@@ -114,5 +118,34 @@
history.replaceState( null, document.title, uri );
}
 
+   // 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';
+   mw.track(
+   'timing.MediaWiki.timing.' + metricName + 
'.backendResponse.' + specialPage,
+   mw.config.get( 'wgBackendResponseTime' )
+   );
+   // HACK: to measure 'ready' time, look at when key 
modules have been loaded
+   rlModules = [
+   'mediawiki.rcfilters.filters.ui',
+   'mediawiki.special.recentchanges',
+   'mediawiki.special.watchlist',
+   'jquery.makeCollapsible'
+   ].filter( function ( module ) {
+   // Only request at modules that are already 
going to be loaded
+   return mw.loader.getState( module ) !== 
'registered';
+   } );
+   mw.loader.using( rlModules ).done( function () {
+   mw.track(
+   'timing.MediaWiki.timing.' + metricName 
+ '.ready.' + specialPage,
+   window.performance.now()
+   );
+   } );
+   }
+
} );
 }( jQuery, mediaWiki ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/381148
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: 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/core[wmf/1.31.0-wmf.1]: Revert "Revert "Add logging for Unicode check failures in Ed...

[MaxSem (Code Review)]

Hello jenkins-bot, Tpt, Jackmcbarn,

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

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

to review the following change.


Change subject: Revert "Revert "Add logging for Unicode check failures in 
EditPage""
..

Revert "Revert "Add logging for Unicode check failures in EditPage""

Too hasty.

This reverts commit 35e7ebc24e63cf17a0e6ab7d588ceba6bd0a62ff.

Change-Id: I50ce7887935d1c1d657c078a4e85ad0a1620b3d6
---
M includes/EditPage.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/381147/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f49157f..d742298 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -918,7 +918,7 @@
}
}
 
-   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck' );
+   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck', '' );
 
$this->summary = $request->getText( 'wpSummary' );
 
@@ -1788,6 +1788,10 @@
}
 
if ( $this->unicodeCheck !== self::UNICODE_CHECK ) {
+   wfDebugLog( 'AdHocDebug', "Unicode check failed: 
value={$this->unicodeCheck}, expected "
+   . self::UNICODE_CHECK
+   . " UA: 
{$this->getContext()->getRequest()->getHeader( 'User-Agent' )}"
+   );
$status->fatal( 'unicode-support-fail' );
$status->value = self::AS_UNICODE_NOT_SUPPORTED;
return $status;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50ce7887935d1c1d657c078a4e85ad0a1620b3d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.1
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Tpt 
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.1]: Revert "Add logging for Unicode check failures in EditPage"

[jenkins-bot (Code Review)]

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

Change subject: Revert "Add logging for Unicode check failures in EditPage"
..


Revert "Add logging for Unicode check failures in EditPage"

This reverts commit 454ae53a7991b1edd9b10f2ff30bb1d5e319e256.

Change-Id: I1d6ced4f365771412163199ffc90ee3b89cad43c
---
M includes/EditPage.php
1 file changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index d742298..f49157f 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -918,7 +918,7 @@
}
}
 
-   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck', '' );
+   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck' );
 
$this->summary = $request->getText( 'wpSummary' );
 
@@ -1788,10 +1788,6 @@
}
 
if ( $this->unicodeCheck !== self::UNICODE_CHECK ) {
-   wfDebugLog( 'AdHocDebug', "Unicode check failed: 
value={$this->unicodeCheck}, expected "
-   . self::UNICODE_CHECK
-   . " UA: 
{$this->getContext()->getRequest()->getHeader( 'User-Agent' )}"
-   );
$status->fatal( 'unicode-support-fail' );
$status->value = self::AS_UNICODE_NOT_SUPPORTED;
return $status;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Unify monospace font family stack

[jenkins-bot (Code Review)]

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

Change subject: Unify monospace font family stack
..


Unify monospace font family stack

Bug: T176636
Change-Id: I9ad1a92cef7875371e232c8e4babc842ba711e8c
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
M modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
3 files changed, 9 insertions(+), 6 deletions(-)

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



diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
index 5420d4e..4a0d96f 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
@@ -10,8 +10,9 @@
max-width: none;
/* Don't allow the widget to force the dialog to have scrollbars */
height: 100%;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
 }
 
 .ve-ui-mwPreDialog .oo-ui-textInputWidget textarea {
diff --git a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css 
b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
index ca22b21..d7c8ee5 100644
--- a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
+++ b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
@@ -6,7 +6,8 @@
  */
 
 .ve-ui-mwParameterPage .ve-ui-mwParameter-wikitextFallbackInput {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
background-color: #c8ccd1;
 }
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css 
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
index 07f7f6e..d674495 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
@@ -8,8 +8,9 @@
 .ve-ui-mwAceEditorWidget .ace_editor {
border: 1px solid #c8ccd1;
margin: 1px;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
font-size: inherit;
line-height: 1.5;
/* Allow tooptip outside of editor */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ad1a92cef7875371e232c8e4babc842ba711e8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
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]: Unify monospace font family stack

[VolkerE (Code Review)]

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

Change subject: Unify monospace font family stack
..

Unify monospace font family stack

Bug: T176636
Change-Id: I28d490a6c1decb68fce20307cc58678c9fe64ecc
---
M resources/src/mediawiki.legacy/shared.css
M resources/src/mediawiki.skinning/elements.css
M resources/src/mediawiki/mediawiki.debug.less
3 files changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/381145/1

diff --git a/resources/src/mediawiki.legacy/shared.css 
b/resources/src/mediawiki.legacy/shared.css
index 9930525..b3e67f0 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -113,12 +113,14 @@
 /* Edit font preference */
 /* TODO: for 'default' on non-textareas we could compute the default font of 
textarea in the client */
 .mw-editfont-default:not( textarea ) {
-   font-family: monospace;
+   /* Support: Blink, Gecko, Webkit; enable unified font sizes for 
monospace font. T176636 */
+   font-family: monospace, monospace;
 }
 
 /* Keep this rule separate from the :not rule above so it still works in older 
browsers */
 .mw-editfont-monospace {
-   font-family: monospace;
+   /* Support: Blink, Gecko, Webkit; enable unified font sizes for 
monospace font. T176636 */
+   font-family: monospace, monospace;
 }
 
 .mw-editfont-sans-serif {
diff --git a/resources/src/mediawiki.skinning/elements.css 
b/resources/src/mediawiki.skinning/elements.css
index 245fb53..e72a680 100644
--- a/resources/src/mediawiki.skinning/elements.css
+++ b/resources/src/mediawiki.skinning/elements.css
@@ -203,11 +203,7 @@
 kbd,
 samp,
 .mw-code {
-   /*
-* Some browsers will render the monospace text too small, namely 
Firefox, Chrome and Safari.
-* Specifying any valid, second value will trigger correct behavior 
without forcing a different font.
-* See T176636
-*/
+   /* Support: Blink, Gecko, Webkit; enable unified font sizes for 
monospace font. T176636 */
font-family: monospace, monospace;
 }
 
diff --git a/resources/src/mediawiki/mediawiki.debug.less 
b/resources/src/mediawiki/mediawiki.debug.less
index dec0571..f3e320a 100644
--- a/resources/src/mediawiki/mediawiki.debug.less
+++ b/resources/src/mediawiki/mediawiki.debug.less
@@ -92,7 +92,7 @@
height: 300px;
overflow: scroll;
display: none;
-   font-family: monospace;
+   font-family: monospace, monospace;
font-size: 11px;
background-color: #e1eff2;
box-sizing: border-box;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "EditPage: Don't allow clients that mangle unicode to...

[MaxSem (Code Review)]

Hello Krinkle, Legoktm, jenkins-bot, Siebrand, Tpt, Anomie, Jforrester, 
Jackmcbarn,

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

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

to review the following change.


Change subject: Revert "EditPage: Don't allow clients that mangle unicode to 
edit"
..

Revert "EditPage: Don't allow clients that mangle unicode to edit"

Shit hit fan.

This reverts commit 19b739bd19c437c5a637d85f431f139da7521508.

Bug: T67297
Change-Id: Ie57194ff2be97c19d6942a003886a9aa0f3778ff
---
M RELEASE-NOTES-1.30
M includes/DefaultSettings.php
M includes/EditPage.php
M includes/api/ApiEditPage.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M tests/phpunit/includes/EditPageTest.php
7 files changed, 166 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/381146/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 513dc3a..8517a8f 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -73,7 +73,6 @@
 * (T138166) Added ability for users to prohibit other users from sending them
   emails with Special:Emailuser. Can be enabled by setting
   $wgEnableUserEmailBlacklist to true.
-* $wgBrowserBlacklist is deprecated, and changing it will have no effect.
 
 === External library changes in 1.30 ===
 
@@ -222,7 +221,6 @@
 * wfShellExec() and related functions are deprecated, use Shell::command().
 * (T138166) SpecialEmailUser::getTarget() now requires a second argument, the 
sending
   user object. Using the method without the second argument is deprecated.
-* (T67297) Browsers that don't support Unicode will have their edits rejected.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5630dcb..cdb7ce8 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2980,9 +2980,46 @@
 $wgLegacyEncoding = false;
 
 /**
- * @deprecated since 1.30, does nothing
+ * Browser Blacklist for unicode non compliant browsers. Contains a list of
+ * regexps : "/regexp/"  matching problematic browsers. These browsers will
+ * be served encoded unicode in the edit box instead of real unicode.
  */
-$wgBrowserBlackList = [];
+$wgBrowserBlackList = [
+   /**
+* Netscape 2-4 detection
+* The minor version may contain strings such as "Gold" or "SGoldC-SGI"
+* Lots of non-netscape user agents have "compatible", so it's useful 
to check for that
+* with a negative assertion. The [UIN] identifier specifies the level 
of security
+* in a Netscape/Mozilla browser, checking for it rules out a number of 
fakers.
+* The language string is unreliable, it is missing on NS4 Mac.
+*
+* Reference: http://www.psychedelix.com/agents/index.shtml
+*/
+   '/^Mozilla\/2\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+   '/^Mozilla\/3\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+   '/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+
+   /**
+* MSIE on Mac OS 9 is teh sux0r, converts þ to , ð to ,
+* Þ to  and Ð to 
+*
+* Known useragents:
+* - Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)
+* - Mozilla/4.0 (compatible; MSIE 5.15; Mac_PowerPC)
+* - Mozilla/4.0 (compatible; MSIE 5.23; Mac_PowerPC)
+* - [...]
+*
+* @link 
https://en.wikipedia.org/w/index.php?diff=12356041=12355864
+* @link https://en.wikipedia.org/wiki/Template%3AOS9
+*/
+   '/^Mozilla\/4\.0 \(compatible; MSIE \d+\.\d+; Mac_PowerPC\)/',
+
+   /**
+* Google wireless transcoder, seems to eat a lot of chars alive
+* 
https://it.wikipedia.org/w/index.php?title=Luciano_Ligabue=prev=8857361
+*/
+   '/^Mozilla\/4\.0 \(compatible; MSIE 6.0; Windows NT 5.0; Google 
Wireless Transcoder;\)/'
+];
 
 /**
  * If set to true, the MediaWiki 1.4 to 1.5 schema conversion will
diff --git a/includes/EditPage.php b/includes/EditPage.php
index b40a054..0ea61c0 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -41,11 +41,6 @@
  */
 class EditPage {
/**
-* Used for Unicode support checks
-*/
-   const UNICODE_CHECK = 'ℳ풲♥퓊퓃풾풸ℴ풹ℯ';
-
-   /**
 * Status: Article successfully updated
 */
const AS_SUCCESS_UPDATE = 200;
@@ -181,11 +176,6 @@
 * $wgContentHandlerUseDB being false
 */
const AS_CANNOT_USE_CUSTOM_MODEL = 241;
-
-   /**
-* Status: edit rejected because browser doesn't support Unicode.
-*/
-   const AS_UNICODE_NOT_SUPPORTED = 242;
 
/**
 * HTML id and name for the beginning of the edit form.
@@ -422,11 +412,6 @@
 * @var bool Whether an old revision is edited
 */
private $isOldRev = false;
-
-   /**
-* @var 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Unify monospace font family stack

[jenkins-bot (Code Review)]

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

Change subject: Unify monospace font family stack
..


Unify monospace font family stack

Bug: T176636
Change-Id: I904353233bddf1efa6d9192ec03f79595a076241
---
M demos/ve/demo.minimal.css
M demos/ve/eventLogger.html
M src/ce/styles/nodes/ve.ce.CommentNode.css
M src/ui/styles/contextitems/ve.ui.CommentContextItem.css
M src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
M src/ui/styles/tools/ve.ui.FormatTool.css
M src/ui/styles/ve.ui.DebugBar.css
M src/ui/styles/ve.ui.Surface.css
8 files changed, 20 insertions(+), 14 deletions(-)

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



diff --git a/demos/ve/demo.minimal.css b/demos/ve/demo.minimal.css
index 1b7159d..3a3a587 100644
--- a/demos/ve/demo.minimal.css
+++ b/demos/ve/demo.minimal.css
@@ -21,5 +21,5 @@
 .ve-demo-html {
margin-top: 1em;
max-width: none;
-   font-family: monospace, 'Courier';
+   font-family: monospace, monospace; /* Support: Blink, Gecko, Webkit, 
see T176636 */
 }
diff --git a/demos/ve/eventLogger.html b/demos/ve/eventLogger.html
index f6c7419..0afe933 100644
--- a/demos/ve/eventLogger.html
+++ b/demos/ve/eventLogger.html
@@ -42,7 +42,7 @@
width: 100%;
height: 80%;
white-space: pre;
-   font-family: monospace;
+   font-family: monospace, monospace; /* Support: 
Blink, Gecko, Webkit, see T176636 */
padding: 0;
overflow-y: auto;
}
diff --git a/src/ce/styles/nodes/ve.ce.CommentNode.css 
b/src/ce/styles/nodes/ve.ce.CommentNode.css
index f0e866c..3fb963e 100644
--- a/src/ce/styles/nodes/ve.ce.CommentNode.css
+++ b/src/ce/styles/nodes/ve.ce.CommentNode.css
@@ -5,8 +5,9 @@
  */
 
 .ve-ce-commentNode > .ve-ce-focusableNode-invisibleIcon.oo-ui-iconElement {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
font-size: 0.8125em;
width: auto;
 }
diff --git a/src/ui/styles/contextitems/ve.ui.CommentContextItem.css 
b/src/ui/styles/contextitems/ve.ui.CommentContextItem.css
index d54c42b..545c682 100644
--- a/src/ui/styles/contextitems/ve.ui.CommentContextItem.css
+++ b/src/ui/styles/contextitems/ve.ui.CommentContextItem.css
@@ -9,8 +9,9 @@
margin: 0 0.5em 1em 0.5em;
overflow: auto;
max-height: 10em;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
white-space: pre-wrap;
line-height: 1.25em;
color: #555;
diff --git a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css 
b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
index dc84d35..5b077c7 100644
--- a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
+++ b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
@@ -49,8 +49,9 @@
 }
 
 .ve-ui-commandHelpDialog-list dt kbd {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
font-size: 0.8125em;
font-weight: bold;
font-style: normal;
diff --git a/src/ui/styles/tools/ve.ui.FormatTool.css 
b/src/ui/styles/tools/ve.ui.FormatTool.css
index 4ca9a23..653099c 100644
--- a/src/ui/styles/tools/ve.ui.FormatTool.css
+++ b/src/ui/styles/tools/ve.ui.FormatTool.css
@@ -49,8 +49,9 @@
 }
 
 .oo-ui-menuToolGroup .oo-ui-tool-name-preformatted .oo-ui-tool-title {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
 }
 
 .oo-ui-menuToolGroup .oo-ui-tool-name-blockquote .oo-ui-tool-title {
diff --git a/src/ui/styles/ve.ui.DebugBar.css b/src/ui/styles/ve.ui.DebugBar.css
index 719d93a..917ee8c 100644
--- a/src/ui/styles/ve.ui.DebugBar.css
+++ b/src/ui/styles/ve.ui.DebugBar.css
@@ -26,8 +26,9 @@
 
 .ve-ui-debugBar-selectionLabel {
min-width: 20em;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Revert "EditPage: Don't allow clients that mangle unicode to...

[MaxSem (Code Review)]

Hello Legoktm, jenkins-bot, Siebrand, Tpt, Anomie, Jackmcbarn,

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

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

to review the following change.


Change subject: Revert "EditPage: Don't allow clients that mangle unicode to 
edit"
..

Revert "EditPage: Don't allow clients that mangle unicode to edit"

Apocalypse.

This reverts commit 5ca7e8e5c7704fad44d77d8398b481fac3c24a45.

Change-Id: I3df89f8881185debf35b8c6870b6b24aef0d059f
---
M RELEASE-NOTES-1.30
M includes/DefaultSettings.php
M includes/EditPage.php
M includes/api/ApiEditPage.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M tests/phpunit/includes/EditPageTest.php
7 files changed, 166 insertions(+), 48 deletions(-)


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

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 513dc3a..8517a8f 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -73,7 +73,6 @@
 * (T138166) Added ability for users to prohibit other users from sending them
   emails with Special:Emailuser. Can be enabled by setting
   $wgEnableUserEmailBlacklist to true.
-* $wgBrowserBlacklist is deprecated, and changing it will have no effect.
 
 === External library changes in 1.30 ===
 
@@ -222,7 +221,6 @@
 * wfShellExec() and related functions are deprecated, use Shell::command().
 * (T138166) SpecialEmailUser::getTarget() now requires a second argument, the 
sending
   user object. Using the method without the second argument is deprecated.
-* (T67297) Browsers that don't support Unicode will have their edits rejected.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5ec61d7..5ffa064 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2980,9 +2980,46 @@
 $wgLegacyEncoding = false;
 
 /**
- * @deprecated since 1.30, does nothing
+ * Browser Blacklist for unicode non compliant browsers. Contains a list of
+ * regexps : "/regexp/"  matching problematic browsers. These browsers will
+ * be served encoded unicode in the edit box instead of real unicode.
  */
-$wgBrowserBlackList = [];
+$wgBrowserBlackList = [
+   /**
+* Netscape 2-4 detection
+* The minor version may contain strings such as "Gold" or "SGoldC-SGI"
+* Lots of non-netscape user agents have "compatible", so it's useful 
to check for that
+* with a negative assertion. The [UIN] identifier specifies the level 
of security
+* in a Netscape/Mozilla browser, checking for it rules out a number of 
fakers.
+* The language string is unreliable, it is missing on NS4 Mac.
+*
+* Reference: http://www.psychedelix.com/agents/index.shtml
+*/
+   '/^Mozilla\/2\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+   '/^Mozilla\/3\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+   '/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+
+   /**
+* MSIE on Mac OS 9 is teh sux0r, converts þ to , ð to ,
+* Þ to  and Ð to 
+*
+* Known useragents:
+* - Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)
+* - Mozilla/4.0 (compatible; MSIE 5.15; Mac_PowerPC)
+* - Mozilla/4.0 (compatible; MSIE 5.23; Mac_PowerPC)
+* - [...]
+*
+* @link 
https://en.wikipedia.org/w/index.php?diff=12356041=12355864
+* @link https://en.wikipedia.org/wiki/Template%3AOS9
+*/
+   '/^Mozilla\/4\.0 \(compatible; MSIE \d+\.\d+; Mac_PowerPC\)/',
+
+   /**
+* Google wireless transcoder, seems to eat a lot of chars alive
+* 
https://it.wikipedia.org/w/index.php?title=Luciano_Ligabue=prev=8857361
+*/
+   '/^Mozilla\/4\.0 \(compatible; MSIE 6.0; Windows NT 5.0; Google 
Wireless Transcoder;\)/'
+];
 
 /**
  * If set to true, the MediaWiki 1.4 to 1.5 schema conversion will
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 23b206b..7750b10 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -41,11 +41,6 @@
  */
 class EditPage {
/**
-* Used for Unicode support checks
-*/
-   const UNICODE_CHECK = 'ℳ풲♥퓊퓃풾풸ℴ풹ℯ';
-
-   /**
 * Status: Article successfully updated
 */
const AS_SUCCESS_UPDATE = 200;
@@ -181,11 +176,6 @@
 * $wgContentHandlerUseDB being false
 */
const AS_CANNOT_USE_CUSTOM_MODEL = 241;
-
-   /**
-* Status: edit rejected because browser doesn't support Unicode.
-*/
-   const AS_UNICODE_NOT_SUPPORTED = 242;
 
/**
 * HTML id and name for the beginning of the edit form.
@@ -422,11 +412,6 @@
 * @var bool Whether an old revision is edited
 */
private $isOldRev = false;
-
-   /**
-* @var string|null What the user submitted in the 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.1]: Revert "Add logging for Unicode check failures in EditPage"

[MaxSem (Code Review)]

Hello jenkins-bot, Tpt, Jackmcbarn,

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

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

to review the following change.


Change subject: Revert "Add logging for Unicode check failures in EditPage"
..

Revert "Add logging for Unicode check failures in EditPage"

This reverts commit 454ae53a7991b1edd9b10f2ff30bb1d5e319e256.

Change-Id: I1d6ced4f365771412163199ffc90ee3b89cad43c
---
M includes/EditPage.php
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/381143/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d742298..f49157f 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -918,7 +918,7 @@
}
}
 
-   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck', '' );
+   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck' );
 
$this->summary = $request->getText( 'wpSummary' );
 
@@ -1788,10 +1788,6 @@
}
 
if ( $this->unicodeCheck !== self::UNICODE_CHECK ) {
-   wfDebugLog( 'AdHocDebug', "Unicode check failed: 
value={$this->unicodeCheck}, expected "
-   . self::UNICODE_CHECK
-   . " UA: 
{$this->getContext()->getRequest()->getHeader( 'User-Agent' )}"
-   );
$status->fatal( 'unicode-support-fail' );
$status->value = self::AS_UNICODE_NOT_SUPPORTED;
return $status;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d6ced4f365771412163199ffc90ee3b89cad43c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.1
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Tpt 
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.1]: Add logging for Unicode check failures in EditPage

[jenkins-bot (Code Review)]

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

Change subject: Add logging for Unicode check failures in EditPage
..


Add logging for Unicode check failures in EditPage

Bug: T67297
Change-Id: I0cf2ec1213f81821a5feb0ff60d6f0655811b6cf
---
M includes/EditPage.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index f49157f..d742298 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -918,7 +918,7 @@
}
}
 
-   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck' );
+   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck', '' );
 
$this->summary = $request->getText( 'wpSummary' );
 
@@ -1788,6 +1788,10 @@
}
 
if ( $this->unicodeCheck !== self::UNICODE_CHECK ) {
+   wfDebugLog( 'AdHocDebug', "Unicode check failed: 
value={$this->unicodeCheck}, expected "
+   . self::UNICODE_CHECK
+   . " UA: 
{$this->getContext()->getRequest()->getHeader( 'User-Agent' )}"
+   );
$status->fatal( 'unicode-support-fail' );
$status->value = self::AS_UNICODE_NOT_SUPPORTED;
return $status;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cf2ec1213f81821a5feb0ff60d6f0655811b6cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.1
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Tpt 
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...SmashPig[master]: Handle additional paypal refund reason codes.

[XenoRyet (Code Review)]

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

Change subject: Handle additional paypal refund reason codes.
..

Handle additional paypal refund reason codes.

Handle 'unauthorized_spoof' and 'admin_fraud_reversal' reason codes.

Bug: T176225
Change-Id: Iad0a51dadb8b205e4e77a6b1749f7f1efeb6e1a5
---
M PaymentProviders/PayPal/RefundMessage.php
A PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal.json
A 
PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal_transformed.json
A PaymentProviders/PayPal/Tests/Data/refund_unauthorized_spoof.json
A PaymentProviders/PayPal/Tests/Data/refund_unauthorized_spoof_transformed.json
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
6 files changed, 113 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/41/381141/1

diff --git a/PaymentProviders/PayPal/RefundMessage.php 
b/PaymentProviders/PayPal/RefundMessage.php
index bc99a77..eb81075 100644
--- a/PaymentProviders/PayPal/RefundMessage.php
+++ b/PaymentProviders/PayPal/RefundMessage.php
@@ -5,12 +5,22 @@
 class RefundMessage extends Message {
 
public static function normalizeMessage( &$message, $ipnMessage ) {
+
+   $reasonCodes = array (
+   'refund',
+   'buyer_complaint',
+   'other',
+   'unauthorized_spoof',
+   'admin_fraud_reversal'
+   );
+
$message['gateway_refund_id'] = $ipnMessage['txn_id'];
$message['gross_currency'] = $ipnMessage['mc_currency'];
+
if ( isset( $message['txn_type'] ) && $message['txn_type'] === 
'adjustment' ) {
$message['type'] = 'chargeback';
 
-   } elseif ( isset( $ipnMessage['reason_code'] ) && in_array( 
$ipnMessage['reason_code'], [ 'refund', 'buyer_complaint', 'other' ] ) ) {
+   } elseif ( isset( $ipnMessage['reason_code'] ) && in_array( 
$ipnMessage['reason_code'], $reasonCodes ) ) {
$message['type'] = 'refund';
 
}
diff --git 
a/PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal.json 
b/PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal.json
new file mode 100644
index 000..aa4aa4b
--- /dev/null
+++ b/PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal.json
@@ -0,0 +1,32 @@
+{
+  "transaction_subject": "49123019",
+  "payment_date": "21:44:10 Sep 25, 2017 PDT",
+  "last_name": "Binks",
+  "residence_country": "US",
+  "item_name": "Donation to the Wikimedia Foundation",
+  "payment_gross": "-2.00",
+  "mc_currency": "USD",
+  "business": "some...@wikimedia.org",
+  "payment_type": "instant",
+  "protection_eligibility": "Ineligible",
+  "verify_sign": "AxE4TrrxMNhqKiFhwnvr8h7Z1h2CARJqs8-8lTKbgpFWtNqJknF-ZjvM",
+  "payer_email": "bi...@naboo.gov",
+  "txn_id": "41C736991R055474F",
+  "receiver_email": "some...@wikimedia.org",
+  "first_name": "JarJar",
+  "parent_txn_id": "3BR53982VX768520D",
+  "payer_id": "N5D6L2B4ZLFJC",
+  "receiver_id": "EZ782AXEUJUW8",
+  "reason_code": "admin_fraud_reversal",
+  "item_number": "DONATE",
+  "handling_amount": "0.00",
+  "payment_status": "Reversed",
+  "payment_fee": "-0.28",
+  "mc_fee": "-0.28",
+  "shipping": "0.00",
+  "mc_gross": "-2.00",
+  "custom": "49123019",
+  "charset": "UTF-8",
+  "notify_version": "3.8",
+  "ipn_track_id": "a605cc7b1e5a6"
+}
\ No newline at end of file
diff --git 
a/PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal_transformed.json
 
b/PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal_transformed.json
new file mode 100644
index 000..d4a2793
--- /dev/null
+++ 
b/PaymentProviders/PayPal/Tests/Data/refund_admin_fraud_reversal_transformed.json
@@ -0,0 +1,18 @@
+{
+  "date": "1506401050"",
+  "gateway_parent_id": "3BR53982VX768520D",
+  "gateway_txn_id": "41C736991R055474F",
+  "currency": "USD",
+  "type": "refund",
+  "contribution_tracking_id": "49123019",
+  "email": "bi...@naboo.gov",
+  "first_name": "JarJar",
+  "last_name": "Binks",
+  "gross": "-2.00",
+  "fee": "-0.28",
+  "order_id": "49123019",
+  "gateway_refund_id": "41C736991R055474F",
+  "gross_currency": "USD",
+  "country": "US",
+  "gateway": "paypal"
+}
\ No newline at end of file
diff --git a/PaymentProviders/PayPal/Tests/Data/refund_unauthorized_spoof.json 
b/PaymentProviders/PayPal/Tests/Data/refund_unauthorized_spoof.json
new file mode 100644
index 000..a20d6c7
--- /dev/null
+++ b/PaymentProviders/PayPal/Tests/Data/refund_unauthorized_spoof.json
@@ -0,0 +1,32 @@
+{
+  "transaction_subject": "48295084",
+  "payment_date": "15:44:06 Sep 06, 2017 PDT",
+  "last_name": "McFakeperson",
+  "residence_country": "US",
+  "item_name": "Donation to the Wikimedia Foundation",
+  "payment_gross": "-5.00",

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Unify monospace font family stack

[VolkerE (Code Review)]

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

Change subject: Unify monospace font family stack
..

Unify monospace font family stack

Bug: T176636
Change-Id: I9ad1a92cef7875371e232c8e4babc842ba711e8c
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
M modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
3 files changed, 9 insertions(+), 6 deletions(-)


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

diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
index 5420d4e..4a0d96f 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWPreDialog.css
@@ -10,8 +10,9 @@
max-width: none;
/* Don't allow the widget to force the dialog to have scrollbars */
height: 100%;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
 }
 
 .ve-ui-mwPreDialog .oo-ui-textInputWidget textarea {
diff --git a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css 
b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
index ca22b21..d7c8ee5 100644
--- a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
+++ b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
@@ -6,7 +6,8 @@
  */
 
 .ve-ui-mwParameterPage .ve-ui-mwParameter-wikitextFallbackInput {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
background-color: #c8ccd1;
 }
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css 
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
index 07f7f6e..d674495 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css
@@ -8,8 +8,9 @@
 .ve-ui-mwAceEditorWidget .ace_editor {
border: 1px solid #c8ccd1;
margin: 1px;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
font-size: inherit;
line-height: 1.5;
/* Allow tooptip outside of editor */

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add EntityUsage::DESCRIPTION_USAGE for descriptions

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381140 )

Change subject: Add EntityUsage::DESCRIPTION_USAGE for descriptions
..

Add EntityUsage::DESCRIPTION_USAGE for descriptions

Not yet used, but will be soon in "mw.wikibase.description" and
"mw.wikibase.getDescriptionWithLang".
I also updated the docs regarding other usage types a bit.

Deploy: We should add "D" to $wgWBClientSettings['disabledUsageAspects']

Bug: T106287
Change-Id: Id4927ddb8a36d07bb5b2667e7f0c197eb2ec73b5
---
M client/i18n/en.json
M client/i18n/qqq.json
M client/includes/Api/ApiListEntityUsage.php
M client/includes/Api/ApiPropsEntityUsage.php
M client/includes/Usage/EntityUsage.php
M client/includes/Usage/UsageAccumulator.php
M client/tests/phpunit/includes/Usage/UsageAccumulatorContractTester.php
M docs/usagetracking.wiki
8 files changed, 44 insertions(+), 2 deletions(-)


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

diff --git a/client/i18n/en.json b/client/i18n/en.json
index 549c9af..744a9a1 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -118,6 +118,7 @@
"wikibase-pageinfo-entity-usage-L": "Label: $1",
"wikibase-pageinfo-entity-usage-T": "Title",
"wikibase-pageinfo-entity-usage-C": "Statement: $1",
+   "wikibase-pageinfo-entity-usage-D": "Description: $1",
"wikibase-pageinfo-entity-usage-X": "All entity data",
"wikibase-pageinfo-entity-usage-O": "Other (Statements)",
"wikibase-property-render-error": "Failed to render property $1: $2",
diff --git a/client/i18n/qqq.json b/client/i18n/qqq.json
index aa9fcfe..d2458e3 100644
--- a/client/i18n/qqq.json
+++ b/client/i18n/qqq.json
@@ -130,6 +130,7 @@
"wikibase-pageinfo-entity-usage-L": "Name for ''label'' entity 
usage\n{{Identical|Label}}\n{{Related|Wikibase-pageinfo-entity-usage}}",
"wikibase-pageinfo-entity-usage-T": "Name for ''title'' entity usage\n* 
see 
[[:wikidata:Wikidata:Glossary#Title]]\n{{Identical|Title}}\n{{Related|Wikibase-pageinfo-entity-usage}}",
"wikibase-pageinfo-entity-usage-C": "Name for ''statement'' entity 
usage\n{{Identical|Statement}}\n{{Related|Wikibase-pageinfo-entity-usage}}",
+   "wikibase-pageinfo-entity-usage-D": "Name for ''description'' entity 
usage\n{{Identical|Description}}\n{{Related|Wikibase-pageinfo-entity-usage}}",
"wikibase-pageinfo-entity-usage-X": "Name for ''all'' entity 
usage\n{{Related|Wikibase-pageinfo-entity-usage}}",
"wikibase-pageinfo-entity-usage-O": "Name for ''other'' entity 
usage\n{{Related|Wikibase-pageinfo-entity-usage}}",
"wikibase-property-render-error": "Error message shown when the 
#property parser function fails to render a property value.\n\nParameters:\n* 
$1 - the property ID or name\n* $2 - the original error message (this is 
typically in English and may be rather technical)",
diff --git a/client/includes/Api/ApiListEntityUsage.php 
b/client/includes/Api/ApiListEntityUsage.php
index 66845ea..471b6bb 100644
--- a/client/includes/Api/ApiListEntityUsage.php
+++ b/client/includes/Api/ApiListEntityUsage.php
@@ -255,6 +255,7 @@
EntityUsage::LABEL_USAGE,
EntityUsage::TITLE_USAGE,
EntityUsage::STATEMENT_USAGE,
+   EntityUsage::DESCRIPTION_USAGE,
EntityUsage::ALL_USAGE,
EntityUsage::OTHER_USAGE,
]
diff --git a/client/includes/Api/ApiPropsEntityUsage.php 
b/client/includes/Api/ApiPropsEntityUsage.php
index c3fe617..30ce60b 100644
--- a/client/includes/Api/ApiPropsEntityUsage.php
+++ b/client/includes/Api/ApiPropsEntityUsage.php
@@ -179,6 +179,7 @@
EntityUsage::LABEL_USAGE,
EntityUsage::TITLE_USAGE,
EntityUsage::STATEMENT_USAGE,
+   EntityUsage::DESCRIPTION_USAGE,
EntityUsage::ALL_USAGE,
EntityUsage::OTHER_USAGE,
]
diff --git a/client/includes/Usage/EntityUsage.php 
b/client/includes/Usage/EntityUsage.php
index 917a13b..ffe02b6 100644
--- a/client/includes/Usage/EntityUsage.php
+++ b/client/includes/Usage/EntityUsage.php
@@ -27,7 +27,7 @@
const SITELINK_USAGE = 'S';
 
/**
-* Usage flag indicating that the entity's label in the local content 
language was used.
+* Usage flag indicating that one of the entity's labels were used.
 * This would be the case when showing the label of a referenced 
entity. Note that
 * label usage is typically tracked with a modifier specifying the 
label's 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: screen-monitoring: whitelist all db/es by regex

[Dzahn (Code Review)]

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

Change subject: screen-monitoring: whitelist all db/es by regex
..


screen-monitoring: whitelist all db/es by regex

Some db/es servers did not get covered by the whitelisting
per puppet role because they don't actually use role classes
in site.pp or because their roles had not been added yet.

To avoid having to adjust the list of roles, just whitelist
them all here by regex. Using same regex already used to cover
all db servers for other purposes.

Bug: T165348
Change-Id: I23a9605ce4b2660915929e3519908c86328d985e
---
M hieradata/regex.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index ac6fb9a..63cf8a4 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -316,7 +316,7 @@
   __regex: !ruby/regexp /^mw13(0[7-9]|1[0-9])\.eqiad\.wmnet$/
   profile::base::notifications_enabled: '0'
 
-# Temporary since es200[234] currently dont have any role
-es_without_role:
-  __regex: !ruby/regexp /^es200([234])\.codfw\.wmnet$/
+# disable screen monitoring, fallback for servers not covered by roles 
(T165348)
+db_without_role:
+  __regex: !ruby/regexp 
/^(db|dbstore|es|pc|labsdb)[12]\d\d\d\.(eqiad|codfw)\.wmnet$/
   monitor_screens: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23a9605ce4b2660915929e3519908c86328d985e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
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.1]: Add logging for Unicode check failures in EditPage

[MaxSem (Code Review)]

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

Change subject: Add logging for Unicode check failures in EditPage
..

Add logging for Unicode check failures in EditPage

Bug: T67297
Change-Id: I0cf2ec1213f81821a5feb0ff60d6f0655811b6cf
---
M includes/EditPage.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/381139/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f49157f..d742298 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -918,7 +918,7 @@
}
}
 
-   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck' );
+   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck', '' );
 
$this->summary = $request->getText( 'wpSummary' );
 
@@ -1788,6 +1788,10 @@
}
 
if ( $this->unicodeCheck !== self::UNICODE_CHECK ) {
+   wfDebugLog( 'AdHocDebug', "Unicode check failed: 
value={$this->unicodeCheck}, expected "
+   . self::UNICODE_CHECK
+   . " UA: 
{$this->getContext()->getRequest()->getHeader( 'User-Agent' )}"
+   );
$status->fatal( 'unicode-support-fail' );
$status->value = self::AS_UNICODE_NOT_SUPPORTED;
return $status;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cf2ec1213f81821a5feb0ff60d6f0655811b6cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.1
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Unify monospace font family stack

[VolkerE (Code Review)]

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

Change subject: Unify monospace font family stack
..

Unify monospace font family stack

Bug: T176636
Change-Id: I904353233bddf1efa6d9192ec03f79595a076241
---
M demos/ve/demo.minimal.css
M demos/ve/eventLogger.html
M src/ce/styles/nodes/ve.ce.CommentNode.css
M src/ui/styles/contextitems/ve.ui.CommentContextItem.css
M src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
M src/ui/styles/tools/ve.ui.FormatTool.css
M src/ui/styles/ve.ui.DebugBar.css
M src/ui/styles/ve.ui.Surface.css
8 files changed, 20 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/38/381138/1

diff --git a/demos/ve/demo.minimal.css b/demos/ve/demo.minimal.css
index 1b7159d..3a3a587 100644
--- a/demos/ve/demo.minimal.css
+++ b/demos/ve/demo.minimal.css
@@ -21,5 +21,5 @@
 .ve-demo-html {
margin-top: 1em;
max-width: none;
-   font-family: monospace, 'Courier';
+   font-family: monospace, monospace; /* Support: Blink, Gecko, Webkit, 
see T176636 */
 }
diff --git a/demos/ve/eventLogger.html b/demos/ve/eventLogger.html
index f6c7419..0afe933 100644
--- a/demos/ve/eventLogger.html
+++ b/demos/ve/eventLogger.html
@@ -42,7 +42,7 @@
width: 100%;
height: 80%;
white-space: pre;
-   font-family: monospace;
+   font-family: monospace, monospace; /* Support: 
Blink, Gecko, Webkit, see T176636 */
padding: 0;
overflow-y: auto;
}
diff --git a/src/ce/styles/nodes/ve.ce.CommentNode.css 
b/src/ce/styles/nodes/ve.ce.CommentNode.css
index f0e866c..3fb963e 100644
--- a/src/ce/styles/nodes/ve.ce.CommentNode.css
+++ b/src/ce/styles/nodes/ve.ce.CommentNode.css
@@ -5,8 +5,9 @@
  */
 
 .ve-ce-commentNode > .ve-ce-focusableNode-invisibleIcon.oo-ui-iconElement {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
font-size: 0.8125em;
width: auto;
 }
diff --git a/src/ui/styles/contextitems/ve.ui.CommentContextItem.css 
b/src/ui/styles/contextitems/ve.ui.CommentContextItem.css
index d54c42b..545c682 100644
--- a/src/ui/styles/contextitems/ve.ui.CommentContextItem.css
+++ b/src/ui/styles/contextitems/ve.ui.CommentContextItem.css
@@ -9,8 +9,9 @@
margin: 0 0.5em 1em 0.5em;
overflow: auto;
max-height: 10em;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
white-space: pre-wrap;
line-height: 1.25em;
color: #555;
diff --git a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css 
b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
index dc84d35..5b077c7 100644
--- a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
+++ b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
@@ -49,8 +49,9 @@
 }
 
 .ve-ui-commandHelpDialog-list dt kbd {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
font-size: 0.8125em;
font-weight: bold;
font-style: normal;
diff --git a/src/ui/styles/tools/ve.ui.FormatTool.css 
b/src/ui/styles/tools/ve.ui.FormatTool.css
index 4ca9a23..653099c 100644
--- a/src/ui/styles/tools/ve.ui.FormatTool.css
+++ b/src/ui/styles/tools/ve.ui.FormatTool.css
@@ -49,8 +49,9 @@
 }
 
 .oo-ui-menuToolGroup .oo-ui-tool-name-preformatted .oo-ui-tool-title {
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   font-family: monospace, monospace;
 }
 
 .oo-ui-menuToolGroup .oo-ui-tool-name-blockquote .oo-ui-tool-title {
diff --git a/src/ui/styles/ve.ui.DebugBar.css b/src/ui/styles/ve.ui.DebugBar.css
index 719d93a..917ee8c 100644
--- a/src/ui/styles/ve.ui.DebugBar.css
+++ b/src/ui/styles/ve.ui.DebugBar.css
@@ -26,8 +26,9 @@
 
 .ve-ui-debugBar-selectionLabel {
min-width: 20em;
-   /* Specify a valid second value to fix size in Chrome/FF */
-   font-family: monospace, 'Courier';
+   /* Support: Blink, Gecko, Webkit */
+   /* Specify a valid second value to fix size, see T176636 */
+   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: screen-monitoring: whitelist all db/es by regex

[Dzahn (Code Review)]

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

Change subject: screen-monitoring: whitelist all db/es by regex
..

screen-monitoring: whitelist all db/es by regex

Some db/es servers did not get covered by the whitelisting
per puppet role because they don't actually use role classes
in site.pp or because their roles had not been added yet.

To avoid having to adjust the list of roles, just whitelist
them all here by regex. Using same regex already used to cover
all db servers for other purposes.

Bug: T165348
Change-Id: I23a9605ce4b2660915929e3519908c86328d985e
---
M hieradata/regex.yaml
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/381137/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index ac6fb9a..544abf4 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -316,7 +316,7 @@
   __regex: !ruby/regexp /^mw13(0[7-9]|1[0-9])\.eqiad\.wmnet$/
   profile::base::notifications_enabled: '0'
 
-# Temporary since es200[234] currently dont have any role
-es_without_role:
-  __regex: !ruby/regexp /^es200([234])\.codfw\.wmnet$/
+# Some db servers don't use role classes 
+db_without_role:
+  __regex: !ruby/regexp 
/^(db|dbstore|es|pc|labsdb)[12]\d\d\d\.(eqiad|codfw)\.wmnet$/
   monitor_screens: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23a9605ce4b2660915929e3519908c86328d985e
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]: screen-monitoring, whitelist es200[234] by regex

[Dzahn (Code Review)]

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

Change subject: screen-monitoring, whitelist es200[234] by regex
..


screen-monitoring, whitelist es200[234] by regex

These hosts were not whitelisted even though they should
have been as db hosts. But currently they don't use any role
class in site.pp and there is a comment indicating that is
temporary.

To avoid any alerts on them, whitelist them by regex on hostname.

Bug: T165348
Change-Id: I98e500861dc722a730e1e27fdee1dcf0432a53f1
---
M hieradata/regex.yaml
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index e710b23..ac6fb9a 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -315,3 +315,8 @@
 new_mw_appservers:
   __regex: !ruby/regexp /^mw13(0[7-9]|1[0-9])\.eqiad\.wmnet$/
   profile::base::notifications_enabled: '0'
+
+# Temporary since es200[234] currently dont have any role
+es_without_role:
+  __regex: !ruby/regexp /^es200([234])\.codfw\.wmnet$/
+  monitor_screens: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98e500861dc722a730e1e27fdee1dcf0432a53f1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
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]: screen-monitoring, whitelist es200[234] by regex

[Dzahn (Code Review)]

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

Change subject: screen-monitoring, whitelist es200[234] by regex
..

screen-monitoring, whitelist es200[234] by regex

These hosts were not whitelisted even though they should
have been as db hosts. But currently they don't use any role
class in site.pp and there is a comment indicating that is
temporary.

To avoid any alerts on them, whitelist them by regex on hostname.

Bug: T165348
Change-Id: I98e500861dc722a730e1e27fdee1dcf0432a53f1
---
M hieradata/regex.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index e710b23..2d7ec92 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -315,3 +315,8 @@
 new_mw_appservers:
   __regex: !ruby/regexp /^mw13(0[7-9]|1[0-9])\.eqiad\.wmnet$/
   profile::base::notifications_enabled: '0'
+
+# Temporary since es200[234] currently dont have any role
+es_without_role:
+  __regex: !ruby/regexp /^es200(234])\.codfw\.wmnet$/
+  monitor_screens: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98e500861dc722a730e1e27fdee1dcf0432a53f1
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] wikimedia...tools[master]: Alter definition of silverpop_countrylangs to match actual

[Eileen (Code Review)]

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

Change subject: Alter definition of silverpop_countrylangs to match actual
..

Alter definition of silverpop_countrylangs to match actual

I have been hitting
_mysql_exceptions.OperationalError: (1267, Illegal mix of collations 
(utf8_unicode_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation '=')

so I figured the table definition should be updated to match what is actually 
in use. It turned out to be a little
surprising - ie. varbinary & charset=binary, but I guess that is what the 
actual DB is using so it should be what
is in our code

Change-Id: Ic79e745028f32542de900f4819529a86124a648b
---
M silverpop_export/silverpop_countrylangs.sql
R silverpop_export/silverpop_export.yaml
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/35/381135/1

diff --git a/silverpop_export/silverpop_countrylangs.sql 
b/silverpop_export/silverpop_countrylangs.sql
index 41e1c0f..ce0d918 100644
--- a/silverpop_export/silverpop_countrylangs.sql
+++ b/silverpop_export/silverpop_countrylangs.sql
@@ -1,11 +1,11 @@
 DROP TABLE IF EXISTS silverpop_countrylangs;
-CREATE TABLE IF NOT EXISTS silverpop_countrylangs(
-  id int unsigned PRIMARY KEY AUTO_INCREMENT,
-  country varchar(2),
-  lang varchar(20),
-
-  INDEX spcl_country (country)
-);
+ CREATE TABLE `silverpop_countrylangs` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `country` varbinary(2) DEFAULT NULL,
+  `lang` varbinary(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `spcl_country` (`country`)
+) ENGINE=InnoDB DEFAULT CHARSET=binary;
 
 INSERT INTO silverpop_countrylangs (country, lang) VALUES
   ('AF', 'prs'),
diff --git a/silverpop_export/silverpop_export.yaml.example 
b/silverpop_export/silverpop_export.yaml
similarity index 100%
rename from silverpop_export/silverpop_export.yaml.example
rename to silverpop_export/silverpop_export.yaml

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Consistently preserve anchors in the title specified in 'mai...

[Code Review]

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

Change subject: Consistently preserve anchors in the title specified in 
'mainpage' message
..

Consistently preserve anchors in the title specified in 'mainpage' message

When 'mainpage' was used in the 'sidebar' message, the anchor would be
preserved (code in Skin::addToSidebarPlain() uses Title::getLinkURL()).

When 'mainpage' was used on its own in Skin::makeMainPageUrl() (which
is used in SkinTemplate::buildNavUrls(), and many skins use that data
to generate the logo link), it would not be preserved (the code used
Title::getLocalURL()).

Bug: T176583
Change-Id: Icc4895c08089caaa06e37ce765819829b90de0ff
---
M includes/skins/Skin.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/381134/1

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 8fb0d1c..167b49d 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1095,7 +1095,7 @@
$title = Title::newMainPage();
self::checkTitle( $title, '' );
 
-   return $title->getLocalURL( $urlaction );
+   return $title->getLinkURL( $urlaction );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc4895c08089caaa06e37ce765819829b90de0ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: WIP: add image info

[Bmansurov (Code Review)]

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

Change subject: WIP: add image info
..

WIP: add image info

Bug: T175856
Change-Id: I7ef0444c474a904a2610c3960ac8524bacad67dd
---
M i18n/en.json
M i18n/qqq.json
M includes/BookRenderer.php
M includes/DataProvider.php
A templates/images.mustache
5 files changed, 100 insertions(+), 4 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 0627409..478cf6b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -189,6 +189,10 @@
"coll-notice-download-pdf-text": "While the Book Creator PDF rendering 
is being replaced, you can try 'Download as PDF' from the sidebar tools 
for individual articles.",
"coll-toc-title": "Table of Contents",
"coll-contributors-title": "Contributors",
+   "coll-images-title": "Images",
+   "coll-images-source": "Source",
+   "coll-images-license": "License",
+   "coll-images-original-author": "Original artist",
"coll-rendererror-title": "Could not generate the book",
"coll-rendererror-no-session": "Book definition not found in session. 
It might have been discarded due to inactivity.",
"coll-rendererror-pdf": "PDF rendering failed: $1",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0a1befa..9d5da30 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -216,6 +216,10 @@
"coll-notice-download-pdf-text": "Text describing how to download 
article as PDF while Book Creator PDF feature is unavailable",
"coll-toc-title": "Text shown on top of PDF table of contents",
"coll-contributors-title": "Text shown on top of PDF contributors 
section",
+   "coll-images-title": "Text shown on top of PDF images section",
+   "coll-images-source": "Text shown beside the image title of each image 
in the images section",
+   "coll-images-license": "Text shown beside the image title of each image 
in the images section",
+   "coll-images-original-author": "Text shown beside the image title of 
each image in the images section",
"coll-rendererror-title": "Error page title for book rendering errors.",
"coll-rendererror-no-session": "Error shown when trying to render a 
book but there is no collection stored in the session.",
"coll-rendererror-pdf": "Error shown when the Electron request to 
render the book into PDF failed. Parameters:\n* $1 - error message",
diff --git a/includes/BookRenderer.php b/includes/BookRenderer.php
index 1825ca7..a6b602e 100644
--- a/includes/BookRenderer.php
+++ b/includes/BookRenderer.php
@@ -98,7 +98,8 @@
 
$final = $this->renderCoverAndToc( $collection, $metadata )
 . $final
-. $this->renderContributors( $metadata, 
$headingCounter->incrementAndGetTopLevel() );
+. $this->renderContributors( $metadata, 
$headingCounter->incrementAndGetTopLevel() )
+. $this->renderImageInfos( $metadata, 
$headingCounter->incrementAndGetTopLevel() );
return $final;
}
 
@@ -172,6 +173,13 @@
'anchor' => 'mw-book-contributors',
'number' => $headingCounter->incrementAndGetTopLevel(),
];
+   $outline[] = [
+   'text' => wfMessage( 'coll-images-title' )->text(),
+   'type' => 'images',
+   'level' => $contributorsLevel,
+   'anchor' => 'mw-book-images',
+   'number' => $headingCounter->incrementAndGetTopLevel(),
+   ];
$metadata['outline'] = $outline;
 
return $this->templateParser->processTemplate( 'toc', 
$this->fixTemplateData( [
@@ -203,6 +211,25 @@
}
 
/**
+* Generate HTML for the images used in the book
+* @param array[] $metadata Map of prefixed DB key => metadata, as 
returned by fetchMetadata().
+* @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 ) {
+   var_dump($metadata['images'], $sectionNumber );
+   return $this->templateParser->processTemplate( 'images', [
+   'sectionNumber' => $sectionNumber,
+   'images?' => count( $metadata['images'] ),
+   'images' => $metadata['images'],
+   'headingMsg' => wfMessage( 'coll-images-title' 
)->text(),
+   'sourceMsg' => wfMessage( 'coll-images-source' 
)->text(),
+   'licenseMsg' => wfMessage( 'coll-images-license' 
)->text(),
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_ifstatus: ignore swfab interfaces

[Ayounsi (Code Review)]

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

Change subject: check_ifstatus: ignore swfab interfaces
..


check_ifstatus: ignore swfab interfaces

We don't use swfab, but the interfaces are up/down.

From Juniper:
"The fact swfab0 is Up and swfab1 is Down is something merely cosmetic,
the status of the interface follows the primacy of the RG0, when RG0 is
primary on node 0 the swfab0 will show as up and when RG0 is primary on
node 1 the swfab1 will show as up, this will not have any kind of impact
on the device neither on your traffic."

Change-Id: I20e76bbf826e47ec89bcfee76a111a2da3532aa7
---
M modules/nagios_common/files/check_commands/check_ifstatus_nomon
1 file changed, 17 insertions(+), 17 deletions(-)

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



diff --git a/modules/nagios_common/files/check_commands/check_ifstatus_nomon 
b/modules/nagios_common/files/check_commands/check_ifstatus_nomon
index f2d8c20..60ad91f 100755
--- a/modules/nagios_common/files/check_commands/check_ifstatus_nomon
+++ b/modules/nagios_common/files/check_commands/check_ifstatus_nomon
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 #
-# check_ifstatus.pl - nagios plugin 
-# 
+# check_ifstatus.pl - nagios plugin
+#
 #
 # Copyright (C) 2000 Christoph Kron
 # Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh)
@@ -26,7 +26,7 @@
 #
 #
 # Report bugs to: c...@zet.net, nagiosplug-h...@lists.sf.net
-# 
+#
 # 11.01.2000 Version 1.0
 #
 # 2014-10-05 - bbl...@wikimedia.org - copied from check_ifstatus,
@@ -103,7 +103,7 @@
 my @unused_ports ;
 my %session_opts;
 
-my @ignoredIfNames = ["vlan"];
+my @ignoredIfNames = ["vlan", "swfab0", "swfab1"];
 
 
 
@@ -126,7 +126,7 @@
 
 alarm($timeout);
 ($session, $error) = Net::SNMP->session(%session_opts);
-   
+
 if (!defined($session)) {
$state='UNKNOWN';
$answer=$error;
@@ -195,7 +195,7 @@
}else{
$ifexclude++;
}
-   
+
}
}else{
$ifunused++;
@@ -268,11 +268,11 @@
printf "   -U (--secname)username for SNMPv3 context\n";
printf "   -c (--context)SNMPv3 context name (default is empty 
string)\n";
printf "   -A (--authpass)   authentication password (cleartext ascii 
or localized key\n";
-   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n"; 
+   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n";
printf " auth password and authEngineID\n";
printf "   -a (--authproto)  Authentication protocol (MD5 or SHA1)\n";
printf "   -X (--privpass)   privacy password (cleartext ascii or 
localized key\n";
-   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n"; 
+   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n";
printf " privacy password and authEngineID\n";
printf "   -P (--privproto)  privacy protocol (DES or AES; default: 
DES)\n";
printf "   -M (--maxmsgsize) Max message size - usefull only for v1 or 
v2c\n";
@@ -280,7 +280,7 @@
printf "   -V (--version)Plugin version\n";
printf "   -h (--help)   usage help \n\n";
print_revision($PROGNAME, '1.4.15');
-   
+
 }
 
 sub process_arguments() {
@@ -304,7 +304,7 @@
"M=i" => \$maxmsgsize, "maxmsgsize=i" => \$maxmsgsize,
"t=i" => \$timeout,"timeout=i" => \$timeout,
);
-   
+
if ($status == 0){
print_help();
exit $ERRORS{'OK'};
@@ -347,12 +347,12 @@
# v3 requires a security username
if (defined $seclevel && defined $secname) {
$session_opts{'-username'} = $secname;
-   
+
# Must define a security level even though defualt is 
noAuthNoPriv
unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv 
authPriv) ) {
usage("Must define a valid security level even 
though default is noAuthNoPriv");
}
-   
+
# Authentication wanted
if ( $seclevel eq 'authNoPriv' || $seclevel eq 
'authPriv' ) {
if (defined $authproto && $authproto ne 'MD5' 
&& $authproto ne 'SHA1') {
@@ -370,7 +370,7 @@
}
}
}
-   
+
# Privacy (DES encryption) wanted
if ($seclevel eq 'authPriv' ) 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga/base: re-enable screen/tmux monitoring

[Dzahn (Code Review)]

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

Change subject: icinga/base: re-enable screen/tmux monitoring
..


icinga/base: re-enable screen/tmux monitoring

Re-enabling screen monitoring again after it was initially
reverted in I959702d4c12b. But now 2 precautions have been taken:

a) several hosts have been whitelisted in I8fc231cbcf2f60717046

b) CRIT threshold initially raised to a full year, so only WARNS
unless a screen actually runs over a year. Ied897edabbe1237ad
   
We can then decide if we want to whitelist more hosts and how much
to lower the threshold based on the warning list.

Since they will be just warnings they will not spam IRC and should
just show up in Icinga web UI.

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

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



diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 91733b3..966307b 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -147,7 +147,7 @@
 }
 }
 
-if hiera('monitor_screens', false) {
+if hiera('monitor_screens', true) {
 
 file { '/usr/local/lib/nagios/plugins/check_long_procs':
 ensure => present,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0569c449294603c81ff16fa34ab95a2c7fc5906b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to 2f4b9a8c + update dependencies for nsp warnings

[jenkins-bot (Code Review)]

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

Change subject: Bump src/ to 2f4b9a8c + update dependencies for nsp warnings
..


Bump src/ to 2f4b9a8c + update dependencies for nsp warnings

 * Also, updates scap & debian config.yaml files after the 
   linter settings change.

Change-Id: I218d8702cda9fa11ae499aeaa1806a7307e4f6f8
---
M debian/config.yaml
M node_modules/bytes/package.json
M node_modules/compression/HISTORY.md
D node_modules/compression/node_modules/bytes/History.md
D node_modules/compression/node_modules/bytes/LICENSE
D node_modules/compression/node_modules/bytes/Readme.md
D node_modules/compression/node_modules/bytes/index.js
D node_modules/compression/node_modules/bytes/package.json
M node_modules/compression/node_modules/debug/CHANGELOG.md
M node_modules/compression/node_modules/debug/component.json
M node_modules/compression/node_modules/debug/package.json
A node_modules/compression/node_modules/debug/src/inspector-log.js
M node_modules/compression/node_modules/debug/src/node.js
D node_modules/compression/node_modules/safe-buffer/.travis.yml
D node_modules/compression/node_modules/safe-buffer/LICENSE
D node_modules/compression/node_modules/safe-buffer/README.md
D node_modules/compression/node_modules/safe-buffer/index.js
D node_modules/compression/node_modules/safe-buffer/package.json
D node_modules/compression/node_modules/safe-buffer/test.js
M node_modules/compression/package.json
M node_modules/content-type/package.json
M node_modules/encodeurl/package.json
M node_modules/escape-html/package.json
M node_modules/express/node_modules/content-type/package.json
M node_modules/express/node_modules/debug/package.json
D node_modules/express/node_modules/finalhandler/HISTORY.md
D node_modules/express/node_modules/finalhandler/LICENSE
D node_modules/express/node_modules/finalhandler/README.md
D node_modules/express/node_modules/finalhandler/index.js
D node_modules/express/node_modules/finalhandler/package.json
M node_modules/express/package.json
M node_modules/finalhandler/HISTORY.md
M node_modules/finalhandler/index.js
M node_modules/finalhandler/package.json
M node_modules/kad/package.json
M node_modules/negotiator/package.json
M node_modules/nsp/.drone.yml
M node_modules/nsp/README.md
M node_modules/nsp/lib/check.js
M node_modules/nsp/lib/commands/check.js
M node_modules/nsp/lib/formatters/default.js
M node_modules/nsp/lib/formatters/index.js
A node_modules/nsp/lib/formatters/quiet.js
M node_modules/nsp/lib/index.js
R node_modules/nsp/node_modules/agent-base/.npmignore
A node_modules/nsp/node_modules/agent-base/.travis.yml
A node_modules/nsp/node_modules/agent-base/History.md
R node_modules/nsp/node_modules/agent-base/README.md
A node_modules/nsp/node_modules/agent-base/agent.js
R node_modules/nsp/node_modules/agent-base/node_modules/.bin/semver
R node_modules/nsp/node_modules/agent-base/node_modules/semver/.npmignore
R node_modules/nsp/node_modules/agent-base/node_modules/semver/.travis.yml
R node_modules/nsp/node_modules/agent-base/node_modules/semver/LICENSE
R node_modules/nsp/node_modules/agent-base/node_modules/semver/README.md
R node_modules/nsp/node_modules/agent-base/node_modules/semver/bin/semver
A node_modules/nsp/node_modules/agent-base/node_modules/semver/package.json
R node_modules/nsp/node_modules/agent-base/node_modules/semver/semver.js
R 
node_modules/nsp/node_modules/agent-base/node_modules/semver/test/big-numbers.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/clean.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/gtr.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/index.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/ltr.js
R 
node_modules/nsp/node_modules/agent-base/node_modules/semver/test/major-minor-patch.js
A node_modules/nsp/node_modules/agent-base/package.json
R node_modules/nsp/node_modules/agent-base/patch-core.js
R node_modules/nsp/node_modules/agent-base/test/ssl-cert-snakeoil.key
R node_modules/nsp/node_modules/agent-base/test/ssl-cert-snakeoil.pem
A node_modules/nsp/node_modules/agent-base/test/test.js
A node_modules/nsp/node_modules/ansi-regex/index.js
R node_modules/nsp/node_modules/ansi-regex/license
A node_modules/nsp/node_modules/ansi-regex/package.json
A node_modules/nsp/node_modules/ansi-regex/readme.md
R node_modules/nsp/node_modules/ansi-styles/index.js
R node_modules/nsp/node_modules/ansi-styles/license
A node_modules/nsp/node_modules/ansi-styles/package.json
R node_modules/nsp/node_modules/ansi-styles/readme.md
R node_modules/nsp/node_modules/boom/.npmignore
R node_modules/nsp/node_modules/boom/.travis.yml
R node_modules/nsp/node_modules/boom/CONTRIBUTING.md
R node_modules/nsp/node_modules/boom/LICENSE
R node_modules/nsp/node_modules/boom/README.md
R node_modules/nsp/node_modules/boom/images/boom.png
R 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Prepare to break the server side MobileFrontend dependency o...

[jenkins-bot (Code Review)]

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

Change subject: Prepare to break the server side MobileFrontend dependency on 
Minerva
..


Prepare to break the server side MobileFrontend dependency on Minerva

Changes:
* Minerva now maintains a MinervaUI - a simplified version of
MobileUI that provides iconClass and buttonClass helpers.
* Minerva now maintains its own ResourceLoaderParserMessageModule

Remaining issues:
* Main menu links to '#'
* Unknown dependency errors are thrown due to the missing
JS libraries e.g. mobile.watchstar
thus JS based UI components are unusable e.g. search autocomplete,
and edit button
* Language button navigates to a missing special page without
MobileFrontend (see T104660)

Bug: T169569
Change-Id: I89e2e15faabab73b0cba91afc2f2c5e785edef29
---
A includes/MinervaResourceLoaderParsedMessageModule.php
A includes/MinervaUI.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M skin.json
M tests/phpunit/skins/SkinMinervaTest.php
6 files changed, 186 insertions(+), 24 deletions(-)

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



diff --git a/includes/MinervaResourceLoaderParsedMessageModule.php 
b/includes/MinervaResourceLoaderParsedMessageModule.php
new file mode 100644
index 000..2cab60b
--- /dev/null
+++ b/includes/MinervaResourceLoaderParsedMessageModule.php
@@ -0,0 +1,107 @@
+ $option ) {
+   switch ( $member ) {
+   case 'messages':
+   $this->processMessages( $option );
+   $this->hasHackedScriptMode = true;
+   // Prevent them being reinitialised 
when parent construct is called.
+   unset( $options[$member] );
+   break;
+   }
+   }
+
+   parent::__construct( $options );
+   }
+
+   /**
+* Process messages which have been marked as needing parsing
+*
+* @param ResourceLoaderContext $context
+* @return string JavaScript code
+*/
+   public function addParsedMessages( ResourceLoaderContext $context ) {
+   if ( !$this->parsedMessages ) {
+   return '';
+   }
+   $messages = [];
+   foreach ( $this->parsedMessages as $key ) {
+   $messages[ $key ] = $context->msg( $key )->parse();
+   }
+   return Xml::encodeJsCall( 'mw.messages.set', [ $messages ] );
+   }
+
+   /**
+* Separate messages which have been marked as needing parsing from 
standard messages
+* @param array $messages Array of messages to process
+*/
+   private function processMessages( $messages ) {
+   foreach ( $messages as $key => $value ) {
+   if ( is_array( $value ) ) {
+   foreach ( $value as $directive ) {
+   if ( $directive == 'parse' ) {
+   $this->parsedMessages[] = $key;
+   }
+   }
+   } else {
+   $this->messages[] = $value;
+   }
+   }
+   }
+
+   /**
+* Gets all scripts for a given context concatenated together including 
processed messages
+*
+* @param ResourceLoaderContext $context Context in which to generate 
script
+* @return string JavaScript code for $context
+*/
+   public function getScript( ResourceLoaderContext $context ) {
+   $script = parent::getScript( $context );
+   return $this->addParsedMessages( $context ) . $script;
+   }
+
+   /**
+* Get the URL or URLs to load for this module's JS in debug mode.
+* @param ResourceLoaderContext $context
+* @return array list of urls
+* @see ResourceLoaderModule::getScriptURLsForDebug
+*/
+   public function getScriptURLsForDebug( ResourceLoaderContext $context ) 
{
+   if ( $this->hasHackedScriptMode ) {
+   $derivative = new DerivativeResourceLoaderContext( 
$context );
+   $derivative->setDebug( true );
+   $derivative->setModules( [ $this->getName() ] );
+   // @todo FIXME: Make this templates and update
+   // makeModuleResponse so that it only outputs template 
code.
+   // When this is done you can merge with parent array and
+   // retain file names.
+   $derivative->setOnly( 'scripts' );
+   $rl = 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_ifstatus: ignore swfab interfaces

[Ayounsi (Code Review)]

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

Change subject: check_ifstatus: ignore swfab interfaces
..

check_ifstatus: ignore swfab interfaces

We don't use swfab, but the interfaces are up/down.

From Juniper:
"The fact swfab0 is Up and swfab1 is Down is something merely cosmetic,
the status of the interface follows the primacy of the RG0, when RG0 is
primary on node 0 the swfab0 will show as up and when RG0 is primary on
node 1 the swfab1 will show as up, this will not have any kind of impact
on the device neither on your traffic."

Change-Id: I20e76bbf826e47ec89bcfee76a111a2da3532aa7
---
M modules/nagios_common/files/check_commands/check_ifstatus_nomon
1 file changed, 17 insertions(+), 17 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_ifstatus_nomon 
b/modules/nagios_common/files/check_commands/check_ifstatus_nomon
index f2d8c20..c792647 100755
--- a/modules/nagios_common/files/check_commands/check_ifstatus_nomon
+++ b/modules/nagios_common/files/check_commands/check_ifstatus_nomon
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 #
-# check_ifstatus.pl - nagios plugin 
-# 
+# check_ifstatus.pl - nagios plugin
+#
 #
 # Copyright (C) 2000 Christoph Kron
 # Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh)
@@ -26,7 +26,7 @@
 #
 #
 # Report bugs to: c...@zet.net, nagiosplug-h...@lists.sf.net
-# 
+#
 # 11.01.2000 Version 1.0
 #
 # 2014-10-05 - bbl...@wikimedia.org - copied from check_ifstatus,
@@ -103,7 +103,7 @@
 my @unused_ports ;
 my %session_opts;
 
-my @ignoredIfNames = ["vlan"];
+my @ignoredIfNames = ["vlan", "swfab"];
 
 
 
@@ -126,7 +126,7 @@
 
 alarm($timeout);
 ($session, $error) = Net::SNMP->session(%session_opts);
-   
+
 if (!defined($session)) {
$state='UNKNOWN';
$answer=$error;
@@ -195,7 +195,7 @@
}else{
$ifexclude++;
}
-   
+
}
}else{
$ifunused++;
@@ -268,11 +268,11 @@
printf "   -U (--secname)username for SNMPv3 context\n";
printf "   -c (--context)SNMPv3 context name (default is empty 
string)\n";
printf "   -A (--authpass)   authentication password (cleartext ascii 
or localized key\n";
-   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n"; 
+   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n";
printf " auth password and authEngineID\n";
printf "   -a (--authproto)  Authentication protocol (MD5 or SHA1)\n";
printf "   -X (--privpass)   privacy password (cleartext ascii or 
localized key\n";
-   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n"; 
+   printf " in hex with 0x prefix generated by using 
\"snmpkey\" utility\n";
printf " privacy password and authEngineID\n";
printf "   -P (--privproto)  privacy protocol (DES or AES; default: 
DES)\n";
printf "   -M (--maxmsgsize) Max message size - usefull only for v1 or 
v2c\n";
@@ -280,7 +280,7 @@
printf "   -V (--version)Plugin version\n";
printf "   -h (--help)   usage help \n\n";
print_revision($PROGNAME, '1.4.15');
-   
+
 }
 
 sub process_arguments() {
@@ -304,7 +304,7 @@
"M=i" => \$maxmsgsize, "maxmsgsize=i" => \$maxmsgsize,
"t=i" => \$timeout,"timeout=i" => \$timeout,
);
-   
+
if ($status == 0){
print_help();
exit $ERRORS{'OK'};
@@ -347,12 +347,12 @@
# v3 requires a security username
if (defined $seclevel && defined $secname) {
$session_opts{'-username'} = $secname;
-   
+
# Must define a security level even though defualt is 
noAuthNoPriv
unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv 
authPriv) ) {
usage("Must define a valid security level even 
though default is noAuthNoPriv");
}
-   
+
# Authentication wanted
if ( $seclevel eq 'authNoPriv' || $seclevel eq 
'authPriv' ) {
if (defined $authproto && $authproto ne 'MD5' 
&& $authproto ne 'SHA1') {
@@ -370,7 +370,7 @@
}
}
}
-   
+
# Privacy (DES encryption) wanted
if ($seclevel eq 'authPriv' ) {
   

[MediaWiki-commits] [Gerrit] integration/config[master]: fab: skip hosts when deploying slave scripts

[Hashar (Code Review)]

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

Change subject: fab: skip hosts when deploying slave scripts
..

fab: skip hosts when deploying slave scripts

There are no slave scripts on docker/android slaves thus filter them out
using a negative lookahead.

Change-Id: I0bc1f66871b91a48532a67cdb858fbf2474f4e31
---
M fabfile.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/31/381131/1

diff --git a/fabfile.py b/fabfile.py
index eea187b..271a4d6 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -46,7 +46,7 @@
 """Pull integration/jenkins on CI labs slaves"""
 env.sudo_user = 'root'
 env.host_string = 'integration-cumin.integration.eqiad.wmflabs'
-sudo("cumin --force 'name:slave' "
+sudo("cumin --force 'name:\"slave-(?!docker|.*android)\"' "
  "'cd /srv/deployment/integration/slave-scripts && git pull'")
 
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: screen-monitor, raise CRIT limit to 1 year

[Dzahn (Code Review)]

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

Change subject: base: screen-monitor, raise CRIT limit to 1 year
..


base: screen-monitor, raise CRIT limit to 1 year

I want to enable screen-monitoring again by default
but before i do it i want to temp. raise the CRIT
threshold time to a full year.

So that we only get WARNS in Icinga web ui to get an
idea and decide whether we add more things to the whitelist
or not.

The plan is to lower it again afterwards.

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

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



diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 5c50293..91733b3 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -164,7 +164,7 @@
 
 ::nrpe::monitor_service { 'check_long_procs':
 description  => 'Long running screen/tmux',
-nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 8 -c 48',
+nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 8 -c 8760',
 }
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied897edabbe1237ada227d1b409f744cd1dbca94
Gerrit-PatchSet: 1
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]: base: screen-monitor, raise CRIT limit to 1 year

[Dzahn (Code Review)]

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

Change subject: base: screen-monitor, raise CRIT limit to 1 year
..

base: screen-monitor, raise CRIT limit to 1 year

I want to enable screen-monitoring again by default
but before i do it i want to temp. raise the CRIT
threshold time to a full year.

So that we only get WARNS in Icinga web ui to get an
idea and decide whether we add more things to the whitelist
or not.

The plan is to lower it again afterwards.

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


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

diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 5c50293..91733b3 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -164,7 +164,7 @@
 
 ::nrpe::monitor_service { 'check_long_procs':
 description  => 'Long running screen/tmux',
-nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 8 -c 48',
+nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 8 -c 8760',
 }
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied897edabbe1237ada227d1b409f744cd1dbca94
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]: fab: migrate from salt to cumin

[Hashar (Code Review)]

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

Change subject: fab: migrate from salt to cumin
..

fab: migrate from salt to cumin

salt is being sunset and replaced by cumin. I had integration-cumin
setup to act as the master.

See doc on:
https://wikitech.wikimedia.org/wiki/Cumin

Bug: T176314
Change-Id: I1d9c046922697da148907b680be988301f9cce2f
---
M fabfile.py
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/29/381129/1

diff --git a/fabfile.py b/fabfile.py
index 1f9f039..eea187b 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -8,7 +8,7 @@
   access the following hosts and uses
   the proper username and key:
- contint1001.wikimedia.org
-   - integration-saltmaster.integration.eqiad.wmflabs
+   - integration-cumin.integration.eqiad.wmflabs
 * Run $ fab deploy_zuul
 
 """
@@ -45,8 +45,8 @@
 def deploy_slave_scripts():
 """Pull integration/jenkins on CI labs slaves"""
 env.sudo_user = 'root'
-env.host_string = 'integration-saltmaster.integration.eqiad.wmflabs'
-sudo("salt -v '*slave*' cmd.run "
+env.host_string = 'integration-cumin.integration.eqiad.wmflabs'
+sudo("cumin --force 'name:slave' "
  "'cd /srv/deployment/integration/slave-scripts && git pull'")
 
 
@@ -54,8 +54,8 @@
 def docker_pull_image(imageName):
 """Pull a docker image onto the docker slaves"""
 env.sudo_user = 'root'
-env.host_string = 'integration-saltmaster.integration.eqiad.wmflabs'
-sudo("salt -v '*slave-docker*' cmd.run "
+env.host_string = 'integration-cumin.integration.eqiad.wmflabs'
+sudo("cumin --force 'name:slave-docker' "
  "'docker pull " + imageName + "'")
 
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Utils need to s/parsoidConfig/parsoidOptions/

[jenkins-bot (Code Review)]

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

Change subject: Utils need to s/parsoidConfig/parsoidOptions/
..


Utils need to s/parsoidConfig/parsoidOptions/

 * Also, do s/opts/cliOpts/ to clarify where that's coming from.

 * This should have been part of 976b8950.

Change-Id: I9a4d60713ba84ec80f21d0eb83d70b7990870b99
---
M lib/utils/Util.js
1 file changed, 44 insertions(+), 44 deletions(-)

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



diff --git a/lib/utils/Util.js b/lib/utils/Util.js
index efba925..f66f734 100644
--- a/lib/utils/Util.js
+++ b/lib/utils/Util.js
@@ -38,22 +38,22 @@
 *
 * Set debugging flags on an object, based on an options object.
 *
-* @param {Object} parsoidConfig The config to modify.
-* @param {Object} opts The options object to use for setting the debug 
flags.
+* @param {Object} parsoidOptions Object to be assigned to the 
ParsoidConfig.
+* @param {Object} cliOpts The options object to use for setting the 
debug flags.
 * @return {Object} The modified object.
 */
-   setDebuggingFlags: function(parsoidConfig, opts) {
+   setDebuggingFlags: function(parsoidOptions, cliOpts) {
// Handle the --help options
var exit = false;
-   if (opts.trace === 'help') {
+   if (cliOpts.trace === 'help') {
console.error(Util.traceUsageHelp());
exit = true;
}
-   if (opts.dump === 'help') {
+   if (cliOpts.dump === 'help') {
console.error(Util.dumpUsageHelp());
exit = true;
}
-   if (opts.debug === 'help') {
+   if (cliOpts.debug === 'help') {
console.error(Util.debugUsageHelp());
exit = true;
}
@@ -62,37 +62,37 @@
}
 
// Ok, no help requested: process the options.
-   if (opts.debug !== undefined) {
+   if (cliOpts.debug !== undefined) {
// Continue to support generic debugging.
-   if (opts.debug === true) {
+   if (cliOpts.debug === true) {
console.warn("Warning: Generic debugging, not 
handler-specific.");
-   parsoidConfig.debug = 
Util.booleanOption(opts.debug);
+   parsoidOptions.debug = 
Util.booleanOption(cliOpts.debug);
} else {
// Setting --debug automatically enables --trace
-   parsoidConfig.debugFlags = 
this.splitFlags(opts.debug);
-   parsoidConfig.traceFlags = 
parsoidConfig.debugFlags;
+   parsoidOptions.debugFlags = 
this.splitFlags(cliOpts.debug);
+   parsoidOptions.traceFlags = 
parsoidOptions.debugFlags;
}
}
 
-   if (opts.trace !== undefined) {
-   if (opts.trace === true) {
+   if (cliOpts.trace !== undefined) {
+   if (cliOpts.trace === true) {
console.warn("Warning: Generic tracing is no 
longer supported. Ignoring --trace flag. Please provide handler-specific 
tracing flags, e.g. '--trace pre,html5', to turn it on.");
} else {
// Add any new trace flags to the list of 
existing trace flags (if
// any were inherited from debug); otherwise, 
create a new list.
-   parsoidConfig.traceFlags = 
(parsoidConfig.traceFlags || []).concat(this.splitFlags(opts.trace));
+   parsoidOptions.traceFlags = 
(parsoidOptions.traceFlags || []).concat(this.splitFlags(cliOpts.trace));
}
}
 
-   if (opts.dump !== undefined) {
-   if (opts.dump === true) {
+   if (cliOpts.dump !== undefined) {
+   if (cliOpts.dump === true) {
console.warn("Warning: Generic dumping not 
enabled. Please set a flag.");
} else {
-   parsoidConfig.dumpFlags = 
this.splitFlags(opts.dump);
+   parsoidOptions.dumpFlags = 
this.splitFlags(cliOpts.dump);
}
}
 
-   return parsoidConfig;
+   return parsoidOptions;
},
 
 
@@ -205,11 +205,11 @@
 * Sets templating and processing flags on an object,
 * based on an options object.
 *
-* 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to 4dff8de0 + update dependencies for nsp warnings

[Arlolra (Code Review)]

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

Change subject: Bump src/ to 4dff8de0 + update dependencies for nsp warnings
..

Bump src/ to 4dff8de0 + update dependencies for nsp warnings

 * Also, updates the config.yaml's for the linter settings change.

Change-Id: I218d8702cda9fa11ae499aeaa1806a7307e4f6f8
---
M debian/config.yaml
M node_modules/bytes/package.json
M node_modules/compression/HISTORY.md
D node_modules/compression/node_modules/bytes/History.md
D node_modules/compression/node_modules/bytes/LICENSE
D node_modules/compression/node_modules/bytes/Readme.md
D node_modules/compression/node_modules/bytes/index.js
D node_modules/compression/node_modules/bytes/package.json
M node_modules/compression/node_modules/debug/CHANGELOG.md
M node_modules/compression/node_modules/debug/component.json
M node_modules/compression/node_modules/debug/package.json
A node_modules/compression/node_modules/debug/src/inspector-log.js
M node_modules/compression/node_modules/debug/src/node.js
D node_modules/compression/node_modules/safe-buffer/.travis.yml
D node_modules/compression/node_modules/safe-buffer/LICENSE
D node_modules/compression/node_modules/safe-buffer/README.md
D node_modules/compression/node_modules/safe-buffer/index.js
D node_modules/compression/node_modules/safe-buffer/package.json
D node_modules/compression/node_modules/safe-buffer/test.js
M node_modules/compression/package.json
M node_modules/content-type/package.json
M node_modules/encodeurl/package.json
M node_modules/escape-html/package.json
M node_modules/express/node_modules/content-type/package.json
M node_modules/express/node_modules/debug/package.json
D node_modules/express/node_modules/finalhandler/HISTORY.md
D node_modules/express/node_modules/finalhandler/LICENSE
D node_modules/express/node_modules/finalhandler/README.md
D node_modules/express/node_modules/finalhandler/index.js
D node_modules/express/node_modules/finalhandler/package.json
M node_modules/express/package.json
M node_modules/finalhandler/HISTORY.md
M node_modules/finalhandler/index.js
M node_modules/finalhandler/package.json
M node_modules/kad/package.json
M node_modules/negotiator/package.json
M node_modules/nsp/.drone.yml
M node_modules/nsp/README.md
M node_modules/nsp/lib/check.js
M node_modules/nsp/lib/commands/check.js
M node_modules/nsp/lib/formatters/default.js
M node_modules/nsp/lib/formatters/index.js
A node_modules/nsp/lib/formatters/quiet.js
M node_modules/nsp/lib/index.js
R node_modules/nsp/node_modules/agent-base/.npmignore
A node_modules/nsp/node_modules/agent-base/.travis.yml
A node_modules/nsp/node_modules/agent-base/History.md
R node_modules/nsp/node_modules/agent-base/README.md
A node_modules/nsp/node_modules/agent-base/agent.js
R node_modules/nsp/node_modules/agent-base/node_modules/.bin/semver
R node_modules/nsp/node_modules/agent-base/node_modules/semver/.npmignore
R node_modules/nsp/node_modules/agent-base/node_modules/semver/.travis.yml
R node_modules/nsp/node_modules/agent-base/node_modules/semver/LICENSE
R node_modules/nsp/node_modules/agent-base/node_modules/semver/README.md
R node_modules/nsp/node_modules/agent-base/node_modules/semver/bin/semver
A node_modules/nsp/node_modules/agent-base/node_modules/semver/package.json
R node_modules/nsp/node_modules/agent-base/node_modules/semver/semver.js
R 
node_modules/nsp/node_modules/agent-base/node_modules/semver/test/big-numbers.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/clean.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/gtr.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/index.js
R node_modules/nsp/node_modules/agent-base/node_modules/semver/test/ltr.js
R 
node_modules/nsp/node_modules/agent-base/node_modules/semver/test/major-minor-patch.js
A node_modules/nsp/node_modules/agent-base/package.json
R node_modules/nsp/node_modules/agent-base/patch-core.js
R node_modules/nsp/node_modules/agent-base/test/ssl-cert-snakeoil.key
R node_modules/nsp/node_modules/agent-base/test/ssl-cert-snakeoil.pem
A node_modules/nsp/node_modules/agent-base/test/test.js
A node_modules/nsp/node_modules/ansi-regex/index.js
R node_modules/nsp/node_modules/ansi-regex/license
A node_modules/nsp/node_modules/ansi-regex/package.json
A node_modules/nsp/node_modules/ansi-regex/readme.md
R node_modules/nsp/node_modules/ansi-styles/index.js
R node_modules/nsp/node_modules/ansi-styles/license
A node_modules/nsp/node_modules/ansi-styles/package.json
R node_modules/nsp/node_modules/ansi-styles/readme.md
R node_modules/nsp/node_modules/boom/.npmignore
R node_modules/nsp/node_modules/boom/.travis.yml
R node_modules/nsp/node_modules/boom/CONTRIBUTING.md
R node_modules/nsp/node_modules/boom/LICENSE
R node_modules/nsp/node_modules/boom/README.md
R node_modules/nsp/node_modules/boom/images/boom.png
R node_modules/nsp/node_modules/boom/lib/index.js
A 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Consolidation: Use styles for commonly-used text instances.

[Dbrant (Code Review)]

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

Change subject: Consolidation: Use styles for commonly-used text instances.
..

Consolidation: Use styles for commonly-used text instances.

Change-Id: Idcb0cadd413c02bf57147642ce002948d1c1e98c
---
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/fragment_history.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/layout/fragment_reading_list.xml
M app/src/main/res/layout/fragment_reading_lists.xml
M app/src/main/res/layout/fragment_search_recent.xml
M app/src/main/res/layout/inflate_create_account_onboarding.xml
M app/src/main/res/layout/item_language_list_entry.xml
M app/src/main/res/layout/item_page_list_entry.xml
M app/src/main/res/layout/item_reading_list.xml
M app/src/main/res/layout/item_search_result.xml
M app/src/main/res/layout/view_card_offline.xml
M app/src/main/res/layout/view_link_preview_error.xml
M app/src/main/res/layout/view_list_card_item.xml
M app/src/main/res/layout/view_search_empty.xml
M app/src/main/res/layout/view_static_card.xml
M app/src/main/res/values/styles.xml
17 files changed, 67 insertions(+), 74 deletions(-)


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

diff --git a/app/src/main/res/layout/activity_login.xml 
b/app/src/main/res/layout/activity_login.xml
index c20221d..2a6e414 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -26,7 +26,7 @@
 
 
 
 
 
 
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml 
b/app/src/main/res/layout/fragment_local_compilations.xml
index b65548a..ad9be8b 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -93,9 +93,7 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:gravity="center"
-android:textSize="20sp"
-android:fontFamily="sans-serif-medium"
-android:textColor="?attr/primary_text_color"
+style="@style/MaterialLargePrimaryTitle"
 android:text="@string/offline_library_empty_title"/>
 
 
 
 
diff --git a/app/src/main/res/layout/fragment_reading_lists.xml 
b/app/src/main/res/layout/fragment_reading_lists.xml
index c64dcb7..dc1ffd3 100644
--- a/app/src/main/res/layout/fragment_reading_lists.xml
+++ b/app/src/main/res/layout/fragment_reading_lists.xml
@@ -21,8 +21,7 @@
 android:layout_height="wrap_content"
 android:layout_gravity="center_horizontal"
 android:gravity="center"
-android:textSize="20sp"
-android:fontFamily="sans-serif-medium"
+style="@style/MaterialLargePrimaryTitle"
 android:layout_marginBottom="20dp"
 android:text="@string/reading_lists_empty" />
 
 
 
diff --git a/app/src/main/res/layout/fragment_search_recent.xml 
b/app/src/main/res/layout/fragment_search_recent.xml
index 481a141..263d39b 100644
--- a/app/src/main/res/layout/fragment_search_recent.xml
+++ b/app/src/main/res/layout/fragment_search_recent.xml
@@ -33,8 +33,7 @@
 android:layout_marginRight="30dp"
 android:gravity="center"
 android:text="@string/search_empty_message"
-android:textSize="16sp"
-android:lineSpacingMultiplier="1.25"/>
+style="@style/MaterialMediumSecondaryCaption"/>
 
 
 
 
 
@@ -24,8 +24,8 @@
 android:id="@+id/language_subtitle"
 android:layout_width="wrap_content"
 android:layout_height="wrap_content"
-style="@style/RtlAwareTextView"
-android:textAppearance="?android:attr/textAppearanceSmall"
+style="@style/MaterialListSubtitle"
+android:textAppearance="@style/RtlAwareTextView"
 android:gravity="center_vertical"
 tools:text="Sample article local name"
 />
diff --git a/app/src/main/res/layout/item_page_list_entry.xml 
b/app/src/main/res/layout/item_page_list_entry.xml
index 3d4e05d..f8edbc2 100644
--- a/app/src/main/res/layout/item_page_list_entry.xml
+++ b/app/src/main/res/layout/item_page_list_entry.xml
@@ -24,10 +24,10 @@
 android:layout_marginLeft="@dimen/list_item_horizontal_padding"
 android:layout_marginRight="@dimen/list_item_horizontal_padding"
 android:gravity="center_vertical"
+android:textColor="?attr/section_title_color"
 android:visibility="gone"
 tools:visibility="visible"
-tools:text="Header text"
-/>
+tools:text="Header text" />
 
 
 
 
 
 
diff --git a/app/src/main/res/layout/item_reading_list.xml 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: EventLogging modules should be soft dependencies

[jenkins-bot (Code Review)]

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

Change subject: EventLogging modules should be soft dependencies
..


EventLogging modules should be soft dependencies

Change-Id: Ibc546a89b11360769c9c50dc52cb9b7b5e433100
---
M resources/skins.minerva.editor/init.js
M resources/skins.minerva.mainMenu/MainMenu.js
M skin.json
3 files changed, 15 insertions(+), 10 deletions(-)

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



diff --git a/resources/skins.minerva.editor/init.js 
b/resources/skins.minerva.editor/init.js
index 862180b..c71dd2f 100644
--- a/resources/skins.minerva.editor/init.js
+++ b/resources/skins.minerva.editor/init.js
@@ -168,14 +168,19 @@
 * @method
 */
function logInit( editor ) {
-   mw.track( 'mf.schemaEdit', {
-   action: 'init',
-   type: 'section',
-   mechanism: initMechanism,
-   editor: editor,
-   editingSessionId: 
editorOptions.sessionId
+   // If MobileFrontend is not available this will 
not be possible so
+   // check first.
+   mw.loader.using( 'mobile.loggingSchemas.edit' 
).done( function () {
+   mw.track( 'mf.schemaEdit', {
+   action: 'init',
+   type: 'section',
+   mechanism: initMechanism,
+   editor: editor,
+   editingSessionId: 
editorOptions.sessionId
+   } );
} );
}
+
/**
 * Load source editor
 * @private
diff --git a/resources/skins.minerva.mainMenu/MainMenu.js 
b/resources/skins.minerva.mainMenu/MainMenu.js
index 4b51e40..e957cf3 100644
--- a/resources/skins.minerva.mainMenu/MainMenu.js
+++ b/resources/skins.minerva.mainMenu/MainMenu.js
@@ -36,6 +36,8 @@
 * attributes on elements.
 */
enableLogging: function () {
+   // Load the EventLogging module inside MobileFrontend 
if available
+   mw.loader.using( 
'mobile.loggingSchemas.mobileWebMainMenuClickTracking' );
this.$( 'a' ).on( 'click', function () {
var $link = $( this ),
eventName = $link.data( 'event-name' );
diff --git a/skin.json b/skin.json
index 47a89cb..319e415 100644
--- a/skin.json
+++ b/skin.json
@@ -233,8 +233,7 @@
"dependencies": [
"skins.minerva.mainMenu.icons",
"skins.minerva.mainMenu.styles",
-   "mobile.startup",
-   
"mobile.loggingSchemas.mobileWebMainMenuClickTracking"
+   "mobile.startup"
],
"position": "bottom",
"templates": {
@@ -360,8 +359,7 @@
"mediawiki.ui.input",
"mobile.startup",
"skins.minerva.toggling",
-   "mediawiki.jqueryMsg",
-   "mobile.loggingSchemas.edit"
+   "mediawiki.jqueryMsg"
],
"messages": {
"0": "mobile-frontend-editor-disabled",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc546a89b11360769c9c50dc52cb9b7b5e433100
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Rancid add 4 conservers as up; 1 as down until replaced

[Ayounsi (Code Review)]

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

Change subject: Rancid add 4 conservers as up; 1 as down until replaced
..


Rancid add 4 conservers as up; 1 as down until replaced

Bug: T175876
Change-Id: I0ca82b34f0637fbbc0d304d3bc448b4cbd903602
---
M modules/rancid/files/core/router.db
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/modules/rancid/files/core/router.db 
b/modules/rancid/files/core/router.db
index 961a53a..02fbf54 100644
--- a/modules/rancid/files/core/router.db
+++ b/modules/rancid/files/core/router.db
@@ -33,4 +33,9 @@
 mr1-codfw.wikimedia.org;juniper;up;
 mr1-esams.wikimedia.org;juniper;up;
 mr1-ulsfo.wikimedia.org;juniper;up;
-scs-ulsfo.mgmt.ulsfo.wmnet;opengear;up
+scs-ulsfo.mgmt.ulsfo.wmnet;opengear;up;
+scs-a8-eqiad.mgmt.eqiad.wmnet;opengear;up;
+scs-a1-codfw.mgmt.codfw.wmnet;opengear;up;
+scs-oe11-esams.mgmt.esams.wmnet;opengear;up;
+scs-c1-codfw.mgmt.codfw.wmnet;opengear;up;
+scs-c1-eqiad.mgmt.eqiad.wmnet;opengear;down;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ca82b34f0637fbbc0d304d3bc448b4cbd903602
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
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]: Session counts by volume for mobile web search

[Chelsyx (Code Review)]

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

Change subject: Session counts by volume for mobile web search
..

Session counts by volume for mobile web search

Bug: T176811
Change-Id: I545a80a5f4214e3f170d6a104a48e6d30dddecc9
---
M docs/README.md
M modules/metrics/search/config.yaml
A modules/metrics/search/mobile_session_counts
A modules/metrics/search/mobile_session_counts.R
4 files changed, 80 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/26/381126/1

diff --git a/docs/README.md b/docs/README.md
index e5cc336..2053bcf 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,7 +8,7 @@
 infrastructure. These datasets provide the metrics that are used by
 [Discovery's Dashboards](https://discovery.wmflabs.org/)
 
-Last updated on 22 September 2017
+Last updated on 27 September 2017
 
 Daily Metrics
 -
@@ -204,6 +204,8 @@
 after clickthrough; Number of sessions with at least a click and the
 number of sessions that return to search for different things after
 clickthrough.
+-   **mobile\_session\_counts.tsv**: Number of user sessions on mobile
+web, broken down by high, medium and low volume.
 
 wdqs/
 -
diff --git a/modules/metrics/search/config.yaml 
b/modules/metrics/search/config.yaml
index 2181168..4b3f099 100644
--- a/modules/metrics/search/config.yaml
+++ b/modules/metrics/search/config.yaml
@@ -233,3 +233,8 @@
 granularity: days
 starts: 2017-04-01
 type: script
+mobile_session_counts:
+description: Number of user sessions on mobile web, broken down by 
high, medium and low volume.
+granularity: days
+starts: 2017-04-01
+type: script
diff --git a/modules/metrics/search/mobile_session_counts 
b/modules/metrics/search/mobile_session_counts
new file mode 100755
index 000..e88dc7e
--- /dev/null
+++ b/modules/metrics/search/mobile_session_counts
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+Rscript modules/metrics/search/mobile_session_counts.R -d $1
diff --git a/modules/metrics/search/mobile_session_counts.R 
b/modules/metrics/search/mobile_session_counts.R
new file mode 100644
index 000..89a3d10
--- /dev/null
+++ b/modules/metrics/search/mobile_session_counts.R
@@ -0,0 +1,69 @@
+#!/usr/bin/env Rscript
+
+source("config.R")
+.libPaths(r_library)
+suppressPackageStartupMessages(library("optparse"))
+
+option_list <- list(
+  make_option(c("-d", "--date"), default = NA, action = "store", type = 
"character")
+)
+
+# Get command line options, if help option encountered print help and exit,
+# otherwise if options not found on command line then set defaults:
+opt <- parse_args(OptionParser(option_list = option_list))
+
+if (is.na(opt$date)) {
+  quit(save = "no", status = 1)
+}
+
+# Build query:
+date_clause <- as.character(as.Date(opt$date), format = "LEFT(timestamp, 8) = 
'%Y%m%d'")
+
+query <-paste0("SELECT
+  DATE('", opt$date, "') AS date,
+  event_userSessionToken AS userSessionToken,
+  COUNT(DISTINCT event_searchSessionToken) AS n_search_session
+  FROM MobileWebSearch_12054448
+  WHERE ", date_clause, "
+  GROUP BY date, event_userSessionToken;")
+
+# Fetch data from MySQL database:
+results <- tryCatch(
+  suppressMessages(data.table::as.data.table(wmf::mysql_read(query, "log"))),
+  error = function(e) {
+return(data.frame())
+  }
+)
+
+if (nrow(results) == 0) {
+  # Here we make the script output tab-separated
+  # column names, as required by Reportupdater:
+  output <- data.frame(
+date = character(),
+user_sessions = numeric(),
+search_sessions = numeric(),
+high_volume = numeric(),
+medium_volume = numeric(),
+low_volume = numeric(),
+threshold_high = numeric(),
+threshold_low = numeric()
+  )
+} else {
+  # Split session counts:
+  `90th percentile` <- floor(quantile(results$n_search_session, 0.9))
+  `10th percentile` <- ceiling(quantile(results$n_search_session, 0.1))
+  results$session_type <- dplyr::case_when(
+results$n_search_session > `90th percentile` ~ "high_volume",
+results$n_search_session < `10th percentile` ~ "low_volume",
+TRUE ~ "medium_volume"
+  )
+  output <- cbind(date = "20170901",#opt$date,
+  user_sessions = nrow(results),
+  search_sessions = sum(results$n_search_session, na.rm = 
TRUE),
+  tidyr::spread(results[, list(userSession = 
length(userSessionToken)), by = "session_type"],
+session_type, userSession),
+  threshold_high = `90th percentile`,
+  threshold_low = `10th percentile`)
+}
+
+write.table(output, file = "", append = FALSE, sep = "\t", row.names = FALSE, 
quote = FALSE)

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Rancid add 4 conservers as up; 1 as down until replaced

[Ayounsi (Code Review)]

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

Change subject: Rancid add 4 conservers as up; 1 as down until replaced
..

Rancid add 4 conservers as up; 1 as down until replaced

Bug: T175876
Change-Id: I0ca82b34f0637fbbc0d304d3bc448b4cbd903602
---
M modules/rancid/files/core/router.db
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/modules/rancid/files/core/router.db 
b/modules/rancid/files/core/router.db
index 961a53a..02fbf54 100644
--- a/modules/rancid/files/core/router.db
+++ b/modules/rancid/files/core/router.db
@@ -33,4 +33,9 @@
 mr1-codfw.wikimedia.org;juniper;up;
 mr1-esams.wikimedia.org;juniper;up;
 mr1-ulsfo.wikimedia.org;juniper;up;
-scs-ulsfo.mgmt.ulsfo.wmnet;opengear;up
+scs-ulsfo.mgmt.ulsfo.wmnet;opengear;up;
+scs-a8-eqiad.mgmt.eqiad.wmnet;opengear;up;
+scs-a1-codfw.mgmt.codfw.wmnet;opengear;up;
+scs-oe11-esams.mgmt.esams.wmnet;opengear;up;
+scs-c1-codfw.mgmt.codfw.wmnet;opengear;up;
+scs-c1-eqiad.mgmt.eqiad.wmnet;opengear;down;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add logging for Unicode check failures in EditPage

[MaxSem (Code Review)]

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

Change subject: Add logging for Unicode check failures in EditPage
..

Add logging for Unicode check failures in EditPage

Bug: T67297
Change-Id: I0cf2ec1213f81821a5feb0ff60d6f0655811b6cf
---
M includes/EditPage.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f49157f..67f1da0 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -918,7 +918,7 @@
}
}
 
-   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck' );
+   $this->unicodeCheck = $request->getText( 
'wpUnicodeCheck', '' );
 
$this->summary = $request->getText( 'wpSummary' );
 
@@ -1788,6 +1788,8 @@
}
 
if ( $this->unicodeCheck !== self::UNICODE_CHECK ) {
+   wfDebugLog( 'AdHocDebug', "Unicode check failed: 
value={$this->unicodeCheck}, expected "
+   . self::UNICODE_CHECK );
$status->fatal( 'unicode-support-fail' );
$status->value = self::AS_UNICODE_NOT_SUPPORTED;
return $status;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cf2ec1213f81821a5feb0ff60d6f0655811b6cf
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]: tools clush: exclude puppetmaster from hostgroup

[Andrew Bogott (Code Review)]

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

Change subject: tools clush: exclude puppetmaster from hostgroup
..


tools clush: exclude puppetmaster from hostgroup

Generally we're using clush to manage those hosts
that are managed by the tools puppetmaster.  The
puppetmaster itself is a special case that clush
doesn't work for in the current setup.

Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
---
M modules/role/files/toollabs/clush/tools-clush-generator
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/files/toollabs/clush/tools-clush-generator 
b/modules/role/files/toollabs/clush/tools-clush-generator
index 0cabe16..5266762 100644
--- a/modules/role/files/toollabs/clush/tools-clush-generator
+++ b/modules/role/files/toollabs/clush/tools-clush-generator
@@ -63,6 +63,11 @@
 )
 for instance in client.servers.list():
 name = instance.name
+if name.startswith('tools-puppetmaster'):
+# To avoid chicken/egg strangeness, the tools puppetmaster
+#  is not itself managed by the tools puppetmaster.  That
+#  means clush keys aren't set up there.
+continue
 for prefix in classifier:
 if name.startswith('tools-' + prefix):
 role = classifier[prefix]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Unify monospace font family stack

[jenkins-bot (Code Review)]

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

Change subject: Unify monospace font family stack
..


Unify monospace font family stack

Additionally adding MinervaNeue specific variable.

Bug: T176636
Change-Id: I4450508be0b7836602f6fdea603ed5f4d9a0b16d
---
M minerva.less/minerva.variables.less
M resources/skins.minerva.content.styles/text.less
2 files changed, 2 insertions(+), 1 deletion(-)

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 5cf2d6f..754b58d 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -70,6 +70,7 @@
 
 // typography
 @fontFamilyHeading: 'Linux Libertine', 'Georgia', 'Times', serif;
+@fontFamilyMonospace: monospace, monospace;
 @fontScalingFactor: 1;
 @contentLineHeight: 1.65;
 
diff --git a/resources/skins.minerva.content.styles/text.less 
b/resources/skins.minerva.content.styles/text.less
index 37a2500..fbcfe99 100644
--- a/resources/skins.minerva.content.styles/text.less
+++ b/resources/skins.minerva.content.styles/text.less
@@ -45,7 +45,7 @@
 // Styleguide 1.7.
 code,
 pre {
-   font-family: monospace;
+   font-family: @fontFamilyMonospace;
border: solid 1px @colorGray12;
white-space: pre-wrap;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4450508be0b7836602f6fdea603ed5f4d9a0b16d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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] pywikibot/i18n[master]: Added name of template reflist on Serbian language

[Zoranzoki21 (Code Review)]

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

Change subject: Added name of template reflist on Serbian language
..

Added name of template reflist on Serbian language

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


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n 
refs/changes/23/381123/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8449a99be1cccae669efdab90b58d47656d06568
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools clush: exclude puppetmaster from hostgroup

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381122 )

Change subject: tools clush: exclude puppetmaster from hostgroup
..

tools clush: exclude puppetmaster from hostgroup

Generally we're using clush to manage those hosts
that are managed by the tools puppetmaster.  The
puppetmaster itself is a special case that clush
doesn't work for in the current setup.

Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
---
M modules/role/files/toollabs/clush/tools-clush-generator
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/role/files/toollabs/clush/tools-clush-generator 
b/modules/role/files/toollabs/clush/tools-clush-generator
index 0cabe16..5266762 100644
--- a/modules/role/files/toollabs/clush/tools-clush-generator
+++ b/modules/role/files/toollabs/clush/tools-clush-generator
@@ -63,6 +63,11 @@
 )
 for instance in client.servers.list():
 name = instance.name
+if name.startswith('tools-puppetmaster'):
+# To avoid chicken/egg strangeness, the tools puppetmaster
+#  is not itself managed by the tools puppetmaster.  That
+#  means clush keys aren't set up there.
+continue
 for prefix in classifier:
 if name.startswith('tools-' + prefix):
 role = classifier[prefix]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
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...parsoid[master]: Utils need s/parsoidConfig/parsoidOptions/

[Arlolra (Code Review)]

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

Change subject: Utils need  s/parsoidConfig/parsoidOptions/
..

Utils need  s/parsoidConfig/parsoidOptions/

 * This should have been part of 976b8950.

Change-Id: I9a4d60713ba84ec80f21d0eb83d70b7990870b99
---
M lib/utils/Util.js
1 file changed, 24 insertions(+), 24 deletions(-)


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

diff --git a/lib/utils/Util.js b/lib/utils/Util.js
index efba925..72e3508 100644
--- a/lib/utils/Util.js
+++ b/lib/utils/Util.js
@@ -38,11 +38,11 @@
 *
 * Set debugging flags on an object, based on an options object.
 *
-* @param {Object} parsoidConfig The config to modify.
+* @param {Object} parsoidOptions Object to be assigned to the 
ParsoidConfig.
 * @param {Object} opts The options object to use for setting the debug 
flags.
 * @return {Object} The modified object.
 */
-   setDebuggingFlags: function(parsoidConfig, opts) {
+   setDebuggingFlags: function(parsoidOptions, opts) {
// Handle the --help options
var exit = false;
if (opts.trace === 'help') {
@@ -66,11 +66,11 @@
// Continue to support generic debugging.
if (opts.debug === true) {
console.warn("Warning: Generic debugging, not 
handler-specific.");
-   parsoidConfig.debug = 
Util.booleanOption(opts.debug);
+   parsoidOptions.debug = 
Util.booleanOption(opts.debug);
} else {
// Setting --debug automatically enables --trace
-   parsoidConfig.debugFlags = 
this.splitFlags(opts.debug);
-   parsoidConfig.traceFlags = 
parsoidConfig.debugFlags;
+   parsoidOptions.debugFlags = 
this.splitFlags(opts.debug);
+   parsoidOptions.traceFlags = 
parsoidOptions.debugFlags;
}
}
 
@@ -80,7 +80,7 @@
} else {
// Add any new trace flags to the list of 
existing trace flags (if
// any were inherited from debug); otherwise, 
create a new list.
-   parsoidConfig.traceFlags = 
(parsoidConfig.traceFlags || []).concat(this.splitFlags(opts.trace));
+   parsoidOptions.traceFlags = 
(parsoidOptions.traceFlags || []).concat(this.splitFlags(opts.trace));
}
}
 
@@ -88,11 +88,11 @@
if (opts.dump === true) {
console.warn("Warning: Generic dumping not 
enabled. Please set a flag.");
} else {
-   parsoidConfig.dumpFlags = 
this.splitFlags(opts.dump);
+   parsoidOptions.dumpFlags = 
this.splitFlags(opts.dump);
}
}
 
-   return parsoidConfig;
+   return parsoidOptions;
},
 
 
@@ -205,11 +205,11 @@
 * Sets templating and processing flags on an object,
 * based on an options object.
 *
-* @param {Object} parsoidConfig The config to modify.
+* @param {Object} parsoidOptions Object to be assigned to the 
ParsoidConfig.
 * @param {Object} opts The options object to use for setting the debug 
flags.
 * @return {Object} The modified object.
 */
-   setTemplatingAndProcessingFlags: function(parsoidConfig, opts) {
+   setTemplatingAndProcessingFlags: function(parsoidOptions, opts) {
[
'fetchConfig',
'fetchTemplates',
@@ -219,38 +219,38 @@
'addHTMLTemplateParameters',
].forEach(function(c) {
if (opts[c] !== undefined) {
-   parsoidConfig[c] = Util.booleanOption(opts[c]);
+   parsoidOptions[c] = Util.booleanOption(opts[c]);
}
});
if (opts.usePHPPreProcessor !== undefined) {
-   parsoidConfig.usePHPPreProcessor = 
parsoidConfig.fetchTemplates &&
+   parsoidOptions.usePHPPreProcessor = 
parsoidOptions.fetchTemplates &&
Util.booleanOption(opts.usePHPPreProcessor);
}
if (opts.maxDepth !== undefined) {
-   parsoidConfig.maxDepth = typeof (opts.maxdepth) === 
'number' ?
-   opts.maxdepth : parsoidConfig.maxDepth;
+   parsoidOptions.maxDepth = typeof 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fill in defaults for linting configs

[jenkins-bot (Code Review)]

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

Change subject: Fill in defaults for linting configs
..


Fill in defaults for linting configs

 * Follow up to 13972c9b

Change-Id: I7bf8b4f94c7c8bff7ad6d169d90ead36a1442426
---
M lib/config/ParsoidConfig.js
M lib/utils/Util.js
M tests/mocha/linter.js
M tests/mocha/parsoid.config.js
4 files changed, 26 insertions(+), 37 deletions(-)

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



diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
index 7f6a364..0109ea3 100644
--- a/lib/config/ParsoidConfig.js
+++ b/lib/config/ParsoidConfig.js
@@ -87,6 +87,22 @@
maxHTMLSize: 1000,  // 10M
},
},
+
+   linter: {
+   // Whether to send lint errors to the MW API
+   // Requires the MW Linter extension to be installed and 
configured.
+   sendAPI: false,
+
+   // Ratio at which to sample linter errors, per page.
+   // This is deterministic and based on page_id.
+   apiSampling: 1,
+
+   // Max length of content covered by 'white-space:nowrap' CSS
+   // that we consider "safe" when Tidy is replaced. Beyond that,
+   // wikitext will have to be fixed up to manually insert 
whitespace
+   // at the right places.
+   tidyWhitespaceBugMaxLength: 100,
+   },
 });
 
 /**
@@ -104,10 +120,9 @@
 function ParsoidConfig(localSettings, options) {
this.mwApiMap = new Map();
this.reverseMwApiMap = new Map();
-   this.timeouts = Util.clone(CONFIG_DEFAULTS.timeouts);
-   this.retries = Util.clone(CONFIG_DEFAULTS.retries);
-   this.limits = Util.clone(CONFIG_DEFAULTS.limits);
-   this.maxSockets = Util.clone(CONFIG_DEFAULTS.maxSockets);
+   Object.keys(CONFIG_DEFAULTS).forEach(function(k) {
+   this[k] = Util.clone(CONFIG_DEFAULTS[k]);
+   }, this);
this._uniq = 0;
 
// Don't freak out!
@@ -232,35 +247,6 @@
  * Or an array of enabled lint types
  */
 ParsoidConfig.prototype.linting = false;
-
-// FIXME: Fold other linter config options into this.
-ParsoidConfig.prototype.linter = {
-   /**
-* @property {boolean} sendAPI
-* Whether to send lint errors to the MW API
-* Requires the MW Linter extension to be installed
-* and configured.
-*/
-   sendAPI: false,
-
-   /**
-* @property {number} apiSampling
-*
-* Ratio at which to sample linter errors, per page.
-* This is deterministic and based on page_id.
-*/
-   apiSampling: 1,
-
-   /**
-* @property {number} tidyWhiteSpaceBugMaxLength
-*
-* Max length of content covered by 'white-space:nowrap' CSS
-* that we consider "safe" when Tidy is replaced. Beyond that,
-* wikitext will have to be fixed up to manually insert whitespace
-* at the right places.
-*/
-   tidyWhitespaceBugMaxLength: 100,
-};
 
 /**
  * @property {Function} loggerBackend
diff --git a/lib/utils/Util.js b/lib/utils/Util.js
index 6511186..efba925 100644
--- a/lib/utils/Util.js
+++ b/lib/utils/Util.js
@@ -243,9 +243,7 @@
if (opts.lint) {
parsoidConfig.linting = true;
if (!parsoidConfig.linter) {
-   // Late require since we have a circular 
require involved
-   var ParsoidConfig = 
require('../config/ParsoidConfig.js').ParsoidConfig;
-   parsoidConfig.linter = 
Util.clone(ParsoidConfig.prototype.linter);
+   parsoidConfig.linter = {};
}
parsoidConfig.linter.sendAPI = false;
}
diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js
index 8492525..f176e9c 100644
--- a/tests/mocha/linter.js
+++ b/tests/mocha/linter.js
@@ -8,6 +8,7 @@
 require('chai').should();
 
 var ParsoidConfig = require('../../lib/config/ParsoidConfig.js').ParsoidConfig;
+var Util = require('../../lib/utils/Util.js').Util;
 var helpers = require('./test.helpers.js');
 
 describe('Linter Tests', function() {
@@ -17,6 +18,8 @@
// Parsing the `[[file:...]]` tags below may also require running the
// mock API to answer imageinfo queries.
var parsoidConfig = new ParsoidConfig(null, { defaultWiki: 'enwiki', 
loadWMF: true, linting: true });
+   // Undo freezing so we can tweak it below
+   parsoidConfig.linter = Util.clone(parsoidConfig.linter);
var parseWT = function(wt, opts) {
return helpers.parse(parsoidConfig, wt, 
opts).then(function(ret) {
return ret.env.lintLogger.buffer;
diff --git 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweak: proper theming of bottom sheets.

[jenkins-bot (Code Review)]

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

Change subject: Design tweak: proper theming of bottom sheets.
..


Design tweak: proper theming of bottom sheets.

This removes the explicit background color from our bottom sheet dialog
layouts, and instead makes it a globally implicit background color for all
bottom sheets.

Change-Id: Ieb1163566b32cdbc3a0eebcda70f682c2c1afad4
---
M app/src/main/res/layout/dialog_add_to_reading_list.xml
M app/src/main/res/layout/dialog_link_preview.xml
M app/src/main/res/layout/dialog_reference.xml
M app/src/main/res/layout/dialog_theme_chooser.xml
M app/src/main/res/layout/dialog_wiktionary.xml
M app/src/main/res/values/styles.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
8 files changed, 38 insertions(+), 26 deletions(-)

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



diff --git a/app/src/main/res/layout/dialog_add_to_reading_list.xml 
b/app/src/main/res/layout/dialog_add_to_reading_list.xml
index 901b001..2620e2f 100644
--- a/app/src/main/res/layout/dialog_add_to_reading_list.xml
+++ b/app/src/main/res/layout/dialog_add_to_reading_list.xml
@@ -3,28 +3,35 @@
 xmlns:android="http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
 android:layout_width="match_parent"
-android:layout_height="wrap_content"
-android:background="@color/base50">
+android:layout_height="wrap_content">
 
-
+android:layout_height="wrap_content"
+android:orientation="vertical">
+
+
+
+
 
 
+android:layout_marginTop="56.5dp">
 
 
 
 http://schemas.android.com/tools;
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
-android:background="?attr/paper_color"
 android:orientation="vertical">
 
 
+android:paddingRight="16dp">
 
 
 
 
 @style/AppPreferenceTheme
-@style/AppBottomSheetDialogTheme
 @style/EditTextAutoSummarizePreference
 @style/LongPreference
 @style/IntPreference
@@ -175,10 +174,6 @@
 16sp
 ?attr/primary_text_color
 
-
-
-
-@style/AppBottomSheetModalStyle
 
 
 
diff --git a/app/src/main/res/values/styles_dark.xml 
b/app/src/main/res/values/styles_dark.xml
index 9a1ab59..8fb617c 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -30,6 +30,7 @@
 @style/PopupMenuDark
 @style/DialogDark
 @style/AlertDialogDark
+@style/BottomSheetDialogDark
 
 
 @drawable/toc_item_background_dark
@@ -79,6 +80,12 @@
 true
 
 
+
+@style/AppBottomSheetModalStyle
+@color/accent75
+?attr/paper_color
+
+
 
 @color/accent75
 @color/base90
diff --git a/app/src/main/res/values/styles_light.xml 
b/app/src/main/res/values/styles_light.xml
index 20750a7..00b3080 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -30,6 +30,7 @@
 @style/PopupMenuLight
 @style/DialogLight
 @style/AlertDialogLight
+@style/BottomSheetDialogLight
 
 
 @drawable/toc_item_background_light
@@ -79,6 +80,12 @@
 true
 
 
+
+@style/AppBottomSheetModalStyle
+@color/accent50
+?attr/paper_color
+
+
 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: CiviFixtures cleans up after itself better

[jenkins-bot (Code Review)]

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

Change subject: CiviFixtures cleans up after itself better
..


CiviFixtures cleans up after itself better

Change-Id: Ib3748e458e9692be63138d280da39d28f362082a
---
M sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php 
b/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
index d269c05..273f561 100644
--- a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
+++ b/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
@@ -18,6 +18,7 @@
 public $subscription_id;
 public $contribution_amount;
 public $contribution_invoice_id;
+public $contribution_id;
 
 /**
  * @return CiviFixtures
@@ -90,10 +91,11 @@
 'invoice_id' => mt_rand(),
 );
 $contribution = civicrm_api3('Contribution', 'Create', 
$contribution_params);
-$id = $contribution['id'];
-$contribution_values = $contribution['values'][$id];
+   $out->contribution_id = $contribution['id'];
+$contribution_values = $contribution['values'][$out->contribution_id];
 $out->contribution_invoice_id = $contribution_values['invoice_id'];
 
+   (new CRM_Core_Transaction())->commit();
 return $out;
 }
 
@@ -102,6 +104,7 @@
*/
 public function __destruct() {
 civicrm_api3('ContributionRecur', 'delete', array('id' => 
$this->contribution_recur_id));
+   civicrm_api3('Contribution', 'delete', array('id' => 
$this->contribution_id));
 civicrm_api3('Contact', 'delete', array('id' => $this->contact_id));
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3748e458e9692be63138d280da39d28f362082a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Duplicate invoice special handling in message requeue

[jenkins-bot (Code Review)]

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

Change subject: Duplicate invoice special handling in message requeue
..


Duplicate invoice special handling in message requeue

This avoids the lookup before each insert, but adds special case
handling to the base queue consumer.

Ugliness vs performance tradeoff.

This is an alternative to Ie72abfbe73451bc4be000a19

Bug: T171349
Change-Id: Ide9b64e5a4d896290e13d82fccc90cbf66035109
---
M sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
M sites/all/modules/wmf_common/WmfException.php
M sites/all/modules/wmf_common/WmfQueueConsumer.php
4 files changed, 46 insertions(+), 9 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
index 3c9ca7e..cc18669 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
@@ -485,8 +485,16 @@
 'payment_method' => 'cc',
 'gateway_txn_id' => 'CON_TEST_GATEWAY' . mt_rand(),
 );
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$this->assertEquals(substr($contribution['invoice_id'], 0, 
strlen($fixtures->contribution_invoice_id)), 
$fixtures->contribution_invoice_id);
+$exceptioned = false;
+try {
+wmf_civicrm_contribution_message_import( $msg );
+} catch ( WmfException $ex ) {
+$exceptioned = true;
+$this->assertTrue( $ex->isRequeue() );
+$this->assertEquals( 'DUPLICATE_INVOICE', $ex->getErrorName() );
+$this->assertEquals( WmfException::DUPLICATE_INVOICE, 
$ex->getCode() );
+}
+$this->assertTrue( $exceptioned );
 }
 
   /**
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index aa4b536..51f4683 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -454,11 +454,16 @@
 $duplicate = civicrm_api3( "Contribution", "getcount", array( 
"invoice_id" => $invoice_id ) );
 }
 if ( $duplicate > 0 ) {
-$contribution['invoice_id'] = $contribution['invoice_id'] . 
'|dup-' . UtcDate::getUtcTimeStamp();
-watchdog( 'wmf_civicrm', 'Found duplicate invoice ID, changing 
this one to ' . $contribution['invoice_id'], NULL, WATCHDOG_INFO );
-$contribution_result = civicrm_api3( "Contribution", "Create", 
$contribution );
-watchdog( 'wmf_civicrm', 'Contribution result from 
civicrm_contribution_add(): ' . print_r( $contribution_result, TRUE ), NULL, 
WATCHDOG_DEBUG );
-$msg['contribution_tags'][] = 'DuplicateInvoiceId';
+// We can't retry the insert here because the original API
+// error has marked the Civi transaction for rollback.
+// This WmfException code has special handling in the
+// WmfQueueConsumer that will alter the invoice_id before
+// re-queueing the message.
+throw new WmfException(
+'DUPLICATE_INVOICE',
+'Duplicate invoice ID, should modify and retry',
+$e->getExtraParams()
+);
 } else {
 throw new WmfException(
 'INVALID_MESSAGE',
diff --git a/sites/all/modules/wmf_common/WmfException.php 
b/sites/all/modules/wmf_common/WmfException.php
index a8d7a4e..1ab193d 100644
--- a/sites/all/modules/wmf_common/WmfException.php
+++ b/sites/all/modules/wmf_common/WmfException.php
@@ -23,7 +23,8 @@
 const BANNER_HISTORY = 20;
 const GET_CONTACT = 21;
 const EMAIL_SYSTEM_FAILURE = 22;
-const BAD_EMAIL = 22;
+const BAD_EMAIL = 23;
+   const DUPLICATE_INVOICE = 24;
 
 //XXX shit we aren't using the 'rollback' attribute
 // and it's not correct in most of these cases
@@ -56,6 +57,10 @@
 'drop' => TRUE,
 'no-email' => TRUE,
 ),
+   'DUPLICATE_INVOICE' => array(
+   'requeue' => TRUE,
+   'no-email' => TRUE,
+   ),
 'GET_CONTRIBUTION' => array(
 'reject' => TRUE,
 ),
@@ -113,7 +118,7 @@
* WmfException constructor.
*
* @param string $type Error type
-   * @param int $message A WMF constructed message.
+   * @param string $message A WMF constructed message.
* @param array $extra Extra parameters.
*   If error_message is included then it will be included in the User Error 
message.
*   If you are 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Rancid: Add scs-ulsfo

[Ayounsi (Code Review)]

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

Change subject: Rancid: Add scs-ulsfo
..


Rancid: Add scs-ulsfo

Bug: T175876
Change-Id: I1616a9f44ee533460e81afe5d9dd5d7c9027d372
---
M modules/rancid/files/core/router.db
M modules/rancid/templates/cloginrc.erb
2 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/rancid/files/core/router.db 
b/modules/rancid/files/core/router.db
index 76f665b..961a53a 100644
--- a/modules/rancid/files/core/router.db
+++ b/modules/rancid/files/core/router.db
@@ -33,3 +33,4 @@
 mr1-codfw.wikimedia.org;juniper;up;
 mr1-esams.wikimedia.org;juniper;up;
 mr1-ulsfo.wikimedia.org;juniper;up;
+scs-ulsfo.mgmt.ulsfo.wmnet;opengear;up
diff --git a/modules/rancid/templates/cloginrc.erb 
b/modules/rancid/templates/cloginrc.erb
index 1b62f43..107312e 100644
--- a/modules/rancid/templates/cloginrc.erb
+++ b/modules/rancid/templates/cloginrc.erb
@@ -1,2 +1,6 @@
 add method * {ssh}
 add password * {bogus_password}
+
+# OpenGear specific configuration
+add noenable scs*wmnet {1}
+add cyphertype scs*wmnet {aes256-ctr}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1616a9f44ee533460e81afe5d9dd5d7c9027d372
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Muck with dependencies for the latest set of nsp warnings

[jenkins-bot (Code Review)]

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

Change subject: Muck with dependencies for the latest set of nsp warnings
..


Muck with dependencies for the latest set of nsp warnings

 * finalhandler is downgraded from yesterday because nsp has a bug
   where it's falsely reporting its dependency, however, this may
   not be a bad thing to keep the same version express is using at
   the top level.

Change-Id: Ia4940d426bddd98ab7a4d7b43e0e32287540ec99
---
M .nsprc
M npm-shrinkwrap.json
M package.json
3 files changed, 181 insertions(+), 246 deletions(-)

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



diff --git a/.nsprc b/.nsprc
index d0da284..b800ece 100644
--- a/.nsprc
+++ b/.nsprc
@@ -1,5 +1,7 @@
 {
   "exceptions": [
-"https://nodesecurity.io/advisories/338;
+"https://nodesecurity.io/advisories/338;,
+// Not affected, https://github.com/expressjs/express/issues/3431
+"https://nodesecurity.io/advisories/535;
   ]
 }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 186df80..60e842f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -420,29 +420,19 @@
   }
 },
 "compression": {
-  "version": "1.7.0",
-  "from": "compression@1.7.0",
-  "resolved": 
"https://registry.npmjs.org/compression/-/compression-1.7.0.tgz;,
+  "version": "1.7.1",
+  "from": "compression@1.7.1",
+  "resolved": 
"https://registry.npmjs.org/compression/-/compression-1.7.1.tgz;,
   "dependencies": {
-"bytes": {
-  "version": "2.5.0",
-  "from": "bytes@2.5.0",
-  "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz;
-},
 "debug": {
-  "version": "2.6.8",
-  "from": "debug@2.6.8",
-  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz;
+  "version": "2.6.9",
+  "from": "debug@2.6.9",
+  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz;
 },
 "ms": {
   "version": "2.0.0",
   "from": "ms@2.0.0",
   "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz;
-},
-"safe-buffer": {
-  "version": "5.1.1",
-  "from": "safe-buffer@5.1.1",
-  "resolved": 
"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz;
 }
   }
 },
@@ -1002,18 +992,13 @@
   "dependencies": {
 "content-type": {
   "version": "1.0.4",
-  "from": "content-type@~1.0.2",
+  "from": "content-type@>=1.0.2 <1.1.0",
   "resolved": 
"https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz;
 },
 "debug": {
   "version": "2.6.9",
   "from": "debug@2.6.9",
   "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz;
-},
-"finalhandler": {
-  "version": "1.0.6",
-  "from": "finalhandler@>=1.0.6 <1.1.0",
-  "resolved": 
"https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz;
 },
 "ms": {
   "version": "2.0.0",
@@ -1066,9 +1051,9 @@
   "dev": true
 },
 "finalhandler": {
-  "version": "1.1.0",
-  "from": "finalhandler@1.1.0",
-  "resolved": 
"https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz;,
+  "version": "1.0.6",
+  "from": "finalhandler@1.0.6",
+  "resolved": 
"https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz;,
   "dependencies": {
 "debug": {
   "version": "2.6.9",
@@ -1892,158 +1877,150 @@
   "resolved": 
"https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz;
 },
 "nsp": {
-  "version": "2.6.3",
-  "from": "nsp@>=2.6.3 <3.0.0",
-  "resolved": "https://registry.npmjs.org/nsp/-/nsp-2.6.3.tgz;,
+  "version": "2.8.1",
+  "from": "nsp@2.8.1",
+  "resolved": "https://registry.npmjs.org/nsp/-/nsp-2.8.1.tgz;,
   "dev": true,
   "dependencies": {
+"agent-base": {
+  "version": "2.1.1",
+  "from": 
"agent-base@https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz;,
+  "resolved": 
"https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz;,
+  "dev": true,
+  "dependencies": {
+"semver": {
+  "version": "5.0.3",
+  "from": 
"semver@https://registry.npmjs.org/semver/-/semver-5.0.3.tgz;,
+  "resolved": 
"https://registry.npmjs.org/semver/-/semver-5.0.3.tgz;,
+  "dev": true
+}
+  }
+},
+"ansi-regex": {
+  "version": "2.1.1",
+  "from": 
"ansi-regex@https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
+  "resolved": 
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
+  "dev": true
+},

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Load tablet device code on mobile devices

[Jdlrobson (Code Review)]

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

Change subject: Load tablet device code on mobile devices
..

Load tablet device code on mobile devices

There is little benefit from loading tablet scripts conditionally.
This causes cache fragmentation for the sake of a few bytes.

Let's simplify our code base and

Note table of contents will not load on mobile and will still load
on a resize.

Logic updated to continue to enforce that the table of contents only
shows in main namespace

Change-Id: Iffd1274c35ea17533e4a90a5e5e860c11366c368
---
M resources/skins.minerva.scripts/preInit.js
R resources/skins.minerva.scripts/toc.js
M skin.json
3 files changed, 5 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/98/381098/1

diff --git a/resources/skins.minerva.scripts/preInit.js 
b/resources/skins.minerva.scripts/preInit.js
index 2f4491b..645ec01 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -18,7 +18,6 @@
),
skinData = {
el: 'body',
-   tabletModules: [ 'skins.minerva.tablet.scripts' ],
page: getCurrentPage(),
referencesGateway: 
ReferencesMobileViewGateway.getSingleton()
};
diff --git a/resources/skins.minerva.tablet.scripts/toc.js 
b/resources/skins.minerva.scripts/toc.js
similarity index 85%
rename from resources/skins.minerva.tablet.scripts/toc.js
rename to resources/skins.minerva.scripts/toc.js
index ba26354..3d1f7c8 100644
--- a/resources/skins.minerva.tablet.scripts/toc.js
+++ b/resources/skins.minerva.scripts/toc.js
@@ -33,8 +33,8 @@
}
}
 
-   // add a ToC only for "view" action (user is reading a page)
-   if ( mw.config.get( 'wgAction' ) === 'view' ) {
+   // add a ToC only for "view" action in main namespace (user is reading 
a page)
+   if ( mw.config.get( 'wgAction' ) === 'view' && mw.config.get( 
'wgNamespaceNumber' ) === 0 ) {
init( M.getCurrentPage() );
}
 
diff --git a/skin.json b/skin.json
index 47a89cb..6ee1293 100644
--- a/skin.json
+++ b/skin.json
@@ -261,6 +261,7 @@
"mobile.search.api",
"mobile.search",
"mobile.references",
+   "mobile.toc",
"mobile.betaoptin"
],
"messages": [
@@ -282,7 +283,8 @@

"resources/skins.minerva.scripts/mobileRedirect.js",
"resources/skins.minerva.scripts/search.js",
"resources/skins.minerva.scripts/references.js",
-   
"resources/skins.minerva.scripts/cleanuptemplates.js"
+   
"resources/skins.minerva.scripts/cleanuptemplates.js",
+   "resources/skins.minerva.scripts/toc.js"
]
},
"skins.minerva.scripts.top": {
@@ -462,18 +464,6 @@
],
"scripts": [
"resources/skins.minerva.fontchanger/init.js"
-   ]
-   },
-   "skins.minerva.tablet.scripts": {
-   "targets": [
-   "mobile",
-   "desktop"
-   ],
-   "dependencies": [
-   "mobile.toc"
-   ],
-   "scripts": [
-   "resources/skins.minerva.tablet.scripts/toc.js"
]
}
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffd1274c35ea17533e4a90a5e5e860c11366c368
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Rancid: Add scs-ulsfo

[Ayounsi (Code Review)]

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

Change subject: Rancid: Add scs-ulsfo
..

Rancid: Add scs-ulsfo

Bug: T175876
Change-Id: I1616a9f44ee533460e81afe5d9dd5d7c9027d372
---
M modules/rancid/files/core/router.db
M modules/rancid/templates/cloginrc.erb
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/381094/1

diff --git a/modules/rancid/files/core/router.db 
b/modules/rancid/files/core/router.db
index 76f665b..961a53a 100644
--- a/modules/rancid/files/core/router.db
+++ b/modules/rancid/files/core/router.db
@@ -33,3 +33,4 @@
 mr1-codfw.wikimedia.org;juniper;up;
 mr1-esams.wikimedia.org;juniper;up;
 mr1-ulsfo.wikimedia.org;juniper;up;
+scs-ulsfo.mgmt.ulsfo.wmnet;opengear;up
diff --git a/modules/rancid/templates/cloginrc.erb 
b/modules/rancid/templates/cloginrc.erb
index 1b62f43..107312e 100644
--- a/modules/rancid/templates/cloginrc.erb
+++ b/modules/rancid/templates/cloginrc.erb
@@ -1,2 +1,6 @@
 add method * {ssh}
 add password * {bogus_password}
+
+# OpenGear specific configuration
+add noenable scs*wmnet {1}
+add cyphertype scs*wmnet {aes256-ctr}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Revision::newFromTitle may return null

[jenkins-bot (Code Review)]

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

Change subject: Revision::newFromTitle may return null
..


Revision::newFromTitle may return null

Bug: T176882
Change-Id: I9aea25c2db81a12f16414edcb279f3241dc380bc
---
M includes/skins/SkinMinerva.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index cc09b05..102bef4 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -746,7 +746,12 @@
$historyUrl = $title->getLocalURL( [ 'action' => 
'history' ] );
}
 
-   $editor = $this->getRevisionEditor( Revision::newFromTitle( 
$title ) );
+   $rev = Revision::newFromTitle( $title );
+   if ( $rev ) {
+   $editor = $this->getRevisionEditor( $rev );
+   } else {
+   $editor = false;
+   }
return [
// Use $edit['timestamp'] (Unix format) instead of 
$timestamp (MW format)
'data-timestamp' => $isMainPage ? '' : wfTimestamp( 
TS_UNIX, $timestamp ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9aea25c2db81a12f16414edcb279f3241dc380bc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: device_backup: Update cron MAILTo to new mailing list address

[Madhuvishy (Code Review)]

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

Change subject: device_backup: Update cron MAILTo to new mailing list address
..


device_backup: Update cron MAILTo to new mailing list address

Bug: T168480
Change-Id: I087b1a0f321e72c632b8be9113b42f8310b45042
---
M modules/labstore/manifests/device_backup.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/labstore/manifests/device_backup.pp 
b/modules/labstore/manifests/device_backup.pp
index c02aa90..b915cfa 100644
--- a/modules/labstore/manifests/device_backup.pp
+++ b/modules/labstore/manifests/device_backup.pp
@@ -33,7 +33,7 @@
 weekday => $day[$weekday],
 hour=> $hour,
 minute  => $minute,
-environment => 'MAILTO=labs-ad...@lists.wikimedia.org',
+environment => 'MAILTO=cloud-ad...@lists.wikimedia.org',
 require => File['/usr/local/sbin/snapshot-manager'],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I087b1a0f321e72c632b8be9113b42f8310b45042
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Muck with dependencies for the latest set of nsp warnings

[Arlolra (Code Review)]

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

Change subject: Muck with dependencies for the latest set of nsp warnings
..

Muck with dependencies for the latest set of nsp warnings

Change-Id: Ia4940d426bddd98ab7a4d7b43e0e32287540ec99
---
M .nsprc
M npm-shrinkwrap.json
M package.json
3 files changed, 15 insertions(+), 28 deletions(-)


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

diff --git a/.nsprc b/.nsprc
index d0da284..b800ece 100644
--- a/.nsprc
+++ b/.nsprc
@@ -1,5 +1,7 @@
 {
   "exceptions": [
-"https://nodesecurity.io/advisories/338;
+"https://nodesecurity.io/advisories/338;,
+// Not affected, https://github.com/expressjs/express/issues/3431
+"https://nodesecurity.io/advisories/535;
   ]
 }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 186df80..c3afcc7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -420,29 +420,19 @@
   }
 },
 "compression": {
-  "version": "1.7.0",
-  "from": "compression@1.7.0",
-  "resolved": 
"https://registry.npmjs.org/compression/-/compression-1.7.0.tgz;,
+  "version": "1.7.1",
+  "from": "compression@1.7.1",
+  "resolved": 
"https://registry.npmjs.org/compression/-/compression-1.7.1.tgz;,
   "dependencies": {
-"bytes": {
-  "version": "2.5.0",
-  "from": "bytes@2.5.0",
-  "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz;
-},
 "debug": {
-  "version": "2.6.8",
-  "from": "debug@2.6.8",
-  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz;
+  "version": "2.6.9",
+  "from": "debug@2.6.9",
+  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz;
 },
 "ms": {
   "version": "2.0.0",
   "from": "ms@2.0.0",
   "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz;
-},
-"safe-buffer": {
-  "version": "5.1.1",
-  "from": "safe-buffer@5.1.1",
-  "resolved": 
"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz;
 }
   }
 },
@@ -1002,18 +992,13 @@
   "dependencies": {
 "content-type": {
   "version": "1.0.4",
-  "from": "content-type@~1.0.2",
+  "from": "content-type@>=1.0.2 <1.1.0",
   "resolved": 
"https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz;
 },
 "debug": {
   "version": "2.6.9",
   "from": "debug@2.6.9",
   "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz;
-},
-"finalhandler": {
-  "version": "1.0.6",
-  "from": "finalhandler@>=1.0.6 <1.1.0",
-  "resolved": 
"https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz;
 },
 "ms": {
   "version": "2.0.0",
@@ -1066,9 +1051,9 @@
   "dev": true
 },
 "finalhandler": {
-  "version": "1.1.0",
-  "from": "finalhandler@1.1.0",
-  "resolved": 
"https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz;,
+  "version": "1.0.6",
+  "from": "finalhandler@1.0.6",
+  "resolved": 
"https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz;,
   "dependencies": {
 "debug": {
   "version": "2.6.9",
diff --git a/package.json b/package.json
index f0fa7a5..8f7dcc5 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 "async": "^0.9.2",
 "babybird": "^0.0.1",
 "body-parser": "^1.18.2",
-"compression": "^1.7.0",
+"compression": "^1.7.1",
 "connect-busboy": "^0.0.2",
 "content-type": "git+https://github.com/wikimedia/content-type#master;,
 "core-js": "^2.5.1",
@@ -16,7 +16,7 @@
 "entities": "^1.1.1",
 "express": "^4.15.5",
 "express-handlebars": "^3.0.0",
-"finalhandler": "^1.1.0",
+"finalhandler": "^1.0.6",
 "js-yaml": "^3.8.1",
 "mediawiki-title": "^0.6.4",
 "negotiator": 
"git+https://github.com/arlolra/negotiator#full-parse-access;,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: force ferm dns resolution to Ipv4

[Hashar (Code Review)]

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

Change subject: prometheus: force ferm dns resolution to Ipv4
..

prometheus: force ferm dns resolution to Ipv4

Labs lacks IPv6 and the class is installed on the deploymemt-memc*
hosts.

Bug: T176314
Change-Id: Ib58ecbd3a91dbcc0b7e212b643515d7f91e643fe
---
M modules/profile/manifests/prometheus/memcached_exporter.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/381073/1

diff --git a/modules/profile/manifests/prometheus/memcached_exporter.pp 
b/modules/profile/manifests/prometheus/memcached_exporter.pp
index 8d7bbd4..c29a174 100644
--- a/modules/profile/manifests/prometheus/memcached_exporter.pp
+++ b/modules/profile/manifests/prometheus/memcached_exporter.pp
@@ -3,11 +3,11 @@
 ) {
 prometheus::memcached_exporter { 'default': }
 $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
-$ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
+$ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), A))"
 
 ferm::service { 'prometheus-memcached-exporter':
 proto  => 'tcp',
 port   => '9150',
 srange => $ferm_srange,
 }
-}
\ No newline at end of file
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: replication should be a forced push

[Dzahn (Code Review)]

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

Change subject: Gerrit: replication should be a forced push
..


Gerrit: replication should be a forced push

Change-Id: Icc0752e6fd04e31f27c99abdeedc6325bf5fe7ef
---
M modules/gerrit/templates/replication.config.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/gerrit/templates/replication.config.erb 
b/modules/gerrit/templates/replication.config.erb
index ce527e6..5906c1f 100644
--- a/modules/gerrit/templates/replication.config.erb
+++ b/modules/gerrit/templates/replication.config.erb
@@ -4,6 +4,7 @@
 [gerrit]
   replicateOnStartup = false
   autoReload = true
+  defaultForceUpdate = true
 <%
 # replication is a hash which maps remote "names" to their URLs
 # and other settings.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc0752e6fd04e31f27c99abdeedc6325bf5fe7ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
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]: Gerrit: replication should be a forced push

[Chad (Code Review)]

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

Change subject: Gerrit: replication should be a forced push
..

Gerrit: replication should be a forced push

Change-Id: Icc0752e6fd04e31f27c99abdeedc6325bf5fe7ef
---
M modules/gerrit/templates/replication.config.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/381072/1

diff --git a/modules/gerrit/templates/replication.config.erb 
b/modules/gerrit/templates/replication.config.erb
index ce527e6..5906c1f 100644
--- a/modules/gerrit/templates/replication.config.erb
+++ b/modules/gerrit/templates/replication.config.erb
@@ -4,6 +4,7 @@
 [gerrit]
   replicateOnStartup = false
   autoReload = true
+  defaultForceUpdate = true
 <%
 # replication is a hash which maps remote "names" to their URLs
 # and other settings.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Revision::newFromTitle may return null

[Jdlrobson (Code Review)]

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

Change subject: Revision::newFromTitle may return null
..

Revision::newFromTitle may return null

Bug: T176882
Change-Id: I9aea25c2db81a12f16414edcb279f3241dc380bc
---
M includes/skins/SkinMinerva.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/71/381071/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index cc09b05..102bef4 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -746,7 +746,12 @@
$historyUrl = $title->getLocalURL( [ 'action' => 
'history' ] );
}
 
-   $editor = $this->getRevisionEditor( Revision::newFromTitle( 
$title ) );
+   $rev = Revision::newFromTitle( $title );
+   if ( $rev ) {
+   $editor = $this->getRevisionEditor( $rev );
+   } else {
+   $editor = false;
+   }
return [
// Use $edit['timestamp'] (Unix format) instead of 
$timestamp (MW format)
'data-timestamp' => $isMainPage ? '' : wfTimestamp( 
TS_UNIX, $timestamp ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aea25c2db81a12f16414edcb279f3241dc380bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolforge: Remove /usr/bin/sql

[Madhuvishy (Code Review)]

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

Change subject: toolforge: Remove /usr/bin/sql
..


toolforge: Remove /usr/bin/sql

The misctools debian package created from labs/toollabs.git contains
a rewrite of /usr/bin/sql to python3 that was added by Tim Landsheidt in
695c7fb, but we have not stopped overwriting it with the older bash
version.

Bug: T176688
Change-Id: I91cdc62ff27546351f593a83f090aa2dede0d736
---
D modules/toollabs/files/sql
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 0 insertions(+), 128 deletions(-)

Approvals:
  Madhuvishy: Looks good to me, approved
  Merlijn van Deen: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql
deleted file mode 100755
index 65f5314..000
--- a/modules/toollabs/files/sql
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-# this tool allow you to connect quickly to sql database
-# it should work for all newbies
-
-verbose=0
-
-function Log {
-if [ $verbose -eq 1 ];then
-   echo "$1"
-fi
-}
-
-if [ $# -lt 1 ];then
-echo "Usage: \"sql  [-vh]\" type sql --help for 
more help"
-exit 0
-fi
-
-if [ "$1" = "-h" ] || [ "$1" == "--help" ];then
-echo "Usage: sql [_p] [-vh] [command(s)]"
-   echo
-   echo "This tool allows you to easily open a connection to sql database 
without having to provide the credentials or a database host server"
-   echo "Example: sql frwiki_p"
-   echo
-   echo "Parameters:"
-   echo "  -v: verbose - produce various information about the resolution 
of db"
-   echo
-   echo "Report bugs to phabricator: https://phabricator.wikimedia.org;
-   exit 0
-fi
-
-for i
-do
-   if [ "$i" = "-v" ] || [ "$i" = "--verbose" ]
-   then
-   verbose=1
-   fi
-done
-
-if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ]
-then
-   Log "WARNING: There is no configuration file for mysql to use, you will 
probably be unable to access the database"
-fi
-
-param=""
-# check if the user has a replica file
-if [ -f ~/replica.my.cnf ];then
-param=" --defaults-file=~/replica.my.cnf"
-else
-if [ ! -f ~/.my.cnf ];then
-param=" -p"
-fi
-fi
-
-server="enwiki.labsdb"
-db="enwiki_p"
-
-case "$1" in
-"en" | "enwiki" | "enwiki_p")
-server="enwiki.labsdb"
-db="enwiki_p"
-;;
-"de" | "dewiki" | "dewiki_p")
-server="dewiki.labsdb"
-db="dewiki_p"
-;;
-"fr" | "frwiki" | "frwiki_p")
-server="frwiki.labsdb"
-db="frwiki_p"
-;;
-"cs" | "cswiki" | "cswiki_p")
-server="cswiki.labsdb"
-db="cswiki_p"
-;;
-"commons" | "commonswiki" | "commonswiki_p")
-server="commonswiki.labsdb"
-db="commonswiki_p"
-;;
-"wikidata" | "wikidatawiki" | "wikidatawiki_p")
-server="wikidatawiki.labsdb"
-db="wikidatawiki_p"
-;;
-"meta" | "meta_p")
-# Not to confuse with metawiki[_p]
-# 
https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database
-server="s7.labsdb"
-db="meta_p"
-;;
-"local")
-server=tools-db
-db=""
-if [ -f ~/.my.cnf ];then
-   param=""
-fi
-   ;;
-   *)
-   # we don't know what the database is so we check if it exist first
-   Log "This database name is not known by sql script, fallback to dblist 
resolution"
-   db="${1%_p}_p"
-   server="${db%_p}.labsdb"
-   if getent hosts -- "$server" > /dev/null
-   then
-   Log "Resolved to $server $db"
-   else
-   echo "Could not find requested database"
-if [ "$db" != "$1" ]; then
-echo 'Make sure to ask for a db in format of _p'
-fi
-   exit 1
-   fi
-   ;;
-esac
-
-shift
-Log "Connecting to $server"
-if [ $# -lt 1 ]; then
-  exec mysql $param -h $server $db "$@"
-else
-  echo "$@" | mysql $param -h $server $db
-fi
diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index f33c47a..53c73cb 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -401,14 +401,6 @@
 ensure => latest,
 }
 
-file { '/usr/bin/sql':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-source => 'puppet:///modules/toollabs/sql',
-}
-
 sysctl::parameters { 'tool labs':
 values => {
 'vm.overcommit_memory' => 2,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91cdc62ff27546351f593a83f090aa2dede0d736
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production

[MediaWiki-commits] [Gerrit] mediawiki...CategoryTree[master]: Remove hack and check for existent of message rootcategory

[Fomafix (Code Review)]

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

Change subject: Remove hack and check for existent of message rootcategory
..

Remove hack and check for existent of message rootcategory

Since 184658eb included in MediaWiki 1.28 not existing messages return
⧼rootcategory⧽ instead of .

Bug: T176904
Change-Id: I56b2f4f767abaa20fa2910ca8c40113de72785be
---
M CategoryTreePage.php
1 file changed, 7 insertions(+), 6 deletions(-)


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

diff --git a/CategoryTreePage.php b/CategoryTreePage.php
index 864cff9..c6501d9 100644
--- a/CategoryTreePage.php
+++ b/CategoryTreePage.php
@@ -49,15 +49,16 @@
if ( $par ) {
$this->target = $par;
} else {
-   $this->target = $request->getVal( 'target', $this->msg( 
'rootcategory' )->text() );
+   $this->target = $request->getVal( 'target' );
+   if ( $this->target === null ) {
+   $rootcategory = $this->msg( 'rootcategory' );
+   if ( $rootcategory->exists() ) {
+   $this->target = $rootcategory->text();
+   }
+   }
}
 
$this->target = trim( $this->target );
-
-   # HACK for undefined root category
-   if ( $this->target == '' || $this->target == 
'rootcategory' ) {
-   $this->target = null;
-   }
 
$options = [];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56b2f4f767abaa20fa2910ca8c40113de72785be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] mediawiki...MsCalendar[master]: Updated translation from riverbees

[MarkAHershberger (Code Review)]

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

Change subject: Updated translation from riverbees
..

Updated translation from riverbees

Change-Id: I6f23f2ce0c043b49b25f4f00f9da4e01f3108fd5
---
M i18n/fr.json
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/i18n/fr.json b/i18n/fr.json
index b3dcf58..85d6f8d 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1,10 +1,11 @@
 {
"@metadata": {
"authors": [
-   "mberthault"
+   "mberthault",
+"riverbees"
]
},
-   "msc-desc": "Adds the mscalendar tag to insert 
calendars into wiki pages",
+   "msc-desc": "Ajouter mscalendar pour insérer un 
calendrier dans une page dans le wiki.",
"msc-notfirstday": "Pas le premier jour... ",
"msc-change": "Confirmer",
"msc-remove": "Supprimer",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [WIP] Index descriptions for Wikibase

[Smalyshev (Code Review)]

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

Change subject: [WIP] Index descriptions for Wikibase
..

[WIP] Index descriptions for Wikibase

Bug: T176903
Change-Id: Ie304527c41c364e0bdb536cb04cb066fff6c6d7b
---
M repo/includes/Search/Elastic/Fields/DescriptionsField.php
M repo/includes/Search/Elastic/Fields/LabelsField.php
2 files changed, 32 insertions(+), 7 deletions(-)


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

diff --git a/repo/includes/Search/Elastic/Fields/DescriptionsField.php 
b/repo/includes/Search/Elastic/Fields/DescriptionsField.php
index 59bf1c4..66a4651 100644
--- a/repo/includes/Search/Elastic/Fields/DescriptionsField.php
+++ b/repo/includes/Search/Elastic/Fields/DescriptionsField.php
@@ -1,6 +1,7 @@
 languages = $languages;
+   parent::__construct( "", \SearchIndexField::INDEX_TYPE_NESTED );
}
 
/**
 * @param SearchEngine $engine
-* @param string $name
-* @return null|\SearchIndexField
+* @return null|array
 */
-   public function getMappingField( SearchEngine $engine, $name ) {
-   // TODO: no mapping for now, since we're only storing it for 
retrieval
-   // When we start indexing it, we'll need to figure out how to 
add proper analyzers
-   return null;
+   public function getMapping( SearchEngine $engine ) {
+   // Since we need a specially tuned field, we can not use
+   // standard search engine types.
+   if ( !( $engine instanceof CirrusSearch ) ) {
+   // For now only Cirrus/Elastic is supported
+   return [];
+   }
+
+   $config = [
+   'type' => 'object',
+   'properties' => []
+   ];
+   foreach ( $this->languages as $language ) {
+   $langConfig = $this->getUnindexedField();
+
+   // FIXME: now this config copies labels, but should 
have proper analyzer handling
+   $langConfig['fields']['near_match_folded'] =
+   $this->getSubfield( 'near_match_asciifolding' );
+   $langConfig['fields']['near_match'] = 
$this->getSubfield( 'near_match' );
+   // TODO: should we also have *_all field? Or add 
descriptions to "all"?
+   $config['properties'][$language] = $langConfig;
+   }
+
+   return $config;
}
 
/**
diff --git a/repo/includes/Search/Elastic/Fields/LabelsField.php 
b/repo/includes/Search/Elastic/Fields/LabelsField.php
index d2f84b3..175679b 100644
--- a/repo/includes/Search/Elastic/Fields/LabelsField.php
+++ b/repo/includes/Search/Elastic/Fields/LabelsField.php
@@ -18,6 +18,10 @@
 */
private $languages;
 
+   /**
+* LabelsField constructor.
+* @param string[] $languages
+*/
public function __construct( $languages ) {
$this->languages = $languages;
parent::__construct( "", \SearchIndexField::INDEX_TYPE_NESTED );

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group1 to 1.31.0-wmf.1

[jenkins-bot (Code Review)]

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

Change subject: Group1 to 1.31.0-wmf.1
..


Group1 to 1.31.0-wmf.1

Change-Id: I591064abbe77b79afa81497f3b2d791fb204262a
---
M php
M wikiversions.json
2 files changed, 604 insertions(+), 604 deletions(-)

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



diff --git a/php b/php
index daf57b0..7c087ac 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.19
\ No newline at end of file
+php-1.31.0-wmf.1
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 72adfd1..9163aec 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.19",
-"aawikibooks": "php-1.30.0-wmf.19",
-"aawiktionary": "php-1.30.0-wmf.19",
+"aawikibooks": "php-1.31.0-wmf.1",
+"aawiktionary": "php-1.31.0-wmf.1",
 "abwiki": "php-1.30.0-wmf.19",
-"abwiktionary": "php-1.30.0-wmf.19",
+"abwiktionary": "php-1.31.0-wmf.1",
 "acewiki": "php-1.30.0-wmf.19",
-"advisorywiki": "php-1.30.0-wmf.19",
+"advisorywiki": "php-1.31.0-wmf.1",
 "adywiki": "php-1.30.0-wmf.19",
 "afwiki": "php-1.30.0-wmf.19",
-"afwikibooks": "php-1.30.0-wmf.19",
-"afwikiquote": "php-1.30.0-wmf.19",
-"afwiktionary": "php-1.30.0-wmf.19",
+"afwikibooks": "php-1.31.0-wmf.1",
+"afwikiquote": "php-1.31.0-wmf.1",
+"afwiktionary": "php-1.31.0-wmf.1",
 "akwiki": "php-1.30.0-wmf.19",
-"akwikibooks": "php-1.30.0-wmf.19",
-"akwiktionary": "php-1.30.0-wmf.19",
+"akwikibooks": "php-1.31.0-wmf.1",
+"akwiktionary": "php-1.31.0-wmf.1",
 "alswiki": "php-1.30.0-wmf.19",
-"alswikibooks": "php-1.30.0-wmf.19",
-"alswikiquote": "php-1.30.0-wmf.19",
-"alswiktionary": "php-1.30.0-wmf.19",
+"alswikibooks": "php-1.31.0-wmf.1",
+"alswikiquote": "php-1.31.0-wmf.1",
+"alswiktionary": "php-1.31.0-wmf.1",
 "amwiki": "php-1.30.0-wmf.19",
-"amwikiquote": "php-1.30.0-wmf.19",
-"amwiktionary": "php-1.30.0-wmf.19",
+"amwikiquote": "php-1.31.0-wmf.1",
+"amwiktionary": "php-1.31.0-wmf.1",
 "angwiki": "php-1.30.0-wmf.19",
-"angwikibooks": "php-1.30.0-wmf.19",
-"angwikiquote": "php-1.30.0-wmf.19",
-"angwikisource": "php-1.30.0-wmf.19",
-"angwiktionary": "php-1.30.0-wmf.19",
+"angwikibooks": "php-1.31.0-wmf.1",
+"angwikiquote": "php-1.31.0-wmf.1",
+"angwikisource": "php-1.31.0-wmf.1",
+"angwiktionary": "php-1.31.0-wmf.1",
 "anwiki": "php-1.30.0-wmf.19",
-"anwiktionary": "php-1.30.0-wmf.19",
+"anwiktionary": "php-1.31.0-wmf.1",
 "arbcom_cswiki": "php-1.30.0-wmf.19",
 "arbcom_dewiki": "php-1.30.0-wmf.19",
 "arbcom_enwiki": "php-1.30.0-wmf.19",
@@ -35,881 +35,881 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.19",
 "arcwiki": "php-1.30.0-wmf.19",
 "arwiki": "php-1.30.0-wmf.19",
-"arwikibooks": "php-1.30.0-wmf.19",
-"arwikimedia": "php-1.30.0-wmf.19",
-"arwikinews": "php-1.30.0-wmf.19",
-"arwikiquote": "php-1.30.0-wmf.19",
-"arwikisource": "php-1.30.0-wmf.19",
-"arwikiversity": "php-1.30.0-wmf.19",
-"arwiktionary": "php-1.30.0-wmf.19",
+"arwikibooks": "php-1.31.0-wmf.1",
+"arwikimedia": "php-1.31.0-wmf.1",
+"arwikinews": "php-1.31.0-wmf.1",
+"arwikiquote": "php-1.31.0-wmf.1",
+"arwikisource": "php-1.31.0-wmf.1",
+"arwikiversity": "php-1.31.0-wmf.1",
+"arwiktionary": "php-1.31.0-wmf.1",
 "arzwiki": "php-1.30.0-wmf.19",
 "astwiki": "php-1.30.0-wmf.19",
-"astwikibooks": "php-1.30.0-wmf.19",
-"astwikiquote": "php-1.30.0-wmf.19",
-"astwiktionary": "php-1.30.0-wmf.19",
+"astwikibooks": "php-1.31.0-wmf.1",
+"astwikiquote": "php-1.31.0-wmf.1",
+"astwiktionary": "php-1.31.0-wmf.1",
 "aswiki": "php-1.30.0-wmf.19",
-"aswikibooks": "php-1.30.0-wmf.19",
-"aswikisource": "php-1.30.0-wmf.19",
-"aswiktionary": "php-1.30.0-wmf.19",
+"aswikibooks": "php-1.31.0-wmf.1",
+"aswikisource": "php-1.31.0-wmf.1",
+"aswiktionary": "php-1.31.0-wmf.1",
 "atjwiki": "php-1.30.0-wmf.19",
-"auditcomwiki": "php-1.30.0-wmf.19",
+"auditcomwiki": "php-1.31.0-wmf.1",
 "avwiki": "php-1.30.0-wmf.19",
-"avwiktionary": "php-1.30.0-wmf.19",
+"avwiktionary": "php-1.31.0-wmf.1",
 "aywiki": "php-1.30.0-wmf.19",
-"aywikibooks": "php-1.30.0-wmf.19",
-"aywiktionary": "php-1.30.0-wmf.19",
+"aywikibooks": "php-1.31.0-wmf.1",
+"aywiktionary": "php-1.31.0-wmf.1",
 "azbwiki": "php-1.30.0-wmf.19",
 "azwiki": "php-1.30.0-wmf.19",
-"azwikibooks": "php-1.30.0-wmf.19",
-"azwikiquote": "php-1.30.0-wmf.19",
-"azwikisource": "php-1.30.0-wmf.19",
-"azwiktionary": "php-1.30.0-wmf.19",
+"azwikibooks": "php-1.31.0-wmf.1",
+"azwikiquote": "php-1.31.0-wmf.1",
+"azwikisource": "php-1.31.0-wmf.1",
+"azwiktionary":