date:20170403

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

2017-04-03 Thread jenkins-bot (Code Review)

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

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


db-eqiad.php: Depool db1034

db1034 needs an alter table
pool db1062 to take over db1034 temporarliy

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 84ef436..6a81d46 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -162,9 +162,9 @@
'db1041' => 0,   # B2 1.4TB  64GB, master
 #  'db1033' => 0,   # B2 1.4TB  64GB, old master
'db1028' => 0,   # B1 1.4TB  64GB, vslow, dump
-   'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+#  'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager #T160390
 #  'db1039' => 0,   # B2 1.4TB  64GB
-#  'db1062' => 1,   # D1 2.8TB 128GB, watchlist, recentchanges, 
contributions, logpager
+   'db1062' => 1,   # D1 2.8TB 128GB, watchlist, recentchanges, 
contributions, logpager #T160390
'db1079' => 300, # A2 3.6TB 512GB, api
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
@@ -420,19 +420,19 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'recentchanges' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'recentchangeslinked' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'contributions' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'logpager' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
],
 ],

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

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

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

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

2017-04-03 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1034

db1034 needs an alter table
pool db1062 to take over db1034 temporarliy

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 84ef436..6a81d46 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -162,9 +162,9 @@
'db1041' => 0,   # B2 1.4TB  64GB, master
 #  'db1033' => 0,   # B2 1.4TB  64GB, old master
'db1028' => 0,   # B1 1.4TB  64GB, vslow, dump
-   'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+#  'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager #T160390
 #  'db1039' => 0,   # B2 1.4TB  64GB
-#  'db1062' => 1,   # D1 2.8TB 128GB, watchlist, recentchanges, 
contributions, logpager
+   'db1062' => 1,   # D1 2.8TB 128GB, watchlist, recentchanges, 
contributions, logpager #T160390
'db1079' => 300, # A2 3.6TB 512GB, api
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
@@ -420,19 +420,19 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'recentchanges' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'recentchangeslinked' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'contributions' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
'logpager' => [
-   'db1034' => 1,
+   'db1062' => 1,
],
],
 ],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Exchange expected and actual parameters for assertEquals

2017-04-03 Thread Fomafix (Code Review)

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

Change subject: Exchange expected and actual parameters for assertEquals
..

Exchange expected and actual parameters for assertEquals

assertEquals from PHPUnit uses the first parameter as $expected and the second
parameter as $actual.
https://phpunit.de/manual/current/en/appendixes.assertions.html#appendixes.assertions.assertEquals

Change-Id: I4dad9d3e802ab838787c7c951f4076c450ea8d9e
---
M lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
M repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php
3 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php 
b/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
index d8f5ebb..18e4694 100644
--- a/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
+++ b/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
@@ -67,7 +67,7 @@
 
$result = $worker->getScript( $languageCode );
 
-   $this->assertEquals( $result, 'mw.config.set({"wbSiteDetails":' 
. $expected . '});' );
+   $this->assertEquals( 'mw.config.set({"wbSiteDetails":' . 
$expected . '});', $result );
}
 
public function getScriptProvider() {
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
index 7f2f324..948418a 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
@@ -72,7 +72,7 @@
/** @var Statement $statement */
$statement = reset( $statements );
$rank = $statement->getRank();
-   $this->assertEquals( $rank, $expectedRank, "No reference with 
expected hash" );
+   $this->assertEquals( $expectedRank, $rank, "No reference with 
expected hash" );
}
 
private function newItemWithClaim( $itemIdString, $mainSnak ) {
diff --git a/repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php 
b/repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php
index 6b63ed8..e015ef2 100644
--- a/repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php
+++ b/repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php
@@ -96,7 +96,7 @@
public function testGetPropertyAndDetailedValue( $snak, $expected ) {
$snakVisualizer = $this->newDifferencesSnakVisualizer();
$result = $snakVisualizer->getPropertyAndDetailedValue( $snak );
-   $this->assertEquals( $result, $expected );
+   $this->assertEquals( $expected, $result );
}
 
public function provideGetPropertyAndDetailedValue() {
@@ -115,7 +115,7 @@
public function testGetDetailedValue( $snak, $expected ) {
$snakVisualizer = $this->newDifferencesSnakVisualizer();
$result = $snakVisualizer->getDetailedValue( $snak );
-   $this->assertEquals( $result, $expected );
+   $this->assertEquals( $expected, $result );
}
 
public function provideGetDetailedValue() {
@@ -134,7 +134,7 @@
public function testGetPropertyAndValueHeader( $snak, $expected ) {
$snakVisualizer = $this->newDifferencesSnakVisualizer();
$result = $snakVisualizer->getPropertyAndValueHeader( $snak );
-   $this->assertEquals( $result, $expected );
+   $this->assertEquals( $expected, $result );
}
 
public function provideGetPropertyAndValueHeader() {
@@ -153,7 +153,7 @@
public function testGetPropertyHeader( $snak, $expected ) {
$snakVisualizer = $this->newDifferencesSnakVisualizer();
$result = $snakVisualizer->getPropertyHeader( $snak );
-   $this->assertEquals( $result, $expected );
+   $this->assertEquals( $expected, $result );
}
 
public function provideGetPropertyHeader() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dad9d3e802ab838787c7c951f4076c450ea8d9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
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] operations/puppet[production]: nagios_common: enhance check_ssl_certfile plugin

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: nagios_common: enhance check_ssl_certfile plugin
..

nagios_common: enhance check_ssl_certfile plugin

Change-Id: Id59027b11a702919a72acff8dd7d1d9619b04021
---
M modules/nagios_common/files/check_commands/check_ssl_certfile
1 file changed, 26 insertions(+), 9 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_ssl_certfile 
b/modules/nagios_common/files/check_commands/check_ssl_certfile
index 7068821..328dbc9 100755
--- a/modules/nagios_common/files/check_commands/check_ssl_certfile
+++ b/modules/nagios_common/files/check_commands/check_ssl_certfile
@@ -1,19 +1,36 @@
 #!/bin/bash
-if [ ! -f $1 ]; then
-echo "Cannot find cert file $1"
+# Icinga plugin to check expiration of a SSL certificate
+# https://phabricator.wikimedia.org/T116332
+#
+
+CERT_FILE=$1 # (full path to cert file)
+WARN_DAYS="30" # (days before expiry to show a WARN)
+CRIT_DAYS="15" # (days before expiry to show a CRIT)
+
+let WARN_SECS=$WARN_DAYS*24*60*60
+let CRIT_SECS=$CRIT_DAYS*24*60*60
+
+SSL=$(which openssl)
+SSL_ARGS="x509 -checkend"
+
+if [ ! -f $CERT_FILE ]; then
+echo "Cannot find cert file ${CERT_FILE}."
 exit 3
 fi
-openssl x509 -checkend 324000 -noout -in $1
-if [[ $? == 0 ]]; then
-echo "Cert $1 will not expire for at least 90 days"
+
+if (${SSL} ${SSL_ARGS} ${WARN_SECS} -noout -in ${CERT_FILE}); then
+echo "Cert ${CERT_FILE} will not expire for at least ${WARN_DAYS} days."
 exit 0
 else
-openssl x509 -checkend 108000 -noout -in $1
-if [[ $? == 0 ]]; then
-echo "Cert $1 will expire in less than 90 days"
+if (${SSL} ${SSL_ARGS} ${CRIT_SECS} -noout -in ${CERT_FILE}); then
+echo "Cert ${CERT_FILE} will expire in less than ${WARN_DAYS} days."
 exit 1
 else
-echo "Cert $1 will expire in less than 30 days"
+echo "Cert ${CERT_FILE} will expire in less than ${CRIT_DAYS} days."
 exit 2
 fi
 fi
+
+echo "plugin error. please check $0"
+exit 3
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id59027b11a702919a72acff8dd7d1d9619b04021
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] analytics/refinery[master]: Add zero carrier to druid pageviews

2017-04-03 Thread Joal (Code Review)

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

Change subject: Add zero carrier to druid pageviews
..

Add zero carrier to druid pageviews

The field was already populated in hive temporary extracted data,
but not passed to druid.

Bug: T161824
Change-Id: I27b5b9eed1f705b496cc7f774420b7e3c109d4d7
---
M oozie/pageview/druid/daily/load_pageview_daily.json.template
M oozie/pageview/druid/monthly/load_pageview_monthly.json.template
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/35/346235/1

diff --git a/oozie/pageview/druid/daily/load_pageview_daily.json.template 
b/oozie/pageview/druid/daily/load_pageview_daily.json.template
index 9873920..d892500 100644
--- a/oozie/pageview/druid/daily/load_pageview_daily.json.template
+++ b/oozie/pageview/druid/daily/load_pageview_daily.json.template
@@ -27,6 +27,7 @@
 "access_method",
 "agent_type",
 "referer_class",
+"zero",
 "continent",
 "country_code",
 "country",
diff --git a/oozie/pageview/druid/monthly/load_pageview_monthly.json.template 
b/oozie/pageview/druid/monthly/load_pageview_monthly.json.template
index 24307c7..4add06d 100644
--- a/oozie/pageview/druid/monthly/load_pageview_monthly.json.template
+++ b/oozie/pageview/druid/monthly/load_pageview_monthly.json.template
@@ -27,6 +27,7 @@
 "access_method",
 "agent_type",
 "referer_class",
+"zero",
 "continent",
 "country_code",
 "country",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27b5b9eed1f705b496cc7f774420b7e3c109d4d7
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Joal 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Add DynamoBagOStuff class

2017-04-03 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/335751 )

Change subject: [WIP] Add DynamoBagOStuff class
..

[WIP] Add DynamoBagOStuff class

Change-Id: I9865c85220220e359b1e2fcb9a20cb9ebaea417d
---
M autoload.php
A includes/libs/objectcache/DynamoBagOStuff.php
2 files changed, 370 insertions(+), 0 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index b871535..b884dfc 100644
--- a/autoload.php
+++ b/autoload.php
@@ -404,6 +404,7 @@
'DumpRev' => __DIR__ . '/maintenance/storage/dumpRev.php',
'DumpStringOutput' => __DIR__ . '/includes/export/DumpStringOutput.php',
'DuplicateJob' => __DIR__ . '/includes/jobqueue/jobs/DuplicateJob.php',
+   'DynamoBagOStuff' => __DIR__ . 
'/includes/libs/objectcache/DynamoBagOStuff.php',
'EditAction' => __DIR__ . '/includes/actions/EditAction.php',
'EditCLI' => __DIR__ . '/maintenance/edit.php',
'EditPage' => __DIR__ . '/includes/EditPage.php',
diff --git a/includes/libs/objectcache/DynamoBagOStuff.php 
b/includes/libs/objectcache/DynamoBagOStuff.php
new file mode 100644
index 000..b1d10fa
--- /dev/null
+++ b/includes/libs/objectcache/DynamoBagOStuff.php
@@ -0,0 +1,369 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Cache
+ */
+
+/**
+ * Base class for dynamo clients, geared towards 
https://github.com/Netflix/dyno
+ *
+ * The dyno daemon is open source and can use redis or memcached as a backend
+ *
+ * @ingroup Cache
+ */
+class DynamoBagOStuff extends BagOStuff {
+   /** @var string */
+   protected $accessKey;
+   /** @var string */
+   protected $secretKey;
+   /** @var string */
+   protected $authUrl;
+   /** @var string */
+   protected $storageUrl;
+   /** @var string */
+   protected $storageHost;
+   /** @var array */
+   protected $credentials;
+
+   /** @var MultiHttpClient */
+   protected $http;
+
+   function __construct( array $params ) {
+   parent::__construct( $params );
+
+   $this->accessKey = $params['accessKey'];
+   $this->secretKey = $params['secretKey'];
+   $this->authUrl = $params['authUrl'];
+   $this->storageUrl = $params['storageUrl'];
+
+   $urlInfo = parse_url( $this->storageUrl );
+   $this->storageHost = $urlInfo['host'];
+
+   $this->http = new MultiHttpClient( [] );
+   $this->attrMap[self::ATTR_SYNCWRITES] = 
self::QOS_SYNCWRITES_BE; // unreliable
+   }
+
+   protected function doGet( $key, $flags = 0 ) {
+   $casToken = null;
+
+   return $this->getWithToken( $key, $casToken, $flags );
+   }
+
+   protected function getWithToken( $key, &$casToken, $flags = 0 ) {
+   $result = $this->tryStorageRequest(
+   'GetItem',
+   [
+   'TableName' => 'ObjectCache',
+   'Key' => [
+   'Name' => [ 'S' => $key ]
+   ],
+   'ConsistentRead' => ( $flags & 
self::READ_LATEST ) ? true : false
+   ]
+   );
+
+   if ( is_array( $result ) && isset( $result['Item'] ) ) {
+   if ( $result['Item']['Expires'] < time() ) {
+   return false;
+   }
+
+   $casToken = $result['Item']['Token'];
+
+   return $this->unserialize( $result['Item']['Value'] );
+   }
+
+   return false;
+   }
+
+   public function set( $key, $value, $exptime = 0, $flags = 0 ) {
+   $type = is_int( $value ) ? 'I' : 'S';
+   $result = $this->tryStorageRequest(
+   'PutItem',
+   [
+   'TableName' => 'ObjectCache',
+   'Item' => [
+   'Name' => [ 'S' => $key ],
+   'Value' => [ $type => $this->serialize( 
$value ) ],
+   'Expires' => [ 'I' => time() + $exptime 
],
+   'Token' => mt_rand( 0, 2 ^ 31 - 1 )
+   ]
+   ]
+   );
+
+   if ( is_array( $result ) ) {
+   return true;
+   }
+
+   return false;
+   }
+
+   protected function cas( $casToken, $key, $value, $exptime = 0 ) {
+   $type = is_int( $value ) ? 'I' : 'S';
+   $result = $this->tryStorageRequest(
+   'UpdateItem',
+   [
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [WIP] Document and automate sources of static/project-logos

2017-04-03 Thread Krinkle (Code Review)

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

Change subject: [WIP] Document and automate sources of static/project-logos
..

[WIP] Document and automate sources of static/project-logos

Bug: T98640
Change-Id: I5c1c4c18bd8e290267f6a30f42cb4817cbf8b671
---
A project-logos.py
A project-logos.sh
2 files changed, 117 insertions(+), 0 deletions(-)


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

diff --git a/project-logos.py b/project-logos.py
new file mode 100644
index 000..c59c320
--- /dev/null
+++ b/project-logos.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+import os
+import re
+import sys
+
+import requests
+
+
+logoDir = './static/images/project-logos'
+
+logoUrls = {
+   # This is *not* the same as 
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/135px-Wikipedia-logo-v2-en.svg.png
+   # This PNG was tuned (long ago) for improved legibility at 135px
+   'enwiki': 
'https://upload.wikimedia.org/wikipedia/commons/d/d6/Wikipedia-logo-v2-en.png',
+   'abwiki': 
'https://upload.wikimedia.org/wikipedia/commons/5/5a/Wikipedia-logo-v2-ab.png'
+}
+
+logo15Urls = {}
+
+logo20Urls = {}
+
+print '\n wgLogo'
+for key, value in logoUrls.items():
+   filename = '%s.png' % key
+   print '[%s] %s %s' % (key, filename, value)
+   # TODO
+   # - Download url, save to filename in logoDir
+
+print '\n wgLogoHD["1.5x"]'
+for key, value in logo15Urls.items():
+   filename = '%s.png' % key
+   print '[%s] %s %s' % (key, filename, value)
+   # TODO
+   # - Download url, save to filename in logoDir
+
+
+print '\n wgLogoHD["2x"]'
+for key, value in logo20Urls.items():
+   filename = '%s.png' % key
+   print '[%s] %s %s' % (key, filename, value)
+   # TODO
+   # - Download url, save to filename in logoDir
+
+print '\n Clean up'
+for entry in os.listdir(logoDir):
+   if os.path.isfile(os.path.join(logoDir, entry)):
+   dbname = re.sub(r'(-(2|1.5)x)?\.png$', '', entry)
+   if entry.endswith('-2x.png'):
+   if dbname not in logo20Urls:
+   print 'Warning: Untracked %s (logo20Urls[%s] 
not set)' % (entry, dbname)
+   elif entry.endswith('-1.5x.png'):
+   if dbname not in logo15Urls:
+   print 'Warning: Untracked %s (logo15Urls[%s] 
not set)' % (entry, dbname)
+   elif dbname not in logoUrls:
+   print 'Warning: Untracked %s (logoUrls[%s] not 
set)' % (entry, dbname)
diff --git a/project-logos.sh b/project-logos.sh
new file mode 100755
index 000..a4e74ed
--- /dev/null
+++ b/project-logos.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash -eu
+# Bash 4 or higher required (associative arrays)
+declare -A logo_urls logo_15_urls logo_20_urls
+
+# Mapping of wiki dbnames to the image used for for $wgLogo.
+# Served from /static/images/project-logos/:dbname.png.
+logo_urls=(
+   # This is *not* the same as
+   # 
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/135px-Wikipedia-logo-v2-en.svg.png
+   # This PNG was hand-tuned long ago for improved text legibility at the 
small
+   # size of 135px
+   
["enwiki"]="https://upload.wikimedia.org/wikipedia/commons/d/d6/Wikipedia-logo-v2-en.png;
+   
["abwiki"]="https://upload.wikimedia.org/wikipedia/commons/5/5a/Wikipedia-logo-v2-ab.png;
+)
+
+logo_15_urls=(
+)
+
+logo_20_urls=(
+)
+
+echo " wgLogo"
+for dbname in "${!logo_urls[@]}"
+do
+   echo "$dbname: ${logo_urls[$dbname]}"
+done
+
+echo " Clean up"
+status=0
+for path in static/images/project-logos/*.png
+do
+   filename=$(basename "$path")
+   if [[ "$filename" != *"-"*"x.png" ]]; then
+   # wgLogo (dbname-variant.png)
+   dbname="${filename%.png}"
+   if [[ -z "${logo_urls[$dbname]:-}" ]]; then
+   # echo "Warning: Untracked $filename 
(logo_urls[$dbname] not set)"
+   status=1
+   fi
+   else
+   # wgLogoHD (dbname-variant-DDPXx.png)
+   dbname="${filename%-*.png}"
+   base="${filename%.png}"
+   dppx="${base##*-}" # Long match to also strip -variant
+   if [[ "$dppx" == "1.5x" ]]; then
+   if [[ -z "${logo_15_urls[$dbname]:-}" ]]; then
+   # echo "Warning: Untracked $filename 
(logo_15_urls[$dbname] not set)"
+   status=1
+   fi
+   elif [[ "$dppx" == "2x" ]]; then
+   if [[ -z "${logo_20_urls[$dbname]:-}" ]]; then
+   # echo "Warning: Untracked $filename 
(logo_20_urls[$dbname] not set)"
+

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Add text color option to configs of StatsUtil

2017-04-03 Thread Ladsgroup (Code Review)

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

Change subject: Add text color option to configs of StatsUtil
..

Add text color option to configs of StatsUtil

Bug: T162058
Change-Id: Ie1679417b6138bf6ac9a5d13ff2ec7b904f0f264
---
M Translate.php
M specials/SpecialLanguageStats.php
M utils/StatsTable.php
3 files changed, 21 insertions(+), 9 deletions(-)


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

diff --git a/Translate.php b/Translate.php
index 5df15ab..8d1b761 100644
--- a/Translate.php
+++ b/Translate.php
@@ -471,6 +471,7 @@
  * for each state.
  * The currently supported properties are:
  * * color: the color that is used for displaying the state in the tables.
+ * * textColor: Color of text when you want to change it. Only works if color 
is set
  * * right: additional right that is needed to set the state.
  * Users who have the translate-groupreview right can set this in
  * Special:Translate.
@@ -479,15 +480,15 @@
  * If the value is false, the workflow states feature is disabled.
  * State name can be up to 32 characters maximum.
  * Example:
- * $wgTranslateWorkflowStates = array(
- *  'new' => array( 'color' => 'FF' ), // red
- *  'needs_proofreading' => array( 'color' => 'FF' ), // blue
- *  'ready' => array( 'color' => '00' ), // yellow
- *  'published' => array(
+ * $wgTranslateWorkflowStates = [
+ *  'new' => [ 'color' => 'FF', 'textColor' => 'FF' ], // red with 
white text
+ *  'needs_proofreading' => [ 'color' => 'FF' ], // blue
+ *  'ready' => [ 'color' => '00' ], // yellow
+ *  'published' => [
  *  'color' => '00FF00', // green
  *  'right' => 'centralnotice-admin',
- *  ),
- * );
+ *  ],
+ * ];
  */
 $wgTranslateWorkflowStates = false;
 
diff --git a/specials/SpecialLanguageStats.php 
b/specials/SpecialLanguageStats.php
index f8473a0..81c26a9 100644
--- a/specials/SpecialLanguageStats.php
+++ b/specials/SpecialLanguageStats.php
@@ -333,6 +333,7 @@
 
$sortValue = -1;
$stateColor = '';
+   $textColor = '';
if ( isset( $stateConfig[$state] ) ) {
$sortIndex = array_flip( array_keys( $stateConfig ) );
$sortValue = $sortIndex[$state] + 1;
@@ -342,7 +343,10 @@
$stateColor = $stateConfig[$state];
} elseif ( isset( $stateConfig[$state]['color'] ) ) {
$stateColor = $stateConfig[$state]['color'];
+   if ( isset( $stateConfig[$state]['textColor'] ) 
) {
+   $textColor = 
$stateConfig[$state]['textColor'];
}
+
}
 
$stateMessage = $this->msg( "translate-workflow-state-$state" );
@@ -351,7 +355,8 @@
return "\n\t\t" . $this->table->element(
$stateText,
$stateColor,
-   $sortValue
+   $sortValue,
+   $textColor
);
}
 
diff --git a/utils/StatsTable.php b/utils/StatsTable.php
index 36d029a..61b2189 100644
--- a/utils/StatsTable.php
+++ b/utils/StatsTable.php
@@ -52,9 +52,10 @@
 * @param string $in Element contents.
 * @param string $bgcolor Backround color in ABABAB format.
 * @param string $sort Value used for sorting.
+* @param string $textColor Color of text in ABABAB format.
 * @return string Html td element.
 */
-   public function element( $in, $bgcolor = '', $sort = '' ) {
+   public function element( $in, $bgcolor = '', $sort = '', $textColor = 
'' ) {
$attributes = [];
 
if ( $sort ) {
@@ -64,8 +65,13 @@
if ( $bgcolor ) {
$attributes['style'] = 'background-color: #' . $bgcolor;
$attributes['class'] = 'hover-color';
+
+   if ( $textColor ) {
+   $attributes['style'] .= '; color: #' . 
$textColor;
+   }
}
 
+
$element = Html::element( 'td', $attributes, $in );
 
return $element;

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Convert RebaseServer tests to data provider

2017-04-03 Thread Catrope (Code Review)

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

Change subject: Convert RebaseServer tests to data provider
..

Convert RebaseServer tests to data provider

Also use a document and a surface in TestRebaseClient
to make things easier.

Change-Id: Ib565de328606ed9024256674b9fd197ecb4e7c0e
---
M tests/dm/ve.dm.RebaseServer.test.js
M tests/dm/ve.dm.TestRebaseClient.js
2 files changed, 238 insertions(+), 193 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/32/346232/1

diff --git a/tests/dm/ve.dm.RebaseServer.test.js 
b/tests/dm/ve.dm.RebaseServer.test.js
index b83763d..889ee3f 100644
--- a/tests/dm/ve.dm.RebaseServer.test.js
+++ b/tests/dm/ve.dm.RebaseServer.test.js
@@ -6,195 +6,237 @@
 
 QUnit.module( 've.dm.RebaseServer' );
 
-QUnit.test( 'Rebase', 43, function ( assert ) {
-   var origData = [ { type: 'paragraph' }, { type: '/paragraph' } ],
-   newSurface = function () {
-   return new ve.dm.Surface(
-   ve.dm.example.createExampleDocumentFromData( 
origData )
-   );
+QUnit.test( 'Rebase', function ( assert ) {
+   var cases = [
+   {
+   name: 'Concurrent insertions',
+   initialData: [ { type: 'paragraph' }, { type: 
'/paragraph' } ],
+   clients: [ '1', '2' ],
+   ops: [
+   // Client 1 submits abc
+   [ '1', 'apply', [
+   [ 'insert', 1, [ 'a' ], 3 ],
+   [ 'insert', 2, [ 'b' ], 3 ],
+   [ 'insert', 3, [ 'c' ], 3 ]
+   ] ],
+   // Client getHistorySummary() output looks 
like: confirmed/sent?/unsent!
+   // Obviously, the server only has confirmed 
items
+   [ '1', 'assertHist', 'abc!' ],
+   [ '1', 'submit' ],
+   [ '1', 'assertHist', 'abc?' ],
+   [ '1', 'deliver' ],
+   [ 'server', 'assertHist', 'abc' ],
+
+   // Client 2 submits AB
+   [ '2', 'apply', [
+   [ 'insert', 1, [ 'A' ], 3 ],
+   [ 'insert', 2, [ 'B' ], 3 ]
+   ] ],
+   [ '2', 'assertHist', 'AB!' ],
+   [ '2', 'submit' ],
+   [ '2', 'deliver' ],
+   // Server puts client 2's insertion after 
client 1's
+   [ 'server', 'assertHist', 'abcAB' ],
+
+   // Client 1 inserts bolded def
+   [ '1', 'apply', [
+   [ 'insert', 4, [ 'd', 'e', 'f' ], 3 ]
+   ] ],
+   [ '1', 'assertHist', 'abc?/def!' ],
+   // Client 1 receives confirmation of abc
+   [ '1', 'receive' ],
+   [ '1', 'assertHist', 'abc/def!' ],
+   // Client 1 submits def
+   [ '1', 'submit' ],
+   [ '1', 'assertHist', 'abc/def?' ],
+   [ '1', 'deliver' ],
+   // TODO: Explain why def ends up after AB?!
+   [ 'server', 'assertHist', 'abcABdef' ],
+
+   // Client 2 inserts underlined CD
+   [ '2', 'apply', [
+   [ 'insert', 3, [ 'C', 'D' ], 3 ]
+   ] ],
+   [ '2', 'assertHist', 'AB?/CD!' ],
+   // Client 2 receives abc and rebases over it
+   [ '2', 'receive' ],
+   [ '2', 'assertHist', 'abc/AB?/CD!' ],
+   // Client 2 receives confirmation of AB
+   [ '2', 'receive' ],
+   [ '2', 'assertHist', 'abcAB/CD!' ],
+   // Client 2 submits CD
+   [ '2', 'submit' ],
+   [ '2', 'assertHist', 'abcAB/CD?' ],
+   [ '2', 'deliver' ],
+   [ 'server', 'assertHist', 'abcABdefCD' ],
+
+   // Client 1 receives AB, rebases def over it
+   [ '1', 'receive' ],
+   [ '1',

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: tests: Factor out ve.dm.TestRebaseClient/Server into their o...

2017-04-03 Thread Catrope (Code Review)

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

Change subject: tests: Factor out ve.dm.TestRebaseClient/Server into their own 
files
..

tests: Factor out ve.dm.TestRebaseClient/Server into their own files

Change-Id: Ic94afeba02da38c09aa73b34a4d6b52a97f5b779
---
M build/modules.json
M tests/dm/ve.dm.RebaseServer.test.js
A tests/dm/ve.dm.TestRebaseClient.js
A tests/dm/ve.dm.TestRebaseServer.js
M tests/index.html
5 files changed, 195 insertions(+), 162 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/31/346231/1

diff --git a/build/modules.json b/build/modules.json
index 62a8dfe..7479862 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -676,6 +676,8 @@
"tests/dm/ve.dm.Transaction.test.js",
"tests/dm/ve.dm.TransactionBuilder.test.js",
"tests/dm/ve.dm.Change.test.js",
+   "tests/dm/ve.dm.TestRebaseClient.js",
+   "tests/dm/ve.dm.TestRebaseServer.js",
"tests/dm/ve.dm.RebaseServer.test.js",
"tests/dm/ve.dm.TransactionProcessor.test.js",
"tests/dm/ve.dm.APIResultsQueue.test.js",
diff --git a/tests/dm/ve.dm.RebaseServer.test.js 
b/tests/dm/ve.dm.RebaseServer.test.js
index 44dc837..b83763d 100644
--- a/tests/dm/ve.dm.RebaseServer.test.js
+++ b/tests/dm/ve.dm.RebaseServer.test.js
@@ -6,124 +6,6 @@
 
 QUnit.module( 've.dm.RebaseServer' );
 
-ve.dm.testHistorySummary = function ( change, commitLength, sentLength ) {
-   var committed, sent, unsent,
-   text = [];
-   if ( commitLength === undefined ) {
-   commitLength = change.transactions.length;
-   }
-   if ( sentLength === undefined ) {
-   sentLength = change.transactions.length;
-   }
-   committed = change.transactions.slice( 0, commitLength ),
-   sent = change.transactions.slice( commitLength, sentLength ),
-   unsent = change.transactions.slice( sentLength );
-
-   function joinText( transactions ) {
-   return transactions.map( function ( transaction ) {
-   return transaction.operations.filter( function ( op ) {
-   return op.type === 'replace';
-   } ).map( function ( op ) {
-   var text = [];
-   if ( op.remove.length ) {
-   text.push( '-(' + op.remove.map( 
function ( item ) {
-   return item[ 0 ];
-   } ).join( '' ) + ')' );
-   }
-   if ( op.insert.length ) {
-   text.push( op.insert.map( function ( 
item ) {
-   return item[ 0 ];
-   } ).join( '' ) );
-   }
-   return text.join( '' );
-   } ).join( '' );
-   } ).join( '' );
-   }
-   if ( committed.length ) {
-   text.push( joinText( committed ) );
-   }
-   if ( sent.length ) {
-   text.push( joinText( sent ) + '?' );
-   }
-   if ( unsent.length ) {
-   text.push( joinText( unsent ) + '!' );
-   }
-   return text.join( '/' );
-};
-
-ve.dm.TestRebaseServer = function VeDmRebaseServer() {
-   ve.dm.RebaseServer.apply( this );
-};
-
-OO.inheritClass( ve.dm.TestRebaseServer, ve.dm.RebaseServer );
-
-ve.dm.TestRebaseServer.prototype.historySummary = function historySummary() {
-   return ve.dm.testHistorySummary( this.getDocState( 'foo' ).history );
-};
-
-ve.dm.TestRebaseClient = function VeDmTestRebaseClient( server, sharedIncoming 
) {
-   ve.dm.RebaseClient.apply( this );
-   this.server = server;
-   this.sharedIncoming = sharedIncoming;
-   this.incomingPointer = 0;
-   this.outgoing = [];
-   this.outgoingPointer = 0;
-   this.history = new ve.dm.Change( 0, [], [], {} );
-   this.trueHistory = [];
-};
-
-OO.initClass( ve.dm.TestRebaseClient );
-OO.mixinClass( ve.dm.TestRebaseClient, ve.dm.RebaseClient );
-
-ve.dm.TestRebaseClient.prototype.historySummary = function () {
-   return ve.dm.testHistorySummary( this.history, this.commitLength, 
this.sentLength );
-};
-
-ve.dm.TestRebaseClient.prototype.getChangeSince = function ( start ) {
-   return this.history.mostRecent( start );
-};
-
-ve.dm.TestRebaseClient.prototype.sendChange = function ( backtrack, change ) {
-   this.outgoing.push( { backtrack: backtrack, change: change } );
-};
-
-ve.dm.TestRebaseClient.prototype.applyChange = function ( change ) {
-   var author = this.getAuthor();
-

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fix some indenting

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix some indenting
..


Fix some indenting

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

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



diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index c062b84..edab896 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -133,9 +133,9 @@
 
if ( selectPeri ) {
codeMirror.doc.setSelection(
-   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length ),
-   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length + selText.length )
-   );
+   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length ),
+   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length + selText.length )
+   );
}
} );
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6bb9a8875d053ddac564d6d74ad34c8c9b0332ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Pastakhov 
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...process-control[master]: Copy logging to stdout when run interactively

2017-04-03 Thread Awight (Code Review)

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

Change subject: Copy logging to stdout when run interactively
..

Copy logging to stdout when run interactively

Change-Id: I69cdf23df9e5e04384c2f306d8c3a1e69c56f805
---
M processcontrol/config.py
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/30/346230/1

diff --git a/processcontrol/config.py b/processcontrol/config.py
index c7771a4..8fd719c 100644
--- a/processcontrol/config.py
+++ b/processcontrol/config.py
@@ -2,6 +2,7 @@
 import logging
 import logging.config
 import os
+import sys
 import yaml
 
 
@@ -32,6 +33,9 @@
 # Set to the root logger.
 log = logging.getLogger()
 
+if sys.stdout.isatty():
+log.addHandler(logging.StreamHandler(sys.stdout))
+
 
 class Configuration():
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69cdf23df9e5e04384c2f306d8c3a1e69c56f805
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Fix undefined variable stateObject error

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix undefined variable stateObject error
..


Fix undefined variable stateObject error

Defines stateObject outside of if block so it is
always defined.

Bug:T161735
Change-Id: Icf098d6d3ddf4476cf5564ea97a90897798c58e3
---
M Quiz.class.php
1 file changed, 11 insertions(+), 8 deletions(-)

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



diff --git a/Quiz.class.php b/Quiz.class.php
index e97234b..81f5aea 100755
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -329,11 +329,16 @@
 
$this->mQuestionId++;
 
-   //this will generate the answers HTML code
+   // This will generate the answers HTML code
$answers = call_user_func(
array( $question, $question->mType . 'ParseObject' ),
$matches[3]
);
+
+   // Set default table title and style
+
+   $tableTitle = "";
+   $tableStyle = "";
 
$lState = $question->getState(); // right wrong or unanswered?
 
@@ -342,8 +347,6 @@
global $wgContLang;
$border = $wgContLang->isRTL() ? 'border-right' : 
'border-left';
$tableStyle = $border . ': 3px solid ' . 
self::getColor( $lState ) . ';';
-
-   $tableTitle = "";
 
// if the question is of type=simple
if ( $this->mIgnoringCoef ) {
@@ -386,13 +389,13 @@
$this->mState = 'error';
break;
}
-
-   $stateObject = array(
-   'tableStyle' => $tableStyle,
-   'tableTitle' => $tableTitle
-   );
}
 
+   $stateObject = array(
+   'tableStyle' => $tableStyle,
+   'tableTitle' => $tableTitle
+   );
+
return $templateParser->processTemplate(
'Question',
array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf098d6d3ddf4476cf5564ea97a90897798c58e3
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Mvolz 
Gerrit-Reviewer: Crisbal 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mvolz 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split out some internal methods in QuorumLockManager for rea...

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Split out some internal methods in QuorumLockManager for 
readability
..


Split out some internal methods in QuorumLockManager for readability

Change-Id: I74930b930b18110c9f20b945c87790f898258ad5
---
M includes/libs/lockmanager/QuorumLockManager.php
1 file changed, 38 insertions(+), 5 deletions(-)

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



diff --git a/includes/libs/lockmanager/QuorumLockManager.php 
b/includes/libs/lockmanager/QuorumLockManager.php
index a89d864..1d2e21a 100644
--- a/includes/libs/lockmanager/QuorumLockManager.php
+++ b/includes/libs/lockmanager/QuorumLockManager.php
@@ -127,6 +127,39 @@
 * @return StatusValue
 */
final protected function doLockingRequestBucket( $bucket, array 
$pathsByType ) {
+   return $this->collectPledgeQuorum(
+   $bucket,
+   function ( $lockSrv ) use ( $pathsByType ) {
+   return $this->getLocksOnServer( $lockSrv, 
$pathsByType );
+   }
+   );
+   }
+
+   /**
+* Attempt to release locks with the peers for a bucket
+*
+* @param int $bucket
+* @param array $pathsByType Map of LockManager::LOCK_* constants to 
lists of paths
+* @return StatusValue
+*/
+   final protected function doUnlockingRequestBucket( $bucket, array 
$pathsByType ) {
+   return $this->releasePledges(
+   $bucket,
+   function ( $lockSrv ) use ( $pathsByType ) {
+   return $this->freeLocksOnServer( $lockSrv, 
$pathsByType );
+   }
+   );
+   }
+
+   /**
+* Attempt to acquire pledges with the peers for a bucket.
+* This is all or nothing; if any key is already pledged then this 
totally fails.
+*
+* @param int $bucket
+* @param callable $callback Pledge method taking a server name and 
yeilding a StatusValue
+* @return StatusValue
+*/
+   final protected function collectPledgeQuorum( $bucket, callable 
$callback ) {
$status = StatusValue::newGood();
 
$yesVotes = 0; // locks made on trustable servers
@@ -141,7 +174,7 @@
continue; // server down?
}
// Attempt to acquire the lock on this peer
-   $status->merge( $this->getLocksOnServer( $lockSrv, 
$pathsByType ) );
+   $status->merge( $callback( $lockSrv ) );
if ( !$status->isOK() ) {
return $status; // vetoed; resource locked
}
@@ -162,13 +195,13 @@
}
 
/**
-* Attempt to release locks with the peers for a bucket
+* Attempt to release pledges with the peers for a bucket
 *
 * @param int $bucket
-* @param array $pathsByType Map of LockManager::LOCK_* constants to 
lists of paths
+* @param callable $callback Pledge method taking a server name and 
yeilding a StatusValue
 * @return StatusValue
 */
-   final protected function doUnlockingRequestBucket( $bucket, array 
$pathsByType ) {
+   final protected function releasePledges( $bucket, callable $callback ) {
$status = StatusValue::newGood();
 
$yesVotes = 0; // locks freed on trustable servers
@@ -180,7 +213,7 @@
$status->warning( 
'lockmanager-fail-svr-release', $lockSrv );
} else {
// Attempt to release the lock on this peer
-   $status->merge( $this->freeLocksOnServer( 
$lockSrv, $pathsByType ) );
+   $status->merge( $callback( $lockSrv ) );
++$yesVotes; // success for this peer
// Normally the first peers form the quorum, 
and the others are ignored.
// Ignore them in this case, but not when an 
alternative quorum was used.

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Protect against symlinks and ".." directory transversal

2017-04-03 Thread Awight (Code Review)

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

Change subject: Protect against symlinks and ".." directory transversal
..

Protect against symlinks and ".." directory transversal

Change-Id: I3010eb948e51c09ed7b18e94246b951aa4140634
---
M processcontrol/job_wrapper.py
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/29/346229/1

diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 3ec58bf..f3c9ca2 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -37,6 +37,10 @@
 def __init__(self, slug=None):
 self.global_config = config.GlobalConfiguration()
 self.config_path = job_path_for_slug(slug)
+
+# Validate that we're not allowing directory traversal.
+assert os.path.dirname(os.path.realpath(self.config_path)) == 
os.path.abspath(self.global_config.get("job_directory"))
+
 self.config = config.JobConfiguration(self.global_config, 
self.config_path)
 
 self.name = self.config.get("name")

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3010eb948e51c09ed7b18e94246b951aa4140634
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Admin UI: Consolidate and refactor client-side bucket change...

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Admin UI: Consolidate and refactor client-side bucket change 
handler
..


Admin UI: Consolidate and refactor client-side bucket change handler

Change-Id: I9ceac2de7e0738ffa8e9ac689b9c59420caed051
Bug: T144453
---
M resources/infrastructure/campaignManager.js
M resources/infrastructure/centralnotice.js
M special/SpecialCentralNotice.php
3 files changed, 39 insertions(+), 32 deletions(-)

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



diff --git a/resources/infrastructure/campaignManager.js 
b/resources/infrastructure/campaignManager.js
index af3acf8..69a5e15 100644
--- a/resources/infrastructure/campaignManager.js
+++ b/resources/infrastructure/campaignManager.js
@@ -65,17 +65,39 @@
$( '#balanced' ).click( updateWeightColumn );
 
function updateBuckets() {
-   var numCampaignBuckets = $( 'select#buckets :checked' ).val(),
-   i,
-   isBucketDisabled;
+   var numBuckets = getNumBuckets(),
+   maxNumBuckets = mw.config.get( 
'wgNoticeNumberOfBuckets' ),
+   bucketSelectors = $( 'select.bucketSelector' ),
+   i, isBucketDisabled;
 
-   if ( numCampaignBuckets ) {
-   for ( i = 0; i < mw.config.get( 
'wgNoticeNumberOfBuckets' ); i++ ) {
-   isBucketDisabled = ( i >= numCampaignBuckets );
+   // Change selected value of bucket selectors to only available 
buckets
+   bucketSelectors.each( function () {
+   var $selector = $( this ),
+   selectedVal = $selector.val();
 
-   $( 'select.bucketSelector option[value=' + i + 
']' ).prop( 'disabled', isBucketDisabled );
+   $selector.val( selectedVal % numBuckets );
+   } );
+
+   // If only one bucket is available, disable the selectors 
entirely
+   if ( numBuckets === 1 ) {
+   bucketSelectors.prop( 'disabled', true );
+
+   } else {
+   // If more than one bucket is available, enable 
selectors and set options to
+   // disabled or enabled, as appropriate
+   bucketSelectors.prop( 'disabled', false );
+
+   for ( i = 0; i < maxNumBuckets; i++ ) {
+   isBucketDisabled = ( i >= numBuckets );
+
+   bucketSelectors.find( 'option[value=' + i + ']' 
)
+   .prop( 'disabled', isBucketDisabled );
}
}
+   }
+
+   function getNumBuckets() {
+   return parseInt( $( 'select#buckets :selected' ).val(), 10 );
}
 
$( 'select#buckets' ).change( updateBuckets );
@@ -279,5 +301,9 @@
 
updateThrottle();
updateWeightColumn();
-   updateBuckets();
+
+   $( function () {
+   updateBuckets();
+   } );
+
 }( jQuery, mediaWiki ) );
diff --git a/resources/infrastructure/centralnotice.js 
b/resources/infrastructure/centralnotice.js
index 59935b9..9ff7d6a 100644
--- a/resources/infrastructure/centralnotice.js
+++ b/resources/infrastructure/centralnotice.js
@@ -104,28 +104,5 @@
$( '#geoMultiSelector' ).fadeOut( 'fast' );
}
} );
-
-   // Bucketing! Disable bucket selectors if #buckets is not 
checked.
-   $( '#buckets' ).change( function () {
-   var numBuckets = parseInt( this[ this.selectedIndex 
].value, 10 ),
-   buckets = $( 'select[id^="bucketSelector"]' );
-
-   if ( numBuckets === 1 ) {
-   buckets.prop( 'disabled', true );
-   } else {
-   buckets.prop( 'disabled', false );
-   // Go through and modify all the options -- 
disabling inappropriate ones
-   // and remapping the rings
-   buckets.each( function () {
-   var curBucket = parseInt( this[ 
this.selectedIndex ].value, 10 ),
-   i;
-   $( this ).val( curBucket % numBuckets );
-
-   for ( i = 0; i < this.options.length; 
i++ ) {
-   $( this.options[ i ] ).prop( 
'disabled', ( i >= numBuckets ) );
-   }
-   } );
-   }
-   } ).trigger( 'change' );

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable LoginNotify on wikis that don't have Echo

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Disable LoginNotify on wikis that don't have Echo
..


Disable LoginNotify on wikis that don't have Echo

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

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index e6d64a4..4d1bd80 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -496,6 +496,7 @@
 
'wmgUseLoginNotify' => [
'default' => true, // T158878
+   'nonecho' => false,
],
 
'wmgUseRevisionSlider' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacc2942ad720bf6ad8f62c61c57cb3fa1c459017
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable LoginNotify on wikis that don't have Echo

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Disable LoginNotify on wikis that don't have Echo
..

Disable LoginNotify on wikis that don't have Echo

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


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index e6d64a4..4d1bd80 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -496,6 +496,7 @@
 
'wmgUseLoginNotify' => [
'default' => true, // T158878
+   'nonecho' => false,
],
 
'wmgUseRevisionSlider' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Add FIXME comments in centralnotice.js

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Add FIXME comments in centralnotice.js
..


Add FIXME comments in centralnotice.js

Change-Id: Id5c2b496a36343bc5fad5ee54412313c013ee9d9
Bug: T144453
---
M resources/infrastructure/centralnotice.js
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/resources/infrastructure/centralnotice.js 
b/resources/infrastructure/centralnotice.js
index f90f4f0..59935b9 100644
--- a/resources/infrastructure/centralnotice.js
+++ b/resources/infrastructure/centralnotice.js
@@ -1,6 +1,10 @@
 /**
  * CentralNotice Administrative UI - Common Functions
  */
+
+// FIXME Encapsulate logic specific to Special:CentralNoticeLogs
+// FIXME Global functions
+
 ( function ( mw, $ ) {
mw.centralNotice = mw.centralNotice || {};
mw.centralNotice.adminUi = {};
@@ -81,8 +85,8 @@
);
 
// Do the fancy multiselector; but we have to wait for some 
arbitrary time until the
-   // CSS has been applied... Yes, this is an egregious hack until 
I rewrite the mutliselector
-   // to NOT suck -- e.g. make it dynamic... whoo...
+   // CSS has been applied.
+   // FIXME This is a hack.
setTimeout( function () {
$( 'select[multiple="multiple"]' ).multiselect(
{ sortable: false, dividerLocation: 0.5 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5c2b496a36343bc5fad5ee54412313c013ee9d9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Comments flagging possibly unused code for inline banner pre...

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Comments flagging possibly unused code for inline banner 
previews
..


Comments flagging possibly unused code for inline banner previews

Bug: T161907
Change-Id: I393c663c5da9181658463b50f1aa136297c78259
---
M includes/CNBannerPager.php
M includes/HtmlFormElements/HTMLCentralNoticeBanner.php
M resources/infrastructure/centralnotice.js
M special/SpecialCentralNoticeBanners.php
4 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/includes/CNBannerPager.php b/includes/CNBannerPager.php
index 58eb8b5..739e4f2 100644
--- a/includes/CNBannerPager.php
+++ b/includes/CNBannerPager.php
@@ -1,5 +1,7 @@
  'preview',
'class' => 'HTMLCentralNoticeBanner',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I393c663c5da9181658463b50f1aa136297c78259
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: add location to Bytemark (UK) mirror

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: dumps: add location to Bytemark (UK) mirror
..


dumps: add location to Bytemark (UK) mirror

Change-Id: If32cd4107e6a9f0b1dcdc9fb5942941a5cda1ce8
---
M modules/dataset/files/html/public_mirrors.html
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/dataset/files/html/public_mirrors.html 
b/modules/dataset/files/html/public_mirrors.html
index 37e6d02..fe2300c 100644
--- a/modules/dataset/files/html/public_mirrors.html
+++ b/modules/dataset/files/html/public_mirrors.html
@@ -53,6 +53,9 @@
https://wikimedia.bytemark.co.uk/;>https://wikimedia.bytemark.co.uk/
http://wikimedia.bytemark.co.uk/;>http://wikimedia.bytemark.co.uk/
  
+ 
+ United Kingdom
+ 


  

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If32cd4107e6a9f0b1dcdc9fb5942941a5cda1ce8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add location of Bytemark mirror

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Add location of Bytemark mirror
..

Add location of Bytemark mirror

Bug: T159331
Change-Id: I8ca9dbe478ab2a1ec7a2631af0de9370d448
---
M modules/dataset/files/html/public_mirrors.html
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/dataset/files/html/public_mirrors.html 
b/modules/dataset/files/html/public_mirrors.html
index 37e6d02..10c8a3e 100644
--- a/modules/dataset/files/html/public_mirrors.html
+++ b/modules/dataset/files/html/public_mirrors.html
@@ -53,6 +53,9 @@
https://wikimedia.bytemark.co.uk/;>https://wikimedia.bytemark.co.uk/
http://wikimedia.bytemark.co.uk/;>http://wikimedia.bytemark.co.uk/
  
+ 
+   United Kingdom
+ 


  

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: add location to Bytemark (UK) mirror

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: dumps: add location to Bytemark (UK) mirror
..

dumps: add location to Bytemark (UK) mirror

Change-Id: If32cd4107e6a9f0b1dcdc9fb5942941a5cda1ce8
---
M modules/dataset/files/html/public_mirrors.html
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/dataset/files/html/public_mirrors.html 
b/modules/dataset/files/html/public_mirrors.html
index 37e6d02..fe2300c 100644
--- a/modules/dataset/files/html/public_mirrors.html
+++ b/modules/dataset/files/html/public_mirrors.html
@@ -53,6 +53,9 @@
https://wikimedia.bytemark.co.uk/;>https://wikimedia.bytemark.co.uk/
http://wikimedia.bytemark.co.uk/;>http://wikimedia.bytemark.co.uk/
  
+ 
+ United Kingdom
+ 


  

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Updated james-heinrich/getid3 v1.9.13 to v1.9.14

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Updated james-heinrich/getid3 v1.9.13 to v1.9.14
..

Updated james-heinrich/getid3 v1.9.13 to v1.9.14

https://github.com/JamesHeinrich/getID3/releases/tag/v1.9.14
https://github.com/JamesHeinrich/getID3/compare/v1.9.13...v1.9.14

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


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

diff --git a/composer.json b/composer.json
index fd492cf..83f4f96 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
"require": {
-   "james-heinrich/getid3": "v1.9.13"
+   "james-heinrich/getid3": "v1.9.14"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0683289d4586994fc79c0b621ba80d2acbe587ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update cssjanus/cssjanus from 1.1.3 to 1.2.0

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Update cssjanus/cssjanus from 1.1.3 to 1.2.0
..

Update cssjanus/cssjanus from 1.1.3 to 1.2.0

https://github.com/cssjanus/php-cssjanus/releases/tag/v1.2.0
https://github.com/cssjanus/php-cssjanus/compare/v1.1.3...v1.2.0

Change-Id: Iad2ea202b7724edc8360ce74943e2026f57e1f06
Depends-On: Iec366b794e38710102deaba771dba5cf7b412d5a
---
M RELEASE-NOTES-1.29
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/346222/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 964e0bb..2976204 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -65,7 +65,7 @@
  Upgraded external libraries 
 * Added wikimedia/timestamp v1.0.0.
 * Updated QUnit from v1.22.0 to v1.23.1.
-* Updated cssjanus from v1.1.2 to 1.1.3.
+* Updated cssjanus from v1.1.2 to v1.2.0.
 * Updated psr/log from v1.0.0 to v1.0.2.
 * Update Moment.js from v2.8.4 to v2.15.0.
 * Updated oyejorge/less.php from v1.7.0.10 to v1.7.0.13.
diff --git a/composer.json b/composer.json
index 348f9a3..b9ce942 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
},
"require": {
"composer/semver": "1.4.2",
-   "cssjanus/cssjanus": "1.1.3",
+   "cssjanus/cssjanus": "1.2.0",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-json": "*",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update oyejorge/less.php v1.7.0.13 to v1.7.0.14

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Update oyejorge/less.php v1.7.0.13 to v1.7.0.14
..

Update oyejorge/less.php v1.7.0.13 to v1.7.0.14

https://github.com/oyejorge/less.php/releases/tag/v1.7.0.14
https://github.com/oyejorge/less.php/compare/v1.7.0.13...v1.7.0.14

Change-Id: Ibf7cc4704fae5890093e6855403d93b0a2b1b97f
Depends-On: Ie641cf2954c39fd84ab26a92ad3028a49c15926d
---
M RELEASE-NOTES-1.29
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/346223/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 2976204..7458d4d 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -68,7 +68,7 @@
 * Updated cssjanus from v1.1.2 to v1.2.0.
 * Updated psr/log from v1.0.0 to v1.0.2.
 * Update Moment.js from v2.8.4 to v2.15.0.
-* Updated oyejorge/less.php from v1.7.0.10 to v1.7.0.13.
+* Updated oyejorge/less.php from v1.7.0.10 to v1.7.0.14.
 * Added wikimedia/remex-html v1.0.1.
 * Updated monolog from v1.18.2 to 1.22.1.
 * Updated wikimedia/composer-merge-plugin from v1.3.1 to v1.4.0.
diff --git a/composer.json b/composer.json
index b9ce942..81abe40 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
"liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
"oojs/oojs-ui": "0.20.2",
-   "oyejorge/less.php": "1.7.0.13",
+   "oyejorge/less.php": "1.7.0.14",
"php": ">=5.5.9",
"psr/log": "1.0.2",
"wikimedia/assert": "0.2.2",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move new external libraries to correct RELEASE-NOTES section

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Move new external libraries to correct RELEASE-NOTES section
..

Move new external libraries to correct RELEASE-NOTES section

Change-Id: I420ee75026847ce33d91b04534c9e960db557130
---
M RELEASE-NOTES-1.29
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 7458d4d..9e49e56 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -63,17 +63,17 @@
 === External library changes in 1.29 ===
 
  Upgraded external libraries 
-* Added wikimedia/timestamp v1.0.0.
 * Updated QUnit from v1.22.0 to v1.23.1.
 * Updated cssjanus from v1.1.2 to v1.2.0.
 * Updated psr/log from v1.0.0 to v1.0.2.
 * Update Moment.js from v2.8.4 to v2.15.0.
 * Updated oyejorge/less.php from v1.7.0.10 to v1.7.0.14.
-* Added wikimedia/remex-html v1.0.1.
 * Updated monolog from v1.18.2 to 1.22.1.
 * Updated wikimedia/composer-merge-plugin from v1.3.1 to v1.4.0.
 
  New external libraries 
+* Added wikimedia/timestamp v1.0.0.
+* Added wikimedia/remex-html v1.0.1.
 
  Removed and replaced external libraries 
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update composer-merge-plugin from 1.3.1 to 1.4.0

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Update composer-merge-plugin from 1.3.1 to 1.4.0
..

Update composer-merge-plugin from 1.3.1 to 1.4.0

https://github.com/wikimedia/composer-merge-plugin/releases/tag/v1.4.0
https://github.com/wikimedia/composer-merge-plugin/compare/v1.3.1...v1.4.0

Change-Id: I3e01a632b764f7903291d0141243e6210da9bebe
Depends-On: I0c96d9a630ab25ff4269af25a660c5bd7837a9dc
---
M RELEASE-NOTES-1.29
M composer.json
2 files changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 08bfae7..964e0bb 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -71,6 +71,7 @@
 * Updated oyejorge/less.php from v1.7.0.10 to v1.7.0.13.
 * Added wikimedia/remex-html v1.0.1.
 * Updated monolog from v1.18.2 to 1.22.1.
+* Updated wikimedia/composer-merge-plugin from v1.3.1 to v1.4.0.
 
  New external libraries 
 
diff --git a/composer.json b/composer.json
index c0f23dc..348f9a3 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
"wikimedia/base-convert": "1.0.1",
"wikimedia/cdb": "1.4.1",
"wikimedia/cldr-plural-rule-parser": "1.0.0",
-   "wikimedia/composer-merge-plugin": "1.3.1",
+   "wikimedia/composer-merge-plugin": "1.4.0",
"wikimedia/html-formatter": "1.0.1",
"wikimedia/ip-set": "1.1.0",
"wikimedia/php-session-serializer": "1.0.4",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: hhvm: kill a precise reference

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: hhvm: kill a precise reference
..


hhvm: kill a precise reference

The hhvm module never supported precise and it had a require_os()
statement, which is now useless.

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

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



diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 40956f1..bab3bfb 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -70,7 +70,6 @@
 $cache_dir  = '/var/cache/hhvm',
 $malloc_arenas  = undef,
 ) {
-requires_os('ubuntu >= trusty || Debian >= jessie')
 
 
 ## Packages

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I293ab7db6ecdc329d71152bc5eaed9138f313027
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update composer-merge-plugin from 1.3.1 to 1.4.0

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Update composer-merge-plugin from 1.3.1 to 1.4.0
..

Update composer-merge-plugin from 1.3.1 to 1.4.0

https://github.com/wikimedia/composer-merge-plugin/releases/tag/v1.4.0
https://github.com/wikimedia/composer-merge-plugin/compare/v1.3.1...v1.4.0

Change-Id: I0c96d9a630ab25ff4269af25a660c5bd7837a9dc
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
M wikimedia/composer-merge-plugin/README.md
M wikimedia/composer-merge-plugin/composer.json
M wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
A wikimedia/composer-merge-plugin/src/Merge/NestedArray.php
M wikimedia/composer-merge-plugin/src/Merge/PluginState.php
M wikimedia/composer-merge-plugin/src/MergePlugin.php
11 files changed, 510 insertions(+), 114 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/17/346217/1

diff --git a/composer.json b/composer.json
index 70a6f62..b67b275 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,7 @@
"wikimedia/base-convert": "1.0.1",
"wikimedia/cdb": "1.4.1",
"wikimedia/cldr-plural-rule-parser": "1.0.0",
-   "wikimedia/composer-merge-plugin": "1.3.1",
+   "wikimedia/composer-merge-plugin": "1.4.0",
"wikimedia/html-formatter": "1.0.1",
"wikimedia/ip-set": "1.1.0",
"wikimedia/php-session-serializer": "1.0.4",
diff --git a/composer.lock b/composer.lock
index f5c262a..b350064 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "761df02bd81f2c5e4e571d6c573b9d3e",
+"content-hash": "52bddc3ca284cbb5677b76117c71aede",
 "packages": [
 {
 "name": "composer/semver",
@@ -1509,16 +1509,16 @@
 },
 {
 "name": "wikimedia/composer-merge-plugin",
-"version": "v1.3.1",
+"version": "v1.4.0",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/composer-merge-plugin.git;,
-"reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
+"reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4;,
-"reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
+"url": 
"https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/ca453f9f13d8b05f86f20ea10be992a782e6f78c;,
+"reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c",
 "shasum": ""
 },
 "require": {
@@ -1526,7 +1526,7 @@
 "php": ">=5.3.2"
 },
 "require-dev": {
-"composer/composer": "1.0.*@dev",
+"composer/composer": "~1.0.0",
 "jakub-onderka/php-parallel-lint": "~0.8",
 "phpunit/phpunit": "~4.8|~5.0",
 "squizlabs/php_codesniffer": "~2.1.0"
@@ -1554,7 +1554,7 @@
 }
 ],
 "description": "Composer plugin to merge multiple composer.json 
files",
-"time": "2016-03-08T17:11:37+00:00"
+"time": "2017-03-13T16:52:55+00:00"
 },
 {
 "name": "wikimedia/html-formatter",
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index dd81997..3354bc7 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -681,6 +681,7 @@
 'Wikimedia\\Composer\\MergePlugin' => $vendorDir . 
'/wikimedia/composer-merge-plugin/src/MergePlugin.php',
 'Wikimedia\\Composer\\Merge\\ExtraPackage' => $vendorDir . 
'/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php',
 'Wikimedia\\Composer\\Merge\\MissingFileException' => $vendorDir . 
'/wikimedia/composer-merge-plugin/src/Merge/MissingFileException.php',
+'Wikimedia\\Composer\\Merge\\NestedArray' => $vendorDir . 
'/wikimedia/composer-merge-plugin/src/Merge/NestedArray.php',
 'Wikimedia\\Composer\\Merge\\PluginState' => $vendorDir . 
'/wikimedia/composer-merge-plugin/src/Merge/PluginState.php',
 'Wikimedia\\Composer\\Merge\\StabilityFlags' => $vendorDir . 
'/wikimedia/composer-merge-plugin/src/Merge/StabilityFlags.php',
 'Wikimedia\\PhpSessionSerializer' => $vendorDir . 
'/wikimedia/php-session-serializer/src/Wikimedia/PhpSessionSerializer.php',
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update oyejorge/less.php v1.7.0.13 to v1.7.0.14

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Update oyejorge/less.php v1.7.0.13 to v1.7.0.14
..

Update oyejorge/less.php v1.7.0.13 to v1.7.0.14

https://github.com/oyejorge/less.php/releases/tag/v1.7.0.14
https://github.com/oyejorge/less.php/compare/v1.7.0.13...v1.7.0.14

Change-Id: Ie641cf2954c39fd84ab26a92ad3028a49c15926d
---
M composer.json
M composer.lock
M composer/installed.json
M oyejorge/less.php/CHANGES.md
M oyejorge/less.php/composer.json
M oyejorge/less.php/lib/Less/Parser.php
M oyejorge/less.php/lib/Less/Visitor/toCSS.php
7 files changed, 88 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/19/346219/1

diff --git a/composer.json b/composer.json
index 709a28b..efa0ee4 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"monolog/monolog": "1.22.1",
"nmred/kafka-php": "0.1.5",
"oojs/oojs-ui": "0.20.2",
-   "oyejorge/less.php": "1.7.0.13",
+   "oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
"pear/mail_mime": "1.10.0",
diff --git a/composer.lock b/composer.lock
index 5fcfdff..2c22b39 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "9cdd1e9537ca7147f9d3944242c6e57d",
+"content-hash": "11576c6b571bc09ab9b97f3d91396326",
 "packages": [
 {
 "name": "composer/semver",
@@ -544,16 +544,16 @@
 },
 {
 "name": "oyejorge/less.php",
-"version": "v1.7.0.13",
+"version": "v1.7.0.14",
 "source": {
 "type": "git",
 "url": "https://github.com/oyejorge/less.php.git;,
-"reference": "f1bccbee4bc9c7fdb6873e8c246063e01365a9a8"
+"reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/oyejorge/less.php/zipball/f1bccbee4bc9c7fdb6873e8c246063e01365a9a8;,
-"reference": "f1bccbee4bc9c7fdb6873e8c246063e01365a9a8",
+"url": 
"https://api.github.com/repos/oyejorge/less.php/zipball/42925c5a01a07d67ca7e82dfc8fb31814d557bc9;,
+"reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9",
 "shasum": ""
 },
 "require": {
@@ -590,10 +590,6 @@
 {
 "name": "Josh Schmidt",
 "homepage": "https://github.com/oyejorge;
-},
-{
-"name": "Michaël Marinetti",
-"homepage": "https://github.com/Asenar;
 }
 ],
 "description": "PHP port of the Javascript version of LESS 
http://lesscss.org (Originally maintained by Josh Schmidt)",
@@ -606,7 +602,7 @@
 "php",
 "stylesheet"
 ],
-"time": "2017-02-23T14:18:55+00:00"
+"time": "2017-03-28T22:19:25+00:00"
 },
 {
 "name": "pear/console_getopt",
diff --git a/composer/installed.json b/composer/installed.json
index 96cbca6..9d25bef 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1733,74 +1733,6 @@
 "homepage": "https://www.mediawiki.org/wiki/Timestamp;
 },
 {
-"name": "oyejorge/less.php",
-"version": "v1.7.0.13",
-"version_normalized": "1.7.0.13",
-"source": {
-"type": "git",
-"url": "https://github.com/oyejorge/less.php.git;,
-"reference": "f1bccbee4bc9c7fdb6873e8c246063e01365a9a8"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/oyejorge/less.php/zipball/f1bccbee4bc9c7fdb6873e8c246063e01365a9a8;,
-"reference": "f1bccbee4bc9c7fdb6873e8c246063e01365a9a8",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3"
-},
-"require-dev": {
-"phpunit/phpunit": "~4.8.24"
-},
-"time": "2017-02-23T14:18:55+00:00",
-"bin": [
-"bin/lessc"
-],
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"psr-0": {
-"Less": "lib/"
-},
-"classmap": [
-"lessc.inc.php"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"Apache-2.0"
-],
-"authors": [
-{
-"name": "Matt

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update cssjanus/cssjanus from 1.1.3 to 1.2.0

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Update cssjanus/cssjanus from 1.1.3 to 1.2.0
..

Update cssjanus/cssjanus from 1.1.3 to 1.2.0

https://github.com/cssjanus/php-cssjanus/releases/tag/v1.2.0
https://github.com/cssjanus/php-cssjanus/compare/v1.1.3...v1.2.0

Change-Id: Iec366b794e38710102deaba771dba5cf7b412d5a
---
M composer.json
M composer.lock
M composer/autoload_namespaces.php
M composer/autoload_static.php
M composer/installed.json
M cssjanus/cssjanus/.travis.yml
M cssjanus/cssjanus/composer.json
M cssjanus/cssjanus/src/CSSJanus.php
M cssjanus/cssjanus/test/suites/CSSJanusTest.php
9 files changed, 139 insertions(+), 90 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/18/346218/1

diff --git a/composer.json b/composer.json
index b67b275..709a28b 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
],
"require": {
"composer/semver": "1.4.2",
-   "cssjanus/cssjanus": "1.1.3",
+   "cssjanus/cssjanus": "1.2.0",
"firebase/php-jwt": "4.0.0",
"james-heinrich/getid3": "1.9.13",
"justinrainbow/json-schema": "3.0.1",
diff --git a/composer.lock b/composer.lock
index b350064..5fcfdff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "52bddc3ca284cbb5677b76117c71aede",
+"content-hash": "9cdd1e9537ca7147f9d3944242c6e57d",
 "packages": [
 {
 "name": "composer/semver",
@@ -70,20 +70,20 @@
 },
 {
 "name": "cssjanus/cssjanus",
-"version": "v1.1.3",
+"version": "v1.2.0",
 "source": {
 "type": "git",
 "url": "https://github.com/cssjanus/php-cssjanus.git;,
-"reference": "1bd15af0d3f456eb651aea9e045b0c19b901d312"
+"reference": "0fd44d8a3f1f0f10bfb500b6b595240bf6415ffa"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/cssjanus/php-cssjanus/zipball/1bd15af0d3f456eb651aea9e045b0c19b901d312;,
-"reference": "1bd15af0d3f456eb651aea9e045b0c19b901d312",
+"url": 
"https://api.github.com/repos/cssjanus/php-cssjanus/zipball/0fd44d8a3f1f0f10bfb500b6b595240bf6415ffa;,
+"reference": "0fd44d8a3f1f0f10bfb500b6b595240bf6415ffa",
 "shasum": ""
 },
 "require": {
-"php": ">=5.3.3"
+"php": ">=5.4"
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.8.*",
@@ -101,7 +101,7 @@
 "Apache-2.0"
 ],
 "description": "Convert CSS stylesheets between left-to-right and 
right-to-left.",
-"time": "2016-12-24T09:16:21+00:00"
+"time": "2017-03-14T20:57:08+00:00"
 },
 {
 "name": "firebase/php-jwt",
diff --git a/composer/autoload_namespaces.php b/composer/autoload_namespaces.php
index a067a94..4be743c 100644
--- a/composer/autoload_namespaces.php
+++ b/composer/autoload_namespaces.php
@@ -16,5 +16,5 @@
 'Less' => array($vendorDir . '/oyejorge/less.php/lib'),
 'Kafka\\' => array($vendorDir . '/nmred/kafka-php/src'),
 'Console' => array($vendorDir . '/pear/console_getopt'),
-'' => array($vendorDir . '/cssjanus/cssjanus/src', $vendorDir . 
'/pear/pear-core-minimal/src'),
+'' => array($vendorDir . '/pear/pear-core-minimal/src', $vendorDir . 
'/cssjanus/cssjanus/src'),
 );
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 70e45d1..b185ef2 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -186,8 +186,8 @@
 );
 
 public static $fallbackDirsPsr0 = array (
-0 => __DIR__ . '/..' . '/cssjanus/cssjanus/src',
-1 => __DIR__ . '/..' . '/pear/pear-core-minimal/src',
+0 => __DIR__ . '/..' . '/pear/pear-core-minimal/src',
+1 => __DIR__ . '/..' . '/cssjanus/cssjanus/src',
 );
 
 public static $classMap = array (
diff --git a/composer/installed.json b/composer/installed.json
index f7c3020..96cbca6 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1438,43 +1438,6 @@
 "description": "PHP port of the TextCat language guesser utility, see 
http://odur.let.rug.nl/~vannoord/TextCat/.;
 },
 {
-"name": "cssjanus/cssjanus",
-"version": "v1.1.3",
-"version_normalized": "1.1.3.0",
-"source": {
-"type": "git",
-"url": "https://github.com/cssjanus/php-cssjanus.git;,
-"reference":

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add Bytemark to public_mirrors.html list

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: Add Bytemark to public_mirrors.html list
..


Add Bytemark to public_mirrors.html list

Bug: T159331
Change-Id: I2df93a919aaf2412d6984f3319615b35b65aafff
---
M modules/dataset/files/html/public_mirrors.html
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/modules/dataset/files/html/public_mirrors.html 
b/modules/dataset/files/html/public_mirrors.html
index 22212d1..37e6d02 100644
--- a/modules/dataset/files/html/public_mirrors.html
+++ b/modules/dataset/files/html/public_mirrors.html
@@ -44,6 +44,18 @@


  
+   Bytemark
+ 
+ 
+   Last 5 good XML dumps
+ 
+ 
+   https://wikimedia.bytemark.co.uk/;>https://wikimedia.bytemark.co.uk/
+   http://wikimedia.bytemark.co.uk/;>http://wikimedia.bytemark.co.uk/
+ 
+   
+   
+ 
C3SL
  
  

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2df93a919aaf2412d6984f3319615b35b65aafff
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
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] oojs/ui[master]: MediaWiki theme: Unifying padding on ButtonElement

2017-04-03 Thread VolkerE (Code Review)

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

Change subject: MediaWiki theme: Unifying padding on ButtonElement
..

MediaWiki theme: Unifying padding on ButtonElement

Unifying `padding` & positioning of labels/icons/indicators on
ButtonElement and derived widgets.
Also fixing IE 9 issue with `min-width` of framed icon-only buttons
and removing corresponding hack.

Bug: T161177
Change-Id: Ice3e3dc8e1c492934d44ab7d98fe3c31e600be35
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 53 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/16/346216/1

diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 06116f0..a0e6711 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -78,6 +78,10 @@
 @size-toggleswitch-grip-min: 16px;
 @size-dialog-bar-top: 44 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.4375em`≈`44px`
 
+@start-framed-icon-only: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px`; HACK: We have to break 
with `@padding-start-input-text-icon` to perfectly center in 
`@min-width-button-default`
+@start-framed-indicator-only: 13 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `1.09375em`≈`14px`; `@size-indicator + 2 * 
@border-width-default`
+@start-framed-square-indicator-only: 9 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.703125em`≈`9px`
+
 @width-button-combo-widget: @min-width-button-combo-widget;
 
 @height-icon-element: 100%;
@@ -118,6 +122,9 @@
 @padding-top-default: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
 @padding-bottom-default: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px`
 @padding-start-input-text-icon: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // As long as we have whitespace in icon canvas, we 
need reduced `padding-left`.
+@padding-start-icon: @size-icon;
+@padding-start-icon-only: 26 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `2.03125em`≈`26px`; 
@min-width-button-default - @padding-horizontal-default - 2 * 
@border-width-default;
+@padding-start-indicator-only: @padding-start-icon-only;
 @padding-start-input-text-icon-label: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 
 @box-shadow-dialog: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index eabe88c..39c50d7 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -63,12 +63,6 @@
}
 
&-frameless {
-   > .oo-ui-buttonElement-button {
-   .oo-ui-indicatorElement-indicator {
-   margin-right: 0;
-   }
-   }
-
&.oo-ui-labelElement {
> .oo-ui-buttonElement-button {
> .oo-ui-labelElement-label {
@@ -76,12 +70,6 @@
margin-right: 0.25em;
}
}
-   }
-
-   // Support `` from ButtonInputWidget
-   > input.oo-ui-buttonElement-button {
-   padding-left: 0.25em;
-   padding-right: 0.25em;
}
 
&.oo-ui-widget-enabled {
@@ -147,13 +135,6 @@
}
 
&-framed {
-   &.oo-ui-iconElement.oo-ui-labelElement,
-   &.oo-ui-iconElement.oo-ui-indicatorElement {
-   > .oo-ui-buttonElement-button {
-   padding-left: 
@padding-start-input-text-icon-label;
-   }
-   }
-
> .oo-ui-buttonElement-button {
position: relative;
min-height: @min-height-button-default;
@@ -161,15 +142,31 @@
padding: @padding-default;
}
 
-   &.oo-ui-iconElement > .oo-ui-buttonElement-button {
-   min-width: @min-width-button-default;
-   }
+   &.oo-ui-iconElement {
+   > .oo-ui-buttonElement-button {
+   padding-left: @padding-start-icon-only;
 
-   // Support: IE9
-   // Indirectly please IE9 as it doesn't like `min-width` on all 
kinds of buttons (T158728)
-   &.oo-ui-labelElement > .oo-ui-buttonElement-button,
-   &.oo-ui-indicatorElement > .oo-ui-buttonElement-button {
-   min-width: 0;
+   > .oo-ui-iconElement-icon {
+   display: block;
+

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update debian changelog for deb 0.7.0 release

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Update debian changelog for deb 0.7.0 release
..


Update debian changelog for deb 0.7.0 release

Change-Id: Iba3bca7565ede06ef6838a1d0984bc8af344f05c
---
M debian/changelog
1 file changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index 96b7271..0f6053e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+parsoid (0.7.0all) jessie-mediawiki; urgency=medium
+
+  * Updated bundled parsoid to git commit 95b84701
+  * See src/HISTORY.md for details of what changed in Parsoid
+
+  This is the last release with support for node 0.10.
+  Going forward, node v4 is required.
+  Wikimedia production version is now using node v6.
+
+  The only notable change in this release is a native Parsoid
+  implementation of the  extension. Besides that,
+  there have been a number of bug fixes.
+
+ -- Subramanya Sastry   Thu, 30 Mar 2017 15:40:38 -0500
+
 parsoid (0.6.1all) jessie-mediawiki; urgency=medium
 
   * Fixes to the broken 0.6.0 release
@@ -33,7 +48,7 @@
 
   * Security release: Fix reflected XSS security hole
 
- -- Subramanya Sastry   Mon, 31 Oct 2016 15:24:17 -0500
+ -- Subramanya Sastry   Mon, 31 Oct 2016 15:24:17 -0500
 
 parsoid (0.5.1all) jessie-mediawiki; urgency=medium
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3bca7565ede06ef6838a1d0984bc8af344f05c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: remove precise-wikimedia

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: aptrepo: remove precise-wikimedia
..


aptrepo: remove precise-wikimedia

precise is obsolete and gone now.

Change-Id: Iffb347d25d4f8b575cdc5cdd56d22a54e708774a
---
M modules/aptrepo/files/distributions-wikimedia
M modules/aptrepo/files/updates
M modules/aptrepo/templates/incoming-wikimedia.erb
3 files changed, 3 insertions(+), 28 deletions(-)

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



diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index 35ce22c..f4935b3 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -1,20 +1,5 @@
 Origin: Wikimedia
 Label: Wikimedia
-Suite: precise-wikimedia
-Codename: precise-wikimedia
-Version: 12.04
-Architectures: source amd64 i386
-Components: main universe non-free thirdparty mariadb
-UDebComponents: main
-Update: hwraid hp-mcp-precise
-Description: Wikimedia specific packages for Ubuntu Precise
-SignWith: 09DBD9F93F6CD44A
-DebOverride: deb-override
-Log:
- log
-
-Origin: Wikimedia
-Label: Wikimedia
 Suite: trusty-wikimedia
 Codename: trusty-wikimedia
 Version: 14.04
diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates
index 5a0cb4f..41a2f25 100644
--- a/modules/aptrepo/files/updates
+++ b/modules/aptrepo/files/updates
@@ -27,24 +27,14 @@
 ListShellHook: grep-dctrl -e -S 
'^(avro-libs|bigtop-jsvc|bigtop-tomcat|bigtop-utils|crunch|hadoop|hbase|hive|hue|impala|kite|llama|mahout|oozie|parquet|parquet-format|pig|pig-udf-datafu|sentry|solr|flume-ng|spark-core|sqoop|sqoop2|whirr|zookeeper)$'
 || [ $? -eq 1 ]
 
 Name: hwraid
-Method: http://hwraid.le-vert.net/ubuntu
+Method: http://hwraid.le-vert.net/debian
 Components: main>thirdparty
 UDebComponents:
 GetInRelease: no
-Suite: precise
+Suite: jessie
 Architectures: amd64 source
 VerifyRelease: 6005210E23B3D3B4
 ListShellHook: grep-dctrl -e -S '^megacli|arcconf|lsiutil$' || [ $? -eq 1 ]
-
-Name: hp-mcp-precise
-Method:  http://downloads.linux.hpe.com/SDR/repo/mcp
-Components: non-free>thirdparty
-UDebComponents:
-GetInRelease: no
-Suite: precise/current
-Architectures: amd64
-VerifyRelease: FADD8D64B1275EA3|C208ADDE26C2B797
-ListShellHook: grep-dctrl -e -S 
'^hp-health|hpssa|hpssacli|hpssaducli|hpacucli$' || [ $? -eq 1 ]
 
 Name: hp-mcp-trusty
 Method:  http://downloads.linux.hpe.com/SDR/repo/mcp
diff --git a/modules/aptrepo/templates/incoming-wikimedia.erb 
b/modules/aptrepo/templates/incoming-wikimedia.erb
index 2d1a7d2..f6ecb02 100644
--- a/modules/aptrepo/templates/incoming-wikimedia.erb
+++ b/modules/aptrepo/templates/incoming-wikimedia.erb
@@ -1,4 +1,4 @@
 Name: default
 IncomingDir: <%= @incomingdir %>
 TempDir: /tmp
-Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia stretch-wikimedia 
precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia
+Allow: trusty-wikimedia jessie-wikimedia stretch-wikimedia 
trusty>trusty-wikimedia jessie->jessie-wikimedia

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffb347d25d4f8b575cdc5cdd56d22a54e708774a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
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]: Bump version after release

2017-04-03 Thread Arlolra (Code Review)

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

Change subject: Bump version after release
..

Bump version after release

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


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

diff --git a/package.json b/package.json
index 92a383d..acc2832 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "parsoid",
   "description": "Mediawiki parser for the VisualEditor.",
-  "version": "0.7.0",
+  "version": "0.7.0+git",
   "license": "GPL-2.0+",
   "dependencies": {
 "async": "^0.9.2",

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Document hardcoded /etc path

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Document hardcoded /etc path
..


Document hardcoded /etc path

Change-Id: Id89f919f80724e6955f8480a33801bd672be9c10
---
M process-control.example.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/process-control.example.yaml b/process-control.example.yaml
index 0cbe639..f89ed3c 100644
--- a/process-control.example.yaml
+++ b/process-control.example.yaml
@@ -1,3 +1,6 @@
+# Example configuration with reasonable defaults.
+# Please copy to /etc/process-control.yaml and customize.
+
 # This is how each of your jobs will be formatted by cron-generate.
 cron_template: |
 # Generated from {source}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id89f919f80724e6955f8480a33801bd672be9c10
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fix some indenting

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Fix some indenting
..

Fix some indenting

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


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

diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index c062b84..edab896 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -133,9 +133,9 @@
 
if ( selectPeri ) {
codeMirror.doc.setSelection(
-   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length ),
-   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length + selText.length )
-   );
+   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length ),
+   
codeMirror.doc.posFromIndex( codeMirror.doc.indexFromPos( startCursor ) + 
pre.length + selText.length )
+   );
}
} );
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bb9a8875d053ddac564d6d74ad34c8c9b0332ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Type hint for $wgParser

2017-04-03 Thread Reedy (Code Review)

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

Change subject: Type hint for $wgParser
..

Type hint for $wgParser

Change-Id: I91356be31d1ed7a9e4dd1efd140c55a9d91cbc1e
---
M CodeMirror.hooks.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 4dc334a..f425499 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -89,6 +89,7 @@
 * @return array
 */
public static function getGlobalVariables( IContextSource $context ) {
+   /** @var Parser $wgParser */
global $wgParser;
 
// if we already created these variable array, return it

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91356be31d1ed7a9e4dd1efd140c55a9d91cbc1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaBadges[master]: Convert WikimediaBadges to extension registration

2017-04-03 Thread Krinkle (Code Review)

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

Change subject: Convert WikimediaBadges to extension registration
..


Convert WikimediaBadges to extension registration

Bug: T92980
Change-Id: Ib997c0906b9a4f3d6c33d09a5be67327e408157a
---
M WikimediaBadges.php
A extension.json
D resources/Resources.php
3 files changed, 52 insertions(+), 86 deletions(-)

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



diff --git a/WikimediaBadges.php b/WikimediaBadges.php
index f75594d..4b78bf4 100644
--- a/WikimediaBadges.php
+++ b/WikimediaBadges.php
@@ -13,57 +13,15 @@
  * @license GNU GPL v2+
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( 'Not an entry point.' );
-}
-
-if ( defined( 'WIKIMEDIA_BADGES_VERSION' ) ) {
-   // Do not initialize more than once.
-   return 1;
-}
-
-define( 'WIKIMEDIA_BADGES_VERSION', '0.1 alpha' );
-
-// This is the path to the autoloader generated by composer in case of a 
composer install.
-if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-   require_once __DIR__ . '/vendor/autoload.php';
-}
-
-$GLOBALS['wgMessagesDirs']['WikimediaBadges'] = __DIR__ . '/i18n';
-
-/**
- * The Property id of the commons category property.
- * This is used to construct the link target for the other projects
- * sidebar link to Wikimedia Commons.
- *
- * Set this to null in order to disable the other projects
- * sidebar replacement.
- */
-$GLOBALS['wgWikimediaBadgesCommonsCategoryProperty'] = 'P373';
-
-$GLOBALS['wgExtensionFunctions'][] = function() {
-   global $wgExtensionCredits, $wgHooks, $wgResourceModules;
-
-   $wgExtensionCredits['wikibase'][] = array(
-   'path' => __FILE__,
-   'name' => 'WikimediaBadges',
-   'version' => WIKIMEDIA_BADGES_VERSION,
-   'author' => array( '[https://www.mediawiki.org/wiki/User:Bene* 
Bene*]', 'Marius Hoch' ),
-   'url' => 'https://github.com/wmde/WikimediaBadges',
-   'descriptionmsg' => 'wikimediabadges-desc',
-   'license-name' => 'GPL-2.0+'
-   );
-
-   // Hooks
-   $wgHooks['BeforePageDisplay'][] = 
'WikimediaBadges\BeforePageDisplayHookHandler::onBeforePageDisplay';
-   $wgHooks['WikibaseClientOtherProjectsSidebar'][] = 
'WikimediaBadges\OtherProjectsSidebarHookHandler::addToSidebar';
-
-   // Register phpunit tests
-   $wgHooks['UnitTestsList'][] = function( array &$files ) {
-   $files[] =  __DIR__ . '/tests/phpunit';
-   };
-
-   // Resource Loader modules
-   $wgResourceModules = array_merge( $wgResourceModules, include __DIR__ . 
'/resources/Resources.php' );
-
-};
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'WikimediaBadges', __DIR__ . '/extension.json' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['WikimediaBadges'] = __DIR__ . '/i18n';
+   /*wfWarn(
+   'Deprecated PHP entry point used for WikimediaBadges extension. 
Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );*/
+   return;
+} else {
+   die( 'This version of the WikimediaBadges extension requires MediaWiki 
1.25+' );
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..016ecde
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,40 @@
+{
+   "name": "WikimediaBadges",
+   "version": "0.1 alpha",
+   "author": [
+   "[https://www.mediawiki.org/wiki/User:Bene* Bene*]",
+   "Marius Hoch"
+   ],
+   "url": "https://github.com/wmde/WikimediaBadges;,
+   "descriptionmsg": "wikimediabadges-desc",
+   "license-name": "GPL-2.0+",
+   "type": "wikibase",
+   "MessagesDirs": {
+   "WikimediaBadges": [
+   "i18n"
+   ]
+   },
+   "ResourceModules": {
+   "ext.wikimediaBadges": {
+   "position": "bottom",
+   "skinStyles": {
+   "vector": "skins/vector/wikimedia-badges.css",
+   "monobook": 
"skins/monobook/wikimedia-badges.css",
+   "cologneblue": 
"skins/cologneblue/wikimedia-badges.css",
+   "modern": "skins/modern/wikimedia-badges.css"
+   }
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "resources",
+   "remoteExtPath": "WikimediaBadges/resources"
+   },
+   "Hooks": {
+   "BeforePageDisplay": 
"WikimediaBadges\\BeforePageDisplayHookHandler::onBeforePageDisplay",
+   "WikibaseClientOtherProjectsSidebar": 
"WikimediaBadges\\OtherProjectsSidebarHookHandler::addToSidebar"

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Fix language change tooltip positioning

2017-04-03 Thread Code Review

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

Change subject: Fix language change tooltip positioning
..

Fix language change tooltip positioning

Use OOjs UI PopupWidget's new built-in positioning to position
the popup relative to the ULS trigger.

Bug: T161203
Change-Id: I3af45e2e3dbaea5f2e6435dd919a8bc7374e486e
---
M resources/js/ext.uls.interface.js
1 file changed, 4 insertions(+), 9 deletions(-)


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

diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index 9324328..e7114cd 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -193,17 +193,13 @@
}
 
function showTipsy( timeout ) {
-   var offset, tipsyTimer = 0;
-
-   // Position popup
-   offset = $ulsTrigger.offset();
-   ulsPopup.$element.css( {
-   top: offset.top + 24,
-   left: offset.left + $ulsTrigger.outerWidth() / 2
-   } );
+   var tipsyTimer = 0;
 
ulsPopup.toggle( true );
ulsPopup.toggleClipping( false );
+   // Position popup
+   ulsPopup.setFloatableContainer( $ulsTrigger );
+
// if the mouse is over the tooltip, do not hide
$( '.uls-tipsy' ).on( 'mouseover', function () {
window.clearTimeout( tipsyTimer );
@@ -242,7 +238,6 @@
ulsPopup = new OO.ui.PopupWidget( {
padded: true,
width: 300,
-   align: 'forwards',
classes: [ 'uls-tipsy' ],
$content: ( function () {
var link = $( '' ).text( previousAutonym )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3af45e2e3dbaea5f2e6435dd919a8bc7374e486e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
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...DeepSea[master]: Remove media toolbar as it's no longer needed

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Remove media toolbar as it's no longer needed
..


Remove media toolbar as it's no longer needed

Change-Id: I4c6164a132eb5dd3aeeb1909f721b0a2bc1610d8
---
M DeepSea.skin.php
M deepsea/big.css
M deepsea/example-colours.css
M deepsea/interactive.css
M deepsea/screen.css
M deepsea/small.css
M i18n/en.json
M i18n/qqq.json
M skin.json
9 files changed, 8 insertions(+), 96 deletions(-)

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



diff --git a/DeepSea.skin.php b/DeepSea.skin.php
index b7c89f0..9e5eb9e 100644
--- a/DeepSea.skin.php
+++ b/DeepSea.skin.php
@@ -172,7 +172,6 @@



-   renderNavigation( 'MEDIA' ); ?>
renderNavigation( 'PERSONAL' ); ?>

renderNavigation( array( 
'NAMESPACES', 'VARIANTS' ) ); ?>
@@ -450,60 +449,6 @@



- array(
-   'name' => 'Brickipedia',
-   'hover' => 'The LEGO 
Wiki'
-   ),
-   'gbc' => array(
-   'name' => 'GBC',
-   'hover' => 'Great Ball 
Contraptions'
-   )
-   );
-   global $bmProject;
-
-?>
-
-   Brickimedia Navigation
-   
-   
-   Brickimedia:
-   
-$info ) {
-   $liAttributes = array( 'title' => 
$info['hover'] );
-   // Empty class attribute makes W3C Validator 
sad, so add it
-   // only if we have a reason to!
-   if ( $bmProject == $code ) {
-   array_merge( $liAttributes, array( 
'class' => 'selected' ) );
-   }
-   $li = Html::openElement( 'li', $liAttributes );
-   echo $li . "\n"; // the newline is just to 
prettify the HTML output a bit :P
-   ?>
-   
-
-   
-   plain() ?>
-   plain() ?>
-   plain() ?>
-   plain() ?>
-   getSkin()->getTitle()->getPrefixedURL();
-   $thisPageMsg = wfMessage( 
'deepsea-this-page' )->plain();
-   echo "http://$code.brickimedia.org/wiki/{$thisTitle}\;>{$thisPageMsg}";
-   }
-   ?>
-   
-
-   
-   
-   
-
 
 https://www.mediawiki.org/wiki/Skin:DeepSea}};,
-   "deepsea-forums": "Link text in navigation bar\n{{Identical|Forum}}",
-   "deepsea-my-talk": "Link text in navigation bar",
-   "deepsea-this-page": "Link text in navigation bar\n{{Identical|This 
page}}",
"skinname-deepsea": "{{name}}"
 }
diff --git a/skin.json b/skin.json
index d4d23c7..fd3b2a7 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
 {
"name": "DeepSea",
"namemsg": "skinname-deepsea",
-   "version": "1.0.2",
+   "version": "1.0.3",
"author": [
"[https://mediawiki.org/wiki/User:UltrasonicNXT Adam Carter]",
"[https://mediawiki.org/wiki/User:GeorgeBarnick George 
Barnick]",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c6164a132eb5dd3aeeb1909f721b0a2bc1610d8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/DeepSea
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Fix "Mark as reviewed" tooltip positioning

2017-04-03 Thread Code Review

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

Change subject: Fix "Mark as reviewed" tooltip positioning
..

Fix "Mark as reviewed" tooltip positioning

OOjs UI's PopupWidget now tries to automatically position itself
relative to a container. This goes wrong here, because there's no
sensible container here.

Disable the built-in popup and anchor positioning, and apply our own
afterwards.

Bug: T162101
Change-Id: I3e4038c268bbf8b30f2405f34721ef28037533ec
---
M resources/js/ext.translate.messagetable.js
1 file changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/resources/js/ext.translate.messagetable.js 
b/resources/js/ext.translate.messagetable.js
index 5d8aa95..13abb38 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -278,11 +278,13 @@
}
 
offset = $icon.offset();
+   tooltip.$element.appendTo( 'body' );
+   tooltip.toggle( true ).toggleClipping( 
false ).togglePositioning( false );
tooltip.$element.css( {
top: offset.top + 
$icon.outerHeight() + 5,
-   left: offset.left + 
$icon.outerWidth() - 20
-   } ).appendTo( 'body' );
-   tooltip.toggleClipping( false ).toggle( 
true );
+   left: offset.left + 
$icon.outerWidth() - tooltip.$element.width() / 2
+   } );
+   tooltip.$anchor.css( 'margin-left', 
'50%' );
 
setTimeout( function () {
tooltip.$element.remove();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e4038c268bbf8b30f2405f34721ef28037533ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
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]: Deploy ParserMigration extension

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Deploy ParserMigration extension
..


Deploy ParserMigration extension

A tool to compare RemexHtml output with Tidy. Requires core later than
I5285c0b1c6f42891c002637cd3e4bd2f54615940

Also fix a comment which was accidentally moved away from its correct
location.

Bug: T141586
Change-Id: Id3c43149d8fecd0cfaa028403c64e7005db40144
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
3 files changed, 21 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ee261fa..4638db5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3512,12 +3512,25 @@
};
 }
 
-# THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED
-#
-# REALLY ... we're not kidding here ... NO EXTENSIONS AFTER
+if ( $wmgUseParserMigration ) {
+   wfLoadExtension( 'ParserMigration' );
+   $wgParserMigrationTidiers = [
+   [
+   'driver' => 'RaggettInternalHHVM',
+   'tidyConfigFile' => $wgTidyConf,
+   ],
+   [
+   'driver' => 'RemexHtml',
+   ],
+   ];
+}
 
 if ( $wmfRealm === 'labs' ) {
require( "$wmfConfigDir/CommonSettings-labs.php" );
 }
 
+# THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED
+#
+# REALLY ... we're not kidding here ... NO EXTENSIONS AFTER
+
 require( "$wmfConfigDir/ExtensionMessages-$wmgVersionNumber.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dd57464..c5cca91 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18457,6 +18457,10 @@
'foundationwiki' => true,
 ],
 
+'wmgUseParserMigration' => [
+   'default' => true,
+],
+
 ];
 
 ### WMF Labs override #
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 74c0728..b6b725f 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -93,6 +93,7 @@
 $IP/extensions/PageTriage/PageTriage.php
 $IP/extensions/PageViewInfo/extension.json
 $IP/extensions/ParserFunctions/extension.json
+$IP/extensions/ParserMigration/extension.json
 $IP/extensions/ParsoidBatchAPI/extension.json
 $IP/extensions/PdfHandler/extension.json
 $IP/extensions/Petition/extension.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3c43149d8fecd0cfaa028403c64e7005db40144
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src to 95b84701 for deb 0.7.0 release

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Bump src to 95b84701 for deb 0.7.0 release
..


Bump src to 95b84701 for deb 0.7.0 release

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

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



diff --git a/src b/src
index b1b2714..95b8470 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit b1b271460c341e844e21641b5307794cf4dd7feb
+Subproject commit 95b847013e2fba783716dfab644acda2ce75728d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57b5ce5e6032dca76b33e805388bc9f2ca5be39b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Test LoginNotify on Beta cluster

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Test LoginNotify on Beta cluster
..


Test LoginNotify on Beta cluster

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

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 2328f55..5cfb670 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -346,6 +346,10 @@
wfLoadSkin( 'Timeless' ); // T160643
 }
 
+if ( $wmgUseLoginNotify ) {
+   wfLoadExtension( 'LoginNotify' );
+}
+
 $wgMessageCacheType = CACHE_ACCEL;
 
 // Let Beta Cluster Commons do upload-from-URL from production Commons.
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6c321fa..e6d64a4 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -494,6 +494,10 @@
'default' => true,  // T127297
],
 
+   'wmgUseLoginNotify' => [
+   'default' => true, // T158878
+   ],
+
'wmgUseRevisionSlider' => [
'default' => true,  // T134770
],
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index da1257a..d94751d 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -7,3 +7,4 @@
 $IP/extensions/PerformanceInspector/extension.json
 $IP/extensions/Sentry/extension.json
 $IP/skins/Timeless/skin.json
+$IP/extensions/LoginNotify/extension.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I149fe7e82c26c2133b3e73dcf3a6ecf13a3dba8a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Force a pythonic build, ignoring the Makefile

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Force a pythonic build, ignoring the Makefile
..


Force a pythonic build, ignoring the Makefile

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

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



diff --git a/debian/rules b/debian/rules
index 6af70d4..e8722a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
 export PYBUILD_NAME=process-control
 
 %:
-   dh $@ --with python2
+   dh $@ --with=python2 --buildsystem=pybuild

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07b0eb432c4f6fc6709709eda58e0861117e49bf
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
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]: RCFilters: Work around IE11 rendering issues

2017-04-03 Thread Code Review

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

Change subject: RCFilters: Work around IE11 rendering issues
..

RCFilters: Work around IE11 rendering issues

Bug: T162098
Change-Id: Ia9410f2c41036f263decd47290899f20144e0a51
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/346210/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
index 0e38942..3d63831 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
@@ -44,6 +44,11 @@
// Override margin-top and -bottom rules from 
FieldLayout
margin: 0 !important; /* stylelint-disable-line 
declaration-no-important */
}
+
+   .oo-ui-checkboxInputWidget {
+   // Workaround for IE11 rendering issues. T162098
+   display: block;
+   }
}
 
&-highlightButton {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9410f2c41036f263decd47290899f20144e0a51
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] wikimedia...process-control[master]: Wrap yaml load in file context managers

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Wrap yaml load in file context managers
..


Wrap yaml load in file context managers

Change-Id: I8b424749ceb6dd55b8c0b729a0546ec654cdd650
---
M processcontrol/config.py
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/processcontrol/config.py b/processcontrol/config.py
index 2828293..c7771a4 100644
--- a/processcontrol/config.py
+++ b/processcontrol/config.py
@@ -85,7 +85,8 @@
 Later entries override earlier entries.
 """
 if os.access(CONFIG_PATH, os.R_OK):
-config = yaml.safe_load(open(CONFIG_PATH, "r"))
+with open(CONFIG_PATH, "r") as f:
+config = yaml.safe_load(f)
 self.values.update(config)
 
 self.validate_global_config()
@@ -107,7 +108,10 @@
 else:
 defaults = {}
 Configuration.__init__(self, defaults)
-self.values.update(yaml.safe_load(open(config_path, "r")))
+
+with open(config_path, "r") as f:
+self.values.update(yaml.safe_load(f))
+
 # TODO: Catch and interpret errors.
 self.validate_job_config()
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b424749ceb6dd55b8c0b729a0546ec654cdd650
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Cdentinger 
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...process-control[master]: Assert stderr goes to the output file

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Assert stderr goes to the output file
..


Assert stderr goes to the output file

Change-Id: Iaddb2bbae18a4e733842998995b6b84982b507af
---
M tests/test_job_wrapper.py
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py
index e02d3af..73cf23d 100644
--- a/tests/test_job_wrapper.py
+++ b/tests/test_job_wrapper.py
@@ -78,6 +78,9 @@
 assert ("errors", "ERROR", "grep: Invalid regular expression") in loglines
 # TODO: Should we go out of our way to log the non-zero return code as 
well?
 
+lines = get_output_lines("errors")
+assert "ERROR\tgrep: Invalid regular expression" in lines
+
 MockSmtp().sendmail.assert_called_once()
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaddb2bbae18a4e733842998995b6b84982b507af
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Cdentinger 
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]: Update HISTORY.md + bump version numbers to 0.7.0 for deb re...

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Update HISTORY.md + bump version numbers to 0.7.0 for deb 
release
..


Update HISTORY.md + bump version numbers to 0.7.0 for deb release

Change-Id: I46189fae2dc0b01b473c471a8a62d2f6204f3692
---
M HISTORY.md
M lib/ext/Cite/index.js
M lib/ext/Gallery/index.js
M lib/ext/Gallery/modes.js
M lib/ext/JSON/index.js
M lib/ext/LST/index.js
M lib/ext/Nowiki/index.js
M lib/ext/Pre/index.js
M lib/ext/Translate/index.js
M npm-shrinkwrap.json
M package.json
M tests/parserTestsParserHook.js
12 files changed, 14 insertions(+), 13 deletions(-)

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



diff --git a/HISTORY.md b/HISTORY.md
index dc009e3..cffbce4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,4 @@
-0.7.0 / -XX-XX
+0.7.0 / 2017-04-04
 ==
 
   wt -> html changes:
@@ -28,9 +28,10 @@
   * T160207: Fix serializing multi-line indent-pre w/ sol wt syntax
   * T133267: Escape extlink content when containing ] anywhere
   * T152633: Fix crasher from ConstrainedText
+  * T112043: Handle anchors without hrefs
   * Fix and cleanup domdiff annotations which fixes some edge case bugs
 
-  Extensions
+  Extensions:
   * T110910: Implement gallery extension natively inside Parsoid
   * T58381, T108216: Treat NOWIKI and html PRE as extension tags
   * Cite: T102134: Fix hrefs to render properly
diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index 1379725..7cdeddb 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -4,7 +4,7 @@
  * -- */
 'use strict';
 
-var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
+var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.7.0');
 var Util = ParsoidExtApi.Util;
 var DU = ParsoidExtApi.DOMUtils;
 var Promise = ParsoidExtApi.Promise;
diff --git a/lib/ext/Gallery/index.js b/lib/ext/Gallery/index.js
index b0bf1e6..33b3938 100644
--- a/lib/ext/Gallery/index.js
+++ b/lib/ext/Gallery/index.js
@@ -8,7 +8,7 @@
  */
 'use strict';
 
-var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
+var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.7.0');
 var Promise = ParsoidExtApi.Promise;
 var Util = ParsoidExtApi.Util;
 var DU = ParsoidExtApi.DOMUtils;
diff --git a/lib/ext/Gallery/modes.js b/lib/ext/Gallery/modes.js
index c16066b..d3c8df8 100644
--- a/lib/ext/Gallery/modes.js
+++ b/lib/ext/Gallery/modes.js
@@ -3,7 +3,7 @@
 var coreutil = require('util');
 var domino = require('domino');
 
-var ParsoidExtApi = 
module.parent.parent.require('./extapi.js').versionCheck('^0.6.1');
+var ParsoidExtApi = 
module.parent.parent.require('./extapi.js').versionCheck('^0.7.0');
 var DU = ParsoidExtApi.DOMUtils;
 var JSUtils = ParsoidExtApi.JSUtils;
 
diff --git a/lib/ext/JSON/index.js b/lib/ext/JSON/index.js
index 64a0fda..aa4171b 100644
--- a/lib/ext/JSON/index.js
+++ b/lib/ext/JSON/index.js
@@ -6,7 +6,7 @@
  * -- */
 'use strict';
 
-var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
+var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.7.0');
 var DU = ParsoidExtApi.DOMUtils;
 var Promise = ParsoidExtApi.Promise;
 var addMetaData = ParsoidExtApi.addMetaData;
diff --git a/lib/ext/LST/index.js b/lib/ext/LST/index.js
index 85b945c..5a09059 100644
--- a/lib/ext/LST/index.js
+++ b/lib/ext/LST/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
+var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.7.0');
 
 var DU = ParsoidExtApi.DOMUtils;
 var Promise = ParsoidExtApi.Promise;
diff --git a/lib/ext/Nowiki/index.js b/lib/ext/Nowiki/index.js
index dffd03e..d9ecbdb 100644
--- a/lib/ext/Nowiki/index.js
+++ b/lib/ext/Nowiki/index.js
@@ -8,7 +8,7 @@
 // functionality.  See T156099
 var PegTokenizer = require('../../wt2html/tokenizer.js').PegTokenizer;
 
-var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
+var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.7.0');
 var Promise = ParsoidExtApi.Promise;
 var Util = ParsoidExtApi.Util;
 var DU = ParsoidExtApi.DOMUtils;
diff --git a/lib/ext/Pre/index.js b/lib/ext/Pre/index.js
index 82129e4..f083501 100644
--- a/lib/ext/Pre/index.js
+++ b/lib/ext/Pre/index.js
@@ -4,7 +4,7 @@
  */
 'use strict';
 
-var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
+var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.7.0');
 
 var Util = ParsoidExtApi.Util;
 var defines = ParsoidExtApi.defines;
diff --git a/lib/ext/Translate/index.js b/lib/ext/Translate/index.js

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Only run jobs as the service user

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Only run jobs as the service user
..


Only run jobs as the service user

Change-Id: Ia12f06f07a1b4d77b6fa3f69fc121ab1c1b10419
---
M process-control.example.yaml
M processcontrol/job_wrapper.py
M tests/data/global_config/global_defaults.yaml
M tests/override_config.py
M tests/test_crontab.py
5 files changed, 17 insertions(+), 8 deletions(-)

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



diff --git a/process-control.example.yaml b/process-control.example.yaml
index 2891458..0cbe639 100644
--- a/process-control.example.yaml
+++ b/process-control.example.yaml
@@ -6,8 +6,8 @@
 # Absolute path to the job harness.
 runner_path: /usr/bin/run-job
 
-# Cron will setuid to this user before running the command.  Only use service
-# accounts, never privileged ones.
+# Enforce that jobs are run as this service user.
+# FIXME: new service user for this package.
 user: jenkins
 
 # Default values used when the job description doesn't have these keys.  See
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 5d83afb..3ec58bf 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -1,6 +1,7 @@
 import datetime
 import glob
 import os
+import pwd
 import shlex
 import subprocess
 import threading
@@ -61,6 +62,14 @@
 self.environment = {}
 
 def run(self):
+# Check that we are the service user.
+service_user = str(self.global_config.get("user"))
+if service_user.isdigit():
+passwd_entry = pwd.getpwuid(int(service_user))
+else:
+passwd_entry = pwd.getpwnam(service_user)
+assert passwd_entry.pw_uid == os.getuid()
+
 lock.begin(job_tag=self.slug)
 
 config.log.info("Running job {name} ({slug})".format(name=self.name, 
slug=self.slug))
diff --git a/tests/data/global_config/global_defaults.yaml 
b/tests/data/global_config/global_defaults.yaml
index e2ac795..daca679 100644
--- a/tests/data/global_config/global_defaults.yaml
+++ b/tests/data/global_config/global_defaults.yaml
@@ -6,10 +6,6 @@
 # Absolute path to the job harness.
 runner_path: /usr/bin/run-job
 
-# Cron will setuid to this user before running the command.  Only use service
-# accounts, never privileged ones.
-user: jenkins
-
 # Default values used when the job description doesn't have these keys.  See
 # the README for a discussion of how to configure jobs.
 default_job_config:
diff --git a/tests/override_config.py b/tests/override_config.py
index 973813e..b1ef2ed 100644
--- a/tests/override_config.py
+++ b/tests/override_config.py
@@ -21,6 +21,8 @@
 elif "job_directory" not in extra:
 extra["job_directory"] = data_dir
 
+extra["user"] = os.getuid()
+
 OverrideConfiguration.extra = extra
 
 global patcher
diff --git a/tests/test_crontab.py b/tests/test_crontab.py
index 4ae3927..a0bfbc3 100644
--- a/tests/test_crontab.py
+++ b/tests/test_crontab.py
@@ -1,3 +1,4 @@
+import os
 import os.path
 
 from processcontrol import crontab
@@ -33,12 +34,13 @@
 # Strip regional variations.
 tab = tab.replace(job_dir, "X")
 tab = tab.replace(runner_path, "Y")
+tab = tab.replace(str(os.getuid()), "Z")
 
 expected = """# Skipping disabled job disabled
 # Generated from X/schedule_2.yaml
-*/10 * * * * jenkins Y schedule_2
+*/10 * * * * Z Y schedule_2
 # Generated from X/schedule_good.yaml
-*/5 * * * * jenkins Y schedule_good
+*/5 * * * * Z Y schedule_good
 # Skipping disabled job unscheduled
 """
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia12f06f07a1b4d77b6fa3f69fc121ab1c1b10419
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Cdentinger 
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]: ruthenium: increase parsoid-vd clients from 4 to 6

2017-04-03 Thread Subramanya Sastry (Code Review)

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

Change subject: ruthenium: increase parsoid-vd clients from 4 to 6
..

ruthenium: increase parsoid-vd clients from 4 to 6

* Should improve test throughput a little. There is enough RAM
  to support the additional clients.

Change-Id: I2232f0965569f26f2a6aa8a2f9311e893afb830e
---
M modules/testreduce/files/parsoid-vd-client.systemd.service
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/346209/1

diff --git a/modules/testreduce/files/parsoid-vd-client.systemd.service 
b/modules/testreduce/files/parsoid-vd-client.systemd.service
index a2aa579..2324e90 100644
--- a/modules/testreduce/files/parsoid-vd-client.systemd.service
+++ b/modules/testreduce/files/parsoid-vd-client.systemd.service
@@ -10,7 +10,7 @@
 # via the public entrypoints.
 
Environment=PATH=/srv/visualdiff/node_modules/phantomjs/bin:/sbin:/usr/sbin:/bin:/usr/bin
 HTTP_PROXY_AND_PORT=http://webproxy.eqiad.wmnet:8080
 WorkingDirectory=/srv/testreduce/client
-ExecStart=/usr/bin/nodejs client-cluster.js -c 4 
/etc/testreduce/parsoid-vd-client.config.js
+ExecStart=/usr/bin/nodejs client-cluster.js -c 6 
/etc/testreduce/parsoid-vd-client.config.js
 StandardOutput=journal
 StandardError=journal
 RestartSec=2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2232f0965569f26f2a6aa8a2f9311e893afb830e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Run commands in sequence

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Run commands in sequence
..


Run commands in sequence

Bug: T161035
Change-Id: I6f4473881da4e81bab1777bf747ee87e6d1d61d1
---
M README.md
M processcontrol/job_wrapper.py
M processcontrol/lock.py
M processcontrol/output_streamer.py
M tests/test_job_wrapper.py
M tests/test_lock.py
6 files changed, 100 insertions(+), 57 deletions(-)

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



diff --git a/README.md b/README.md
index 8eed1fc..f530113 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,16 @@
 # The commandline that will be run.  This is executed from Python and not from
 # a shell, so globbing and other trickery will not work.  Please give a full
 # path to the executable.
+#
+# Alternatively, a job can be configured as a list of several commands.  These
+# are executed in sequence, and execution stops at the first failure.
+#
+#command:
+## Run sub-jobs, each with their own lock and logfiles.
+#- /usr/bin/run-job prepare_meal
+#- /usr/bin/run-job mangia
+#- /usr/bin/run-job clean_up_from_meal
+#
 command: /usr/local/bin/timecard --start 9:00 --end 5:30
 
 # Optional schedule, in Vixie cron format:
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 699f522..5d83afb 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -42,7 +42,10 @@
 self.slug = slug
 self.start_time = datetime.datetime.utcnow()
 self.mailer = mailer.Mailer(self.config)
-self.timeout = self.config.get("timeout")
+if self.config.has("timeout"):
+self.timeout = self.config.get("timeout")
+else:
+self.timeout = 0
 
 if self.config.has("disabled") and self.config.get("disabled") is True:
 self.enabled = False
@@ -62,36 +65,54 @@
 
 config.log.info("Running job {name} ({slug})".format(name=self.name, 
slug=self.slug))
 
-command = shlex.split(self.config.get("command"))
+# Spawn timeout monitor thread.
+if self.timeout > 0:
+timer = threading.Timer(self.timeout, self.fail_timeout)
+timer.start()
+
+command = self.config.get("command")
+
+if hasattr(command, "encode"):
+# Is stringlike, so cast to a list and handle along with the plural
+# case below.
+command = [command]
+
+try:
+for line in command:
+self.run_command(line)
+finally:
+lock.end()
+if self.timeout > 0:
+timer.cancel()
+
+def run_command(self, command_string):
+# TODO: Log commandline into the output log as well.
+config.log.info("Running command: {cmd}".format(cmd=command_string))
+
+command = shlex.split(command_string)
 
 self.process = subprocess.Popen(command, stdout=subprocess.PIPE, 
stderr=subprocess.PIPE, env=self.environment)
 streamer = output_streamer.OutputStreamer(self.process, self.slug, 
self.start_time)
 streamer.start()
 
-timer = threading.Timer(self.timeout, self.fail_timeout)
-timer.start()
+# should be safe from deadlocks because our OutputStreamer
+# has been consuming stderr and stdout
+self.process.wait()
 
-try:
-# should be safe from deadlocks because our OutputStreamer
-# has been consuming stderr and stdout
-self.process.wait()
-
-stderr_data = streamer.get_errors()
-if len(stderr_data) > 0:
-self.fail_has_stderr(stderr_data)
-finally:
-timer.cancel()
-lock.end()
+streamer.stop()
 
 return_code = self.process.returncode
 if return_code != 0:
 self.fail_exitcode(return_code)
+
+self.process = None
 
 def fail_exitcode(self, return_code):
 message = "Job {name} failed with code {code}".format(name=self.name, 
code=return_code)
 config.log.error(message)
 # TODO: Prevent future jobs according to config.
 self.mailer.fail_mail(message)
+raise JobFailure(message)
 
 def fail_has_stderr(self, stderr_data):
 message = "Job {name} printed things to stderr:".format(name=self.name)
@@ -99,6 +120,7 @@
 body = stderr_data.decode("utf-8")
 config.log.error(body)
 self.mailer.fail_mail(message, body)
+raise JobFailure(message)
 
 def fail_timeout(self):
 self.process.kill()
@@ -106,6 +128,7 @@
 config.log.error(message)
 self.mailer.fail_mail(message)
 # FIXME: Job will return SIGKILL now, fail_exitcode should ignore that 
signal now?
+raise JobFailure(message)
 
 def status(self):
 """Check for any running

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Bump deps

2017-04-03 Thread Arlolra (Code Review)

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

Change subject: Bump deps
..

Bump deps

Change-Id: I4f379ff0affefc902063a503a9dd29e0a55b02e7
---
M npm-shrinkwrap.json
M package.json
2 files changed, 458 insertions(+), 200 deletions(-)


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

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 7aaee6b..11660a6 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -13,11 +13,21 @@
   "from": "accepts@>=1.3.3 <1.4.0",
   "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz;
 },
+"ajv": {
+  "version": "4.11.5",
+  "from": "ajv@>=4.9.1 <5.0.0",
+  "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz;
+},
 "alea": {
   "version": "0.0.9",
   "from": "alea@>=0.0.9 <0.0.10",
   "resolved": "https://registry.npmjs.org/alea/-/alea-0.0.9.tgz;,
   "dev": true
+},
+"align-text": {
+  "version": "0.1.4",
+  "from": "align-text@>=0.1.3 <0.2.0",
+  "resolved": 
"https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz;
 },
 "amdefine": {
   "version": "1.0.1",
@@ -32,7 +42,8 @@
 "ansi-styles": {
   "version": "2.2.1",
   "from": "ansi-styles@>=2.2.1 <3.0.0",
-  "resolved": 
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz;
+  "resolved": 
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz;,
+  "dev": true
 },
 "argparse": {
   "version": "1.0.9",
@@ -107,6 +118,12 @@
   "from": "balanced-match@>=0.4.1 <0.5.0",
   "resolved": 
"https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz;
 },
+"bcrypt-pbkdf": {
+  "version": "1.0.1",
+  "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
+  "resolved": 
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz;,
+  "optional": true
+},
 "bl": {
   "version": "1.2.0",
   "from": "bl@>=1.0.0 <2.0.0",
@@ -118,26 +135,36 @@
   "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz;
 },
 "readable-stream": {
-  "version": "2.2.2",
-  "from": "readable-stream@>=2.0.5 <3.0.0",
-  "resolved": 
"https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz;
+  "version": "2.2.6",
+  "from": "readable-stream@^2.0.5",
+  "resolved": 
"https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz;
 }
   }
 },
 "bluebird": {
-  "version": "3.4.7",
-  "from": "bluebird@>=3.4.6 <4.0.0",
-  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz;
+  "version": "3.5.0",
+  "from": "bluebird@>=3.4.7 <4.0.0",
+  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz;
 },
 "body-parser": {
-  "version": "1.16.0",
-  "from": "body-parser@>=1.16.0 <2.0.0",
-  "resolved": 
"https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz;,
+  "version": "1.17.1",
+  "from": "body-parser@1.17.1",
+  "resolved": 
"https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz;,
   "dependencies": {
 "content-type": {
   "version": "1.0.2",
   "from": "content-type@>=1.0.2 <1.1.0",
   "resolved": 
"https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz;
+},
+"debug": {
+  "version": "2.6.1",
+  "from": "debug@2.6.1",
+  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz;
+},
+"qs": {
+  "version": "6.4.0",
+  "from": "qs@6.4.0",
+  "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz;
 }
   }
 },
@@ -162,9 +189,9 @@
   "resolved": 
"https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz;
 },
 "bunyan": {
-  "version": "1.8.5",
-  "from": "bunyan@>=1.8.1 <2.0.0",
-  "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz;
+  "version": "1.8.9",
+  "from": "bunyan@>=1.8.5 <2.0.0",
+  "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz;
 },
 "bunyan-syslog-udp": {
   "version": "0.1.0",
@@ -189,7 +216,14 @@
 "caseless": {
   "version": "0.11.0",
   "from": "caseless@>=0.11.0 <0.12.0",
-  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz;
+  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz;,
+  "dev": true
+},
+"center-align": {
+  "version": "0.1.3",
+  "from": "center-align@>=0.1.1 <0.2.0",
+  "resolved": 
"https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz;,
+  "optional": true
 },
 "chai": {
   "version": "3.5.0",
@@ -200,7 +234,8 @@
 "chalk": {
   "version": "1.1.3",
   "from":

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Assert stderr goes to the output file

2017-04-03 Thread Awight (Code Review)

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

Change subject: Assert stderr goes to the output file
..

Assert stderr goes to the output file

Change-Id: Iaddb2bbae18a4e733842998995b6b84982b507af
---
M tests/test_job_wrapper.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/07/346207/1

diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py
index e02d3af..73cf23d 100644
--- a/tests/test_job_wrapper.py
+++ b/tests/test_job_wrapper.py
@@ -78,6 +78,9 @@
 assert ("errors", "ERROR", "grep: Invalid regular expression") in loglines
 # TODO: Should we go out of our way to log the non-zero return code as 
well?
 
+lines = get_output_lines("errors")
+assert "ERROR\tgrep: Invalid regular expression" in lines
+
 MockSmtp().sendmail.assert_called_once()
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaddb2bbae18a4e733842998995b6b84982b507af
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Auto display keyboard when launched from widget

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix: Auto display keyboard when launched from widget
..


Fix: Auto display keyboard when launched from widget

When launching Wikipedia from widget Keyboard now
shows properly. The issue was also present when
searching text from another app. That is fixed as well.

Bug: T161106
Change-Id: I66dfa63f0bf62a2247897ccc4de0d479cb5638e1
---
M app/src/main/AndroidManifest.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2f2985f..6ce6068 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,7 +65,7 @@
 
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66dfa63f0bf62a2247897ccc4de0d479cb5638e1
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Hlakhara 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
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]: RCFilters: Don't close the popup when user hits 'escape' in ...

2017-04-03 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Don't close the popup when user hits 'escape' in 
input
..

RCFilters: Don't close the popup when user hits 'escape' in input

Bug: T161493
Change-Id: I6fca5535a6e2855b43196c39cedb50f9bcff07f1
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
1 file changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/346206/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index f4f460d..3af6486 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -50,6 +50,7 @@
// Events
this.resetButton.connect( this, { click: 'onResetButtonClick' } 
);
this.resetButton.$element.on( 'mousedown', 
this.onResetButtonMouseDown.bind( this ) );
+
this.model.connect( this, {
itemUpdate: 'onModelItemUpdate',
highlightChange: 'onModelHighlightChange'
@@ -58,7 +59,10 @@
 
// Add the filterInput as trigger
this.filterInput.$input
-   .on( 'focus', this.focus.bind( this ) );
+   .on( {
+   focus: this.focus.bind( this ),
+   keyup: this.onFilterInputKeyUp.bind( this )
+   } );
 
// Build the content
$contentWrapper.append(
@@ -109,6 +113,18 @@
/* Methods */
 
/**
+* Respond to input keyup event, which is the way to intercept 'escape' 
key
+*
+* @param {jQuery.event} e Event data
+*/
+   
mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.onFilterInputKeyUp = 
function ( e ) {
+   if ( e.keyCode === OO.ui.Keys.ESCAPE ) {
+   this.clearInput();
+   return;
+   }
+   };
+
+   /**
 * Respond to model itemUpdate event
 *
 * @param {mw.rcfilters.dm.FilterItem} item Filter item model

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: PopupWidget: Ignore 'escape' key if it is pressed on $autoCl...

2017-04-03 Thread Mooeypoo (Code Review)

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

Change subject: PopupWidget: Ignore 'escape' key if it is pressed on 
$autoCloseIgnore
..

PopupWidget: Ignore 'escape' key if it is pressed on $autoCloseIgnore

The 'escape' key is intercepted on the document, rather than any of
the individual elements or the $autoCloseIgnore. This means that if
we want to do anything other than hiding the popup, it is impossible.

But the concept of $autoCloseIgnore is to define areas where the popup
should not be automatically closed when clicked. It should also not be
automatically clicked when 'escape' is pressed on it.

This allows things like the CapsuleSelectWidget, that uses its input
as $autoCloseIgnore to decide that if you pressed 'escape' in the input
it should only clear the input but **not** close the popup. If it does
close the popup, the user is left with an empty input in focus but
the popup closed, which is not what was intended.

This should be a good idea in general, it follows the logic of defining
elements that are $autoCloseIgnore whether they're clicks or something
else that the document listens to to close the popup automatically.

Bug: T161493
Change-Id: Ib489b7cb5c9b174cc3be83e184133065c7923214
---
M src/widgets/PopupWidget.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/346205/1

diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 17d6391..8216f5f 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -212,7 +212,8 @@
 OO.ui.PopupWidget.prototype.onDocumentKeyDown = function ( e ) {
if (
e.which === OO.ui.Keys.ESCAPE &&
-   this.isVisible()
+   this.isVisible() &&
+   !OO.ui.contains( this.$element.add( this.$autoCloseIgnore 
).get(), e.target, true )
) {
this.toggle( false );
e.preventDefault();

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileApp[master]: Introduce language blacklist for editing descriptions.

2017-04-03 Thread Dbrant (Code Review)

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

Change subject: Introduce language blacklist for editing descriptions.
..

Introduce language blacklist for editing descriptions.

...to be reduced as we progress in our rollout of the description editing
feature in the app.

Change-Id: I5578a6611318c47a2d7d36b8c1e19b09a4341b3c
---
M config/config.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/config/config.json b/config/config.json
index 92b83ba..22fb904 100644
--- a/config/config.json
+++ b/config/config.json
@@ -5,5 +5,6 @@
 "searchLogSampleRate": 100,
 "tocLogSampleRate": 100,
 "restbaseBetaPercent": 100,
-"restbaseProdPercent": 100
+"restbaseProdPercent": 100,
+"descriptionEditLangBlacklist": 
"['en','de','it','fr','es','ja','nl','pt','tr','zh-hant']"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5578a6611318c47a2d7d36b8c1e19b09a4341b3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Introduce language blacklist for editing descriptions.

2017-04-03 Thread Dbrant (Code Review)

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

Change subject: Introduce language blacklist for editing descriptions.
..

Introduce language blacklist for editing descriptions.

Instead of having a hard-coded whitelist of languages for which we enable
editing descriptions, we now have a blacklist which draws from a remote
config parameter, so that we'll be able to modify it without needing to
re-release the app.

In the current phase of our rollout, we're blacklisting the top ten wikis,
based on pageviews from within the app.

Change-Id: I84c0972bbf132150c3f4fa55910ee56625ddf316
---
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
1 file changed, 22 insertions(+), 3 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
index fb708a9..95ec39a 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
@@ -5,19 +5,24 @@
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+
+import org.wikipedia.WikipediaApp;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.dataclient.mwapi.MwException;
 import org.wikipedia.dataclient.mwapi.MwServiceError;
 import org.wikipedia.dataclient.retrofit.MwCachedService;
 import org.wikipedia.dataclient.retrofit.RetrofitException;
 import org.wikipedia.dataclient.retrofit.WikiCachedService;
+import org.wikipedia.json.GsonUtil;
 import org.wikipedia.login.User;
 import org.wikipedia.page.Page;
 import org.wikipedia.page.PageProperties;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.util.ReleaseUtil;
+import org.wikipedia.util.log.L;
 
-import java.util.Arrays;
 import java.util.List;
 
 import retrofit2.Call;
@@ -30,7 +35,6 @@
  * Data Client to submit a new or updated description to wikidata.org.
  */
 public class DescriptionEditClient {
-private static List ENABLED_LANGUAGES = Arrays.asList("ru", "he", 
"ca");
 private static final String ABUSEFILTER_DISALLOWED = 
"abusefilter-disallowed";
 private static final String ABUSEFILTER_WARNING = "abusefilter-warning";
 
@@ -44,7 +48,22 @@
 public static boolean isEditAllowed(@NonNull Page page) {
 PageProperties props = page.getPageProperties();
 return !TextUtils.isEmpty(props.getWikiBaseItem())
-&& 
(ENABLED_LANGUAGES.contains(page.getTitle().getWikiSite().languageCode()) || 
ReleaseUtil.isPreBetaRelease());
+&& 
(!isLanguageBlacklisted(page.getTitle().getWikiSite().languageCode())
+|| ReleaseUtil.isPreBetaRelease());
+}
+
+private static boolean isLanguageBlacklisted(@NonNull String lang) {
+try {
+List blacklist = 
GsonUtil.getDefaultGson().fromJson(WikipediaApp.getInstance()
+.getRemoteConfig().getConfig()
+.optString("descriptionEditLangBlacklist",
+
"['en','de','it','fr','es','ja','nl','pt','tr','zh-hant']"),
+new TypeToken() {}.getType());
+return blacklist.contains(lang);
+} catch (JsonSyntaxException e) {
+L.logRemoteErrorIfProd(e);
+}
+return true;
 }
 
 @NonNull private final WikiCachedService cachedService

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Only run jobs as the service user

2017-04-03 Thread Awight (Code Review)

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

Change subject: Only run jobs as the service user
..

Only run jobs as the service user

Change-Id: Ia12f06f07a1b4d77b6fa3f69fc121ab1c1b10419
---
M process-control.example.yaml
M processcontrol/job_wrapper.py
M tests/data/global_config/global_defaults.yaml
M tests/override_config.py
4 files changed, 13 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/02/346202/1

diff --git a/process-control.example.yaml b/process-control.example.yaml
index 2891458..0cbe639 100644
--- a/process-control.example.yaml
+++ b/process-control.example.yaml
@@ -6,8 +6,8 @@
 # Absolute path to the job harness.
 runner_path: /usr/bin/run-job
 
-# Cron will setuid to this user before running the command.  Only use service
-# accounts, never privileged ones.
+# Enforce that jobs are run as this service user.
+# FIXME: new service user for this package.
 user: jenkins
 
 # Default values used when the job description doesn't have these keys.  See
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 5d83afb..3ec58bf 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -1,6 +1,7 @@
 import datetime
 import glob
 import os
+import pwd
 import shlex
 import subprocess
 import threading
@@ -61,6 +62,14 @@
 self.environment = {}
 
 def run(self):
+# Check that we are the service user.
+service_user = str(self.global_config.get("user"))
+if service_user.isdigit():
+passwd_entry = pwd.getpwuid(int(service_user))
+else:
+passwd_entry = pwd.getpwnam(service_user)
+assert passwd_entry.pw_uid == os.getuid()
+
 lock.begin(job_tag=self.slug)
 
 config.log.info("Running job {name} ({slug})".format(name=self.name, 
slug=self.slug))
diff --git a/tests/data/global_config/global_defaults.yaml 
b/tests/data/global_config/global_defaults.yaml
index e2ac795..daca679 100644
--- a/tests/data/global_config/global_defaults.yaml
+++ b/tests/data/global_config/global_defaults.yaml
@@ -6,10 +6,6 @@
 # Absolute path to the job harness.
 runner_path: /usr/bin/run-job
 
-# Cron will setuid to this user before running the command.  Only use service
-# accounts, never privileged ones.
-user: jenkins
-
 # Default values used when the job description doesn't have these keys.  See
 # the README for a discussion of how to configure jobs.
 default_job_config:
diff --git a/tests/override_config.py b/tests/override_config.py
index 973813e..b1ef2ed 100644
--- a/tests/override_config.py
+++ b/tests/override_config.py
@@ -21,6 +21,8 @@
 elif "job_directory" not in extra:
 extra["job_directory"] = data_dir
 
+extra["user"] = os.getuid()
+
 OverrideConfiguration.extra = extra
 
 global patcher

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia12f06f07a1b4d77b6fa3f69fc121ab1c1b10419
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Remove DiffElement DOM element when destroying

2017-04-03 Thread Esanders (Code Review)

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

Change subject: Remove DiffElement DOM element when destroying
..

Remove DiffElement DOM element when destroying

Bug: T161877
Change-Id: I1631c4c160ff2bcf4fdbb466ed6294bd6a2f8be3
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/01/346201/1

diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index 1b16c29..c97385c 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -190,6 +190,7 @@
  */
 ve.ui.DiffElement.prototype.destroy = function () {
$( this.getElementWindow() ).off( 'resize', 
this.onWindowResizeDebounced );
+   this.$element.remove();
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1631c4c160ff2bcf4fdbb466ed6294bd6a2f8be3
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWExtension describeChanges: Actually return value of parent

2017-04-03 Thread Esanders (Code Review)

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

Change subject: MWExtension describeChanges: Actually return value of parent
..

MWExtension describeChanges: Actually return value of parent

Bug: T161357
Change-Id: I7a81ab68dc2f632bd6f380caafef2cba326ad0ef
---
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index b8b28ff..91a96f2 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -151,7 +151,7 @@
) ];
}
// Parent method
-   ve.dm.MWExtensionNode.super.static.describeChange.apply( this, 
arguments );
+   return ve.dm.MWExtensionNode.super.static.describeChange.apply( this, 
arguments );
 };
 
 /* Methods */

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: update diff test pages

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: update diff test pages
..


Hygiene: update diff test pages

This is a small change in strategy for the diff tests. Instead of
relying on actual pages it seems better to deal with a few
handcrafted pages for testing, which can limit the number of
templates used to just a few simple and frequently used ones which
hopefully don't change as often.

+ fix minor typo

Change-Id: If2a8eac1b4a6fc9abc475d0ddc4da844a9689c0b
---
M routes/on-this-day.js
D test/diff/results/page_definition-enwiktionary-cat.json
D test/diff/results/page_formatted-dewiki-Helium.json
D test/diff/results/page_formatted-dewiki-Helium/lead-intro.html
D test/diff/results/page_formatted-dewiki-Helium/lead-text.html
D test/diff/results/page_formatted-dewiki-Helium/section1-text.html
D test/diff/results/page_formatted-dewiki-Helium/section10-text.html
D test/diff/results/page_formatted-dewiki-Helium/section12-text.html
D test/diff/results/page_formatted-dewiki-Helium/section13-text.html
D test/diff/results/page_formatted-dewiki-Helium/section14-text.html
D test/diff/results/page_formatted-dewiki-Helium/section15-text.html
D test/diff/results/page_formatted-dewiki-Helium/section16-text.html
D test/diff/results/page_formatted-dewiki-Helium/section17-text.html
D test/diff/results/page_formatted-dewiki-Helium/section18-text.html
D test/diff/results/page_formatted-dewiki-Helium/section19-text.html
D test/diff/results/page_formatted-dewiki-Helium/section20-text.html
D test/diff/results/page_formatted-dewiki-Helium/section21-text.html
D test/diff/results/page_formatted-dewiki-Helium/section22-text.html
D test/diff/results/page_formatted-dewiki-Helium/section23-text.html
D test/diff/results/page_formatted-dewiki-Helium/section24-text.html
D test/diff/results/page_formatted-dewiki-Helium/section25-text.html
D test/diff/results/page_formatted-dewiki-Helium/section26-text.html
D test/diff/results/page_formatted-dewiki-Helium/section27-text.html
D test/diff/results/page_formatted-dewiki-Helium/section28-text.html
D test/diff/results/page_formatted-dewiki-Helium/section3-text.html
D test/diff/results/page_formatted-dewiki-Helium/section4-text.html
D test/diff/results/page_formatted-dewiki-Helium/section5-text.html
D test/diff/results/page_formatted-dewiki-Helium/section6-text.html
D test/diff/results/page_formatted-dewiki-Helium/section7-text.html
D test/diff/results/page_formatted-dewiki-Helium/section9-text.html
D test/diff/results/page_formatted-enwiki-8_mm.json
D test/diff/results/page_formatted-enwiki-8_mm/lead-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-intro.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section1-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section10-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section11-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section12-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section13-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section14-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section16-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section17-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section18-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section19-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section2-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section20-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section21-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section22-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section23-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section3-text.html
A 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section4-text.html
A

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 2f49643fa7cb051b80ddcbe618fb87c0c4655b59:

2017-04-03 Thread Smalyshev (Code Review)

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

Change subject: Merging from 2f49643fa7cb051b80ddcbe618fb87c0c4655b59:
..


Merging from 2f49643fa7cb051b80ddcbe618fb87c0c4655b59:

Merge "Revert "Use color icon instead of b/w one.""

Change-Id: I814a2e1ac0d1be587de6e6ebca7825b08fbe7324
---
M i18n/ar.json
M i18n/ast.json
M i18n/br.json
M i18n/ca.json
M i18n/dty.json
M i18n/el.json
M i18n/sco.json
M i18n/sw.json
M i18n/uk.json
M index.html
10 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/i18n/ar.json b/i18n/ar.json
index 854839e..3b2905b 100644
--- a/i18n/ar.json
+++ b/i18n/ar.json
@@ -1 +1 @@
-{"@metadata":{"authors":["Amire80","DRIHEM","ترجمان05","Hhaboh162002","Meno25","ديفيد"]},"wdqs-app-button-examples":"أمثلة","wdqs-app-button-prefixes":"لواحق","wdqs-app-button-tools":"أدوات","wdqs-app-button-help":"مساعدة","wdqs-app-button-run":"تشغيل","wdqs-app-button-run-title":"تنفيذ
 الاستعلام ( + 
)","wdqs-app-button-clear":"مسح","wdqs-app-button-display":"عرض","wdqs-app-button-download":"تحميل","wdqs-app-button-download-title":"تنزيل
 النتيجة","wdqs-app-button-link":"رابط","wdqs-app-help-feedback":"أرسل لنا 
الملاحظات","wdqs-app-help-request-query":"اطلب 
استعلامًا","wdqs-app-help-portal":"بوابة المساعدة","wdqs-app-help-manual":"دليل 
المستخدم","wdqs-app-help-examples":"أمثلة 
للاستعلامات","wdqs-app-help-datamodel":"نموذج بيانات 
RDF","wdqs-app-help-prefixes":"قائمة البادئات","wdqs-app-footer-help":"اضغط 
[CTRL-SPACE] لتشغيل الإكتمال التلقائي.","wdqs-app-footer-updated":"تحديث 
البيانات قبل $1","wdqs-app-footer-updated-seconds":"تحديث البيانات قبل $1 
ثانية","wdqs-app-result-shorturl":"وصلة إلكترونيَّة قصيرة إلى النتيجة 
المرجُوَّة","wdqs-app-result-shorturl-title":"وصلة قصيرة إلى هذه 
النتيجة","wdqs-app-result-embed":"تضمين 
النتيجة","wdqs-app-result-endpoint":"نقطة نهاية 
SPARQL","wdqs-app-result-endpoint-title":"وصلة إلى نقطة نهاية SPARQL التي تقوم 
بإرجاع نتيجة","wdqs-app-result-formatter-title-datetime":"الطابع الزمني ل ISO 
الخام","wdqs-app-result-json":"ملف JSON","wdqs-app-result-tsv":"ملف 
TSV","wdqs-app-result-csv":"ملف CSV","wdqs-app-result-svg":"صورة 
SVG","wdqs-app-shorturl-page-title":"وصلة URL قصيرة إلى هذه 
الصفحة","wdqs-app-editor-placeholder":"(إدخال استعلام SPARQL أو قم بإختيار مثال 
استعلام)","wdqs-app-editor-addprefixes":"إضافة البادئات 
القياسية","wdqs-dialog-examples-preview-query":"استعراض 
استعلام","wdqs-dialog-examples-preview-result":"استعرض 
النتيجة","wdqs-ve-find":"ابحث","wdqs-ve-show":"إظهار","wdqs-ve-with":"مع","wdqs-ve-and":"و","wdqs-ve-anything":"أي
 شيء","wdqs-ve-any":"أي","wdqs-ve-or":"أو","wdqs-ve-subtype":"النوع 
الفرعي","wdqs-action-query":"تنفيذ الاستعلام","wdqs-action-render":"التجهيز 
للنتيجة","wdqs-action-error-display":"لا يمكن عرض 
النتيجة","wdqs-action-timeout":"الاستعلام استغرق الكثير من 
الوقت","wdqs-action-malformed-query":"الاستعلام 
تالف","wdqs-action-server-error":"خطأ بالخادم","wdqs-action-unknow-error":"خطأ 
غير معروف","wdqs-result-map-layers-all":"كل الطبقات","uls-region-WW":"في جميع 
أنحاء 
العالم","uls-region-SP":"الخاصة","uls-region-AM":"أمريكا","uls-region-AF":"أفريقيا","uls-region-EU":"أوروبا","uls-region-AS":"آسيا","uls-region-ME":"الشرق
 الأوسط","uls-region-PA":"المحيط الهادئ","uls-region-all":"جميع 
اللغات","uls-no-results-found":"لم يتم العثور على 
نتائج","uls-common-languages":"اللغات 
المقترحة","uls-no-results-suggestion-title":"قد تكون مهتما بما 
يلي:","uls-search-help":"يمكنك البحث مستخدما اسم اللغة، أو اسم السكريبت، أو رمز 
اللغة القياسي أو يمكنك التصفح حسب المنطقة.","uls-search-placeholder":"بحث عن 
لغة"}
\ No newline at end of file
+{"@metadata":{"authors":["Amire80","DRIHEM","ترجمان05","Hhaboh162002","Meno25","ديفيد"]},"wdqs-app-button-examples":"أمثلة","wdqs-app-button-prefixes":"لواحق","wdqs-app-button-tools":"أدوات","wdqs-app-button-help":"مساعدة","wdqs-app-button-run":"تشغيل","wdqs-app-button-run-title":"تنفيذ
 الاستعلام ( + 
)","wdqs-app-button-clear":"مسح","wdqs-app-button-clear-title":"امسح 
الإستعلام","wdqs-app-button-display":"عرض","wdqs-app-button-display-title":"إعرض
 النتيجة كجدول، صورة، 
...","wdqs-app-button-download":"تحميل","wdqs-app-button-download-title":"تنزيل 
النتيجة","wdqs-app-button-link":"رابط","wdqs-app-button-link-title":"أحصل على 
رابط للاستعلام","wdqs-app-help-feedback":"أرسل لنا 
الملاحظات","wdqs-app-help-request-query":"اطلب 
استعلامًا","wdqs-app-help-portal":"بوابة المساعدة","wdqs-app-help-manual":"دليل 
المستخدم","wdqs-app-help-examples":"أمثلة 
للاستعلامات","wdqs-app-help-datamodel":"نموذج بيانات 
RDF","wdqs-app-help-prefixes":"قائمة البادئات","wdqs-app-help-copy":"معلومات 
الترخيص","wdqs-app-footer-help":"اضغط [CTRL-SPACE] لتشغيل الإكتمال 
التلقائي.","wdqs-app-footer-updated":"تحديث البيانات قبل 
$1","wdqs-app-footer-updated-seconds":"تحديث البيانات قبل $1 
ثانية","wdqs-app-result-shorturl":"وصلة إلكترونيَّة قصيرة

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 2f49643fa7cb051b80ddcbe618fb87c0c4655b59:

2017-04-03 Thread Smalyshev (Code Review)

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

Change subject: Merging from 2f49643fa7cb051b80ddcbe618fb87c0c4655b59:
..

Merging from 2f49643fa7cb051b80ddcbe618fb87c0c4655b59:

Merge "Revert "Use color icon instead of b/w one.""

Change-Id: I814a2e1ac0d1be587de6e6ebca7825b08fbe7324
---
M i18n/ar.json
M i18n/ast.json
M i18n/br.json
M i18n/ca.json
M i18n/dty.json
M i18n/el.json
M i18n/sco.json
M i18n/sw.json
M i18n/uk.json
M index.html
10 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy 
refs/changes/98/346198/1

diff --git a/i18n/ar.json b/i18n/ar.json
index 854839e..3b2905b 100644
--- a/i18n/ar.json
+++ b/i18n/ar.json
@@ -1 +1 @@
-{"@metadata":{"authors":["Amire80","DRIHEM","ترجمان05","Hhaboh162002","Meno25","ديفيد"]},"wdqs-app-button-examples":"أمثلة","wdqs-app-button-prefixes":"لواحق","wdqs-app-button-tools":"أدوات","wdqs-app-button-help":"مساعدة","wdqs-app-button-run":"تشغيل","wdqs-app-button-run-title":"تنفيذ
 الاستعلام ( + 
)","wdqs-app-button-clear":"مسح","wdqs-app-button-display":"عرض","wdqs-app-button-download":"تحميل","wdqs-app-button-download-title":"تنزيل
 النتيجة","wdqs-app-button-link":"رابط","wdqs-app-help-feedback":"أرسل لنا 
الملاحظات","wdqs-app-help-request-query":"اطلب 
استعلامًا","wdqs-app-help-portal":"بوابة المساعدة","wdqs-app-help-manual":"دليل 
المستخدم","wdqs-app-help-examples":"أمثلة 
للاستعلامات","wdqs-app-help-datamodel":"نموذج بيانات 
RDF","wdqs-app-help-prefixes":"قائمة البادئات","wdqs-app-footer-help":"اضغط 
[CTRL-SPACE] لتشغيل الإكتمال التلقائي.","wdqs-app-footer-updated":"تحديث 
البيانات قبل $1","wdqs-app-footer-updated-seconds":"تحديث البيانات قبل $1 
ثانية","wdqs-app-result-shorturl":"وصلة إلكترونيَّة قصيرة إلى النتيجة 
المرجُوَّة","wdqs-app-result-shorturl-title":"وصلة قصيرة إلى هذه 
النتيجة","wdqs-app-result-embed":"تضمين 
النتيجة","wdqs-app-result-endpoint":"نقطة نهاية 
SPARQL","wdqs-app-result-endpoint-title":"وصلة إلى نقطة نهاية SPARQL التي تقوم 
بإرجاع نتيجة","wdqs-app-result-formatter-title-datetime":"الطابع الزمني ل ISO 
الخام","wdqs-app-result-json":"ملف JSON","wdqs-app-result-tsv":"ملف 
TSV","wdqs-app-result-csv":"ملف CSV","wdqs-app-result-svg":"صورة 
SVG","wdqs-app-shorturl-page-title":"وصلة URL قصيرة إلى هذه 
الصفحة","wdqs-app-editor-placeholder":"(إدخال استعلام SPARQL أو قم بإختيار مثال 
استعلام)","wdqs-app-editor-addprefixes":"إضافة البادئات 
القياسية","wdqs-dialog-examples-preview-query":"استعراض 
استعلام","wdqs-dialog-examples-preview-result":"استعرض 
النتيجة","wdqs-ve-find":"ابحث","wdqs-ve-show":"إظهار","wdqs-ve-with":"مع","wdqs-ve-and":"و","wdqs-ve-anything":"أي
 شيء","wdqs-ve-any":"أي","wdqs-ve-or":"أو","wdqs-ve-subtype":"النوع 
الفرعي","wdqs-action-query":"تنفيذ الاستعلام","wdqs-action-render":"التجهيز 
للنتيجة","wdqs-action-error-display":"لا يمكن عرض 
النتيجة","wdqs-action-timeout":"الاستعلام استغرق الكثير من 
الوقت","wdqs-action-malformed-query":"الاستعلام 
تالف","wdqs-action-server-error":"خطأ بالخادم","wdqs-action-unknow-error":"خطأ 
غير معروف","wdqs-result-map-layers-all":"كل الطبقات","uls-region-WW":"في جميع 
أنحاء 
العالم","uls-region-SP":"الخاصة","uls-region-AM":"أمريكا","uls-region-AF":"أفريقيا","uls-region-EU":"أوروبا","uls-region-AS":"آسيا","uls-region-ME":"الشرق
 الأوسط","uls-region-PA":"المحيط الهادئ","uls-region-all":"جميع 
اللغات","uls-no-results-found":"لم يتم العثور على 
نتائج","uls-common-languages":"اللغات 
المقترحة","uls-no-results-suggestion-title":"قد تكون مهتما بما 
يلي:","uls-search-help":"يمكنك البحث مستخدما اسم اللغة، أو اسم السكريبت، أو رمز 
اللغة القياسي أو يمكنك التصفح حسب المنطقة.","uls-search-placeholder":"بحث عن 
لغة"}
\ No newline at end of file
+{"@metadata":{"authors":["Amire80","DRIHEM","ترجمان05","Hhaboh162002","Meno25","ديفيد"]},"wdqs-app-button-examples":"أمثلة","wdqs-app-button-prefixes":"لواحق","wdqs-app-button-tools":"أدوات","wdqs-app-button-help":"مساعدة","wdqs-app-button-run":"تشغيل","wdqs-app-button-run-title":"تنفيذ
 الاستعلام ( + 
)","wdqs-app-button-clear":"مسح","wdqs-app-button-clear-title":"امسح 
الإستعلام","wdqs-app-button-display":"عرض","wdqs-app-button-display-title":"إعرض
 النتيجة كجدول، صورة، 
...","wdqs-app-button-download":"تحميل","wdqs-app-button-download-title":"تنزيل 
النتيجة","wdqs-app-button-link":"رابط","wdqs-app-button-link-title":"أحصل على 
رابط للاستعلام","wdqs-app-help-feedback":"أرسل لنا 
الملاحظات","wdqs-app-help-request-query":"اطلب 
استعلامًا","wdqs-app-help-portal":"بوابة المساعدة","wdqs-app-help-manual":"دليل 
المستخدم","wdqs-app-help-examples":"أمثلة 
للاستعلامات","wdqs-app-help-datamodel":"نموذج بيانات 
RDF","wdqs-app-help-prefixes":"قائمة البادئات","wdqs-app-help-copy":"معلومات 
الترخيص","wdqs-app-footer-help":"اضغط [CTRL-SPACE] لتشغيل الإكتمال 
التلقائي.","wdqs-app-footer-updated":"تحديث البيانات قبل 
$1","wdqs-app-footer-updated-seconds":"تحديث البيانات قبل $1

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: fix jsdoc lint errors

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: fix jsdoc lint errors
..


Hygiene: fix jsdoc lint errors

A new version of our eslint config was picked up failing the build.

Change-Id: I7641a7670abad931cd10b326dfee80d8adb7886e
---
M app.js
M lib/anchorencode.js
M lib/api-util.js
M lib/dateUtil.js
M lib/feed/featured-image.js
M lib/feed/featured.js
M lib/mobile-util.js
M lib/mwapi.js
M lib/parseProperty.js
M lib/parsoid-access.js
M lib/transformations/markReferenceSections.js
M lib/transforms.js
M lib/util.js
M package.json
M routes/on-this-day.js
M test/diff/diff.js
M test/diff/test-spec.js
M test/utils/assert.js
M test/utils/testUtil.js
19 files changed, 132 insertions(+), 163 deletions(-)

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



diff --git a/app.js b/app.js
index 4ac9024..413ff72 100644
--- a/app.js
+++ b/app.js
@@ -137,7 +137,7 @@
 /**
  * Loads all routes declared in routes/ into the app
  * @param {!Application} app the application object to load routes into
- * @returns {!bluebird} a promise resolving to the app object
+ * @return {!bluebird} a promise resolving to the app object
  */
 function loadRoutes(app) {
 
@@ -189,7 +189,7 @@
 /**
  * Creates and start the service's web server
  * @param {!Application} app the app object to use in the service
- * @returns {!bluebird} a promise creating the web server
+ * @return {!bluebird} a promise creating the web server
  */
 function createServer(app) {
 
diff --git a/lib/anchorencode.js b/lib/anchorencode.js
index 6ff01a4..906f883 100644
--- a/lib/anchorencode.js
+++ b/lib/anchorencode.js
@@ -5,15 +5,13 @@
 /**
  * Encodes an input string so that it can be used as an HTML anchor id
  * (e.g. for a section in a page: ).
- *
  * See 
https://www.mediawiki.org/wiki/Manual:PAGENAMEE_encoding#Encodings_compared
  * https://www.mediawiki.org/wiki/Special:Code/MediaWiki/16279
  * core/include/parser/CoreParserFunctions.php
  * https://phabricator.wikimedia.org/T9059
  * https://gerrit.wikimedia.org/r/#/c/226032/
- *
- * @param input the input string (usually the heading text of a section 
heading)
- * @return the sanitized version of the input string so it can be used as an 
anchor.
+ * @param {!string} input the input string (usually the heading text of a 
section heading)
+ * @return {!string} the sanitized version of the input string so it can be 
used as an anchor.
  */
 function anchorencode(input) {
 const id = input.replace(/\s+/g, '_');
diff --git a/lib/api-util.js b/lib/api-util.js
index 447503f..9fd9959 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -10,7 +10,6 @@
 
 /**
  * Calls the MW API with the supplied query as its body
- *
  * @param {!Object} app the application object
  * @param {string} domain the domain to issue the request to
  * @param {?Object} query an object with all the query parameters for the MW 
API
@@ -47,7 +46,6 @@
 
 /**
  * Calls the REST API with the supplied domain, path and request parameters
- *
  * @param {!Object} app the application object
  * @param {string} domain the domain to issue the request for
  * @param {!string} path the REST API path to contact without the leading slash
@@ -81,7 +79,6 @@
 
 /**
  * Sets up the request templates for MW and RESTBase API requests
- *
  * @param {!Application} app the application object
  */
 function setupApiTemplates(app) {
@@ -114,7 +111,7 @@
 
 /**
  * Checks if the query failed based on the response status code
- * @param response the response received from the API
+ * @param {Response} response the response received from the API
  */
 function checkResponseStatus(response) {
 if (response.status < 200 || response.status > 399) {
diff --git a/lib/dateUtil.js b/lib/dateUtil.js
index c1f13fa..e0b3bd7 100644
--- a/lib/dateUtil.js
+++ b/lib/dateUtil.js
@@ -10,9 +10,7 @@
 /**
  * Returns a Date object with the desired date as specified in the request.
  * The expected format is "/mm/dd".
- *
  * Example: "2016/05/11"
- *
  * @param {!Object} req Object (looking for params property with subproperties 
, mm, dd.
  * @return {!Date} date object
  */
@@ -60,9 +58,7 @@
 /**
  * Returns a String formatted in ISO date format -- just the date. Timezone is 
UTC.
  * This is similar to Date.toISOString() but without the time and time zone 
portions.
- *
  * Example: "2016-05-16"
- *
  * @param {!Date} date date to be used
  * @return {!String} formatted date string
  */
@@ -93,7 +89,6 @@
 
 /**
  * Checks whether the date is within the last 3 days before today started in 
UTC-0 timezone.
- *
  * @param {Date} reqDate a date to check in UTC-0 timezone
  * @return {boolean} true if the date is within the last 3 days
  */
diff --git a/lib/feed/featured-image.js b/lib/feed/featured-image.js
index 43a0e08..3d3b612 100644
--- a/lib/feed/featured-image.js
+++ b/lib/feed/featured-image.js

[MediaWiki-commits] [Gerrit] analytics...source[master]: Use hive query instead of parsing non existent sampled TSV f...

2017-04-03 Thread Ottomata (Code Review)

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

Change subject: Use hive query instead of parsing non existent sampled TSV files
..

Use hive query instead of parsing non existent sampled TSV files

Change-Id: I2b4d48a51e5024efa335aa6e382c6b2e7a6722fc
---
M guard/MediaFileUrlParser/guard_settings.inc
1 file changed, 12 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/97/346197/1

diff --git a/guard/MediaFileUrlParser/guard_settings.inc 
b/guard/MediaFileUrlParser/guard_settings.inc
index e0993d4..61ef166 100644
--- a/guard/MediaFileUrlParser/guard_settings.inc
+++ b/guard/MediaFileUrlParser/guard_settings.inc
@@ -1,21 +1,18 @@
 echo_guard_input() {
-local TSV_FILE_ABS="/a/squid/archive/sampled/sampled-1000.tsv.log-$(date 
+'%Y%m%d').gz"
+local hive_query="
+SELECT
+CONCAT('https://', uri_host, uri_path)
+FROM
+wmf.webrequest TABLESAMPLE(BUCKET 1 OUT OF 64)
+WHERE
+uri_host = 'upload.wikimedia.org' AND
+uri_path NOT RLIKE 
'(monitoring/backend|robots.txt|crossdomain.xml|.{1000,})$' AND
+(http_status = 200 or http_status = 206) AND
+webrequest_source='upload' AND $(date +'year=%Y AND month=%m AND day=%d 
AND hour=0');
+"
 
-if [ ! -f "$TSV_FILE_ABS" ]
-then
-error "The input TSV file '$TSV_FILE_ABS' does not exist"
-fi
 
-zcat /a/squid/archive/sampled/sampled-1000.tsv.log-$(date +'%Y%m%d').gz \
-| cut -f 6,9 \
-| cut -f 2- -d / \
-| grep '^\(200\|206\)' \
-| cut -f 2 \
-| grep '^https\?://upload.wikimedia.org/' \
-| cut -f 1 -d ? \
-| grep -v 
'https\?://upload.wikimedia.org/\(\|monitoring/backend\|robots.txt\|crossdomain.xml\|.\{1000,\}\)$'
 \
-|| true
-
+beeline --silent=true --fastConnect=true  --showHeader=false -e 
"$hive_query" || true
 }
 
 set_guard_arguments() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b4d48a51e5024efa335aa6e382c6b2e7a6722fc
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Delink new parsoid-vd test runs from updates to parsoid git ...

2017-04-03 Thread Subramanya Sastry (Code Review)

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

Change subject: Delink new parsoid-vd test runs from updates to parsoid git repo
..

Delink new parsoid-vd test runs from updates to parsoid git repo

We may not want to start new visual diff test runs with every
new parsoid code update since not all parsoid updates affect
rendering and fix visual diffs.

Rely on an existing feature of testreduce where it requests a test id
from a function instead. For this instance on ruthenium, we let the
ruthenium branch of the visualdiff git repo to provide this function.

In this case, I've added a function to that branch to read this test id
from a file. This lets anyone on the Parsing team (without sudo access)
to update the relevant code by updating that test id text file.

Change-Id: Ib6b27c556ff58082ae3c4c00d2999e86265cec5f
---
M modules/testreduce/templates/parsoid-vd-client.config.js.erb
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/346196/1

diff --git a/modules/testreduce/templates/parsoid-vd-client.config.js.erb 
b/modules/testreduce/templates/parsoid-vd-client.config.js.erb
index 4685063..5ef69fb 100644
--- a/modules/testreduce/templates/parsoid-vd-client.config.js.erb
+++ b/modules/testreduce/templates/parsoid-vd-client.config.js.erb
@@ -58,8 +58,11 @@
 
postJSON: true,
 
-   // Path of the git repo
-   gitRepoPath: '/srv/deployment/parsoid/deploy/src',
+   // The return value of this function is the key for parsoid-vd 
test runs
+   // You can start new test runs by updating the string this 
function returns.
+   // Set "gitRepoPath: " if you want to control 
this automatically
+   // based on when code in a git repo is updated.
+   gitCommitFetch: clientScripts.getTestRunId,
 
runTest: clientScripts.generateVisualDiff,
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6b27c556ff58082ae3c4c00d2999e86265cec5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Pickle] Update keys

2017-04-03 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/346192 )

Change subject: [Pickle] Update keys
..


[Pickle] Update keys

Change-Id: I4849f2baf7fa954bd561994dc7256b4de4968cd3
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 408808e..cf1f78a 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2007,9 +2007,9 @@
 optional = pickle-testspec-subpage, pickle-testcase-subpage, 
pickle-default-subpage
 ignored = pickle-testspec-invoke, pickle-testcase-invoke, pickle-default-invoke
 ignored = pickle-frame-full-header, pickle-frame-vivid-header
-ignored = pickle-report-frame-wrap-description
-ignored = pickle-report-adapt-wrap-line
-ignored = Pickle-report-adapt-wrap-description, 
pickle-report-adapt-full-wrap-line
+ignored = pickle-report-frame-wrap-description, pickle-report-adapt-wrap-line
+ignored = pickle-report-adapt-todo-no-description, 
pickle-report-adapt-skip-no-description
+ignored = pickle-report-adapt-wrap-description
 
 Pipe Escape
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4849f2baf7fa954bd561994dc7256b4de4968cd3
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Pickle] Update keys

2017-04-03 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346192 )

Change subject: [Pickle] Update keys
..

[Pickle] Update keys

Change-Id: I4849f2baf7fa954bd561994dc7256b4de4968cd3
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/92/346192/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 408808e..cf1f78a 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2007,9 +2007,9 @@
 optional = pickle-testspec-subpage, pickle-testcase-subpage, 
pickle-default-subpage
 ignored = pickle-testspec-invoke, pickle-testcase-invoke, pickle-default-invoke
 ignored = pickle-frame-full-header, pickle-frame-vivid-header
-ignored = pickle-report-frame-wrap-description
-ignored = pickle-report-adapt-wrap-line
-ignored = Pickle-report-adapt-wrap-description, 
pickle-report-adapt-full-wrap-line
+ignored = pickle-report-frame-wrap-description, pickle-report-adapt-wrap-line
+ignored = pickle-report-adapt-todo-no-description, 
pickle-report-adapt-skip-no-description
+ignored = pickle-report-adapt-wrap-description
 
 Pipe Escape
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4849f2baf7fa954bd561994dc7256b4de4968cd3
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: fix jsdoc lint errors

2017-04-03 Thread BearND (Code Review)

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

Change subject: Hygiene: fix jsdoc lint errors
..

Hygiene: fix jsdoc lint errors

A new version of our eslint config was picked up failing the build.

Change-Id: I7641a7670abad931cd10b326dfee80d8adb7886e
---
M app.js
M lib/anchorencode.js
M lib/api-util.js
M lib/dateUtil.js
M lib/feed/featured-image.js
M lib/feed/featured.js
M lib/mobile-util.js
M lib/mwapi.js
M lib/parseProperty.js
M lib/parsoid-access.js
M lib/transformations/markReferenceSections.js
M lib/transforms.js
M lib/util.js
M package.json
M routes/on-this-day.js
M test/diff/diff.js
M test/utils/assert.js
M test/utils/testUtil.js
18 files changed, 124 insertions(+), 155 deletions(-)


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

diff --git a/app.js b/app.js
index 4ac9024..413ff72 100644
--- a/app.js
+++ b/app.js
@@ -137,7 +137,7 @@
 /**
  * Loads all routes declared in routes/ into the app
  * @param {!Application} app the application object to load routes into
- * @returns {!bluebird} a promise resolving to the app object
+ * @return {!bluebird} a promise resolving to the app object
  */
 function loadRoutes(app) {
 
@@ -189,7 +189,7 @@
 /**
  * Creates and start the service's web server
  * @param {!Application} app the app object to use in the service
- * @returns {!bluebird} a promise creating the web server
+ * @return {!bluebird} a promise creating the web server
  */
 function createServer(app) {
 
diff --git a/lib/anchorencode.js b/lib/anchorencode.js
index 6ff01a4..906f883 100644
--- a/lib/anchorencode.js
+++ b/lib/anchorencode.js
@@ -5,15 +5,13 @@
 /**
  * Encodes an input string so that it can be used as an HTML anchor id
  * (e.g. for a section in a page: ).
- *
  * See 
https://www.mediawiki.org/wiki/Manual:PAGENAMEE_encoding#Encodings_compared
  * https://www.mediawiki.org/wiki/Special:Code/MediaWiki/16279
  * core/include/parser/CoreParserFunctions.php
  * https://phabricator.wikimedia.org/T9059
  * https://gerrit.wikimedia.org/r/#/c/226032/
- *
- * @param input the input string (usually the heading text of a section 
heading)
- * @return the sanitized version of the input string so it can be used as an 
anchor.
+ * @param {!string} input the input string (usually the heading text of a 
section heading)
+ * @return {!string} the sanitized version of the input string so it can be 
used as an anchor.
  */
 function anchorencode(input) {
 const id = input.replace(/\s+/g, '_');
diff --git a/lib/api-util.js b/lib/api-util.js
index 447503f..9fd9959 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -10,7 +10,6 @@
 
 /**
  * Calls the MW API with the supplied query as its body
- *
  * @param {!Object} app the application object
  * @param {string} domain the domain to issue the request to
  * @param {?Object} query an object with all the query parameters for the MW 
API
@@ -47,7 +46,6 @@
 
 /**
  * Calls the REST API with the supplied domain, path and request parameters
- *
  * @param {!Object} app the application object
  * @param {string} domain the domain to issue the request for
  * @param {!string} path the REST API path to contact without the leading slash
@@ -81,7 +79,6 @@
 
 /**
  * Sets up the request templates for MW and RESTBase API requests
- *
  * @param {!Application} app the application object
  */
 function setupApiTemplates(app) {
@@ -114,7 +111,7 @@
 
 /**
  * Checks if the query failed based on the response status code
- * @param response the response received from the API
+ * @param {Response} response the response received from the API
  */
 function checkResponseStatus(response) {
 if (response.status < 200 || response.status > 399) {
diff --git a/lib/dateUtil.js b/lib/dateUtil.js
index c1f13fa..e0b3bd7 100644
--- a/lib/dateUtil.js
+++ b/lib/dateUtil.js
@@ -10,9 +10,7 @@
 /**
  * Returns a Date object with the desired date as specified in the request.
  * The expected format is "/mm/dd".
- *
  * Example: "2016/05/11"
- *
  * @param {!Object} req Object (looking for params property with subproperties 
, mm, dd.
  * @return {!Date} date object
  */
@@ -60,9 +58,7 @@
 /**
  * Returns a String formatted in ISO date format -- just the date. Timezone is 
UTC.
  * This is similar to Date.toISOString() but without the time and time zone 
portions.
- *
  * Example: "2016-05-16"
- *
  * @param {!Date} date date to be used
  * @return {!String} formatted date string
  */
@@ -93,7 +89,6 @@
 
 /**
  * Checks whether the date is within the last 3 days before today started in 
UTC-0 timezone.
- *
  * @param {Date} reqDate a date to check in UTC-0 timezone
  * @return {boolean} true if the date is within the last 3 days
  */
diff --git a/lib/feed/featured-image.js b/lib/feed/featured-image.js
index 43a0e08..3d3b612 100644
--- a/lib/feed/featured-image.js
+++ b/lib/feed/featured-image.js
@@ -29,7 +29,6

[MediaWiki-commits] [Gerrit] css-sanitizer[master]: Fix unicode-range parsing

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix unicode-range parsing
..


Fix unicode-range parsing

It's syntactically valid to have a range that's backwards or that ends
beyond U+10. The former certainly should not throw an exception.

Change-Id: I21b5d38e7b3ec0fc7704c1361a8d5f9cd993a798
---
M src/Objects/Token.php
M tests/Objects/TokenTest.php
M tests/Parser/DataSourceTokenizerTest.php
3 files changed, 6 insertions(+), 7 deletions(-)

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



diff --git a/src/Objects/Token.php b/src/Objects/Token.php
index 455fa29..3f0ccb3 100644
--- a/src/Objects/Token.php
+++ b/src/Objects/Token.php
@@ -198,9 +198,6 @@
} else {
$this->end = $value['end'];
}
-   if ( $this->end < $this->start ) {
-   throw new \InvalidArgumentException( 
'End may not be less than start' );
-   }
break;
 
case self::T_BAD_STRING:
diff --git a/tests/Objects/TokenTest.php b/tests/Objects/TokenTest.php
index 94c7375..1836eaf 100644
--- a/tests/Objects/TokenTest.php
+++ b/tests/Objects/TokenTest.php
@@ -236,8 +236,6 @@
[ Token::T_UNICODE_RANGE, [ 'start' => 42, 'end' => 
500.0 ],
$iae( 'Ending code point must be an integer' ) 
],
[ Token::T_UNICODE_RANGE, [ 'start' => 42, 'end' => 500 
] ],
-   [ Token::T_UNICODE_RANGE, [ 'start' => 42, 'end' => 41 
],
-   $iae( 'End may not be less than start' ) ],
 
[ Token::T_BAD_STRING, null ],
[ Token::T_BAD_URL, null ],
diff --git a/tests/Parser/DataSourceTokenizerTest.php 
b/tests/Parser/DataSourceTokenizerTest.php
index 1ef596a..39ecc51 100644
--- a/tests/Parser/DataSourceTokenizerTest.php
+++ b/tests/Parser/DataSourceTokenizerTest.php
@@ -302,7 +302,7 @@
],
 
'unicode range' => [
-   'U+12-FdDd U+10? u+0-f u+98- 120 U+???-abcd 
U-123 U+x',
+   'U+12-FdDd U+10? u+0-f u+98- 120 U+???-abcd 
U-123 U+x U+200-100 U+FF',
[
self::t( Token::T_UNICODE_RANGE, 1, 1, 
'', [ 'start' => 0x12, 'end' => 0xfddd ] ),
self::t( Token::T_WHITESPACE, 1, 10 ),
@@ -324,7 +324,11 @@
self::t( Token::T_IDENT, 1, 54, 'U' ),
self::t( Token::T_DELIM, 1, 55, '+' ),
self::t( Token::T_IDENT, 1, 56, 'x' ),
-   self::t( Token::T_EOF, 1, 57 ),
+   self::t( Token::T_WHITESPACE, 1, 57 ),
+   self::t( Token::T_UNICODE_RANGE, 1, 58, 
'', [ 'start' => 0x200, 'end' => 0x100 ] ),
+   self::t( Token::T_WHITESPACE, 1, 67 ),
+   self::t( Token::T_UNICODE_RANGE, 1, 68, 
'', [ 'start' => 0xff, 'end' => 0xff ] ),
+   self::t( Token::T_EOF, 1, 76 ),
]
],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21b5d38e7b3ec0fc7704c1361a8d5f9cd993a798
Gerrit-PatchSet: 1
Gerrit-Project: css-sanitizer
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix theming for Toolbars containing ButtonGroups

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix theming for Toolbars containing ButtonGroups
..


Fix theming for Toolbars containing ButtonGroups

Also, demo this being done, with a "[ Save | v ]" arrangement.

Bug: T160791
Change-Id: I9ef87324cae77ce37090c2bc5580388d7ce73bd3
---
M demos/pages/toolbars.js
M src/themes/mediawiki/tools.less
2 files changed, 51 insertions(+), 6 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js
index 9cf90f6..ff29152 100644
--- a/demos/pages/toolbars.js
+++ b/demos/pages/toolbars.js
@@ -1,5 +1,5 @@
 Demo.static.pages.toolbars = function ( demo ) {
-   var i, toolGroups, saveButton, deleteButton, actionButton, 
actionButtonDisabled, PopupTool, ToolGroupTool,
+   var i, toolGroups, saveButton, deleteButton, actionButton, actionGroup, 
actionButtonDisabled, PopupTool, ToolGroupTool,
setDisabled = function () { this.setDisabled( true ); },
$demo = demo.$element,
$containers = $(),
@@ -12,7 +12,9 @@
{},
{ actions: true },
{ position: 'bottom' },
-   { actions: true, position: 'bottom' }
+   { actions: true, position: 'bottom' },
+   {},
+   { actions: true }
];
 
// Show some random accelerator keys that don't actually work
@@ -26,7 +28,7 @@
}[ name ];
}
 
-   for ( i = 0; i <= 5; i++ ) {
+   for ( i = 0; i <= 7; i++ ) {
toolFactories.push( new OO.ui.ToolFactory() );
toolGroupFactories.push( new OO.ui.ToolGroupFactory() );
toolbars.push( new OO.ui.Toolbar( toolFactories[ i ], 
toolGroupFactories[ i ], configs[ i ] ) );
@@ -268,6 +270,27 @@
include: [ { group: 'autoDisableListTools' }, { group: 
'unusedStuff' } ]
}
] );
+   // Action toolbar for toolbars[7]
+   toolbars[ 6 ].setup( [
+   {
+   type: 'list',
+   indicator: 'down',
+   include: [ { group: 'listTools' } ]
+   }
+   ] );
+   // Toolbar with action buttons, in a buttongroup
+   toolbars[ 7 ].setup( [
+   {
+   type: 'menu',
+   icon: 'image',
+   include: [ { group: 'menuTools' } ]
+   },
+   {
+   type: 'disabledMenu',
+   icon: 'image',
+   include: [ { group: 'disabledMenuTools' } ]
+   }
+   ] );
 
actionButton = new OO.ui.ButtonWidget( { label: 'Action' } );
actionButtonDisabled = new OO.ui.ButtonWidget( { label: 'Disabled', 
disabled: true } );
@@ -278,6 +301,12 @@
saveButton = new OO.ui.ButtonWidget( { label: 'Save', flags: [ 
'progressive', 'primary' ] } );
toolbars[ i ].$actions.append( toolbars[ i - 1 ].$element, 
deleteButton.$element, saveButton.$element );
}
+
+   saveButton = new OO.ui.ButtonWidget( { label: 'Save', flags: [ 
'progressive', 'primary' ] } );
+   actionGroup = new OO.ui.ButtonGroupWidget( {
+   items: [ saveButton, toolbars[ 6 ].items[ 0 ] ]
+   } );
+   toolbars[ 7 ].$actions.append( actionGroup.$element );
 
for ( i = 0; i < toolbars.length; i++ ) {
toolbars[ i ].emit( 'updateState' );
@@ -360,6 +389,9 @@
createToolGroup( 0, 'autoDisableListTools' );
createToolGroup( 1, 'menuTools' );
createToolGroup( 1, 'disabledMenuTools' );
+   createToolGroup( 6, 'listTools' );
+   createToolGroup( 7, 'menuTools' );
+   createToolGroup( 7, 'disabledMenuTools' );
for ( i = 3; i <= 5; i += 2 ) {
createToolGroup( i - 1, 'listTools' );
createToolGroup( i, 'history' );
@@ -374,7 +406,7 @@
}
 
for ( i = 0; i < toolbars.length; i++ ) {
-   if ( i === 2 || i === 4 ) {
+   if ( i === 2 || i === 4 || i === 6 ) {
// Action toolbars
continue;
}
@@ -393,7 +425,8 @@
$containers.eq( 0 ).append( 'Toolbar' ),
$containers.eq( 1 ).append( 'Toolbar with action buttons' ),
$containers.eq( 2 ).append( 'Word processor toolbar' ),
-   $containers.eq( 3 ).prepend( 'Position bottom' )
+   $containers.eq( 3 ).prepend( 'Position bottom' ),
+   $containers.eq( 4 ).append( 'Toolbar with action buttons in a group' )
);
for ( i = 0; i < toolbars.length; i++ ) {

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Revert "Use color icon instead of b/w one."

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Use color icon instead of b/w one."
..


Revert "Use color icon instead of b/w one."

This reverts commit cf8a1dc71772724e13d901811904104d0cc3f52f.

Bug: T162047
Change-Id: I35c03bf4480985d8ff54e8db1186569012d7d226
---
M index.html
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/index.html b/index.html
index 8b07e8d..94cd5f6 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@


 
-   
+   




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35c03bf4480985d8ff54e8db1186569012d7d226
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
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]: Add skin, language, and variant to user_properties_anon

2017-04-03 Thread Andrew Bogott (Code Review)

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

Change subject: Add skin, language, and variant to user_properties_anon
..


Add skin, language, and variant to user_properties_anon

Bug: T152043
Change-Id: Id4841993435708da5f416a68550883194a532a42
---
M modules/role/files/labs/db/views/maintain-meta_p.py
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  BryanDavis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/role/files/labs/db/views/maintain-meta_p.py 
b/modules/role/files/labs/db/views/maintain-meta_p.py
index 71b75e4..9e5f439 100644
--- a/modules/role/files/labs/db/views/maintain-meta_p.py
+++ b/modules/role/files/labs/db/views/maintain-meta_p.py
@@ -351,7 +351,8 @@
 ops.write_execute("START TRANSACTION;")
 ops.write_execute("DELETE FROM meta_p.properties_anon_whitelist;")
 # This is hardcoded for now
-ops.write_execute("INSERT INTO meta_p.properties_anon_whitelist VALUES 
('gadget-%');")
+ops.write_execute("""INSERT INTO meta_p.properties_anon_whitelist
+VALUES ('gadget-%','language,'skin','variant');""")
 ops.write_execute("COMMIT;")
 
 if __name__ == '__main__':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4841993435708da5f416a68550883194a532a42
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Revert "Use color icon instead of b/w one."

2017-04-03 Thread Smalyshev (Code Review)

Hello Jonas Kress (WMDE), jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Use color icon instead of b/w one."
..

Revert "Use color icon instead of b/w one."

This reverts commit cf8a1dc71772724e13d901811904104d0cc3f52f.

Bug: T162047
Change-Id: I35c03bf4480985d8ff54e8db1186569012d7d226
---
M index.html
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/90/346190/1

diff --git a/index.html b/index.html
index 8b07e8d..94cd5f6 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@


 
-   
+   




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35c03bf4480985d8ff54e8db1186569012d7d226
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: The group is 'project-testlabs, ' not 'testlabs'

2017-04-03 Thread Andrew Bogott (Code Review)

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

Change subject: toolschecker:  The group is 'project-testlabs,' not 'testlabs'
..


toolschecker:  The group is 'project-testlabs,' not 'testlabs'

Bug: T126758
Change-Id: I31c8bb9e0f1ba716b3295e7b4ee64d26a800397d
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 91bfe3f..517af90 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -90,7 +90,7 @@
 conn.start_tls_s()
 conn.simple_bind_s(config['user'], config['password'])
 
-query = '(cn=testlabs)'
+query = '(cn=project-testlabs)'
 base = 'ou=groups,dc=wikimedia,dc=org'
 result = conn.search_s(base, ldap.SCOPE_SUBTREE, query)
 if len(result) == 0:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: The group is 'project-testlabs, ' not 'testlabs'

2017-04-03 Thread Andrew Bogott (Code Review)

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

Change subject: toolschecker:  The group is 'project-testlabs,' not 'testlabs'
..

toolschecker:  The group is 'project-testlabs,' not 'testlabs'

Bug: T126758
Change-Id: I31c8bb9e0f1ba716b3295e7b4ee64d26a800397d
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 91bfe3f..517af90 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -90,7 +90,7 @@
 conn.start_tls_s()
 conn.simple_bind_s(config['user'], config['password'])
 
-query = '(cn=testlabs)'
+query = '(cn=project-testlabs)'
 base = 'ou=groups,dc=wikimedia,dc=org'
 result = conn.search_s(base, ldap.SCOPE_SUBTREE, query)
 if len(result) == 0:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31c8bb9e0f1ba716b3295e7b4ee64d26a800397d
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...CentralAuth[master]: Use tabs to indent in json

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Use tabs to indent in json
..


Use tabs to indent in json

Change-Id: I5d8fe4fdf2afc91393b82d046ef3ff3629d0f476
---
M i18n/got.json
M package.json
2 files changed, 22 insertions(+), 22 deletions(-)

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



diff --git a/i18n/got.json b/i18n/got.json
index 3556c61..3ab64a9 100644
--- a/i18n/got.json
+++ b/i18n/got.json
@@ -1,12 +1,12 @@
 {
-"@metadata": {
-"authors": [
-"AndreasJS",
-"Crazymadlover",
-"Jocke Pirat",
-"LeighvsOptimvsMaximvs",
-"Omnipaedista"
-]
-},
-"centralauth-admin-reason": "̰̹̹̰͆͂̽:"
+   "@metadata": {
+   "authors": [
+   "AndreasJS",
+   "Crazymadlover",
+   "Jocke Pirat",
+   "LeighvsOptimvsMaximvs",
+   "Omnipaedista"
+   ]
+   },
+   "centralauth-admin-reason": "̰̹̹̰͆͂̽:"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index ba8c911..7d4b417 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
-  "private": true,
-  "scripts": {
-"test": "grunt test"
-  },
-  "devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-banana-checker": "0.4.0",
-"grunt-jsonlint": "1.0.7",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-jscs": "2.1.0"
-  }
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "0.4.5",
+   "grunt-cli": "0.1.13",
+   "grunt-banana-checker": "0.4.0",
+   "grunt-jsonlint": "1.0.7",
+   "grunt-contrib-jshint": "0.11.3",
+   "grunt-jscs": "2.1.0"
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d8fe4fdf2afc91393b82d046ef3ff3629d0f476
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Align damaging thresholds to filters thresholds

2017-04-03 Thread Sbisson (Code Review)

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

Change subject: Align damaging thresholds to filters thresholds
..

Align damaging thresholds to filters thresholds

All filters and highlighting thresholds are now
centrally available through the Stats class.

Bug: T160575
Change-Id: Ib982705cc5da4a2ce0207823e8fe3d81a6975060
---
M extension.json
M i18n/en.json
M includes/ApiQueryORES.php
M includes/Hooks.php
M modules/ext.ores.highlighter.css
M modules/ext.ores.highlighter.js
6 files changed, 30 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/88/346188/1

diff --git a/extension.json b/extension.json
index 325ab6c..753c1da 100644
--- a/extension.json
+++ b/extension.json
@@ -131,11 +131,6 @@
"Stub": 5
}
},
-   "OresDamagingThresholds": {
-   "softest": 0.90,
-   "soft": 0.70,
-   "hard": 0.50
-   },
"OresFiltersThresholds": {
"damaging": {
"likelygood": { "min": 0, "max": 0.55 },
@@ -163,7 +158,7 @@
}
},
"DefaultUserOptions": {
-   "oresDamagingPref": "hard",
+   "oresDamagingPref": "likelybad",
"oresRCHideNonDamaging": false,
"oresWatchlistHideNonDamaging": false
},
diff --git a/i18n/en.json b/i18n/en.json
index 058bd2a..9e4d3ef 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,15 +6,15 @@
"ores-beta-feature-message": "ORES",
"ores-desc": "Expose automated revision scores in the interface",
"ores-damaging-filter": "$1 probably good edits",
-   "ores-damaging-hard": "High (flags more edits)",
"ores-damaging-letter": "r",
-   "ores-damaging-soft": "Low (flags fewer edits)",
-   "ores-damaging-softest": "Lowest (flags least edits possible)",
"ores-damaging-title": "This edit needs review",
"ores-damaging-legend": "This edit may be damaging and should be 
reviewed ([[:mw:Special:MyLanguage/ORES review tool|more info]])",
-   "ores-help-damaging-pref": "This threshold determines how sensitive 
ORES is when flagging edits needing review",
+   "ores-damaging-maybebad": "May have problems (flags most problem edits 
but includes many false positives)",
+   "ores-damaging-likelybad": "Likely have problems (medium probability)",
+   "ores-damaging-verylikelybad": "Very likely have problems (flags few 
false positives but finds a smaller % of problem edits)",
+   "ores-help-damaging-pref": "Sets the level of probability required 
before the machine-language service ORES flags edits with an \"r\" to indicate 
that they are likely to have problems and \"need review\" on the Recent 
Changes, Watchlist and Contributions pages. Also affects which edits count as 
\"probably good\" for the \"Hide probably good edits\" preference on those 
pages.",
"ores-hide-nondamaging-filter": "Hide probably good edits",
-   "ores-pref-damaging": "ORES sensitivity",
+   "ores-pref-damaging": "Prediction threshold",
"ores-rcfilters-whats-this-link-text": "Learn more",
"ores-rcfilters-ores-conflicts-logactions-global": "The \"Logged 
actions\" filter conflicts with one or more Contribution Quality or User Intent 
filters. Quality and Intent predictions are not available for logged actions. 
The conflicting filters are marked in the Active Filters area, above.",
"ores-rcfilters-logactions-conflicts-ores": "This filter conflicts with 
one or more Contribution Quality or User Intent filters. Quality and Intent 
predictions are not available for logged actions.",
diff --git a/includes/ApiQueryORES.php b/includes/ApiQueryORES.php
index 947264c..6adeb59 100644
--- a/includes/ApiQueryORES.php
+++ b/includes/ApiQueryORES.php
@@ -37,7 +37,7 @@
}
 
public function execute() {
-   global $wgOresBaseUrl, $wgOresExcludeBots, 
$wgOresDamagingThresholds,
+   global $wgOresBaseUrl, $wgOresExcludeBots,
$wgOresEnabledNamespaces, $wgOresWikiId;
 
$result = $this->getResult();
@@ -46,7 +46,7 @@
'wikiid' => $wgOresWikiId ?: wfWikiID(),
'models' => [],
'excludebots' => (bool)$wgOresExcludeBots,
-   'damagingthresholds' => $wgOresDamagingThresholds,
+   'damagingthresholds' => Hooks::getDamagingThresholds(),
'namespaces' => $wgOresEnabledNamespaces
? array_keys( array_filter( 
$wgOresEnabledNamespaces ) )
: \MWNamespace::getValidNamespaces(),
diff --git a/includes/Hooks.php

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Test ldap by checking ou=groups instead of ou...

2017-04-03 Thread Andrew Bogott (Code Review)

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

Change subject: toolschecker:  Test ldap by checking ou=groups instead of 
ou=projects
..


toolschecker:  Test ldap by checking ou=groups instead of ou=projects

ou=projects,dc=wikimedia,dc=org is a remnant of the old Keystone
ldap assignment system which isn't used anymore.

Bug: T126758
Change-Id: I9841f0b7fb48ff01bd4db8bbd887409410564ad7
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index ebaa5ae..91bfe3f 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -91,7 +91,7 @@
 conn.simple_bind_s(config['user'], config['password'])
 
 query = '(cn=testlabs)'
-base = 'ou=projects,dc=wikimedia,dc=org'
+base = 'ou=groups,dc=wikimedia,dc=org'
 result = conn.search_s(base, ldap.SCOPE_SUBTREE, query)
 if len(result) == 0:
 return False

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Test ldap by checking ou=groups instead of ou...

2017-04-03 Thread Andrew Bogott (Code Review)

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

Change subject: toolschecker:  Test ldap by checking ou=groups instead of 
ou=projects
..

toolschecker:  Test ldap by checking ou=groups instead of ou=projects

ou=projects,dc=wikimedia,dc=org is a remnant of the old Keystone
ldap assignment system which isn't used anymore.

Bug: T126758
Change-Id: I9841f0b7fb48ff01bd4db8bbd887409410564ad7
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/346187/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index ebaa5ae..91bfe3f 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -91,7 +91,7 @@
 conn.simple_bind_s(config['user'], config['password'])
 
 query = '(cn=testlabs)'
-base = 'ou=projects,dc=wikimedia,dc=org'
+base = 'ou=groups,dc=wikimedia,dc=org'
 result = conn.search_s(base, ldap.SCOPE_SUBTREE, query)
 if len(result) == 0:
 return False

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9841f0b7fb48ff01bd4db8bbd887409410564ad7
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] labs...wikibugs2[master]: Wikibugs realname should use HTTPS over HTTP

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Wikibugs realname should use HTTPS over HTTP
..


Wikibugs realname should use HTTPS over HTTP

Bug: T161421
Change-Id: I1567e05fceb4b302cda1685f806e3d28366ffbdd
---
M redis2irc.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/redis2irc.py b/redis2irc.py
index 01d73ce..c617a4a 100644
--- a/redis2irc.py
+++ b/redis2irc.py
@@ -150,7 +150,7 @@
 port=6667,
 password=conf.get('IRC_PASSWORD'),
 realname='wikibugs2',
-userinfo=('Wikibugs v2.1, http://tools.wmflabs.org/wikibugs/ ,' +
+userinfo=('Wikibugs v2.1, https://tools.wmflabs.org/wikibugs/ ,' +
   'running on ' + current_host),
 includes=[
 'irc3.plugins.core',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1567e05fceb4b302cda1685f806e3d28366ffbdd
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: MtDu 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfsclient: Enable lookupcache by default for all nfs client ...

2017-04-03 Thread Madhuvishy (Code Review)

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

Change subject: nfsclient: Enable lookupcache by default for all nfs client 
instances
..


nfsclient: Enable lookupcache by default for all nfs client instances

Bug: T136712
Change-Id: I363d67ec81f0d0f267e22deb3b3c5bb7befacea5
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index 9a578c4..baa33db 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -1,6 +1,6 @@
 class role::labs::nfsclient(
 $mode = 'hard',
-$lookupcache = 'none',
+$lookupcache = 'all',
 ) {
 
 labstore::nfs_mount { 'project-on-labstore-secondary':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: RC filters: highlight guided tour

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: RC filters: highlight guided tour
..


RC filters: highlight guided tour

Soft dependency on I16009c5d96f2cafddb8d545eedbf9ca1e11d06c6

Bug: T151006
Change-Id: Idf8196894cc5d7307934e615640074a108598829
---
M WikimediaMessages.hooks.php
M extension.json
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
A modules/images/highlight-tour-ltr.svg
A modules/images/highlight-tour-rtl.svg
A modules/rcfilters-highlight-tour-hooks.js
A modules/rcfilters-highlight-tour.js
A modules/rcfilters-highlight-tour.less
9 files changed, 308 insertions(+), 4 deletions(-)

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



diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index 0b94c1c..b6dfa52 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1343,15 +1343,22 @@
if (
$title->isSpecial( 'Recentchanges' ) &&
$user->isLoggedIn() &&
-   !!$user->getOption( 'rcenhancedfilters' ) &&
-   !$user->getOption( 'rcenhancedfilters-seen-tour' )
+   !!$user->getOption( 'rcenhancedfilters' )
) {
-   GuidedTourLauncher::launchTourByCookie( 
'RcFiltersBeta', 'Welcome' );
+   if ( !$user->getOption( 'rcenhancedfilters-seen-tour' ) 
) {
+   GuidedTourLauncher::launchTourByCookie( 
'RcFiltersBeta', 'Welcome' );
+   }
+
+   if ( !$user->getOption( 
'rcenhancedfilters-tried-highlight' ) ) {
+   $out->addModules( 
'ext.guidedTour.tour.RcFiltersHighlight' );
+   }
+
}
}
 
public static function onResourceLoaderRegisterModules( ResourceLoader 
&$resourceLoader ) {
if ( class_exists( 'GuidedTourHooks' ) ) {
+
$resourceLoader->register( 
'ext.guidedTour.tour.RcFiltersBeta', [
'localBasePath' => __DIR__ . '/modules',
'remoteExtPath' => 'WikimediaMessages/modules',
@@ -1366,13 +1373,31 @@
'ext.guidedTour'
],
] );
+
+   $resourceLoader->register( 
'ext.guidedTour.tour.RcFiltersHighlight', [
+   'localBasePath' => __DIR__ . '/modules',
+   'remoteExtPath' => 'WikimediaMessages/modules',
+   'scripts' => [
+   'rcfilters-highlight-tour-hooks.js',
+   'rcfilters-highlight-tour.js',
+   ],
+   'styles' => 'rcfilters-highlight-tour.less',
+   'messages' => [
+   'eri-rcfilters-tour-highlight-title',
+   
'eri-rcfilters-tour-highlight-description',
+   'eri-rcfilters-tour-highlight-button',
+   ],
+   'dependencies' => [
+   'ext.guidedTour'
+   ],
+   ] );
}
 
return true;
}
 
/**
-* Register 'rcenhancedfilters-seen-tour' preference
+* Register RC Filters preferences
 *
 * @param $user User object
 * @param &$preferences array Preferences object
@@ -1383,6 +1408,14 @@
'type' => 'api',
];
 
+   $preferences[ 'rcenhancedfilters-tried-highlight' ] = [
+   'type' => 'api',
+   ];
+
+   $preferences[ 'rcenhancedfilters-seen-highlight-button-counter' 
] = [
+   'type' => 'api',
+   ];
+
return true;
}
 }
diff --git a/extension.json b/extension.json
index 67ddba7..df77512 100644
--- a/extension.json
+++ b/extension.json
@@ -103,5 +103,8 @@
"config": {
"EnableRcFiltersBetaFeature": false
},
+   "DefaultUserOptions": {
+   "rcenhancedfilters-seen-highlight-button-counter": 0
+   },
"manifest_version": 1
 }
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index fba2956..a168afb 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -278,6 +278,9 @@
"eri-rcfilters-tour-welcome-title": "Introducing: New Filters for Edit 
Review (beta)",
"eri-rcfilters-tour-welcome-description": "Combine improved tools, a 
new interface and the power of machine learning to fight

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RC Filters: Hooks for highlight guided tour

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: RC Filters: Hooks for highlight guided tour
..


RC Filters: Hooks for highlight guided tour

Also prevent the reset/trash button from opening the popup.

Bug: T151006
Change-Id: I16009c5d96f2cafddb8d545eedbf9ca1e11d06c6
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
4 files changed, 19 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 14eabe2..e334d5d 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -256,6 +256,10 @@
mw.rcfilters.Controller.prototype.toggleHighlight = function () {
this.filtersModel.toggleHighlight();
this.updateURL();
+
+   if ( this.filtersModel.isHighlightEnabled() ) {
+   mw.hook( 'RcFilters.highlight.enable' ).fire();
+   }
};
 
/**
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index 728bb38..20eff8b 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -50,14 +50,13 @@
// Events
this.model.connect( this, { update: 'onModelUpdate' } );
 
-   this.closeButton.$element.on( 'mousedown', 
this.onCloseButtonMouseDown.bind( this ) );
-
// Initialization
this.$overlay.append( this.popup.$element );
this.$element
.prepend( this.$highlight )
.attr( 'aria-haspopup', 'true' )
.addClass( 'mw-rcfilters-ui-capsuleItemWidget' )
+   .on( 'mousedown', this.onMouseDown.bind( this ) )
.on( 'mouseenter', this.onMouseEnter.bind( this ) )
.on( 'mouseleave', this.onMouseLeave.bind( this ) );
 
@@ -84,7 +83,7 @@
 *
 * @param {jQuery.Event} e Event
 */
-   mw.rcfilters.ui.CapsuleItemWidget.prototype.onCloseButtonMouseDown = 
function ( e ) {
+   mw.rcfilters.ui.CapsuleItemWidget.prototype.onMouseDown = function ( e 
) {
e.stopPropagation();
};
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index e481bde..f4f460d 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -49,6 +49,7 @@
 
// Events
this.resetButton.connect( this, { click: 'onResetButtonClick' } 
);
+   this.resetButton.$element.on( 'mousedown', 
this.onResetButtonMouseDown.bind( this ) );
this.model.connect( this, {
itemUpdate: 'onModelItemUpdate',
highlightChange: 'onModelHighlightChange'
@@ -167,6 +168,15 @@
};
 
/**
+* Respond to mouse down event on the reset button to prevent the popup 
from opening
+*
+* @param {jQuery.Event} e Event
+*/
+   
mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.onResetButtonMouseDown 
= function ( e ) {
+   e.stopPropagation();
+   };
+
+   /**
 * Reevaluate the restore state for the widget between setting to 
defaults and clearing all filters
 */

mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.reevaluateResetRestoreState
 = function () {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 1fba18c..761fc65 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -98,6 +98,7 @@
this.filterPopup.select( filterName );
this.capsule.select( item );
 
+   this.capsule.popup.toggle( true );
this.scrollToTop( filterWidget.$element );
};
 
@@ -114,6 +115,8 @@

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Do not use fancy styled badge on Modern and CologneBlue

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Do not use fancy styled badge on Modern and CologneBlue
..


Do not use fancy styled badge on Modern and CologneBlue

Just show the textual "Alerts (1)" and "Notices (1)".

Updated NotificationBadgeWidget to use that internally as label,
same as the PHP-generated list item does after d4d325e7.

Bug: T141944
Change-Id: I468c67b0866530e21c9af32cd02816075a3693a1
---
M extension.json
A modules/nojs/mw.echo.alert.cologneblue.less
M modules/nojs/mw.echo.alert.modern.less
D modules/nojs/mw.echo.badge.modern.less
M modules/styles/mw.echo.ui.NotificationBadgeWidget.modern.less
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
6 files changed, 42 insertions(+), 31 deletions(-)

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



diff --git a/extension.json b/extension.json
index 2dec0f1..7e1bb16 100644
--- a/extension.json
+++ b/extension.json
@@ -193,6 +193,8 @@
"mediawiki.api.options"
],
"messages": [
+   "echo-notification-notice",
+   "echo-notification-alert",
"echo-popup-footer-special-page-invitation",
"echo-popup-footer-special-page-invitation-link"
],
@@ -405,19 +407,20 @@
},
"ext.echo.styles.badge": {
"position": "top",
-   "styles": [
-   "nojs/mw.echo.badge.less"
-   ],
"skinStyles": {
+   "default": [
+   "nojs/mw.echo.badge.less"
+   ],
"monobook": [
+   "nojs/mw.echo.badge.less",
"nojs/mw.echo.badge.monobook.less"
],
"vector": [
+   "nojs/mw.echo.badge.less",
"nojs/mw.echo.badge.vector.less"
],
-   "modern": [
-   "nojs/mw.echo.badge.modern.less"
-   ]
+   "cologneblue": [],
+   "modern": []
},
"targets": [
"desktop",
@@ -446,6 +449,9 @@
],
"modern": [
"nojs/mw.echo.alert.modern.less"
+   ],
+   "cologneblue": [
+   "nojs/mw.echo.alert.cologneblue.less"
]
},
"targets": [
diff --git a/modules/nojs/mw.echo.alert.cologneblue.less 
b/modules/nojs/mw.echo.alert.cologneblue.less
new file mode 100644
index 000..af97fb6
--- /dev/null
+++ b/modules/nojs/mw.echo.alert.cologneblue.less
@@ -0,0 +1,3 @@
+#pt-mytalk a.mw-echo-alert {
+   padding: 0;
+}
diff --git a/modules/nojs/mw.echo.alert.modern.less 
b/modules/nojs/mw.echo.alert.modern.less
index 716369d..2800940 100644
--- a/modules/nojs/mw.echo.alert.modern.less
+++ b/modules/nojs/mw.echo.alert.modern.less
@@ -1,3 +1,9 @@
 #pt-mytalk a.mw-echo-alert {
border-radius: 0;
+   display: block;
+   height: 100%;
+}
+
+#pt-mytalk a.mw-echo-alert:hover {
+   background-color: #fab951;
 }
diff --git a/modules/nojs/mw.echo.badge.modern.less 
b/modules/nojs/mw.echo.badge.modern.less
deleted file mode 100644
index 4848401..000
--- a/modules/nojs/mw.echo.badge.modern.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.mw-echo-notifications-badge {
-   #pt-notifications-alert &,
-   #pt-notifications-notice & {
-   &:before {
-   z-index: 0;
-   }
-   }
-}
diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.modern.less 
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.modern.less
index 6dc5914..96c5a7d 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.modern.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.modern.less
@@ -3,16 +3,15 @@
 }
 
 #p-personal li.mw-echo-ui-notificationBadgeButtonPopupWidget {
-   font-variant: normal;
-   text-transform: none;
-   font-weight: normal;
-   // Badge
-   > .oo-ui-buttonElement-button {
-   border-radius: 0;
-   }
-   // Popup buttons
-   .oo-ui-buttonElement-button:hover {
-   // In modern, the hover color is white, which is unhelpful.

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: allow command execution for Ayounsi

2017-04-03 Thread Ayounsi (Code Review)

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

Change subject: icinga: allow command execution for Ayounsi
..


icinga: allow command execution for Ayounsi

Bug: T162073
Change-Id: I0fe7833ca425525cc667678178e6b4eddcee93c2
---
M modules/icinga/files/cgi.cfg
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/icinga/files/cgi.cfg b/modules/icinga/files/cgi.cfg
index 5446c52..7a8abf0 100644
--- a/modules/icinga/files/cgi.cfg
+++ b/modules/icinga/files/cgi.cfg
@@ -131,7 +131,7 @@
 # not use authorization.  You may use an asterisk (*) to
 # authorize any user who has authenticated to the web server.
 
-authorized_for_system_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_system_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
 
 
 # CONFIGURATION INFORMATION ACCESS
@@ -142,7 +142,7 @@
 # an asterisk (*) to authorize any user who has authenticated
 # to the web server.
 
-authorized_for_configuration_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_configuration_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
 
 
 
@@ -155,7 +155,7 @@
 # You may use an asterisk (*) to authorize any user who has
 # authenticated to the web server.
 
-authorized_for_system_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_system_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
 
 
 # GLOBAL HOST/SERVICE VIEW ACCESS
@@ -181,8 +181,8 @@
 # authorization).  You may use an asterisk (*) to authorize any
 # user who has authenticated to the web server.
 
-authorized_for_all_service_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
-authorized_for_all_host_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_all_service_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
+authorized_for_all_host_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Configure Babel for elwikisource

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Configure Babel for elwikisource
..


Configure Babel for elwikisource

Per local consensus, configuring the extension 'Babel' for the Greek
Wikisource.

Bug: T161593
Change-Id: Ieb561172a2b7f4b18bdceded17bb3e22b6d7a29b
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5c80ce4..dd57464 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15429,6 +15429,15 @@
'5' => false,
'N' => 'User %code%-M',
],
+   'elwikisource' => [ // T161593
+   '0' => 'Χρήστης %code%-0',
+   '1' => 'Χρήστης %code%-1',
+   '2' => 'Χρήστης %code%-2',
+   '3' => 'Χρήστης %code%-3',
+   '4' => 'Χρήστης %code%-4',
+   '5' => 'Χρήστης %code%-5',
+   'N' => 'Χρήστης %code%-M',
+   ],
'enwiki' => [
'0' => false,
'1' => 'User %code%-1',
@@ -16033,6 +16042,7 @@
'checkuserwiki' => 'User %code%',
'commonswiki' => 'User %code%',
'cswikiversity' => 'Uživatel %code%', // T15530
+   'elwikisource' => 'Χρήστης %code%', //T161593
'enwiki' => 'User %code%',
'enwikibooks' => 'User %code%',
'enwiktionary' => 'User %code%',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb561172a2b7f4b18bdceded17bb3e22b6d7a29b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DatGuy 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
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]: Valid tags on a gallery should correspond to unordered list

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Valid tags on a gallery should correspond to unordered list
..


Valid tags on a gallery should correspond to unordered list

 * This was introduced in 4d3446a8e3e when galleries were tables.
   However, in 05579cf0e60, it switched to ul's, but missed updating the
   sanitization.

 * As an example, the test shows that summary is currently wrongly
   permitted.

Change-Id: I8c52477dc65499d0c8a1ee5cc661a5f9ae78cc07
---
M includes/parser/Parser.php
M tests/parser/parserTests.txt
2 files changed, 18 insertions(+), 1 deletion(-)

Approvals:
  Subramanya Sastry: Looks good to me, but someone else must approve
  Brion VIBBER: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 47d9a62..be4557d 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4975,7 +4975,7 @@
$ig->setShowFilename( false );
$ig->setParser( $this );
$ig->setHideBadImages();
-   $ig->setAttributes( Sanitizer::validateTagAttributes( $params, 
'table' ) );
+   $ig->setAttributes( Sanitizer::validateTagAttributes( $params, 
'ul' ) );
 
if ( isset( $params['showfilename'] ) ) {
$ig->setShowFilename( true );
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 2def875..3a31351 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -19069,6 +19069,23 @@
 !! end
 ### Note: Above tests excludes the "{{NUMBEROFADMINS}}" magic word because it 
generates a MySQL error when included.
 
+!! test
+Gallery with valid attributes
+!! wikitext
+
+File:File:Foobar.jpg
+
+!! html/php
+
+   
+   File:Foobar.jpg
+   
+   
+   
+
+
+!! end
+
 ## Parsoid thinks the "centre" here is a property, not a caption.
 !! test
 Gallery

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c52477dc65499d0c8a1ee5cc661a5f9ae78cc07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Convert reference lists to 'responsive' on hewiki

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Convert reference lists to 'responsive' on hewiki
..


Convert reference lists to 'responsive' on hewiki

Per consensus at the village pump of hewiki, enabling responsive
references.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f3849c7..5c80ce4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14616,6 +14616,7 @@
 
// Wikis by request
'frwiki' => true, // T160609
+   'hewiki' => true, // T161804
'itwiki' => true, // T160932
'lawiki' => true, // T160844
'nowiki' => true, // T160362

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I378e8254d52a8630e228a0694be146cb5482014b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DatGuy 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update TFA footer saved indicators based on user actions

2017-04-03 Thread jenkins-bot (Code Review)

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

Change subject: Update TFA footer saved indicators based on user actions
..


Update TFA footer saved indicators based on user actions

Updates the visual indication of saved state immediately upon returning
from AddToReadingListDialog.

Leverages the ReadingListPageObserver to update all TFA card saved
indicators if needed upon returning to the Explore feed from another
context.

Bug: T139377
Change-Id: I510863003de30096108a3e20beb0917f522bb59a
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/savedpages/ReadingListPageObserver.java
6 files changed, 99 insertions(+), 43 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 74759e0..921a434 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -2,8 +2,6 @@
 
 import android.app.Activity;
 import android.app.Application;
-import android.database.ContentObserver;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
 import android.support.annotation.IntRange;
@@ -28,8 +26,6 @@
 import org.wikipedia.csrf.CsrfTokenStorage;
 import org.wikipedia.database.Database;
 import org.wikipedia.database.DatabaseClient;
-import org.wikipedia.database.contract.AppContentProviderContract;
-import org.wikipedia.database.contract.ReadingListPageContract;
 import org.wikipedia.dataclient.SharedPreferenceCookieManager;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
@@ -93,7 +89,7 @@
 private AppLanguageState appLanguageState;
 private FunnelManager funnelManager;
 private SessionFunnel sessionFunnel;
-private ContentObserver readingListPageObserver;
+@NonNull private ReadingListPageObserver readingListPageObserver = new 
ReadingListPageObserver(null);
 private NotificationPollBroadcastReceiver notificationReceiver = new 
NotificationPollBroadcastReceiver();
 
 private Database database;
@@ -115,8 +111,7 @@
 private static WikipediaApp INSTANCE;
 
 private Bus bus;
-@NonNull
-private Theme currentTheme = Theme.getFallback();
+@NonNull private Theme currentTheme = Theme.getFallback();
 
 private WikipediaZeroHandler zeroHandler;
 public WikipediaZeroHandler getWikipediaZeroHandler() {
@@ -177,7 +172,7 @@
 AccountUtil.createAccountForLoggedInUser();
 
 UserOptionContentResolver.registerAppSyncObserver(this);
-registerReadingListPageObserver();
+readingListPageObserver.register(this);
 
 listenForNotifications();
 }
@@ -188,6 +183,10 @@
 
 public Bus getBus() {
 return bus;
+}
+
+@NonNull public ReadingListPageObserver getReadingListPageObserver() {
+return readingListPageObserver;
 }
 
 public String getUserAgent() {
@@ -591,15 +590,5 @@
 result = Theme.getFallback();
 }
 return result;
-}
-
-private void registerReadingListPageObserver() {
-readingListPageObserver = new ReadingListPageObserver(null);
-Uri readingListPageBaseUri = ReadingListPageContract.Disk.URI;
-Uri uriWithQuery = readingListPageBaseUri.buildUpon()
-.appendQueryParameter(AppContentProviderContract.NOTIFY, 
"false").build();
-WikipediaApp.getInstance().getContentResolver()
-.registerContentObserver(uriWithQuery, true, 
readingListPageObserver);
-L.i("Registered reading list page observer");
 }
 }
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 95fb51a..3b20988 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -22,6 +22,7 @@
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.activity.FragmentUtil;
 import org.wikipedia.analytics.FeedFunnel;
+import org.wikipedia.feed.featured.FeaturedArticleCard;
 import org.wikipedia.feed.image.FeaturedImage;
 import org.wikipedia.feed.image.FeaturedImageCard;
 import org.wikipedia.feed.model.Card;
@@ -29,6 +30,7 @@
 import org.wikipedia.feed.view.FeedAdapter;
 import org.wikipedia.feed.view.FeedView;
 import org.wikipedia.history.HistoryEntry;
+import org.wikipedia.savedpages.ReadingListPageObserver;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.settings.SettingsActivity;
 import

[MediaWiki-commits] [Gerrit] css-sanitizer[master]: Fix unicode-range parsing

2017-04-03 Thread Anomie (Code Review)

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

Change subject: Fix unicode-range parsing
..

Fix unicode-range parsing

It's syntactically valid to have a range that's backwards or that ends
beyond U+10. The former certainly should not throw an exception.

Change-Id: I21b5d38e7b3ec0fc7704c1361a8d5f9cd993a798
---
M src/Objects/Token.php
M tests/Objects/TokenTest.php
M tests/Parser/DataSourceTokenizerTest.php
3 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/css-sanitizer 
refs/changes/85/346185/1

diff --git a/src/Objects/Token.php b/src/Objects/Token.php
index 455fa29..3f0ccb3 100644
--- a/src/Objects/Token.php
+++ b/src/Objects/Token.php
@@ -198,9 +198,6 @@
} else {
$this->end = $value['end'];
}
-   if ( $this->end < $this->start ) {
-   throw new \InvalidArgumentException( 
'End may not be less than start' );
-   }
break;
 
case self::T_BAD_STRING:
diff --git a/tests/Objects/TokenTest.php b/tests/Objects/TokenTest.php
index 94c7375..1836eaf 100644
--- a/tests/Objects/TokenTest.php
+++ b/tests/Objects/TokenTest.php
@@ -236,8 +236,6 @@
[ Token::T_UNICODE_RANGE, [ 'start' => 42, 'end' => 
500.0 ],
$iae( 'Ending code point must be an integer' ) 
],
[ Token::T_UNICODE_RANGE, [ 'start' => 42, 'end' => 500 
] ],
-   [ Token::T_UNICODE_RANGE, [ 'start' => 42, 'end' => 41 
],
-   $iae( 'End may not be less than start' ) ],
 
[ Token::T_BAD_STRING, null ],
[ Token::T_BAD_URL, null ],
diff --git a/tests/Parser/DataSourceTokenizerTest.php 
b/tests/Parser/DataSourceTokenizerTest.php
index 1ef596a..39ecc51 100644
--- a/tests/Parser/DataSourceTokenizerTest.php
+++ b/tests/Parser/DataSourceTokenizerTest.php
@@ -302,7 +302,7 @@
],
 
'unicode range' => [
-   'U+12-FdDd U+10? u+0-f u+98- 120 U+???-abcd 
U-123 U+x',
+   'U+12-FdDd U+10? u+0-f u+98- 120 U+???-abcd 
U-123 U+x U+200-100 U+FF',
[
self::t( Token::T_UNICODE_RANGE, 1, 1, 
'', [ 'start' => 0x12, 'end' => 0xfddd ] ),
self::t( Token::T_WHITESPACE, 1, 10 ),
@@ -324,7 +324,11 @@
self::t( Token::T_IDENT, 1, 54, 'U' ),
self::t( Token::T_DELIM, 1, 55, '+' ),
self::t( Token::T_IDENT, 1, 56, 'x' ),
-   self::t( Token::T_EOF, 1, 57 ),
+   self::t( Token::T_WHITESPACE, 1, 57 ),
+   self::t( Token::T_UNICODE_RANGE, 1, 58, 
'', [ 'start' => 0x200, 'end' => 0x100 ] ),
+   self::t( Token::T_WHITESPACE, 1, 67 ),
+   self::t( Token::T_UNICODE_RANGE, 1, 68, 
'', [ 'start' => 0xff, 'end' => 0xff ] ),
+   self::t( Token::T_EOF, 1, 76 ),
]
],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21b5d38e7b3ec0fc7704c1361a8d5f9cd993a798
Gerrit-PatchSet: 1
Gerrit-Project: css-sanitizer
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: allow command execution for Ayounsi

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: icinga: allow command execution for Ayounsi
..

icinga: allow command execution for Ayounsi

Bug: T162073
Change-Id: I0fe7833ca425525cc667678178e6b4eddcee93c2
---
M modules/icinga/files/cgi.cfg
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/346184/1

diff --git a/modules/icinga/files/cgi.cfg b/modules/icinga/files/cgi.cfg
index 5446c52..7a8abf0 100644
--- a/modules/icinga/files/cgi.cfg
+++ b/modules/icinga/files/cgi.cfg
@@ -131,7 +131,7 @@
 # not use authorization.  You may use an asterisk (*) to
 # authorize any user who has authenticated to the web server.
 
-authorized_for_system_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_system_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
 
 
 # CONFIGURATION INFORMATION ACCESS
@@ -142,7 +142,7 @@
 # an asterisk (*) to authorize any user who has authenticated
 # to the web server.
 
-authorized_for_configuration_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_configuration_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
 
 
 
@@ -155,7 +155,7 @@
 # You may use an asterisk (*) to authorize any user who has
 # authenticated to the web server.
 
-authorized_for_system_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_system_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
 
 
 # GLOBAL HOST/SERVICE VIEW ACCESS
@@ -181,8 +181,8 @@
 # authorization).  You may use an asterisk (*) to authorize any
 # user who has authenticated to the web server.
 
-authorized_for_all_service_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
-authorized_for_all_host_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui
+authorized_for_all_service_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
+authorized_for_all_host_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ssh: avoid hardcoded hostname for yubiauth, add to Hiera

2017-04-03 Thread Dzahn (Code Review)

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

Change subject: ssh: avoid hardcoded hostname for yubiauth, add to Hiera
..

ssh: avoid hardcoded hostname for yubiauth, add to Hiera

Change-Id: I73bacbc28dfc5d05672bf692e2bea5202b55a267
---
M hieradata/hosts/iron.yaml
M modules/ssh/manifests/server.pp
M modules/ssh/templates/sshd_config.erb
3 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/346183/1

diff --git a/hieradata/hosts/iron.yaml b/hieradata/hosts/iron.yaml
index d656abf..0d3a546 100644
--- a/hieradata/hosts/iron.yaml
+++ b/hieradata/hosts/iron.yaml
@@ -6,3 +6,4 @@
   - ulsfo.wmnet
 admin::groups:
   - datacenter-ops
+enable_yubiauth: true
diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 2f2ed20..3149463 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -9,6 +9,7 @@
 $enable_hba = false,
 $disable_agent_forwarding = true,
 $challenge_response_auth = true,  # Disable all password auth in labs, we 
don't use 2fa there
+$enable_yubiauth = false, 
 ) {
 package { 'openssh-server':
 ensure => present,
diff --git a/modules/ssh/templates/sshd_config.erb 
b/modules/ssh/templates/sshd_config.erb
index 57eb1cc..5cd3810 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -125,12 +125,19 @@
 ## Anything below this point must start with a match declaration
 ## or will only apply to the previous Matches above.
 ##
-<% if @hostname == "iron" then %>
+<% if @enable_yubiauth then %>
 
+<<< HEAD
 # Use two-factor authentication on iron
 # AuthenticationMethods was introduced in OpenSSH 6.2.
+===
+# Use two-factor authentication
+# AuthenticationMethods was introduced in openssh 6.2. Stock precise has only
+# 5.9, but we're already using a trusty backport (so 6.6) there (for T102401)
+>>> 3aa6b08579... ssh: avoid hardcoded hostname for yubiauth, add to Hiera
 # Members of the yubiauth group will use a second authentication factor based
 # on Yubico OTPs (allowing gradual migration towards 2fa)
 Match Group yubiauth
   AuthenticationMethods publickey,keyboard-interactive
 <% end %>
+<% end %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73bacbc28dfc5d05672bf692e2bea5202b55a267
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]: Add ayounsi shell account in ops

2017-04-03 Thread BBlack (Code Review)

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

Change subject: Add ayounsi shell account in ops
..


Add ayounsi shell account in ops

Bug: T162073
Change-Id: I2713a2c021b3ac960391ab6f51a96c011649871a
---
M modules/admin/data/data.yaml
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 6a85f31..113293b 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -25,7 +25,7 @@
 description: include everywhere ops folks
 members: _members [filippo, jgreen, bblack, andrew, faidon, rush, 
oblivian, yuvipanda,
   dzahn, akosiaris, mark, ariel, cmjohnson, otto, robh, tstarling,
-  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui]
+  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui, ayounsi]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701
@@ -2481,6 +2481,15 @@
 email: penor...@mac.com
 expiry_date: 2017-05-31
 expiry_contact: h...@wikimedia.org
+  ayounsi:
+ensure: present
+gid: 500
+name: ayounsi
+realname: Arzhel Younsi
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EBIwAAAQEAweEnau/EYh0Hdyon4KoT/WRnEUBwdh8Cw+1Mvs1wOxSzBqPg2M9U5JADm20WG+SfyeCyrMXlIDjG5SyBTfALKwez4ExonQ5FyGvt8v4ipQRx+U+tdewIu9n2aAdmZia+0pS1ZgbyhkJtwNO8D95axlmeOab46HyQqZs0BVxPPdXM4ysPUgPZpSIyQ3rfFVerrVClLBNxqHvi7ZuyKH1zBAxSURhT60oRRNGI74G0+78nAA1c/cTeY/DbEKsJNpo7VK5slh9XQNUS2/6X4mgYg5IUK3AtaXIDnA6H5HCgghba0pZN4AmVR4dwVmILWeb8HpMInlLowQUQ5jNXM+hnYQ==
 xionox@laptop
+uid: 16756
+email: ayou...@wikimedia.org
 ldap_only_users:
   abartov:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2713a2c021b3ac960391ab6f51a96c011649871a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Muehlenhoff 
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]: Add ayounsi shell account in ops

2017-04-03 Thread BBlack (Code Review)

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

Change subject: Add ayounsi shell account in ops
..

Add ayounsi shell account in ops

Bug: T162073
Change-Id: I2713a2c021b3ac960391ab6f51a96c011649871a
---
M modules/admin/data/data.yaml
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/346182/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 6a85f31..113293b 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -25,7 +25,7 @@
 description: include everywhere ops folks
 members: _members [filippo, jgreen, bblack, andrew, faidon, rush, 
oblivian, yuvipanda,
   dzahn, akosiaris, mark, ariel, cmjohnson, otto, robh, tstarling,
-  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui]
+  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui, ayounsi]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701
@@ -2481,6 +2481,15 @@
 email: penor...@mac.com
 expiry_date: 2017-05-31
 expiry_contact: h...@wikimedia.org
+  ayounsi:
+ensure: present
+gid: 500
+name: ayounsi
+realname: Arzhel Younsi
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EBIwAAAQEAweEnau/EYh0Hdyon4KoT/WRnEUBwdh8Cw+1Mvs1wOxSzBqPg2M9U5JADm20WG+SfyeCyrMXlIDjG5SyBTfALKwez4ExonQ5FyGvt8v4ipQRx+U+tdewIu9n2aAdmZia+0pS1ZgbyhkJtwNO8D95axlmeOab46HyQqZs0BVxPPdXM4ysPUgPZpSIyQ3rfFVerrVClLBNxqHvi7ZuyKH1zBAxSURhT60oRRNGI74G0+78nAA1c/cTeY/DbEKsJNpo7VK5slh9XQNUS2/6X4mgYg5IUK3AtaXIDnA6H5HCgghba0pZN4AmVR4dwVmILWeb8HpMInlLowQUQ5jNXM+hnYQ==
 xionox@laptop
+uid: 16756
+email: ayou...@wikimedia.org
 ldap_only_users:
   abartov:
 ensure: present

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

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

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

1 2 3 >

1 - 100 of 264 matches

Mail list logo