[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Re-introduce use of mime_content_type()

[Krinkle (Code Review)]

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

Change subject: Re-introduce use of mime_content_type()
..

Re-introduce use of mime_content_type()

Follows-up eac059c7224. See also https://stackoverflow.com/a/39676272/319266.

This function was never deprecated. For a short time, the www.php.net
manual page for `mime_content_type` wrongly documented it as having been
deprecated in PHP 5.3, but this wasn't true, and it has been present in
every PHP version since PHP 4.3, including PHP 7 and HHVM 2.3+.

Between PHP 4.3.0-4.3.2 and PHP 5.0-5.3, the function would be absent
if the Mimemagic extension was not enabled at compile-time. However, while
mime_content_type was first introduced by the Mimemagic PHP ext, it is
backend by the Finfo extension since PHP 5.3.0.

Confirmed via https://3v4l.org/IQC1Q.

* CSSMin: Revert conditional use of finfo back to unconditional use
  of mime_content_type.

* MimeAnalyzer: Replace conditional use of finfo with unconditional use
  use of mime_content_type. Also remove the now-redundant 'else' branch.
  The 'else' branch existed because this code was written at a time where
  MediaWiki still supported PHP 4, of which some minor versions could
  sometimes be compiled without this function.

Change-Id: Iee4a0b6f616a469bb779c40e386045f9c3200446
---
M includes/DefaultSettings.php
M includes/libs/CSSMin.php
M includes/libs/filebackend/FileBackendStore.php
M includes/libs/mime/MimeAnalyzer.php
4 files changed, 5 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/367640/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f35715e..74d5fa4 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1304,7 +1304,7 @@
  * Sets an external MIME detector program. The command must print only
  * the MIME type to standard output.
  * The name of the file to process will be appended to the command given here.
- * If not set or NULL, PHP's fileinfo extension will be used if available.
+ * If not set or NULL, PHP's mime_content_type function will be used.
  *
  * @par Example:
  * @code
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index 9e060cd..4c672f4 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -188,17 +188,7 @@
return self::$mimeTypes[$ext];
}
 
-   $realpath = realpath( $file );
-   if (
-   $realpath
-   && function_exists( 'finfo_file' )
-   && function_exists( 'finfo_open' )
-   && defined( 'FILEINFO_MIME_TYPE' )
-   ) {
-   return finfo_file( finfo_open( FILEINFO_MIME_TYPE ), 
$realpath );
-   }
-
-   return false;
+   return mime_content_type( realpath( $file ) );
}
 
/**
diff --git a/includes/libs/filebackend/FileBackendStore.php 
b/includes/libs/filebackend/FileBackendStore.php
index 9bfdbe8..4c6b265 100644
--- a/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@ -1841,10 +1841,8 @@
}
 
$mime = null;
-   if ( $fsPath !== null && function_exists( 'finfo_file' ) ) {
-   $finfo = finfo_open( FILEINFO_MIME_TYPE );
-   $mime = finfo_file( $finfo, $fsPath );
-   finfo_close( $finfo );
+   if ( $fsPath !== null ) {
+   $mime = mime_content_type( $fsPath );
}
 
return is_string( $mime ) ? $mime : 'unknown/unknown';
diff --git a/includes/libs/mime/MimeAnalyzer.php 
b/includes/libs/mime/MimeAnalyzer.php
index 631bb17..ac821a5 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -988,18 +988,8 @@
$m = null;
if ( $callback ) {
$m = $callback( $file );
-   } elseif ( function_exists( "finfo_open" ) && function_exists( 
"finfo_file" ) ) {
-   $mime_magic_resource = finfo_open( FILEINFO_MIME );
-
-   if ( $mime_magic_resource ) {
-   $m = finfo_file( $mime_magic_resource, $file );
-   finfo_close( $mime_magic_resource );
-   } else {
-   $this->logger->info( __METHOD__ .
-   ": finfo_open failed on " . 
FILEINFO_MIME . "!\n" );
-   }
} else {
-   $this->logger->info( __METHOD__ . ": no magic mime 
detector found!\n" );
+   $m = mime_content_type(  $file );
}
 
if ( $m ) {

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Article Reminder feature flag on beta

[jenkins-bot (Code Review)]

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

Change subject: Enable Article Reminder feature flag on beta
..


Enable Article Reminder feature flag on beta

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

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index ab191ea..292171a 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -281,6 +281,9 @@
 // Enabling thank-you-edit on beta for testing T128249. Still disabled in prod.
 $wgEchoNotifications['thank-you-edit']['notify-type-availability']['web'] = 
true;
 
+// Enabling article-reminder on beta for testing T166973. Still disabled in 
prod.
+$wgAllowArticleReminderNotification = true;
+
 if ( $wmgUseGraph ) {
//  THIS LIST MUST MATCH 
puppet/hieradata/labs/deployment-prep/common.yaml 
// See https://www.mediawiki.org/wiki/Extension:Graph#External_data

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id61af723074fe406e2792d001267aa5c6c2ac5e8
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Foxy brown 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Mooeypoo 
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]: Don't need to update submodules recursively

[Reedy (Code Review)]

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

Change subject: Don't need to update submodules recursively
..

Don't need to update submodules recursively

Follows up If86301a13c419a0f67913f57ac061e06c92bf64a

Change-Id: I233df4cd3a201d8b11150dc3e302a31c5f0532fd
---
M modules/scap/files/l10nupdate-1
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/367639/1

diff --git a/modules/scap/files/l10nupdate-1 b/modules/scap/files/l10nupdate-1
index adf7a9b..2469aa4 100755
--- a/modules/scap/files/l10nupdate-1
+++ b/modules/scap/files/l10nupdate-1
@@ -63,7 +63,7 @@
cd $GITDIR/$path
# Update checkout of repo
if git pull &&
-   git submodule update --init --recursive
+   git submodule update --init
then
echo "Updated $path"
else

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid using deprecated PreparedEdit::$pst

[jenkins-bot (Code Review)]

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

Change subject: Avoid using deprecated PreparedEdit::$pst
..


Avoid using deprecated PreparedEdit::$pst

Change-Id: I2767d3a6a95920880b80a76b9e798546f79d
---
M includes/page/WikiPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index f8f53a1..478b1dc 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1607,7 +1607,7 @@
$meta = [
'bot' => ( $flags & EDIT_FORCE_BOT ),
'minor' => ( $flags & EDIT_MINOR ) && $user->isAllowed( 
'minoredit' ),
-   'serialized' => $editInfo->pst,
+   'serialized' => $pstContent->serialize( $serialFormat ),
'serialFormat' => $serialFormat,
'baseRevId' => $baseRevId,
'oldRevision' => $old_revision,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2767d3a6a95920880b80a76b9e798546f79d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WikiPage: Update comments related to new PreparedEdit object

[jenkins-bot (Code Review)]

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

Change subject: WikiPage: Update comments related to new PreparedEdit object
..


WikiPage: Update comments related to new PreparedEdit object

Follows up 85585c47ecbf219.

Change-Id: Iff677257553e20ae37d37142436507b9c8af23a1
---
M includes/page/WikiPage.php
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 20fb9be..f8f53a1 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -50,7 +50,7 @@
public $mLatest = false; // !< Integer (false means "not 
loaded")
/**@}}*/
 
-   /** @var stdClass Map of cache fields (text, parser output, ect) for a 
proposed/new edit */
+   /** @var PreparedEdit Map of cache fields (text, parser output, ect) 
for a proposed/new edit */
public $mPreparedEdit = false;
 
/**
@@ -782,7 +782,7 @@
 * Determine whether a page would be suitable for being counted as an
 * article in the site_stats table based on the title & its content
 *
-* @param object|bool $editInfo (false): object returned by 
prepareTextForEdit(),
+* @param PreparedEdit|bool $editInfo (false): object returned by 
prepareTextForEdit(),
 *   if false, the current database state will be used
 * @return bool
 */
@@ -1961,7 +1961,9 @@
 
/**
 * Prepare content which is about to be saved.
-* Returns a stdClass with source, pst and output members
+*
+* Prior to 1.30, this returned a stdClass object with the same class
+* members.
 *
 * @param Content $content
 * @param Revision|int|null $revision Revision object. For backwards 
compatibility, a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff677257553e20ae37d37142436507b9c8af23a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MultiWriteBagOStuff: Fix async writes of mutable objects

[Krinkle (Code Review)]

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

Change subject: MultiWriteBagOStuff: Fix async writes of mutable objects
..


MultiWriteBagOStuff: Fix async writes of mutable objects

If someone writes an object into a BagOStuff, they typically expect that
later changes to the object will not affect the value stored.
MultiWriteBagOStuff's async write handling was violating this
expectation, which is potentially causing T168040.

Bug: T168040
Change-Id: Ie897b900befdc8998614af06f9339cd07665703e
---
M includes/libs/objectcache/MultiWriteBagOStuff.php
M tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
2 files changed, 13 insertions(+), 3 deletions(-)

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

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



diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php 
b/includes/libs/objectcache/MultiWriteBagOStuff.php
index 687c67c..d94578d 100644
--- a/includes/libs/objectcache/MultiWriteBagOStuff.php
+++ b/includes/libs/objectcache/MultiWriteBagOStuff.php
@@ -181,6 +181,12 @@
$ret = true;
$args = array_slice( func_get_args(), 3 );
 
+   if ( $count > 1 && $asyncWrites ) {
+   // Deep-clone $args to prevent misbehavior when 
something writes an
+   // object to the BagOStuff then modifies it afterwards, 
e.g. T168040.
+   $args = unserialize( serialize( $args ) );
+   }
+
foreach ( $this->caches as $i => $cache ) {
if ( $i >= $count ) {
break; // ignore the lower tiers
diff --git 
a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php 
b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
index 775709f..4a9f6cc 100644
--- a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
@@ -81,22 +81,26 @@
 */
public function testSetDelayed() {
$key = wfRandomString();
-   $value = wfRandomString();
+   $value = (object)[ 'v' => wfRandomString() ];
+   $expectValue = clone $value;
 
// XXX: DeferredUpdates bound to transactions in CLI mode
$dbw = wfGetDB( DB_MASTER );
$dbw->begin();
$this->cache->set( $key, $value );
 
+   // Test that later changes to $value don't affect the saved 
value (e.g. T168040)
+   $value->v = 'bogus';
+
// Set in tier 1
-   $this->assertEquals( $value, $this->cache1->get( $key ), 
'Written to tier 1' );
+   $this->assertEquals( $expectValue, $this->cache1->get( $key ), 
'Written to tier 1' );
// Not yet set in tier 2
$this->assertEquals( false, $this->cache2->get( $key ), 'Not 
written to tier 2' );
 
$dbw->commit();
 
// Set in tier 2
-   $this->assertEquals( $value, $this->cache2->get( $key ), 
'Written to tier 2' );
+   $this->assertEquals( $expectValue, $this->cache2->get( $key ), 
'Written to tier 2' );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie897b900befdc8998614af06f9339cd07665703e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rdbms: Increase coverage for Database::selectSQLText()

[Krinkle (Code Review)]

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

Change subject: rdbms: Increase coverage for Database::selectSQLText()
..

rdbms: Increase coverage for Database::selectSQLText()

* Add case for `$tables[0] == ' '`.
* Add case for `$tables == ''`.
* Add case for 'DISTINCT' option.
* Add case for 'FOR UPDATE' option.
* Add case for 'LOCK IN SHARE MODE' option.
* Add case for 'EXPLAIN' option.

Change-Id: I4a5f4754bc30d31ec35a085f39321fd358b6aa49
---
M tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
1 file changed, 41 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/367638/1

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 7e9494c..f519772 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -61,6 +61,23 @@
],
[
[
+   // 'tables' with space prepended 
indicates pre-escaped table name
+   'tables' => ' table LEFT JOIN table2',
+   'fields' => [ 'field' ],
+   'conds' => [ 'field' => 'text' ],
+   ],
+   "SELECT field FROM  table LEFT JOIN table2 
WHERE field = 'text'"
+   ],
+   [
+   [
+   // Empty 'tables' is allowed
+   'tables' => '',
+   'fields' => [ 'SPECIAL_QUERY()' ],
+   ],
+   "SELECT SPECIAL_QUERY()"
+   ],
+   [
+   [
'tables' => 'table',
'fields' => [ 'field', 'alias' => 
'field2' ],
'conds' => [ 'alias' => 'text' ],
@@ -134,6 +151,30 @@
"FROM table " .
"WHERE alias IN ('1','2','3','4')"
],
+   [
+   [
+   'tables' => 'table',
+   'fields' => [ 'field' ],
+   'options' => [ 'DISTINCT', 'LOCK IN 
SHARE MODE' ],
+   ],
+   "SELECT DISTINCT field FROM table  LOCK IN 
SHARE MODE"
+   ],
+   [
+   [
+   'tables' => 'table',
+   'fields' => [ 'field' ],
+   'options' => [ 'EXPLAIN' => true ],
+   ],
+   'EXPLAIN SELECT field FROM table'
+   ],
+   [
+   [
+   'tables' => 'table',
+   'fields' => [ 'field' ],
+   'options' => [ 'FOR UPDATE' ],
+   ],
+   "SELECT field FROM table  FOR UPDATE"
+   ],
];
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: config: Add more EtcdConfig::fetchAllFromEtcdServer tests

[jenkins-bot (Code Review)]

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

Change subject: config: Add more EtcdConfig::fetchAllFromEtcdServer tests
..


config: Add more EtcdConfig::fetchAllFromEtcdServer tests

Bug: T156924
Change-Id: I88a1c97b6921b59cce93f22d473dd7cea6f4931c
---
M tests/phpunit/includes/config/EtcdConfigTest.php
1 file changed, 109 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php 
b/tests/phpunit/includes/config/EtcdConfigTest.php
index e0694db..19cffa2 100644
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/includes/config/EtcdConfigTest.php
@@ -364,7 +364,86 @@
 
public static function provideFetchFromServer() {
return [
-   '200 OK - Empty' => [
+   '200 OK - Success' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => json_encode( [ 'node' => [ 
'nodes' => [
+   [
+   'key' => '/example/foo',
+   'value' => json_encode( 
[ 'val' => true ] )
+   ],
+   ] ] ] ),
+   'error' => '',
+   ],
+   'expect' => [
+   [ 'foo' => true ], // data
+   null,
+   false // retry
+   ],
+   ],
+   '200 OK - Skip dir' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => json_encode( [ 'node' => [ 
'nodes' => [
+   [
+   'key' => '/example/foo',
+   'value' => json_encode( 
[ 'val' => true ] )
+   ],
+   [
+   'key' => '/example/sub',
+   'dir' => true
+   ],
+   [
+   'key' => '/example/bar',
+   'value' => json_encode( 
[ 'val' => false ] )
+   ],
+   ] ] ] ),
+   'error' => '',
+   ],
+   'expect' => [
+   [ 'foo' => true, 'bar' => false ], // 
data
+   null,
+   false // retry
+   ],
+   ],
+   '200 OK - Bad value' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => json_encode( [ 'node' => [ 
'nodes' => [
+   [
+   'key' => '/example/foo',
+   'value' => 
';"broken{value'
+   ]
+   ] ] ] ),
+   'error' => '',
+   ],
+   'expect' => [
+   null, // data
+   "Failed to parse value for 'foo'.",
+   false // retry
+   ],
+   ],
+   '200 OK - Empty node list' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rdbms: Add more @covers to DatabaseSQLTest

[Krinkle (Code Review)]

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

Change subject: rdbms: Add more @covers to DatabaseSQLTest
..

rdbms: Add more @covers to DatabaseSQLTest

Many of the main methods here have, over the years, been split up
into several protected/private methods.

Change-Id: I1b8489b1c61c0294288442a0a0cd28c9fa77f82e
---
M tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
1 file changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/367637/1

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 57666bd..ae4a90d 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -22,13 +22,14 @@
);
}
 
-   protected function assertLastSqlDb( $sqlText, $db ) {
+   protected function assertLastSqlDb( $sqlText, DatabaseTestHelper $db ) {
$this->assertEquals( $sqlText, $db->getLastSqls() );
}
 
/**
 * @dataProvider provideSelect
 * @covers Wikimedia\Rdbms\Database::select
+* @covers Wikimedia\Rdbms\Database::selectSQLText
 */
public function testSelect( $sql, $sqlText ) {
$this->database->select(
@@ -135,6 +136,8 @@
/**
 * @dataProvider provideUpdate
 * @covers Wikimedia\Rdbms\Database::update
+* @covers Wikimedia\Rdbms\Database::makeUpdateOptions
+* @covers Wikimedia\Rdbms\Database::makeUpdateOptionsArray
 */
public function testUpdate( $sql, $sqlText ) {
$this->database->update(
@@ -303,6 +306,7 @@
/**
 * @dataProvider provideInsert
 * @covers Wikimedia\Rdbms\Database::insert
+* @covers Wikimedia\Rdbms\Database::makeInsertOptions
 */
public function testInsert( $sql, $sqlText ) {
$this->database->insert(
@@ -356,6 +360,7 @@
/**
 * @dataProvider provideInsertSelect
 * @covers Wikimedia\Rdbms\Database::insertSelect
+* @covers Wikimedia\Rdbms\Database::nativeInsertSelect
 */
public function testInsertSelect( $sql, $sqlTextNative, $sqlSelect, 
$sqlInsert ) {
$this->database->insertSelect(
@@ -673,6 +678,7 @@
/**
 * @dataProvider provideBuildLike
 * @covers Wikimedia\Rdbms\Database::buildLike
+* @covers Wikimedia\Rdbms\Database::escapeLikeInternal
 */
public function testBuildLike( $array, $sqlText ) {
$this->assertEquals( trim( $this->database->buildLike(
@@ -921,6 +927,7 @@
 
/**
 * @covers Wikimedia\Rdbms\Database::commit
+* @covers Wikimedia\Rdbms\Database::doCommit
 */
public function testTransactionCommit() {
$this->database->begin( __METHOD__ );
@@ -930,6 +937,7 @@
 
/**
 * @covers Wikimedia\Rdbms\Database::rollback
+* @covers Wikimedia\Rdbms\Database::doRollback
 */
public function testTransactionRollback() {
$this->database->begin( __METHOD__ );
@@ -1035,6 +1043,9 @@
];
}
 
+   /**
+* @covers Wikimedia\Rdbms\Database::registerTempTableOperation
+*/
public function testSessionTempTables() {
$temp1 = $this->database->tableName( 'tmp_table_1' );
$temp2 = $this->database->tableName( 'tmp_table_2' );

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Use groups, not implicitgroups, to determine user rights.

[Mholloway (Code Review)]

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

Change subject: Fix: Use groups, not implicitgroups, to determine user rights.
..

Fix: Use groups, not implicitgroups, to determine user rights.

The groups associated with a user account determine the user's rights to
perform actions such as editing a semi-protected or protected article.
These can be obtained from the 'groups' property for a user via the MW
API.  'Implicitgroups' is a subset of 'groups' consisting of only those
groups that a user is added to automatically, such as 'autoconfirmed.'
For many users 'groups' will be identical to 'implicitgroups' but this is
not always the case.  For instance, for my staff account, which has sysop
rights on testwiki:

https://phabricator.wikimedia.org/P5792

We should look to 'groups' and not 'implicitgroups' to determine the
correct set of groups assigned to the user account.

Change-Id: Ib815d4b8de7c34ea4c27045d9297aba6981936a7
---
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
M app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
2 files changed, 9 insertions(+), 12 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
index 70e977a..ead48be 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
@@ -16,7 +16,6 @@
 import org.wikipedia.useroption.dataclient.UserInfo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -169,17 +168,15 @@
 
 private static class ListUsersResponse {
 @SuppressWarnings("unused") @SerializedName("name") @Nullable private 
String name;
-@SuppressWarnings("unused") @SerializedName("implicitgroups")
-@Nullable private String[] implicitGroups;
+@SuppressWarnings("unused") @Nullable private List groups;
 
 @Nullable Set getGroupsFor(@NonNull String userName) {
-if (userName.equals(name) && implicitGroups != null) {
-Set groups = new ArraySet<>();
-groups.addAll(Arrays.asList(implicitGroups));
-return Collections.unmodifiableSet(groups);
-} else {
-return null;
+if (userName.equals(name) && groups != null) {
+Set groupNames = new ArraySet<>();
+groupNames.addAll(groups);
+return Collections.unmodifiableSet(groupNames);
 }
+return null;
 }
 }
 
diff --git a/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java 
b/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
index be65ada..836997a 100644
--- a/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
+++ b/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
@@ -17,7 +17,7 @@
 import retrofit2.http.Query;
 
 /**
- * Retrofit DataClient to retrieve implicit user info and group membership 
information for a specific user.
+ * Retrofit DataClient to retrieve user info and group membership information 
for a specific user.
  */
 class UserExtendedInfoClient {
 @NonNull private final WikiCachedService cachedService = new 
MwCachedService<>(Service.class);
@@ -81,8 +81,8 @@
 }
 
 @VisibleForTesting interface Service {
-/** Request the implicit groups a user belongs to. */
-
@POST("w/api.php?action=query=json=2=userinfo=users=implicitgroups")
+/** Request the groups a user belongs to. */
+
@POST("w/api.php?action=query=json=2=userinfo=users=groups")
 Call request(@Query("ususers") @NonNull String 
userName);
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: config: Fix invalid EtcdConfig return value after JSON parse...

[jenkins-bot (Code Review)]

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

Change subject: config: Fix invalid EtcdConfig return value after JSON parse 
error
..


config: Fix invalid EtcdConfig return value after JSON parse error

Follows-up 1f2daa913244, 9b459d29e0, 110a21ea18.

Bug: T156924
Change-Id: I79b7e11b32e5be46c8ebdfb5c937e38e46301c0e
---
M includes/config/EtcdConfig.php
M tests/phpunit/includes/config/EtcdConfigTest.php
2 files changed, 5 insertions(+), 9 deletions(-)

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



diff --git a/includes/config/EtcdConfig.php b/includes/config/EtcdConfig.php
index c57eba7..6605c38 100644
--- a/includes/config/EtcdConfig.php
+++ b/includes/config/EtcdConfig.php
@@ -243,7 +243,7 @@
 
$info = json_decode( $rbody, true );
if ( $info === null || !isset( $info['node']['nodes'] ) ) {
-   return [ null, $rcode, "Unexpected JSON response; 
missing 'nodes' list.", false ];
+   return [ null, "Unexpected JSON response; missing 
'nodes' list.", false ];
}
 
$config = [];
diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php 
b/tests/phpunit/includes/config/EtcdConfigTest.php
index 8e57a01..e0694db 100644
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/includes/config/EtcdConfigTest.php
@@ -364,22 +364,18 @@
 
public static function provideFetchFromServer() {
return [
-   [
+   '200 OK - Empty' => [
'http' => [
'code' => 200,
'reason' => 'OK',
-   'headers' => [
-   'content-length' => 0,
-   ],
+   'headers' => [ 'content-length' => 0 ],
'body' => '',
'error' => '(curl error: no status 
set)',
],
'expect' => [
-   // FIXME: Returning 4 values instead of 
3
-   null,
-   200,
+   null, // data
"Unexpected JSON response; missing 
'nodes' list.",
-   false
+   false // retry
],
],
];

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Also load CSS for Monaco when using the pollembed tag

[jenkins-bot (Code Review)]

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

Change subject: Also load CSS for Monaco when using the pollembed tag
..


Also load CSS for Monaco when using the pollembed tag

Change-Id: Iad3795268e231c0691d7d9a87575ab206e7306d5
---
M extension.json
M includes/PollNY.hooks.php
2 files changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/extension.json b/extension.json
index d752a01..9d80880 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PollNY",
-   "version": "3.4.1",
+   "version": "3.4.2",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/PollNY.hooks.php b/includes/PollNY.hooks.php
index 8430aa1..d7d0c59 100644
--- a/includes/PollNY.hooks.php
+++ b/includes/PollNY.hooks.php
@@ -182,11 +182,8 @@
if( $poll_name ) {
global $wgOut, $wgUser, $wgExtensionAssetsPath, 
$wgPollDisplay;
 
-   // Load CSS for non-Monaco skins - Monaco's ny.css 
already contains
-   // PollNY's styles (and more)
-   if ( get_class( $wgOut->getSkin() ) !== 'SkinMonaco' ) {
-   $wgOut->addModuleStyles( 'ext.pollNY.css' );
-   }
+   // Load CSS
+   $wgOut->addModuleStyles( 'ext.pollNY.css' );
 
// Disable caching; this is important so that we don't 
cause subtle
// bugs that are a bitch to fix.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad3795268e231c0691d7d9a87575ab206e7306d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
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...Refreshed[master]: Avoid stupid class naming conflicts with MediaWiki core

[jenkins-bot (Code Review)]

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

Change subject: Avoid stupid class naming conflicts with MediaWiki core
..


Avoid stupid class naming conflicts with MediaWiki core

Change-Id: I5d6b5e59286a9025d16185f2f7ad8e7b3ede9e85
---
M Refreshed.skin.php
M refreshed/scripts/refreshed.js
M refreshed/styles/screen/main.css
M skin.json
4 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/Refreshed.skin.php b/Refreshed.skin.php
index 1ca64de..e445c28 100755
--- a/Refreshed.skin.php
+++ b/Refreshed.skin.php
@@ -237,7 +237,7 @@
?>


-   
+   
 $entry ) {
$dropDownLogo = 
Html::element( 'img', array(
@@ -335,7 +335,7 @@
?>


-   
+   



-   
+   
 $item ) {

$item['class'] = 'header-dropdown-item';
@@ -517,7 +517,7 @@

?>



getMsg( 'moredotdotdot' )->text() ?>
-   

+   








getMsg( 'toolbox' 
)->text() ?>
-   
+   





https://gerrit.wikimedia.org/r/364242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d6b5e59286a9025d16185f2f7ad8e7b3ede9e85
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Also load CSS for Monaco when using the pollembed tag

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367635 )

Change subject: Also load CSS for Monaco when using the pollembed tag
..

Also load CSS for Monaco when using the pollembed tag

Change-Id: Iad3795268e231c0691d7d9a87575ab206e7306d5
---
M extension.json
M includes/PollNY.hooks.php
2 files changed, 3 insertions(+), 6 deletions(-)


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

diff --git a/extension.json b/extension.json
index d752a01..9d80880 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PollNY",
-   "version": "3.4.1",
+   "version": "3.4.2",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/PollNY.hooks.php b/includes/PollNY.hooks.php
index 8430aa1..d7d0c59 100644
--- a/includes/PollNY.hooks.php
+++ b/includes/PollNY.hooks.php
@@ -182,11 +182,8 @@
if( $poll_name ) {
global $wgOut, $wgUser, $wgExtensionAssetsPath, 
$wgPollDisplay;
 
-   // Load CSS for non-Monaco skins - Monaco's ny.css 
already contains
-   // PollNY's styles (and more)
-   if ( get_class( $wgOut->getSkin() ) !== 'SkinMonaco' ) {
-   $wgOut->addModuleStyles( 'ext.pollNY.css' );
-   }
+   // Load CSS
+   $wgOut->addModuleStyles( 'ext.pollNY.css' );
 
// Disable caching; this is important so that we don't 
cause subtle
// bugs that are a bitch to fix.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad3795268e231c0691d7d9a87575ab206e7306d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add ctrl-F and F3 functionality for physical keyboard users

[Austinoneil (Code Review)]

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

Change subject: Add ctrl-F and F3 functionality for physical keyboard users
..

Add ctrl-F and F3 functionality for physical keyboard users

ctrl-F is a fairly ubiquitous keyboard shortcut. F3 is used
in Chrome as well, and would be useful for those with
limited mobility in their hands, or children with small
hands.

Change-Id: I74cb6c8ba551c10b86f567f79b9aa28ea3cd0957
---
M app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
2 files changed, 31 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java 
b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
index 066830c..3504983 100644
--- a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
+++ b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
@@ -5,6 +5,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
 import android.support.annotation.VisibleForTesting;
+import android.view.KeyEvent;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
@@ -121,4 +122,17 @@
 inputStream.close();
 return new ByteArrayInputStream(sb.toString().getBytes());
 }
+
+@Override
+public boolean shouldOverrideKeyEvent(WebView view, KeyEvent event) {
+if(event.isCtrlPressed()) {
+if(event.getKeyCode() == KeyEvent.KEYCODE_F) {
+return true;
+}
+}
+else if(event.getKeyCode() == KeyEvent.KEYCODE_F3) {
+return true;
+}
+return false;
+}
 }
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index eccc44a..dd61c14 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -890,4 +890,21 @@
 }
 }
 }
+
+@Override
+public boolean onKeyDown(int keyCode, KeyEvent event) {
+if(event.isCtrlPressed()) {
+if (keyCode == KeyEvent.KEYCODE_F) {
+pageFragment.showFindInPage();
+return true;
+}
+}
+else {
+if(keyCode == KeyEvent.KEYCODE_F3) {
+pageFragment.showFindInPage();
+return true;
+}
+}
+return super.onKeyDown(keyCode, event);
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix bundled extensions

[jenkins-bot (Code Review)]

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

Change subject: Fix bundled extensions
..


Fix bundled extensions

Bug: T171197
Change-Id: Ie69d7a1676ff0898aa1856cf99b6df5526d3ada3
---
M .gitmodules
A extensions/PdfHandler
D extensions/SimpleAntiSpam
A extensions/SpamBlacklist
D extensions/Vector
5 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index f87c16c..76628e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,10 +18,6 @@
path = extensions/Renameuser
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Renameuser
branch = REL1_29
-[submodule "extensions/Vector"]
-   path = extensions/Vector
-   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Vector
-   branch = REL1_29
 [submodule "extensions/WikiEditor"]
path = extensions/WikiEditor
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikiEditor
@@ -49,10 +45,6 @@
 [submodule "extensions/Poem"]
path = extensions/Poem
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Poem
-   branch = REL1_29
-[submodule "extensions/SimpleAntiSpam"]
-   path = extensions/SimpleAntiSpam
-   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SimpleAntiSpam
branch = REL1_29
 [submodule "extensions/SyntaxHighlight_GeSHi"]
path = extensions/SyntaxHighlight_GeSHi
@@ -86,3 +78,11 @@
path = vendor
url = https://gerrit.wikimedia.org/r/p/mediawiki/vendor
branch = REL1_29
+[submodule "extensions/PdfHandler"]
+   path = extensions/PdfHandler
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PdfHandler
+   branch = REL1_29
+[submodule "extensions/SpamBlacklist"]
+   path = extensions/SpamBlacklist
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SpamBlacklist
+   branch = REL1_29
diff --git a/extensions/PdfHandler b/extensions/PdfHandler
new file mode 16
index 000..6766ffc
--- /dev/null
+++ b/extensions/PdfHandler
@@ -0,0 +1 @@
+Subproject commit 6766ffc58b557fe7c323831a89964364d768607a
diff --git a/extensions/SimpleAntiSpam b/extensions/SimpleAntiSpam
deleted file mode 16
index eb29a6f..000
--- a/extensions/SimpleAntiSpam
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eb29a6f4d73734680735032d5fc5ba94c93d3b3e
diff --git a/extensions/SpamBlacklist b/extensions/SpamBlacklist
new file mode 16
index 000..193339c
--- /dev/null
+++ b/extensions/SpamBlacklist
@@ -0,0 +1 @@
+Subproject commit 193339c7f079245c5a565a226514d68d98c059dd
diff --git a/extensions/Vector b/extensions/Vector
deleted file mode 16
index 767a54c..000
--- a/extensions/Vector
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 767a54c01022404535c96bf9754d3ed72c3ce839

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69d7a1676ff0898aa1856cf99b6df5526d3ada3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: MacFan4000 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: Jforrester 
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] labs...extdist[master]: De-reference symlinks in tarball

[jenkins-bot (Code Review)]

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

Change subject: De-reference symlinks in tarball
..


De-reference symlinks in tarball

https://www.gnu.org/software/tar/manual/html_node/dereference.html

Bug: T135194
Change-Id: If24d990bee25033d84bc206a223c9b494121dc90
---
M nightly.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/nightly.py b/nightly.py
index caab916..969a2b1 100644
--- a/nightly.py
+++ b/nightly.py
@@ -218,7 +218,7 @@
 os.unlink(old)
 os.chdir(self.EXT_PATH)
 # Finally, create the new tarball
-self.shell_exec(['tar', '--exclude', '.git', '-czPf', 
tarball_fname, ext])
+self.shell_exec(['tar', '--exclude', '.git', '-czhPf', 
tarball_fname, ext])
 logging.debug('Moving new tarballs into dist/')
 tarballs = glob.glob(os.path.join(self.EXT_PATH, '*.tar.gz'))
 for tar in tarballs:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If24d990bee25033d84bc206a223c9b494121dc90
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Don't call ParserOuptut::setTOCEnabled()

[jenkins-bot (Code Review)]

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

Change subject: Don't call ParserOuptut::setTOCEnabled()
..


Don't call ParserOuptut::setTOCEnabled()

It's not really needed. Add tests verifying that.

Bug: T168040
Change-Id: I49cf58d92620ad53dd833bc8ce0d2443a00b48e4
---
M includes/ApiQueryExtracts.php
M tests/phpunit/ExtractFormatterTest.php
2 files changed, 15 insertions(+), 1 deletion(-)

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



diff --git a/includes/ApiQueryExtracts.php b/includes/ApiQueryExtracts.php
index 38db171..e760db4 100644
--- a/includes/ApiQueryExtracts.php
+++ b/includes/ApiQueryExtracts.php
@@ -218,7 +218,6 @@
if ( $page->shouldCheckParserCache( $this->parserOptions, 0 ) ) 
{
$pout = ParserCache::singleton()->get( $page, 
$this->parserOptions );
if ( $pout ) {
-   $pout->setTOCEnabled( false );
$text = $pout->getText();
if ( $this->params['intro'] ) {
$text = $this->getFirstSection( $text, 
false );
diff --git a/tests/phpunit/ExtractFormatterTest.php 
b/tests/phpunit/ExtractFormatterTest.php
index 4b53a99..5ad16b9 100644
--- a/tests/phpunit/ExtractFormatterTest.php
+++ b/tests/phpunit/ExtractFormatterTest.php
@@ -27,6 +27,9 @@
public function provideExtracts() {
// @codingStandardsIgnoreStart
$dutch = 'Dutch (https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/11px-Loudspeaker.svg.png;
 width="11" height="11" 
srcset="https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/17px-Loudspeaker.svg.png
 1.5x, 
https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/22px-Loudspeaker.svg.png
 2x" />https://upload.wikimedia.org/wikipedia/commons/d/db/Nl-Nederlands.ogg; 
class="internal" 
title="Nl-Nederlands.ogg">Nederlands(help·info)) is a West Germanic 
language and the native language of most of the population of the Netherlands';
+   $tocText = 'LeadTOC goes here
+Section
+Section text';
// @codingStandardsIgnoreEnd
 
return [
@@ -52,6 +55,18 @@
'quux',
false,
],
+   [
+   // Verify that TOC is properly removed (HTML 
mode)
+   "Lead\nSection\nSection text",
+   $tocText,
+   false,
+   ],
+   [
+   // Verify that TOC is properly removed (plain 
text mode)
+   "Lead\n\n\x01\x021\2\1Section\nSection text",
+   $tocText,
+   true,
+   ],
];
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49cf58d92620ad53dd833bc8ce0d2443a00b48e4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Move WebPageTest to a dedicated slave

[jenkins-bot (Code Review)]

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

Change subject: Move WebPageTest to a dedicated slave
..


Move WebPageTest to a dedicated slave

Switch performance-webpagetest-wmf performance-webpagetest-wpt-org to
the label WebPerformance.

It is served by webperformance.integration.eqiad.wmflabs provisionned
with NodeJs v6.11.0 and npm 2.15.2.

Bug: T166756
Change-Id: I6d552d65b88bff6167925c2ab8aef8d0f9c604b5
---
M jjb/misc.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 89259da..2838df9 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -233,7 +233,7 @@
 
 - job:
 name: 'performance-webpagetest-wmf'
-node: ci-jessie-wikimedia
+node: WebPerformance
 defaults: global
 properties:
  - build-discarder:
@@ -297,7 +297,7 @@
 
 - job:
 name: 'performance-webpagetest-wpt-org'
-node: ci-jessie-wikimedia
+node: WebPerformance
 defaults: global
 properties:
  - build-discarder:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d552d65b88bff6167925c2ab8aef8d0f9c604b5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Phedenskog 
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...TextExtracts[master]: Don't call ParserOuptut::setTOCEnabled()

[MaxSem (Code Review)]

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

Change subject: Don't call ParserOuptut::setTOCEnabled()
..

Don't call ParserOuptut::setTOCEnabled()

It's not really needed. Add tests verifying that.

Bug: T168040
Change-Id: I49cf58d92620ad53dd833bc8ce0d2443a00b48e4
---
M includes/ApiQueryExtracts.php
M tests/phpunit/ExtractFormatterTest.php
2 files changed, 16 insertions(+), 1 deletion(-)


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

diff --git a/includes/ApiQueryExtracts.php b/includes/ApiQueryExtracts.php
index 38db171..e760db4 100644
--- a/includes/ApiQueryExtracts.php
+++ b/includes/ApiQueryExtracts.php
@@ -218,7 +218,6 @@
if ( $page->shouldCheckParserCache( $this->parserOptions, 0 ) ) 
{
$pout = ParserCache::singleton()->get( $page, 
$this->parserOptions );
if ( $pout ) {
-   $pout->setTOCEnabled( false );
$text = $pout->getText();
if ( $this->params['intro'] ) {
$text = $this->getFirstSection( $text, 
false );
diff --git a/tests/phpunit/ExtractFormatterTest.php 
b/tests/phpunit/ExtractFormatterTest.php
index 4b53a99..b7bb25f 100644
--- a/tests/phpunit/ExtractFormatterTest.php
+++ b/tests/phpunit/ExtractFormatterTest.php
@@ -21,12 +21,16 @@
$fmt = new ExtractFormatter( $text, $plainText, $config );
$fmt->remove( '.metadata' ); // Will be added via 
$wgExtractsRemoveClasses on WMF
$text = trim( $fmt->getText() );
+   //$text = str_replace( "\1", '', str_replace( "\2", '', $text ) 
);
$this->assertEquals( $expected, $text );
}
 
public function provideExtracts() {
// @codingStandardsIgnoreStart
$dutch = 'Dutch (https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/11px-Loudspeaker.svg.png;
 width="11" height="11" 
srcset="https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/17px-Loudspeaker.svg.png
 1.5x, 
https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/22px-Loudspeaker.svg.png
 2x" />https://upload.wikimedia.org/wikipedia/commons/d/db/Nl-Nederlands.ogg; 
class="internal" 
title="Nl-Nederlands.ogg">Nederlands(help·info)) is a West Germanic 
language and the native language of most of the population of the Netherlands';
+   $tocText = 'LeadTOC goes here
+Section
+Section text';
// @codingStandardsIgnoreEnd
 
return [
@@ -52,6 +56,18 @@
'quux',
false,
],
+   [
+   // Verify that TOC is properly removed (HTML 
mode)
+   "Lead\nSection\nSection text",
+   $tocText,
+   false,
+   ],
+   [
+   // Verify that TOC is properly removed (plain 
text mode)
+   "Lead\n\n\x01\x021\2\1Section\nSection text",
+   $tocText,
+   true,
+   ],
];
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49cf58d92620ad53dd833bc8ce0d2443a00b48e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: [SECURITY] Fix XSS in UserBoard on social profile pages and ...

[jenkins-bot (Code Review)]

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

Change subject: [SECURITY] Fix XSS in UserBoard on social profile pages and 
CSRF in API modules which do write actions
..


[SECURITY] Fix XSS in UserBoard on social profile pages and CSRF in API modules 
which do write actions

Bug: T171045
Change-Id: I50c1f0837f407489c555c49d3a83437c27a9ddee
---
M .jshintrc
M SocialProfile.php
M UserBoard/ApiDeleteUserBoardMessage.php
M UserBoard/ApiSendUserBoardMessage.php
M UserBoard/SpecialUserBoard.php
M UserBoard/UserBoard.js
M UserBoard/UserBoardClass.php
M UserProfile/ApiUserProfilePrivacy.php
M UserProfile/UpdateProfile.js
M UserProfile/UserProfile.php
M UserProfile/UserProfilePage.js
11 files changed, 97 insertions(+), 82 deletions(-)

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



diff --git a/.jshintrc b/.jshintrc
index 8a2a10c..a0ff444 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -18,6 +18,7 @@
"jquery": true,
 
"globals": {
-   "mediaWiki": false
+   "mediaWiki": false,
+   "mw": false
}
 }
diff --git a/SocialProfile.php b/SocialProfile.php
index e47e4d5..d9ac323 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -150,7 +150,7 @@
'path' => __FILE__,
'name' => 'SocialProfile',
'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
-   'version' => '1.12',
+   'version' => '1.13',
'url' => 'https://www.mediawiki.org/wiki/Extension:SocialProfile',
'descriptionmsg' => 'socialprofile-desc',
 );
@@ -301,6 +301,7 @@
 // UserBoard
 $wgResourceModules['ext.socialprofile.userboard.js'] = array(
'scripts' => 'UserBoard.js',
+   'dependencies' => array( 'mediawiki.api' ),
'messages' => array( 'userboard_confirmdelete' ),
'localBasePath' => __DIR__ . '/UserBoard',
'remoteExtPath' => 'SocialProfile/UserBoard',
diff --git a/UserBoard/ApiDeleteUserBoardMessage.php 
b/UserBoard/ApiDeleteUserBoardMessage.php
index b30d79c..85edd33 100644
--- a/UserBoard/ApiDeleteUserBoardMessage.php
+++ b/UserBoard/ApiDeleteUserBoardMessage.php
@@ -27,6 +27,14 @@
return true;
}
 
+   public function needsToken() {
+   return 'csrf';
+   }
+
+   public function isWriteMode() {
+   return true;
+   }
+
public function getAllowedParams() {
return array_merge( parent::getAllowedParams(), array(
'id' => array(
diff --git a/UserBoard/ApiSendUserBoardMessage.php 
b/UserBoard/ApiSendUserBoardMessage.php
index 6c311e6..b8853ec 100644
--- a/UserBoard/ApiSendUserBoardMessage.php
+++ b/UserBoard/ApiSendUserBoardMessage.php
@@ -36,6 +36,14 @@
return true;
}
 
+   public function needsToken() {
+   return 'csrf';
+   }
+
+   public function isWriteMode() {
+   return true;
+   }
+
public function getAllowedParams() {
return array_merge( parent::getAllowedParams(), array(
'username' => array(
diff --git a/UserBoard/SpecialUserBoard.php b/UserBoard/SpecialUserBoard.php
index d957fa6..438379b 100644
--- a/UserBoard/SpecialUserBoard.php
+++ b/UserBoard/SpecialUserBoard.php
@@ -282,6 +282,9 @@
}
$output .= '';
 
+   // @todo FIXME: This if-else loop *massively* duplicates
+   // UserBoard::displayMessages(). We should refactor that and 
this into
+   // one sane & sensible method. --ashley, 19 July 2017
if ( $ub_messages ) {
foreach ( $ub_messages as $ub_message ) {
$user = Title::makeTitle( NS_USER, 
$ub_message['user_name_from'] );
@@ -325,16 +328,17 @@
$ub_message_text = $ub_message['message_text'];
 
$userPageURL = htmlspecialchars( 
$user->getFullURL() );
+   $senderTitle = htmlspecialchars( 
$ub_message['user_name_from'] );
$output .= "

-   {$ub_message['user_name_from']}  
{$ub_message_type_label}
+   {$ub_message['user_name_from']}  
{$ub_message_type_label}

"
. $this->msg( 
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) )->parse() .
"


-   {$avatar->getAvatarURL()}
+

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: [SECURITY] Fix XSS in UserBoard on social profile pages and ...

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367632 )

Change subject: [SECURITY] Fix XSS in UserBoard on social profile pages and 
CSRF in API modules which do write actions
..

[SECURITY] Fix XSS in UserBoard on social profile pages and CSRF in API modules 
which do write actions

Bug: T171045
Change-Id: I50c1f0837f407489c555c49d3a83437c27a9ddee
---
M SocialProfile.php
M UserBoard/ApiDeleteUserBoardMessage.php
M UserBoard/ApiSendUserBoardMessage.php
M UserBoard/SpecialUserBoard.php
M UserBoard/UserBoard.js
M UserBoard/UserBoardClass.php
M UserProfile/ApiUserProfilePrivacy.php
M UserProfile/UpdateProfile.js
M UserProfile/UserProfile.php
M UserProfile/UserProfilePage.js
10 files changed, 95 insertions(+), 81 deletions(-)


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

diff --git a/SocialProfile.php b/SocialProfile.php
index e47e4d5..d9ac323 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -150,7 +150,7 @@
'path' => __FILE__,
'name' => 'SocialProfile',
'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
-   'version' => '1.12',
+   'version' => '1.13',
'url' => 'https://www.mediawiki.org/wiki/Extension:SocialProfile',
'descriptionmsg' => 'socialprofile-desc',
 );
@@ -301,6 +301,7 @@
 // UserBoard
 $wgResourceModules['ext.socialprofile.userboard.js'] = array(
'scripts' => 'UserBoard.js',
+   'dependencies' => array( 'mediawiki.api' ),
'messages' => array( 'userboard_confirmdelete' ),
'localBasePath' => __DIR__ . '/UserBoard',
'remoteExtPath' => 'SocialProfile/UserBoard',
diff --git a/UserBoard/ApiDeleteUserBoardMessage.php 
b/UserBoard/ApiDeleteUserBoardMessage.php
index b30d79c..85edd33 100644
--- a/UserBoard/ApiDeleteUserBoardMessage.php
+++ b/UserBoard/ApiDeleteUserBoardMessage.php
@@ -27,6 +27,14 @@
return true;
}
 
+   public function needsToken() {
+   return 'csrf';
+   }
+
+   public function isWriteMode() {
+   return true;
+   }
+
public function getAllowedParams() {
return array_merge( parent::getAllowedParams(), array(
'id' => array(
diff --git a/UserBoard/ApiSendUserBoardMessage.php 
b/UserBoard/ApiSendUserBoardMessage.php
index 6c311e6..b8853ec 100644
--- a/UserBoard/ApiSendUserBoardMessage.php
+++ b/UserBoard/ApiSendUserBoardMessage.php
@@ -36,6 +36,14 @@
return true;
}
 
+   public function needsToken() {
+   return 'csrf';
+   }
+
+   public function isWriteMode() {
+   return true;
+   }
+
public function getAllowedParams() {
return array_merge( parent::getAllowedParams(), array(
'username' => array(
diff --git a/UserBoard/SpecialUserBoard.php b/UserBoard/SpecialUserBoard.php
index d957fa6..438379b 100644
--- a/UserBoard/SpecialUserBoard.php
+++ b/UserBoard/SpecialUserBoard.php
@@ -282,6 +282,9 @@
}
$output .= '';
 
+   // @todo FIXME: This if-else loop *massively* duplicates
+   // UserBoard::displayMessages(). We should refactor that and 
this into
+   // one sane & sensible method. --ashley, 19 July 2017
if ( $ub_messages ) {
foreach ( $ub_messages as $ub_message ) {
$user = Title::makeTitle( NS_USER, 
$ub_message['user_name_from'] );
@@ -325,16 +328,17 @@
$ub_message_text = $ub_message['message_text'];
 
$userPageURL = htmlspecialchars( 
$user->getFullURL() );
+   $senderTitle = htmlspecialchars( 
$ub_message['user_name_from'] );
$output .= "

-   {$ub_message['user_name_from']}  
{$ub_message_type_label}
+   {$ub_message['user_name_from']}  
{$ub_message_type_label}

"
. $this->msg( 
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) )->parse() .
"


-   {$avatar->getAvatarURL()}
+   {$avatar->getAvatarURL()}


{$ub_message_text}
diff --git a/UserBoard/UserBoard.js 

[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Fix sleep call

[jenkins-bot (Code Review)]

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

Change subject: Fix sleep call
..


Fix sleep call

sleep() takes an integer argument, so passing a floating number actually
just rounds down to 0 and it doesn't sleep at all.

Use usleep() instead, which takes microseconds instead of seconds.

Change-Id: I11658a705186d9198077cee8b4391e1c32a46823
---
M cli/wm-scripts/bv2013/sendMails.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/cli/wm-scripts/bv2013/sendMails.php 
b/cli/wm-scripts/bv2013/sendMails.php
index bba8f00..3a7a2dd 100644
--- a/cli/wm-scripts/bv2013/sendMails.php
+++ b/cli/wm-scripts/bv2013/sendMails.php
@@ -66,5 +66,5 @@
UserMailer::send( $address, $sender, $subject, $content );
print "Sent to $name <$address> in $lang\n";
 
-   sleep( 0.1 );
+   usleep( 10 );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11658a705186d9198077cee8b4391e1c32a46823
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MZMcBride 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Properly set search limit

[Smalyshev (Code Review)]

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

Change subject: Properly set search limit
..

Properly set search limit

Bug: T171548
Change-Id: I6527619802b6eac98437baad46aeb21ecec16c33
Depends-On: Ib87bbe117cd7c154e10e78f76ebf8e39f7cd57a0
---
M repo/includes/Search/Elastic/WikibasePrefixSearcher.php
M repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M repo/tests/phpunit/data/entitySearch/search_en.expected
M repo/tests/phpunit/data/entitySearch/search_en_strict.expected
M repo/tests/phpunit/data/entitySearch/search_zh-de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_zh.expected
8 files changed, 20 insertions(+), 7 deletions(-)


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

diff --git a/repo/includes/Search/Elastic/WikibasePrefixSearcher.php 
b/repo/includes/Search/Elastic/WikibasePrefixSearcher.php
index f089fe4..b18d31e 100644
--- a/repo/includes/Search/Elastic/WikibasePrefixSearcher.php
+++ b/repo/includes/Search/Elastic/WikibasePrefixSearcher.php
@@ -54,6 +54,12 @@
if ( $highlight ) {
$searchQuery->setHighlight( $highlight );
}
+   if ( $this->offset ) {
+   $searchQuery->setFrom( $this->offset );
+   }
+   if ( $this->limit ) {
+   $searchQuery->setSize( $this->limit );
+   }
$searchQuery->setParam( 'rescore', 
$this->searchContext->getRescore() );
 
return $pageType->createSearch( $searchQuery, $queryOptions );
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 8230968..297534c 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -112,6 +112,7 @@
 }
 }
 },
+"size": 10,
 "rescore": [
 {
 "window_size": 8192,
@@ -147,4 +148,4 @@
 "options": {
 "timeout": "20s"
 }
-}
+}
\ No newline at end of file
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index bd3a853..6a33b2d 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -116,6 +116,7 @@
 }
 }
 },
+"size": 10,
 "rescore": [
 {
 "window_size": 8192,
@@ -151,4 +152,4 @@
 "options": {
 "timeout": "20s"
 }
-}
+}
\ No newline at end of file
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index b75b2d6..ee5d863 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -109,6 +109,7 @@
 }
 }
 },
+"size": 10,
 "rescore": [
 {
 "window_size": 8192,
@@ -144,4 +145,4 @@
 "options": {
 "timeout": "20s"
 }
-}
+}
\ No newline at end of file
diff --git a/repo/tests/phpunit/data/entitySearch/search_en.expected 
b/repo/tests/phpunit/data/entitySearch/search_en.expected
index 5d7f639..5948bbe 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -90,6 +90,7 @@
 }
 }
 },
+"size": 10,
 "rescore": [
 {
 "window_size": 8192,
@@ -125,4 +126,4 @@
 "options": {
 "timeout": "20s"
 }
-}
+}
\ No newline at end of file
diff --git a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
index 81c2ca3..cf1c1a1 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
@@ -89,6 +89,7 @@
 }
 }
 },
+"size": 10,
 "rescore": [
 {
 "window_size": 8192,
@@ -124,4 +125,4 @@
 "options": {
 "timeout": "20s"
 }
-}
+}
\ No newline at end of file
diff --git a/repo/tests/phpunit/data/entitySearch/search_zh-de-ch.expected 
b/repo/tests/phpunit/data/entitySearch/search_zh-de-ch.expected
index 5516e22..c98d337 100644
--- a/repo/tests/phpunit/data/entitySearch/search_zh-de-ch.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_zh-de-ch.expected
@@ -193,6 

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Make limit/offset available to extending classes

[Smalyshev (Code Review)]

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

Change subject: Make limit/offset available to extending classes
..

Make limit/offset available to extending classes

Bug: T171548
Change-Id: Ib87bbe117cd7c154e10e78f76ebf8e39f7cd57a0
---
M includes/Searcher.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/Searcher.php b/includes/Searcher.php
index d8c5ea4..ac155f1 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -73,12 +73,12 @@
/**
 * @var integer search offset
 */
-   private $offset;
+   protected $offset;
 
/**
 * @var integer maximum number of result
 */
-   private $limit;
+   protected $limit;
 
/**
 * @var Language language of the wiki

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib87bbe117cd7c154e10e78f76ebf8e39f7cd57a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add fasw-c-codfw mgmt interfaces to DNS

[Ayounsi (Code Review)]

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

Change subject:  Add fasw-c-codfw mgmt interfaces to DNS
..


Add fasw-c-codfw mgmt interfaces to DNS

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

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 2a2136c..87687b2 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3551,6 +3551,8 @@
 54  1H IN PTR  ps1-d6-codfw.mgmt.codfw.wmnet.
 55  1H IN PTR  ps1-d7-codfw.mgmt.codfw.wmnet.
 56  1H IN PTR  ps1-d8-codfw.mgmt.codfw.wmnet.
+57  1H IN PTR  fasw-c-codfw.mgmt.codfw.wmnet.
+
 
 $ORIGIN 1.193.{{ zonename }}.
 
diff --git a/templates/wmnet b/templates/wmnet
index 93db3f6..9bd1e99 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3244,6 +3244,8 @@
 ps1-d6-codfw1H  IN A10.193.0.54
 ps1-d7-codfw1H  IN A10.193.0.55
 ps1-d8-codfw1H  IN A10.193.0.56
+fasw-c-codfw1H  IN A10.193.0.57
+
 
 ; Servers MGMT - Alphabetical by hostname
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add fasw-c-codfw mgmt interfaces to DNS

[Ayounsi (Code Review)]

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

Change subject:  Add fasw-c-codfw mgmt interfaces to DNS
..

Add fasw-c-codfw mgmt interfaces to DNS

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/29/367629/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 2a2136c..87687b2 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3551,6 +3551,8 @@
 54  1H IN PTR  ps1-d6-codfw.mgmt.codfw.wmnet.
 55  1H IN PTR  ps1-d7-codfw.mgmt.codfw.wmnet.
 56  1H IN PTR  ps1-d8-codfw.mgmt.codfw.wmnet.
+57  1H IN PTR  fasw-c-codfw.mgmt.codfw.wmnet.
+
 
 $ORIGIN 1.193.{{ zonename }}.
 
diff --git a/templates/wmnet b/templates/wmnet
index 93db3f6..9bd1e99 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3244,6 +3244,8 @@
 ps1-d6-codfw1H  IN A10.193.0.54
 ps1-d7-codfw1H  IN A10.193.0.55
 ps1-d8-codfw1H  IN A10.193.0.56
+fasw-c-codfw1H  IN A10.193.0.57
+
 
 ; Servers MGMT - Alphabetical by hostname
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "RCFilters: Hide hours temporarily since they don't w...

[Catrope (Code Review)]

Hello Jack Phoenix, jenkins-bot, Mooeypoo,

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

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

to review the following change.


Change subject: Revert "RCFilters: Hide hours temporarily since they don't work"
..

Revert "RCFilters: Hide hours temporarily since they don't work"

This reverts commit c7c112a8f219857fb5527713aaacb50a599ee1f6.

Change-Id: Ib15256d4541ecebdb29fe294c5285e63e37f9fee
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
3 files changed, 11 insertions(+), 23 deletions(-)


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

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index cced3d5..5ebec27 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -118,8 +118,7 @@
'default': '7',
filters: [
// Hours (1, 2, 6, 12)
-   // TEMPORARY: Hide hours 
temporarily
-   // 0.04166, 0.0833, 0.25, 0.5,
+   0.04166, 0.0833, 0.25, 0.5,
// Days
1, 3, 7, 14, 30
].map( function ( num ) {
@@ -169,12 +168,9 @@
uriValue,
// In this case we 
don't want to round because it can be arbitrary
// weird numbers but we 
want to round to 2 decimal digits
-
-   // HACK: Temporarily 
remove hours from UI
-   // Number( uriValue ) < 
1 ?
-   //  ( Number( 
uriValue ) * 24 ).toFixed( 2 ) :
-   //  Number( 
uriValue )
-   Number( uriValue )
+   Number( uriValue ) < 1 ?
+   ( Number( 
uriValue ) * 24 ).toFixed( 2 ) :
+   Number( 
uriValue )
) );
} else {
groupData.filters.push( 
createFilterDataFromNumber( uriValue, uriValue ) );
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
index 681b350..1569f38 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
@@ -105,11 +105,8 @@
if ( item ) {
this.button.setLabel(
mw.msg(
-   // Number( item.getParamName() ) < 1 ?
-   //  'rcfilters-days-show-hours' : 
'rcfilters-days-show-days',
-
-   // Temporarily hide the functionality 
for hours, use days only
-   'rcfilters-days-show-days',
+   Number( item.getParamName() ) < 1 ?
+   'rcfilters-days-show-hours' : 
'rcfilters-days-show-days',
item.getLabel()
)
);
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
index ac841c0..6971df5 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
@@ -16,8 +16,6 @@
 
this.model = model;
 
-   /*
-   // HACK: Temporarily remove hours from UI
this.hoursValuePicker = new mw.rcfilters.ui.ValuePickerWidget(
this.model,
{
@@ -25,28 +23,25 @@
label: mw.msg( 'rcfilters-hours-title' ),
itemFilter: function ( itemModel ) 

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Fix stylesheet

[Jdlrobson (Code Review)]

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

Change subject: Fix stylesheet
..

Fix stylesheet

You can't nest like this. It creates the invalid selector
.vector-experimental-print-stylesbody

This is a follow up to I453ae43099796a74c39d965b796f2fa13942106c

Bug: T169823
Change-Id: I9cc2f474fdcafdcc68378185391607b72b0f667a
---
M print.less
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/print.less b/print.less
index 50c3d30..6f597dc 100644
--- a/print.less
+++ b/print.less
@@ -2,11 +2,11 @@
 
 @media print {
 
+   body.vector-experimental-print-styles {
+   padding: 10px;
+   font-family: serif;
+   }
.vector-experimental-print-styles {
-{
-   padding: 10px;
-   font-family: serif;
-   }
 
// Normalize Blue links in the article
a {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialRecentchanges: Handle ?days= parameter more sanely

[Catrope (Code Review)]

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

Change subject: SpecialRecentchanges: Handle ?days= parameter more sanely
..

SpecialRecentchanges: Handle ?days= parameter more sanely

Allow fractional values (e.g ?days=0.25). Previously, fractional values
were rounded down (truncated) to integers.

When computing the cutoff timestamp, don't round down to midnight UTC.
This caused a strange phenomenon where ?days=1 would display between
24 and 48 hours' worth of changes depending on when you used it:
if the current time was 2017-07-24 23:59 UTC, the cutoff would be
set at 2017-07-23 00:00 UTC so you would see almost 48 hours' worth,
but if you refreshed two minutes later, the cutoff would be set at
2017-07-24 00:00 UTC and you should see just over 24 hours' worth.
In addition to this strangeness, it also made fractional values
somewhat meaningless and made a feature like "show only the last 3 hours"
impossible to implement.

Bug: T162784
Change-Id: I75b71324e29a4da09939c4b00feeb4cb556f797c
---
M includes/specials/SpecialRecentchanges.php
M tests/phpunit/includes/specials/SpecialRecentchangesTest.php
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/367626/1

diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index c9c2475..a05900b 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -315,7 +315,7 @@
$opts = parent::getDefaultOptions();
$user = $this->getUser();
 
-   $opts->add( 'days', $user->getIntOption( 'rcdays' ) );
+   $opts->add( 'days', $user->getIntOption( 'rcdays' ), 
FormOptions::FLOAT );
$opts->add( 'limit', $user->getIntOption( 'rclimit' ) );
$opts->add( 'from', '' );
 
@@ -359,7 +359,7 @@
if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) {
$opts['limit'] = $m[1];
}
-   if ( preg_match( '/^days=(\d+)$/', $bit, $m ) ) {
+   if ( preg_match( '/^days=(\d+(?:\.\d+)?)$/', $bit, $m ) 
) {
$opts['days'] = $m[1];
}
if ( preg_match( '/^namespace=(.*)$/', $bit, $m ) ) {
@@ -388,7 +388,6 @@
 
// Calculate cutoff
$cutoff_unixtime = time() - ( $opts['days'] * 86400 );
-   $cutoff_unixtime = $cutoff_unixtime - ( $cutoff_unixtime % 
86400 );
$cutoff = $dbr->timestamp( $cutoff_unixtime );
 
$fromValid = preg_match( '/^[0-9]{14}$/', $opts['from'] );
diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php 
b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
index 85becff..a9a612d 100644
--- a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
+++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
@@ -27,6 +27,8 @@
 
[ 'days=3', [ 'days' => '3' ] ],
 
+   [ 'days=0.25', [ 'days' => '0.25'] ],
+
[ 'namespace=5', [ 'namespace' => '5' ] ],
 
[ 'namespace=5|3', [ 'namespace' => '5|3' ] ],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: DON'T MERGE: labsdb: in case labsdb1001 falls over

[Rush (Code Review)]

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

Change subject: DON'T MERGE: labsdb: in case labsdb1001 falls over
..

DON'T MERGE: labsdb: in case labsdb1001 falls over

Currently running on a degraded RAID1

Bug: T171538
Change-Id: I19a79337589257419079bc202810a9060e4130a9
---
M modules/role/manifests/labs/dnsrecursor.pp
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/role/manifests/labs/dnsrecursor.pp 
b/modules/role/manifests/labs/dnsrecursor.pp
index 441fab2..d81be83 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -85,13 +85,13 @@
 # "shards" (s1, etc.) and databases (enwiki, etc.) to these is
 # arbitrary and can be adjusted to depool a server or redistribute
 # load.
-$c1_dbs = ['c1', 's1', 's2', 's4', 'enwiki', 'commonswiki',
+$c1_dbs = ['c1']
+$c2_dbs = ['c2']
+$c3_dbs = ['c1', 'c3', 's1', 's2', 's4', 'enwiki', 'commonswiki',
 'bgwiki', 'bgwiktionary', 'cswiki', 'enwikiquote',
 'enwiktionary', 'eowiki', 'fiwiki', 'idwiki', 'itwiki',
 'nlwiki', 'nowiki', 'plwiki', 'ptwiki', 'svwiki', 'thwiki',
-'trwiki', 'zhwiki']
-$c2_dbs = ['c2']
-$c3_dbs = ['c3', 's3', 's5', 's6', 's7', 'dewiki',
+'trwiki', 'zhwiki', 's3', 's5', 's6', 's7', 'dewiki',
 'wikidatawiki', 'aawiki', 'aawikibooks',
 'aawiktionary', 'abwiki', 'abwiktionary', 'acewiki',
 'advisorywiki', 'adywiki', 'afwiki', 'afwikibooks',

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Fix PayPal EC recurring profile created messages

[Ejegg (Code Review)]

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

Change subject: Fix PayPal EC recurring profile created messages
..

Fix PayPal EC recurring profile created messages

We should send currency and amount to Civi

Bug: T171546
Change-Id: I36dd1f05cbd66eac292b351b0809419c46e9dc09
---
M 
PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
M config/paypal/main.yaml
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/24/367624/1

diff --git 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
index ce73c80..0c7ad8e 100644
--- 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
+++ 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
@@ -15,5 +15,7 @@
   "start_date": 1492533928,
   "date": 1492533928,
   "gateway": "paypal_ec",
-  "recurring": "1"
+  "recurring": "1",
+  "gross": "140",
+  "currency": "JPY"
 }
diff --git a/config/paypal/main.yaml b/config/paypal/main.yaml
index cbd7aaf..005c889 100644
--- a/config/paypal/main.yaml
+++ b/config/paypal/main.yaml
@@ -28,6 +28,7 @@
 # FIXME This is only true for refund messages.  Where to represent?
 #txn_id: gateway_refund_id
 mc_currency: currency
+currency_code: currency
 # FIXME rename refund_type
 reason_code: type
 #test_ipn:  # signals test mode
@@ -46,6 +47,8 @@
 # FIXME this too
 address_name: supplemental_address_1
 gateway: gateway
+# NOTE: order matters, later ones override earlier ones
+amount_per_cycle: gross
 mc_gross: gross
 mc_amount3: gross
 amount3: gross

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36dd1f05cbd66eac292b351b0809419c46e9dc09
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add missing max value to rowiki ORES config

[jenkins-bot (Code Review)]

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

Change subject: Add missing max value to rowiki ORES config
..


Add missing max value to rowiki ORES config

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6f32d19..af74c3a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18740,7 +18740,7 @@
'rowiki' => [
'damaging' => [
// likelygood, maybebad, likelybad use defaults
-   'verylikelybad' => [ 'min' => 
'recall_at_precision(min_precision=0.75)' ],
+   'verylikelybad' => [ 'min' => 
'recall_at_precision(min_precision=0.75)', 'max' => 1 ],
],
'goodfaith' => [
// HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Apex theme: Improve alignment of TextInputWidget and its ele...

[VolkerE (Code Review)]

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

Change subject: Apex theme: Improve alignment of TextInputWidget and its 
elements
..

Apex theme: Improve alignment of TextInputWidget and its elements

Improving vertical alignment in TextInputWidgets (icons, indicators,
labels) and fix its size as follow-up to Id526add14e9fb06

Change-Id: I0374f54f345bfa875ca4a0fb554e030a4672867c
---
M src/themes/apex/common.less
M src/themes/apex/widgets.less
2 files changed, 16 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/367623/1

diff --git a/src/themes/apex/common.less b/src/themes/apex/common.less
index 7bfe443..176ec16 100644
--- a/src/themes/apex/common.less
+++ b/src/themes/apex/common.less
@@ -54,6 +54,8 @@
 @padding-bottom-textinput: unit( 8 / 16 / 0.8, em );
 
 @line-height-base: 1.4;
+@line-height-widget-multiline: 1.275;
+@line-height-widget-singleline: 1.172em; // Firefox needs a value, Chrome the 
unit; equals `15px` at base `font-size: 12.8px`
 
 // Theme animation variables
 // Some of these values are duplicated in OO.ui.ApexTheme
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 32ce2ac..f5c0042 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -255,7 +255,7 @@
 
&-php .oo-ui-indicatorWidget {
right: 0;
-   max-height: 2.375em;
+   max-height: 2.5em;
margin: 0;
margin-right: 0.775em;
}
@@ -1157,7 +1157,6 @@
input,
textarea {
padding: @padding-top-textinput 0.5em @padding-bottom-textinput 
0.5em;
-   line-height: 1.275em;
font-size: inherit;
font-family: inherit;
background-color: @background-color-main;
@@ -1172,6 +1171,14 @@
}
 
.apex-placeholder();
+   }
+
+   input {
+   line-height: @line-height-widget-singleline;
+   }
+
+   textarea {
+   line-height: @line-height-widget-multiline;
}
 
&.oo-ui-widget-enabled {
@@ -1221,7 +1228,7 @@
}
 
.oo-ui-iconElement-icon {
-   max-height: 2.375em;
+   max-height: 2.5em;
margin-left: 0.3em;
}
}
@@ -1233,14 +1240,15 @@
}
 
.oo-ui-indicatorElement-indicator {
-   max-height: 2.375em;
+   max-height: 2.5em;
margin-right: 0.775em;
}
}
 
> .oo-ui-labelElement-label {
-   padding: 0.4em;
-   line-height: 1.5em;
+   top: 1px; // equals `border-width`
+   padding: @padding-top-textinput 0.4em @padding-bottom-textinput 
0.4em;
+   line-height: @line-height-widget-singleline;
color: @color-subtle;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add missing max value to rowiki ORES config

[Catrope (Code Review)]

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

Change subject: Add missing max value to rowiki ORES config
..

Add missing max value to rowiki ORES config

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6f32d19..af74c3a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18740,7 +18740,7 @@
'rowiki' => [
'damaging' => [
// likelygood, maybebad, likelybad use defaults
-   'verylikelybad' => [ 'min' => 
'recall_at_precision(min_precision=0.75)' ],
+   'verylikelybad' => [ 'min' => 
'recall_at_precision(min_precision=0.75)', 'max' => 1 ],
],
'goodfaith' => [
// HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster frontend profile: Allow hiera to configure the...

[Andrew Bogott (Code Review)]

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

Change subject: puppetmaster frontend profile:  Allow hiera to configure the 
hostname
..

puppetmaster frontend profile:  Allow hiera to configure the hostname

Previously it was always and only 'puppet' -- I want to split
that up for labs puppetmasters.

Change-Id: I93b9585e9662e2c7b43086019717ccf7f5258174
---
M hieradata/hosts/labpuppetmaster1001.yaml
M hieradata/hosts/labtestpuppetmaster2001.yaml
M modules/profile/manifests/puppetmaster/frontend.pp
3 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/367621/1

diff --git a/hieradata/hosts/labpuppetmaster1001.yaml 
b/hieradata/hosts/labpuppetmaster1001.yaml
index 97cc41a..bccd700 100644
--- a/hieradata/hosts/labpuppetmaster1001.yaml
+++ b/hieradata/hosts/labpuppetmaster1001.yaml
@@ -4,3 +4,5 @@
   labpuppetmaster1001.wikimedia.org:
 - { worker: labpuppetmaster1001.wikimedia.org, loadfactor: 10 }
 - { worker: labpuppetmaster1002.wikimedia.org, loadfactor: 20 }
+
+profile::puppetmaster::frontend::web_hostname: labs-puppetmaster.wikimedia.org
diff --git a/hieradata/hosts/labtestpuppetmaster2001.yaml 
b/hieradata/hosts/labtestpuppetmaster2001.yaml
index 5c1e37c..41d16cc 100644
--- a/hieradata/hosts/labtestpuppetmaster2001.yaml
+++ b/hieradata/hosts/labtestpuppetmaster2001.yaml
@@ -10,6 +10,8 @@
 profile::puppetmaster::labsencapi::statsd_host: labmon1001.eqiad.wmnet
 profile::puppetmaster::labsencapi::statsd_prefix: labtest.puppetbackend
 
+profile::puppetmaster::frontend::web_hostname: 
labtest-puppetmaster.wikimedia.org
+
 profile::puppetmaster::common::storeconfigs: none
 
 puppetmaster::ca_server: labtestpuppetmaster2001.wikimedia.org
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp 
b/modules/profile/manifests/puppetmaster/frontend.pp
index 36f276f..df2cbc3 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -3,6 +3,7 @@
 class profile::puppetmaster::frontend(
 $config = hiera('profile::puppetmaster::frontend::config', {}),
 $secure_private = hiera('profile::puppetmaster::frontend::config', true),
+$web_hostname = hiera('profile::puppetmaster::frontend::web_hostname', 
'puppet'),
 ) {
 backup::set { 'var-lib-puppet-ssl': }
 backup::set { 'var-lib-puppet-volatile': }
@@ -45,7 +46,7 @@
 }
 
 # Main site to respond to
-::puppetmaster::web_frontend { 'puppet':
+::puppetmaster::web_frontend { $web_hostname:
 master   => $ca_server,
 workers  => $workers,
 bind_address => $::puppetmaster::bind_address,

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ORES on sqwiki and rowiki

[jenkins-bot (Code Review)]

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

Change subject: Enable ORES on sqwiki and rowiki
..


Enable ORES on sqwiki and rowiki

Bug: T170723
Change-Id: Ib5bcc1cb86681bb9100f0d9a47979192f41bc698
---
M wmf-config/InitialiseSettings.php
1 file changed, 28 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a0107eb..2c143a7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18556,7 +18556,9 @@
'nlwiki' => true, // T139432
'plwiki' => true, // T140005
'ptwiki' => true, // T139692
+   'rowiki' => true, // T170723
'ruwiki' => true, // T139541
+   'sqwiki' => true, // T170723
'trwiki' => true, // T139992
 
'wikidatawiki' => true, // T130212
@@ -18736,6 +18738,32 @@
'verylikelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.9)' ],
],
],
+   'sqwiki' => [
+   'damaging' => [
+   // HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995
+   'likelygood' => [ 'min' => 0, 'max' => 
'filter_rate_at_recall(min_recall=0.9)' ],
+   // maybebad, likelybad, verylikelybad use defaults
+   ],
+   'goodfaith' => [
+   // HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995
+   'likelygood' => [ 'min' => 
'filter_rate_at_recall(min_recall=0.9)', 'max' => 1 ],
+   'maybebad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.15)' ],
+   'likelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.45)' ],
+   'verylikelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.9)' ],
+   ],
+   ],
+   'rowiki' => [
+   'damaging' => [
+   // likelygood, maybebad, likelybad use defaults
+   'verylikelybad' => [ 'min' => 
'recall_at_precision(min_precision=0.75)' ],
+   ],
+   'goodfaith' => [
+   // HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995
+   'likelygood' => [ 'min' => 
'filter_rate_at_recall(min_recall=0.9)', 'max' => 1 ],
+   // maybebad, likelybad use defaults
+   'verylikelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.75)' ],
+   ],
+   ],
 ],
 'wmgOresDefaultSensitivityLevel' => [
'default' => 'soft', // likelybad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5bcc1cb86681bb9100f0d9a47979192f41bc698
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
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] operations/mediawiki-config[master]: Remove wgOresDamagingThresholds settings

[jenkins-bot (Code Review)]

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

Change subject: Remove wgOresDamagingThresholds settings
..


Remove wgOresDamagingThresholds settings

This config var doesn't exist any more.

Change-Id: Iea8da4ac97cfe02a4d24c70e34842009f5efcab5
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 19 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 62811ba..e11bdad 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -454,10 +454,6 @@
'wp10' => false,
], // T127661
],
-   'wgOresDamagingThresholds' => [
-   'default' => [ 'hard' => 0.5, 'soft' => 0.7 ],
-   'wikipedia' => [ 'hard' => 0.6, 'soft' => 0.7 ], // 
T127661
-   ],
'wgOresEnabledNamespaces' => [
'default' => [],
'enwiki' => [ 0 => true ],
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2c143a7..6f32d19 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18571,21 +18571,6 @@
'wp10' => false,
],
 ],
-'wgOresDamagingThresholds' => [
-   'default' => [ 'hard' => 0.5, 'soft' => 0.7 ],
-   'fawiki' => [ 'hard' => 0.07, 'soft' => 0.37, 'softest' => 0.9 ], // 
T130211
-   'wikidatawiki' => [ 'hard' => 0.92, 'soft' => 0.97, 'softest' => 0.99 
], // T130212
-   'nlwiki' => [ 'hard' => 0.39, 'soft' => 0.75, 'softest' => 0.95 ], // 
T139432
-   'ruwiki' => [ 'hard' => 0.50, 'soft' => 0.73, 'softest' => 0.95 ], // 
T139541
-   'ptwiki' => [ 'hard' => 0.24, 'soft' => 0.57, 'softest' => 0.94 ], // 
T139692
-   'trwiki' => [ 'hard' => 0.20, 'soft' => 0.58, 'softest' => 0.92 ], // 
T139992
-   'plwiki' => [ 'hard' => 0.19, 'soft' => 0.41, 'softest' => 0.92 ], // 
T140005
-   'enwiki' => [ 'hard' => 0.17, 'soft' => 0.49, 'softest' => 0.96 ], // 
T140003
-   'cswiki' => [ 'hard' => 0.45, 'soft' => 0.8, 'softest' => 0.88 ], // 
T151611
-   'etwiki' => [ 'hard' => 0.34, 'soft' => 0.62, 'softest' => 0.95 ], // 
T159609
-   'hewiki' => [ 'hard' => 0.07, 'soft' => 0.50, 'softest' => 0.94 ], // 
T161621
-   'frwiki' => [ 'hard' => 0.18, 'soft' => 0.40, 'softest' => 0.51 ], // 
T165044
-],
 'wgOresFiltersThresholds' => [
'default' => [],
'enwiki' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea8da4ac97cfe02a4d24c70e34842009f5efcab5
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
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] wikimedia...prince[develop]: Get all country names with portal traffic from polloi

[Bearloga (Code Review)]

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

Change subject: Get all country names with portal traffic from polloi
..


Get all country names with portal traffic from polloi

Bug: T167913
Change-Id: I781a1a11844df5599d8535df5e7ce440ea81428f
---
M extras.R
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/extras.R b/extras.R
index 69c502e..605a49d 100644
--- a/extras.R
+++ b/extras.R
@@ -29,7 +29,8 @@
 )
 
 # For selectizeInput in ui.R
-all_country_names <- c("Zimbabwe", "Zambia", "Yemen", "Virgin Islands, 
British", "Viet Nam", "Venezuela, Bolivarian Republic of", "Uzbekistan", "U.S. 
(West)", "U.S. (South)", "U.S. (Pacific)", "U.S. (Other)", "U.S. (Northeast)", 
"U.S. (Midwest)", "Uruguay", "United Kingdom", "United Arab Emirates", 
"Ukraine", "Uganda", "Turkmenistan", "Turkey", "Tunisia", "Trinidad and 
Tobago", "Timor-Leste", "Thailand", "Tanzania, United Republic of", 
"Tajikistan", "Taiwan, Province of China", "Syrian Arab Republic", 
"Switzerland", "Sweden", "Suriname", "Sudan", "Sri Lanka", "Spain", "South 
Africa", "Somalia", "Slovenia", "Slovakia", "Singapore", "Seychelles", 
"Serbia", "Senegal", "Saudi Arabia", "Rwanda", "Russian Federation", "Romania", 
"Qatar", "Portugal", "Poland", "Philippines", "Peru", "Paraguay", "Papua New 
Guinea", "Panama", "Palestine, State of", "Pakistan", "Other", "Oman", 
"Norway", "Nigeria", "Niger", "Nicaragua", "New Zealand", "Netherlands", 
"Nepal", "Namibia", "Myanmar", "Mozambique", "Morocco", "Montenegro", 
"Mongolia", "Moldova, Republic of", "Mexico", "Mauritius", "Mauritania", 
"Martinique", "Mali", "Malaysia", "Malawi", "Madagascar", "Macedonia, Republic 
of", "Macao", "Luxembourg", "Lithuania", "Libya", "Lebanon", "Latvia", "Lao 
People's Democratic Republic", "Kyrgyzstan", "Kuwait", "Korea, Republic of", 
"Kenya", "Kazakhstan", "Jordan", "Jersey", "Japan", "Jamaica", "Italy", 
"Israel", "Ireland", "Iraq", "Iran, Islamic Republic of", "Indonesia", "India", 
"Iceland", "Hungary", "Hong Kong", "Honduras", "Haiti", "Guernsey", 
"Guatemala", "Greenland", "Greece", "Ghana", "Germany", "Georgia", "French 
Polynesia", "France", "Finland", "Fiji", "Ethiopia", "Estonia", "El Salvador", 
"Egypt", "Ecuador", "Dominican Republic", "Dominica", "Djibouti", "Denmark", 
"Czechia", "Cyprus", "Curacao", "Cuba", "Croatia", "Cote d'Ivoire", "Costa 
Rica", "Congo, The Democratic Republic of the", "Colombia", "China", "Chile", 
"Canada", "Cameroon", "Cambodia", "Burkina Faso", "Bulgaria", "British Indian 
Ocean Territory", "Brazil", "Botswana", "Bolivia, Plurinational State of", 
"Bhutan", "Benin", "Belgium", "Belarus", "Barbados", "Bangladesh", "Bahrain", 
"Azerbaijan", "Austria", "Australia", "Aruba", "Armenia", "Argentina", 
"Angola", "Algeria", "Albania", "Afghanistan", "Togo", "Malta", "Guadeloupe", 
"Gibraltar", "Gabon", "Faroe Islands", "Congo", "Cayman Islands", "Brunei 
Darussalam", "Bosnia and Herzegovina", "Bahamas", "Reunion", "Maldives", 
"Guyana", "Guinea", "Cabo Verde", "Burundi", "Antigua and Barbuda", 
"Swaziland", "Saint Lucia", "Isle of Man", "Gambia", "Central African 
Republic", "Belize", "Vanuatu", "Sierra Leone", "Saint Kitts and Nevis", "New 
Caledonia", "Lesotho", "Solomon Islands", "French Guiana", "Chad", "Bermuda", 
"Turks and Caicos Islands", "Liberia", "Comoros", "Bonaire, Sint Eustatius and 
Saba", "Aland Islands", "Grenada", "Mayotte", "Liechtenstein", "Samoa", 
"Equatorial Guinea", "Andorra", "South Sudan", "Saint Martin (French part)", 
"Saint Vincent and the Grenadines", "Holy See (Vatican City State)", 
"Guinea-Bissau", "Eritrea", "Saint Barthelemy", "Cook Islands", "Sint Maarten 
(Dutch part)", "Sao Tome and Principe", "Anguilla", "Monaco", "Kiribati", 
"Micronesia, Federated States of", "San Marino", "United States")
+data(portal_regions, package = "polloi")
+all_country_names <- portal_regions
 
 fill_out <- function(x, start_date, end_date, fill = 0) {
   temp <- dplyr::data_frame(date = seq(start_date, end_date, "day"))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I781a1a11844df5599d8535df5e7ce440ea81428f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/prince
Gerrit-Branch: develop
Gerrit-Owner: Chelsyx 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Use new functions in polloi to get geo data

[Bearloga (Code Review)]

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

Change subject: Use new functions in polloi to get geo data
..


Use new functions in polloi to get geo data

Bug: T167913
Change-Id: I00cad391fa22399f583eb7791256c1eb25ba611b
---
M modules/metrics/portal/geographic_breakdown.R
1 file changed, 2 insertions(+), 14 deletions(-)

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



diff --git a/modules/metrics/portal/geographic_breakdown.R 
b/modules/metrics/portal/geographic_breakdown.R
index 606e6a0..3456a45 100644
--- a/modules/metrics/portal/geographic_breakdown.R
+++ b/modules/metrics/portal/geographic_breakdown.R
@@ -66,23 +66,11 @@
 } else {
   results$ts <- as.POSIXct(results$ts, format = "%Y%m%d%H%M%S")
   # Geography data that is common to both outputs:
-  data("ISO_3166_1", package = "ISOcodes")
-  # Remove accents because Reportupdater requires ASCII:
-  ISO_3166_1$Name <- stringi::stri_trans_general(ISO_3166_1$Name, 
"Latin-ASCII")
-  us_other_abb <- c("AS", "GU", "MP", "PR", "VI")
-  us_other_mask <- match(us_other_abb, ISO_3166_1$Alpha_2)
-  regions <- data.frame(abb = c(paste0("US:", c(as.character(state.abb), 
"DC")), us_other_abb),
-region = paste0("U.S. (", 
c(as.character(state.region), "South", rep("Other",5)), ")"),
-state = c(state.name, "District of Columbia", 
ISO_3166_1$Name[us_other_mask]),
-stringsAsFactors = FALSE)
-  regions$region[regions$region == "U.S. (North Central)"] <- "U.S. (Midwest)"
-  regions$region[c(state.division == "Pacific", rep(FALSE, 5))] <- "U.S. 
(Pacific)" # see https://phabricator.wikimedia.org/T136257#2399411
+  regions <- polloi::get_us_state()
   library(magrittr) # Required for piping
   if (opt$include_all) {
 # Generate all countries breakdown
-all_countries <- data.frame(abb = c(regions$abb, 
ISO_3166_1$Alpha_2[-us_other_mask]),
-name = c(regions$region, 
ISO_3166_1$Name[-us_other_mask]),
-stringsAsFactors = FALSE)
+all_countries <- polloi::get_country_state()
 data_w_countryname <- results %>%
   dplyr::mutate(country = ifelse(country %in% all_countries$abb, country, 
"Other")) %>%
   dplyr::left_join(all_countries, by = c("country" = "abb")) %>%

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00cad391fa22399f583eb7791256c1eb25ba611b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix MediaInfo jenkins breakage on master

[jenkins-bot (Code Review)]

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

Change subject: Fix MediaInfo jenkins breakage on master
..


Fix MediaInfo jenkins breakage on master

See Id64b72f9f07a2721a6407ef647786b3b668839c8

Change-Id: Idcf639a46fc7297de846152d138bc5719c7d96c6
---
M repo/tests/phpunit/includes/Api/EditEntityTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/repo/tests/phpunit/includes/Api/EditEntityTest.php 
b/repo/tests/phpunit/includes/Api/EditEntityTest.php
index 50f91da..1ff8f98 100644
--- a/repo/tests/phpunit/includes/Api/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/Api/EditEntityTest.php
@@ -980,7 +980,7 @@
'e' => [ 'exception' => [
'type' => ApiUsageException::class,
'code' => 'no-such-entity',
-   'message' => 'Could not find such an 
entity'
+   'message-key' => 
'wikibase-api-no-such-entity'
] ],
'requires' => 'mediainfo' // skip if MediaInfo 
is not configured
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idcf639a46fc7297de846152d138bc5719c7d96c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: AnotherLadsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Switch disk check test to check_disk_space

[Paladox (Code Review)]

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

Change subject: Switch disk check test to check_disk_space
..


Switch disk check test to check_disk_space

Change-Id: I9c2e6983766131c4fec2e773bc0b60f0aea0e043
---
M templates/hosts.conf.erb
M templates/services.conf.erb
2 files changed, 12 insertions(+), 20 deletions(-)

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



diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index 975c1e9..e9ccc0b 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -258,7 +258,7 @@
 vars.sla = "24x7"
 vars.address = "ores-lb-02.ores.eqiad.wmflabs"
 vars.check_user = true
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-lb-02.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -277,7 +277,7 @@
 vars.sla = "24x7"
 vars.check_user = true
 vars.address = "ores-redis-01.ores.eqiad.wmflabs"
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-redis-01.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -297,7 +297,7 @@
 vars.sla = "24x7"
 vars.check_user = true
 vars.address = "ores-redis-02.ores.eqiad.wmflabs"
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-redis-02.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -317,7 +317,7 @@
 vars.sla = "24x7"
 vars.check_user = true
 vars.address = "ores-web-03.ores.eqiad.wmflabs"
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-web-03.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -337,7 +337,7 @@
 vars.sla = "24x7"
 vars.check_user = true
 vars.address = "ores-web-05.ores.eqiad.wmflabs"
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-web-05.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -357,7 +357,7 @@
 vars.sla = "24x7"
 vars.address = "ores-worker-05.ores.eqiad.wmflabs"
 vars.check_user = true
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-worker-05.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -377,7 +377,7 @@
 vars.sla = "24x7"
 vars.address = "ores-worker-06.ores.eqiad.wmflabs"
 vars.check_user = true
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-worker-06.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -397,7 +397,7 @@
 vars.sla = "24x7"
 vars.address = "ores-worker-07.ores.eqiad.wmflabs"
 vars.check_user = true
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-worker-07.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -417,7 +417,7 @@
 vars.sla = "24x7"
 vars.address = "ores-worker-08.ores.eqiad.wmflabs"
 vars.check_user = true
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-worker-08.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -437,7 +437,7 @@
 vars.sla = "24x7"
 vars.address = "ores-worker-09.ores.eqiad.wmflabs"
 vars.check_user = true
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-worker-09.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
@@ -457,7 +457,7 @@
 vars.sla = "24x7"
 vars.address = "ores-worker-10.ores.eqiad.wmflabs"
 vars.check_user = true
-vars.check_disk_ores = true
+vars.check_disk = true
 vars.host = "ores-worker-10.ores.eqiad.wmflabs"
 vars.notification.ores = true
 vars.check_puppet = true
diff --git a/templates/services.conf.erb b/templates/services.conf.erb
index 737b3a2..139414d 100644
--- a/templates/services.conf.erb
+++ b/templates/services.conf.erb
@@ -75,16 +75,8 @@
   import "generic-service"
   check_command = "nrpe-check-1arg"
   vars.host = host.address
-  vars.check = "check_disk"
-  assign where host.vars.check_disk
-}
-
-apply Service "check disk_space" {
-  import "generic-service"
-  check_command = "nrpe-check-1arg"
-  vars.host = host.address
   vars.check = "check_disk_space"
-  assign where host.vars.check_disk_ores
+  assign where host.vars.check_disk
 }
 
 apply Service "check http" {

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

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Switch disk check test to check_disk_space

[Paladox (Code Review)]

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

Change subject: Switch disk check test to check_disk_space
..

Switch disk check test to check_disk_space

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/20/367620/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c2e6983766131c4fec2e773bc0b60f0aea0e043
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix ElasticTermResultTest for wikis w/o CirrusSearch

[jenkins-bot (Code Review)]

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

Change subject: Fix ElasticTermResultTest for wikis w/o CirrusSearch
..


Fix ElasticTermResultTest for wikis w/o CirrusSearch

I did this before in c82ce4db91adf4e757b1ed21c576a6c87f3ceb69.
Found by travis:
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/256993804

Change-Id: I14ff7b6aa6e75c6e4c318cdc51344bb9dd2521ee
---
M repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git 
a/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php 
b/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
index 3622078..7cb9ed2 100644
--- a/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
+++ b/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Repo\Search\Elastic\Tests;
 
+use CirrusSearch;
 use CirrusSearch\Search\SearchContext;
 use Elastica\Result;
 use Elastica\ResultSet;
@@ -16,6 +17,14 @@
  */
 class ElasticTermResultTest extends MediaWikiTestCase {
 
+   public function setUp() {
+   parent::setUp();
+
+   if ( !class_exists( CirrusSearch::class ) ) {
+   $this->markTestSkipped( 'CirrusSearch needed.' );
+   }
+   }
+
public function termResultsProvider() {
return [
'simple' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14ff7b6aa6e75c6e4c318cdc51344bb9dd2521ee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Ladsgroup 
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]: puppetmaster profiles: Fix some really extreme typos

[Andrew Bogott (Code Review)]

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

Change subject: puppetmaster profiles:  Fix some really extreme typos
..


puppetmaster profiles:  Fix some really extreme typos

Fortunately these did not affect any actual hosts, just
future setups.

Change-Id: I93a2d6ddcee5b9b16c9c041834e412d1f091db92
---
M modules/profile/manifests/puppetmaster/backend.pp
M modules/profile/manifests/puppetmaster/frontend.pp
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/profile/manifests/puppetmaster/backend.pp 
b/modules/profile/manifests/puppetmaster/backend.pp
index 02451fa..b2592a9 100644
--- a/modules/profile/manifests/puppetmaster/backend.pp
+++ b/modules/profile/manifests/puppetmaster/backend.pp
@@ -1,8 +1,8 @@
 # vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
 
 class profile::puppetmaster::backend(
-$config = hiera('profile::puppetmater::backed::config', {}),
-$secure_private = hiera('profile::puppetmater::backed::config', true),
+$config = hiera('profile::puppetmaster::backend::config', {}),
+$secure_private = hiera('profile::puppetmaster::backend::config', true),
 ) {
 $ca_server = hiera('puppetmaster::ca_server', 
'puppetmaster1001.eqiad.wmnet')
 
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp 
b/modules/profile/manifests/puppetmaster/frontend.pp
index 3f50d40..36f276f 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -1,8 +1,8 @@
 # vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
 
 class profile::puppetmaster::frontend(
-$config = hiera('profile::puppetmater::backed::config', {}),
-$secure_private = hiera('profile::puppetmater::backed::config', true),
+$config = hiera('profile::puppetmaster::frontend::config', {}),
+$secure_private = hiera('profile::puppetmaster::frontend::config', true),
 ) {
 backup::set { 'var-lib-puppet-ssl': }
 backup::set { 'var-lib-puppet-volatile': }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93a2d6ddcee5b9b16c9c041834e412d1f091db92
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]: puppetmaster profiles: Fix some really extreme typos

[Andrew Bogott (Code Review)]

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

Change subject: puppetmaster profiles:  Fix some really extreme typos
..

puppetmaster profiles:  Fix some really extreme typos

Fortunately these did not affect any actual hosts, just
future setups.

Change-Id: I93a2d6ddcee5b9b16c9c041834e412d1f091db92
---
M modules/profile/manifests/puppetmaster/backend.pp
M modules/profile/manifests/puppetmaster/frontend.pp
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/367619/1

diff --git a/modules/profile/manifests/puppetmaster/backend.pp 
b/modules/profile/manifests/puppetmaster/backend.pp
index 02451fa..b2592a9 100644
--- a/modules/profile/manifests/puppetmaster/backend.pp
+++ b/modules/profile/manifests/puppetmaster/backend.pp
@@ -1,8 +1,8 @@
 # vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
 
 class profile::puppetmaster::backend(
-$config = hiera('profile::puppetmater::backed::config', {}),
-$secure_private = hiera('profile::puppetmater::backed::config', true),
+$config = hiera('profile::puppetmaster::backend::config', {}),
+$secure_private = hiera('profile::puppetmaster::backend::config', true),
 ) {
 $ca_server = hiera('puppetmaster::ca_server', 
'puppetmaster1001.eqiad.wmnet')
 
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp 
b/modules/profile/manifests/puppetmaster/frontend.pp
index 3f50d40..36f276f 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -1,8 +1,8 @@
 # vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
 
 class profile::puppetmaster::frontend(
-$config = hiera('profile::puppetmater::backed::config', {}),
-$secure_private = hiera('profile::puppetmater::backed::config', true),
+$config = hiera('profile::puppetmaster::frontend::config', {}),
+$secure_private = hiera('profile::puppetmaster::frontend::config', true),
 ) {
 backup::set { 'var-lib-puppet-ssl': }
 backup::set { 'var-lib-puppet-volatile': }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93a2d6ddcee5b9b16c9c041834e412d1f091db92
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] apps...wikipedia[master]: Merge Compilation and CompilationInfo.

[Dbrant (Code Review)]

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

Change subject: Merge Compilation and CompilationInfo.
..

Merge Compilation and CompilationInfo.

Change-Id: I0079b6d73b4a21bb6dc4742139adf4006760c596
---
M app/src/main/java/org/wikipedia/offline/Compilation.java
R app/src/main/java/org/wikipedia/offline/CompilationClient.java
D app/src/main/java/org/wikipedia/offline/CompilationInfo.java
M app/src/main/java/org/wikipedia/offline/OfflineManager.java
R app/src/test/java/org/wikipedia/offline/CompilationClientTest.java
5 files changed, 189 insertions(+), 210 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/offline/Compilation.java 
b/app/src/main/java/org/wikipedia/offline/Compilation.java
index ec354dd..77f93d7 100644
--- a/app/src/main/java/org/wikipedia/offline/Compilation.java
+++ b/app/src/main/java/org/wikipedia/offline/Compilation.java
@@ -1,5 +1,6 @@
 package org.wikipedia.offline;
 
+import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
@@ -8,101 +9,232 @@
 
 import com.dmitrybrant.zimdroid.ZimFile;
 import com.dmitrybrant.zimdroid.ZimReader;
+import com.google.gson.annotations.SerializedName;
 
+import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.util.log.L;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class Compilation {
-@NonNull private ZimFile file;
-@NonNull private ZimReader reader;
+@Nullable private String name;
+@Nullable private Uri uri;
+@Nullable private List langCodes;
+@Nullable private String summary;
+@Nullable private String description;
+@Nullable private MediaContent media;
+@SerializedName("thumb_url") @Nullable private String thumbUrl;
+@SerializedName("image_url") @Nullable private String imageUrl;
+private int count;
+private long size; // bytes
+private long timestamp;
 
-public Compilation(@NonNull File file) throws IOException {
-this.file = new ZimFile(file.getAbsolutePath());
+@Nullable private String path;
+@Nullable private transient ZimFile file;
+@Nullable private transient ZimReader reader;
+
+public enum MediaContent {
+ALL, IMAGES, NONE
+}
+
+Compilation(@NonNull File file) throws IOException {
+path = file.getAbsolutePath();
+this.file = new ZimFile(path);
 reader = new ZimReader(this.file);
 }
 
 @VisibleForTesting
 Compilation(@NonNull File file, LruCache titleCache, LruCache urlCache) 
throws Exception {
-this.file = new ZimFile(file.getAbsolutePath());
+path = file.getAbsolutePath();
+this.file = new ZimFile(path);
 reader = new ZimReader(this.file, titleCache, urlCache);
+}
+
+// TODO: Constructor for development/testing only, remove when no longer 
needed
+@SuppressWarnings("checkstyle:parameternumber")
+Compilation(@NonNull String name, @NonNull Uri uri, @Nullable List 
langCodes,
+@Nullable String summary, @Nullable String description, 
@Nullable MediaContent media,
+@Nullable String thumbUrl, @Nullable String imageUrl, int 
count, long size, long timestamp) {
+this.name = name;
+this.uri = uri;
+this.langCodes = langCodes;
+this.summary = summary;
+this.description = description;
+this.media = media;
+this.thumbUrl = thumbUrl;
+this.imageUrl = imageUrl;
+this.count = count;
+this.size = size;
+this.timestamp = timestamp;
+}
+
+public void copyMetadataFrom(@NonNull Compilation other) {
+name = other.name();
+uri = other.uri();
+langCodes = other.langCodes();
+summary = other.summary();
+description = other.description();
+media = other.mediaContent();
+thumbUrl = other.thumbUrl();
+imageUrl = other.imageUrl();
+count = other.count();
+size = other.size();
+timestamp = other.timestamp();
 }
 
 public void close() {
 try {
-reader.close();
+if (reader != null) {
+reader.close();
+}
 } catch (IOException e) {
 // close silently
 }
 }
 
-@NonNull public String path() {
-return file.getAbsolutePath();
+@Nullable
+public Uri uri() {
+return uri;
+}
+
+@Nullable
+public List langCodes() {
+return langCodes;
+}
+
+@NonNull
+public String path() {
+return file != null ? file.getAbsolutePath() : 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Cache compilations when finished detecting them.

[Dbrant (Code Review)]

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

Change subject: Cache compilations when finished detecting them.
..

Cache compilations when finished detecting them.

This saves a cache of the compilations that were found while searching the
filesystem, so that subsequent launches of the app will be immediately
aware of which compilations are available.

Change-Id: Id54afe67b2da816a148c63fa9a73f46cd72d56e2
---
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/OfflineManager.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/values/preference_keys.xml
5 files changed, 42 insertions(+), 19 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index 1507856..3eafdaf 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -132,7 +132,7 @@
 if (callback() != null) {
 callback().onRequestUpdateCompilations();
 }
-updateEmptyState(currentSearchQuery);
+update();
 }
 
 private void update() {
@@ -163,19 +163,13 @@
 }
 
 private void updateEmptyState(@Nullable String searchQuery) {
-if (updating) {
-progressBar.setVisibility(View.VISIBLE);
+progressBar.setVisibility(updating ? View.VISIBLE : View.GONE);
+if (TextUtils.isEmpty(searchQuery)) {
 searchEmptyView.setVisibility(View.GONE);
-listContainer.setVisibility(View.GONE);
+listContainer.setVisibility(View.VISIBLE);
 } else {
-progressBar.setVisibility(View.GONE);
-if (TextUtils.isEmpty(searchQuery)) {
-searchEmptyView.setVisibility(View.GONE);
-listContainer.setVisibility(View.VISIBLE);
-} else {
-listContainer.setVisibility(displayedItems.isEmpty() ? 
View.GONE : View.VISIBLE);
-searchEmptyView.setVisibility(displayedItems.isEmpty() ? 
View.VISIBLE : View.GONE);
-}
+listContainer.setVisibility(displayedItems.isEmpty() ? View.GONE : 
View.VISIBLE);
+searchEmptyView.setVisibility(displayedItems.isEmpty() ? 
View.VISIBLE : View.GONE);
 }
 }
 
diff --git a/app/src/main/java/org/wikipedia/offline/OfflineManager.java 
b/app/src/main/java/org/wikipedia/offline/OfflineManager.java
index dbe6f21..1f8983d 100644
--- a/app/src/main/java/org/wikipedia/offline/OfflineManager.java
+++ b/app/src/main/java/org/wikipedia/offline/OfflineManager.java
@@ -4,9 +4,11 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 
+import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.log.L;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,6 +63,7 @@
 }
 compilations.clear();
 compilations.addAll(results);
+Prefs.setCompilationCache(compilations);
 callback.onCompilationsFound(results);
 }
 
@@ -159,5 +162,16 @@
 }
 
 private OfflineManager() {
+List cachedCompilations = Prefs.getCompilationCache();
+for (Compilation cached : cachedCompilations) {
+try {
+Compilation c = new Compilation(new File(cached.path()));
+c.copyMetadataFrom(cached);
+L.d("Restoring compilation from cache: " + c.path());
+compilations.add(c);
+} catch (IOException e) {
+L.w("Cached compilation no longer available: " + 
cached.path(), e);
+}
+}
 }
 }
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 67a7820..2a97fd0 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -17,11 +17,13 @@
 import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.json.SessionUnmarshaller;
 import org.wikipedia.json.TabUnmarshaller;
+import org.wikipedia.offline.Compilation;
 import org.wikipedia.page.tabs.Tab;
 import org.wikipedia.theme.Theme;
 import org.wikipedia.util.ReleaseUtil;
 import org.wikipedia.util.StringUtil;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -528,5 +530,16 @@
 .equals(StringUtil.md5string(userName));
 }
 
+

[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: Update DonationInterface submodule

[jenkins-bot (Code Review)]

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

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

Change-Id: I4e8623f5f8e1894eb13290ea66966ed2191ef797
---
M extensions/DonationInterface
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index f1b6131..f3b3f26 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit f1b6131da1f5fdd70a99bba26b75f439f3a7708d
+Subproject commit f3b3f26fe813ab4f0fd944272d4d4245b0342f89

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e8623f5f8e1894eb13290ea66966ed2191ef797
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add pfw3a/b-codfw mgmt interfaces to DNS

[Ayounsi (Code Review)]

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

Change subject: Add pfw3a/b-codfw mgmt interfaces to DNS
..


Add pfw3a/b-codfw mgmt interfaces to DNS

Bug: T169643
Change-Id: I1b0e617dc32d25619ea5f3f40e856e6876472ec4
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e900baf..2a2136c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3517,7 +3517,8 @@
 19  1H IN PTR  asw-d-codfw.mgmt.codfw.wmnet.
 21  1H IN PTR  pfw1-codfw.mgmt.codfw.wmnet.
 22  1H IN PTR  pfw2-codfw.mgmt.codfw.wmnet.
-
+23  1H IN PTR  pfw3a-codfw.mgmt.codfw.wmnet.
+24  1H IN PTR  pfw3b-codfw.mgmt.codfw.wmnet.
 25  1H IN PTR  ps1-a1-codfw.mgmt.codfw.wmnet.
 26  1H IN PTR  ps1-a2-codfw.mgmt.codfw.wmnet.
 27  1H IN PTR  ps1-a3-codfw.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 8c409d7..93db3f6 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3210,7 +3210,8 @@
 
 pfw1-codfw  1H  IN A10.193.0.21
 pfw2-codfw  1H  IN A10.193.0.22
-
+pfw3a-codfw 1H  IN A10.193.0.23
+pfw3b-codfw 1H  IN A10.193.0.24
 ps1-a1-codfw1H  IN A10.193.0.25
 ps1-a2-codfw1H  IN A10.193.0.26
 ps1-a3-codfw1H  IN A10.193.0.27

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add pfw3a/b-codfw mgmt interfaces to DNS

[Ayounsi (Code Review)]

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

Change subject: Add pfw3a/b-codfw mgmt interfaces to DNS
..

Add pfw3a/b-codfw mgmt interfaces to DNS

Bug: T169643
Change-Id: I1b0e617dc32d25619ea5f3f40e856e6876472ec4
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/16/367616/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e900baf..2a2136c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3517,7 +3517,8 @@
 19  1H IN PTR  asw-d-codfw.mgmt.codfw.wmnet.
 21  1H IN PTR  pfw1-codfw.mgmt.codfw.wmnet.
 22  1H IN PTR  pfw2-codfw.mgmt.codfw.wmnet.
-
+23  1H IN PTR  pfw3a-codfw.mgmt.codfw.wmnet.
+24  1H IN PTR  pfw3b-codfw.mgmt.codfw.wmnet.
 25  1H IN PTR  ps1-a1-codfw.mgmt.codfw.wmnet.
 26  1H IN PTR  ps1-a2-codfw.mgmt.codfw.wmnet.
 27  1H IN PTR  ps1-a3-codfw.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 8c409d7..93db3f6 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3210,7 +3210,8 @@
 
 pfw1-codfw  1H  IN A10.193.0.21
 pfw2-codfw  1H  IN A10.193.0.22
-
+pfw3a-codfw 1H  IN A10.193.0.23
+pfw3b-codfw 1H  IN A10.193.0.24
 ps1-a1-codfw1H  IN A10.193.0.25
 ps1-a2-codfw1H  IN A10.193.0.26
 ps1-a3-codfw1H  IN A10.193.0.27

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: Update DonationInterface submodule

[Ejegg (Code Review)]

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

Change subject: Update DonationInterface submodule
..

Update DonationInterface submodule

Change-Id: I4e8623f5f8e1894eb13290ea66966ed2191ef797
---
M extensions/DonationInterface
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index f1b6131..f3b3f26 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit f1b6131da1f5fdd70a99bba26b75f439f3a7708d
+Subproject commit f3b3f26fe813ab4f0fd944272d4d4245b0342f89

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e8623f5f8e1894eb13290ea66966ed2191ef797
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Remove DNS records for unused IPs

[Ayounsi (Code Review)]

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

Change subject: Remove DNS records for unused IPs
..


Remove DNS records for unused IPs

IPv4/IPv6 IPs previously used for the GRE tunnel between esams and eqiad

Change-Id: I233e77ef132a8231d8217ba5412ba2be14ef
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/155.80.208.in-addr.arpa
2 files changed, 2 insertions(+), 13 deletions(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 4da017d..57ca4fc 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -292,12 +292,6 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-4-2-0.cr2-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-1-1-0.cr1-eqord.wikimedia.org.
 
-; cr2-eqiad <--> cr2-knams GRE (2620:0:861:fe03::/64)
-
-$ORIGIN 3.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-0-0-0-1.cr1-esams.wikimedia.org.
-
 ; cr1-eqiad <--> mr1-eqiad (2620:0:861:fe04::/64)
 
 $ORIGIN 4.0.e.f.{{ zonename }}.
diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index f9c551a..3cfb676 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -28,12 +28,7 @@
 13  1H IN PTR   frdev-eqiad.wikimedia.org.
 14  1H IN PTR   fundraising-eqiad.wikimedia.org.
 
-; 208.80.155.32/27 Infrastructure block
-
-; 208.80.155.32/30 cr1-esams <-> cr2-eqiad GRE tunnel
-
-33  1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
-34  1H IN PTR   gr-0-0-0-1.cr1-esams.wikimedia.org.
+; 208.80.155.32/27 Unused
 
 ;208.80.155.64/28 sandbox1-b-eqiad subnet
 65  1H IN PTR   vrrp-gw-1202.wikimedia.org.
@@ -199,4 +194,4 @@
 252 1H IN CNAME 252.128-25
 253 1H IN CNAME 253.128-25
 254 1H IN CNAME 254.128-25
-255 1H IN CNAME 255.128-25
\ No newline at end of file
+255 1H IN CNAME 255.128-25

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I233e77ef132a8231d8217ba5412ba2be14ef
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix hide status cookie

[jenkins-bot (Code Review)]

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

Change subject: Fix hide status cookie
..


Fix hide status cookie

Change-Id: I5134fea1680788d65664b7703bd1178949208261
---
M wikibase/queryService/ui/App.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index d0d5088..3f94b77 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -233,7 +233,7 @@
var visible = $( '.query-helper' ).is( ':visible' );
 
$( '.query-helper' ).toggleClass( 
'query-helper-hidden', visible );
-   Cookies.set( cookieHide, !visible );
+   Cookies.set( cookieHide, visible );
self._updateQueryEditorSize();
 
self._track( 'buttonClick.queryHelperTrigger.' + ( 
visible ? 'close' : 'open' ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5134fea1680788d65664b7703bd1178949208261
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: 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] mediawiki...Wikibase[master]: Fix misplaced var_dump in a test

[jenkins-bot (Code Review)]

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

Change subject: Fix misplaced var_dump in a test
..


Fix misplaced var_dump in a test

var_dump does not return anything, it dumps to the stardard output.

Change-Id: Id47511a3957c55790332db4fd82cefce72832d15
---
M repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php 
b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
index 9343d4c..0deb900 100644
--- a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
@@ -444,7 +444,7 @@
return '';
} elseif ( $status->isOK() ) {
$warnings = $status->getErrorsByType( 'warning' );
-   return "\nStatus (OK): Warnings: " . var_dump( 
$warnings );
+   return "\nStatus (OK): Warnings: " . var_export( 
$warnings );
} else {
return "\n" . $status->getWikiText();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id47511a3957c55790332db4fd82cefce72832d15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Thiemo Mättig (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] wikidata...gui[master]: Add tooltips to buttons in Query Helper toolbar

[jenkins-bot (Code Review)]

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

Change subject: Add tooltips to buttons in Query Helper toolbar
..


Add tooltips to buttons in Query Helper toolbar

Change-Id: I43b0384c99b198a2e61673aea1af81749a376049
---
M i18n/en.json
M i18n/qqq.json
M style.css
M wikibase/queryService/ui/queryHelper/QueryHelper.js
4 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 68a2002..1c53fb0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -61,6 +61,8 @@
 "wdqs-dialog-examples-preview-result": "Preview result",
 "wdqs-ve-filter": "Filter",
 "wdqs-ve-show": "Show",
+"wdqs-ve-add-label-title": "Add variable containing entity label",
+"wdqs-ve-remove-row-title": "Remove this row",
 "wdqs-ve-with": "with",
 "wdqs-ve-anything": "anything",
 "wdqs-ve-any": "any",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ce7e9b6..a9309b5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -63,6 +63,8 @@
"wdqs-dialog-examples-preview-result": "Label to preview result in 
example dialog",
"wdqs-ve-filter": "Label to add a filter in Query 
Helper\n{{Identical|Filter}}",
"wdqs-ve-show": "Label to show some item\n{{Identical|Show}}",
+"wdqs-ve-add-label-title": "Title to add variable containing entity label",
+"wdqs-ve-remove-row-title": "Title to remove row",
"wdqs-ve-with": "Label item with property\n{{Identical|With}}",
"wdqs-ve-anything": "Label to find anything\n{{Identical|Anything}}",
"wdqs-ve-any": "Label to any property\n{{Identical|Any}}",
diff --git a/style.css b/style.css
index b49afd2..a7cf39b 100644
--- a/style.css
+++ b/style.css
@@ -512,7 +512,7 @@
 
 #query-box .query-helper .toolbar .fa {
font-size: 1.2em;
-   display: inherit;
+   display: inline-block;
padding: 0.1em;
 }
 
diff --git a/wikibase/queryService/ui/queryHelper/QueryHelper.js 
b/wikibase/queryService/ui/queryHelper/QueryHelper.js
index 82bd50a..3647ef4 100644
--- a/wikibase/queryService/ui/queryHelper/QueryHelper.js
+++ b/wikibase/queryService/ui/queryHelper/QueryHelper.js
@@ -446,6 +446,8 @@
}
 
return false;
+   } ).tooltip( {
+   title: self._i18n( 'remove-row-title' )
} );
 
var $label = $( '' ).addClass( 'fa fa-tag' ).click( 
function () {
@@ -462,6 +464,8 @@
self._changeListener( self );
}
return false;
+   } ).tooltip( {
+   title: self._i18n( 'add-label-title' )
} );
 
return $( '' ).append( $label, $delete );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43b0384c99b198a2e61673aea1af81749a376049
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: WMDE-jand 
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...PropertySuggester[master]: Add P279 to PropertySuggesterClassifyingPropertyIds per defa...

[jenkins-bot (Code Review)]

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

Change subject: Add P279 to PropertySuggesterClassifyingPropertyIds per default.
..


Add P279 to PropertySuggesterClassifyingPropertyIds per default.

The default of PropertySuggesterClassifyingPropertyIds should be
the same as the default of the classifying_properties setting in
analyzer.ini in PropertySuggester-Python.

Note: as per T169058, this setting is set explicitly in production,
so this change to the default does not have any effect in production.
See T169060 for changing this setting in production.

Bug: T169057
Change-Id: Id2b1626a930e662fed334f9848bc6ceb6c912315
---
M extension.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 7f86413..ffc8e80 100644
--- a/extension.json
+++ b/extension.json
@@ -48,7 +48,8 @@
107
],
"PropertySuggesterClassifyingPropertyIds": [
-   31
+   31,
+   279
],
"PropertySuggesterInitialSuggestions": [
31,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2b1626a930e662fed334f9848bc6ceb6c912315
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PropertySuggester
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Thiemo Mättig (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/mediawiki-config[master]: Remove wgOresDamagingThresholds settings

[Catrope (Code Review)]

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

Change subject: Remove wgOresDamagingThresholds settings
..

Remove wgOresDamagingThresholds settings

This config var doesn't exist any more.

Change-Id: Iea8da4ac97cfe02a4d24c70e34842009f5efcab5
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 19 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 62811ba..e11bdad 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -454,10 +454,6 @@
'wp10' => false,
], // T127661
],
-   'wgOresDamagingThresholds' => [
-   'default' => [ 'hard' => 0.5, 'soft' => 0.7 ],
-   'wikipedia' => [ 'hard' => 0.6, 'soft' => 0.7 ], // 
T127661
-   ],
'wgOresEnabledNamespaces' => [
'default' => [],
'enwiki' => [ 0 => true ],
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2c143a7..6f32d19 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18571,21 +18571,6 @@
'wp10' => false,
],
 ],
-'wgOresDamagingThresholds' => [
-   'default' => [ 'hard' => 0.5, 'soft' => 0.7 ],
-   'fawiki' => [ 'hard' => 0.07, 'soft' => 0.37, 'softest' => 0.9 ], // 
T130211
-   'wikidatawiki' => [ 'hard' => 0.92, 'soft' => 0.97, 'softest' => 0.99 
], // T130212
-   'nlwiki' => [ 'hard' => 0.39, 'soft' => 0.75, 'softest' => 0.95 ], // 
T139432
-   'ruwiki' => [ 'hard' => 0.50, 'soft' => 0.73, 'softest' => 0.95 ], // 
T139541
-   'ptwiki' => [ 'hard' => 0.24, 'soft' => 0.57, 'softest' => 0.94 ], // 
T139692
-   'trwiki' => [ 'hard' => 0.20, 'soft' => 0.58, 'softest' => 0.92 ], // 
T139992
-   'plwiki' => [ 'hard' => 0.19, 'soft' => 0.41, 'softest' => 0.92 ], // 
T140005
-   'enwiki' => [ 'hard' => 0.17, 'soft' => 0.49, 'softest' => 0.96 ], // 
T140003
-   'cswiki' => [ 'hard' => 0.45, 'soft' => 0.8, 'softest' => 0.88 ], // 
T151611
-   'etwiki' => [ 'hard' => 0.34, 'soft' => 0.62, 'softest' => 0.95 ], // 
T159609
-   'hewiki' => [ 'hard' => 0.07, 'soft' => 0.50, 'softest' => 0.94 ], // 
T161621
-   'frwiki' => [ 'hard' => 0.18, 'soft' => 0.40, 'softest' => 0.51 ], // 
T165044
-],
 'wgOresFiltersThresholds' => [
'default' => [],
'enwiki' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ORES on sqwiki and rowiki

[Catrope (Code Review)]

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

Change subject: Enable ORES on sqwiki and rowiki
..

Enable ORES on sqwiki and rowiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a0107eb..2c143a7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18556,7 +18556,9 @@
'nlwiki' => true, // T139432
'plwiki' => true, // T140005
'ptwiki' => true, // T139692
+   'rowiki' => true, // T170723
'ruwiki' => true, // T139541
+   'sqwiki' => true, // T170723
'trwiki' => true, // T139992
 
'wikidatawiki' => true, // T130212
@@ -18736,6 +18738,32 @@
'verylikelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.9)' ],
],
],
+   'sqwiki' => [
+   'damaging' => [
+   // HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995
+   'likelygood' => [ 'min' => 0, 'max' => 
'filter_rate_at_recall(min_recall=0.9)' ],
+   // maybebad, likelybad, verylikelybad use defaults
+   ],
+   'goodfaith' => [
+   // HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995
+   'likelygood' => [ 'min' => 
'filter_rate_at_recall(min_recall=0.9)', 'max' => 1 ],
+   'maybebad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.15)' ],
+   'likelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.45)' ],
+   'verylikelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.9)' ],
+   ],
+   ],
+   'rowiki' => [
+   'damaging' => [
+   // likelygood, maybebad, likelybad use defaults
+   'verylikelybad' => [ 'min' => 
'recall_at_precision(min_precision=0.75)' ],
+   ],
+   'goodfaith' => [
+   // HACK: use recall-based likelygood threshold because 
it has a higher precision than even precision=0.995
+   'likelygood' => [ 'min' => 
'filter_rate_at_recall(min_recall=0.9)', 'max' => 1 ],
+   // maybebad, likelybad use defaults
+   'verylikelybad' => [ 'min' => 0, 'max' => 
'recall_at_precision(min_precision=0.75)' ],
+   ],
+   ],
 ],
 'wmgOresDefaultSensitivityLevel' => [
'default' => 'soft', // likelybad

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up

  8ef93f59975df3e36bf9847df875175c9a1960a0 Log more and catch errors on 
duplicate invoice ID
6cf21b0e5d9130ac8c858ffbaffac7ebd810506c Guard against undefined username/pw
d5df1125168b2ee75de3dc1c08071c18481b2d20 Update Silverpopconnector
a4ed41cfe615790f553366432cb00eebef6323c0 Submodule update for CiviCRM

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

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




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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Apex theme: Replace and unify `border-radius` with variables

[VolkerE (Code Review)]

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

Change subject: Apex theme: Replace and unify `border-radius` with variables
..

Apex theme: Replace and unify `border-radius` with variables

Replacing fix values with `@border-radius*` variables and unifiying
them by `4px` value instead of `0.3em` and `0.3125em` ones. A `px`
doesn't have disadvantages on `border-radius` compared to other
properties.

Change-Id: I4de5c0fda6e096b6c3a0ca9811e4bcb7d9c5022b
---
M src/themes/apex/common.less
M src/themes/apex/tools.less
M src/themes/apex/widgets.less
M src/themes/apex/windows.less
4 files changed, 35 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/12/367612/1

diff --git a/src/themes/apex/common.less b/src/themes/apex/common.less
index 7bfe443..71aafa1 100644
--- a/src/themes/apex/common.less
+++ b/src/themes/apex/common.less
@@ -40,7 +40,7 @@
 @start-frameless: -@padding-horizontal-frameless;
 
 @border-radius-base: 0.25em;
-@border-radius-button: 0.3em;
+@border-radius-button: 4px;
 @border-radius-taboption: 0.5em;
 
 @padding-base: @padding-vertical-base @padding-horizontal-base;
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index aa34bc8..a8fdc5f 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -60,13 +60,13 @@
 
// Like .oo-ui-tool in barToolGroup
&:first-child > .oo-ui-popupToolGroup {
-   border-top-left-radius: 0.3125em;
-   border-bottom-left-radius: 0.3125em;
+   border-top-left-radius: @border-radius-button;
+   border-bottom-left-radius: @border-radius-button;
}
 
&:last-child > .oo-ui-popupToolGroup {
-   border-top-right-radius: 0.3125em;
-   border-bottom-right-radius: 0.3125em;
+   border-top-right-radius: @border-radius-button;
+   border-bottom-right-radius: @border-radius-button;
}
 
// Like .oo-ui-tool-link in barToolGroup
@@ -89,7 +89,7 @@
 
 .theme-oo-ui-toolGroup () {
margin: 0.375em;
-   border-radius: 0.3125em;
+   border-radius: @border-radius-button;
border: 1px solid transparent;
.oo-ui-transition( border-color @medium-ease );
 
@@ -116,14 +116,14 @@
border: 1px solid transparent;
 
&:first-child {
-   border-top-left-radius: 0.3125em;
-   border-bottom-left-radius: 0.3125em;
+   border-top-left-radius: @border-radius-button;
+   border-bottom-left-radius: @border-radius-button;
}
 
&:last-child {
margin-right: -1px;
-   border-top-right-radius: 0.3125em;
-   border-bottom-right-radius: 0.3125em;
+   border-top-right-radius: @border-radius-button;
+   border-bottom-right-radius: @border-radius-button;
}
 
> .oo-ui-tool-link {
@@ -436,16 +436,16 @@
}
 
&:first-child > .oo-ui-popupToolGroup-handle {
-   border-bottom-left-radius: 0.3em;
-   border-top-left-radius: 0.3em;
+   border-bottom-left-radius: @border-radius-button;
+   border-top-left-radius: @border-radius-button;
margin-left: 0;
}
 
&:last-child {
margin-right: 0.5em;
& > .oo-ui-popupToolGroup-handle {
-   border-bottom-right-radius: 0.3em;
-   border-top-right-radius: 0.3em;
+   border-bottom-right-radius: 
@border-radius-button;
+   border-top-right-radius: @border-radius-button;
}
}
}
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 32ce2ac..9eba3c0 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -15,7 +15,7 @@
 .theme-oo-ui-buttonGroupWidget () {
display: inline-block;
white-space: nowrap;
-   border-radius: 0.3em;
+   border-radius: @border-radius-button;
 
.oo-ui-inline-spacing(0.5em);
.oo-ui-buttonElement {
@@ -29,14 +29,14 @@
}
 
&:first-child .oo-ui-buttonElement-button {
-   border-bottom-left-radius: 0.3em;
-   border-top-left-radius: 0.3em;
+   border-bottom-left-radius: @border-radius-button;
+   border-top-left-radius: @border-radius-button;
margin-left: 0;
}
 
&:last-child .oo-ui-buttonElement-button {
-  

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[Eileen (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up

  8ef93f59975df3e36bf9847df875175c9a1960a0 Log more and catch errors on 
duplicate invoice ID
6cf21b0e5d9130ac8c858ffbaffac7ebd810506c Guard against undefined username/pw
d5df1125168b2ee75de3dc1c08071c18481b2d20 Update Silverpopconnector
a4ed41cfe615790f553366432cb00eebef6323c0 Submodule update for CiviCRM

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/11/367611/1


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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Vendor update

[jenkins-bot (Code Review)]

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

Change subject: Vendor update
..


Vendor update

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

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



diff --git a/vendor b/vendor
index c4c13cc..9673cc8 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit c4c13ccde740425210bf945188cedaf79a5333ce
+Subproject commit 9673cc835b4410331258f291ecb37db0c6264d29

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Fix sleep call

[Legoktm (Code Review)]

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

Change subject: Fix sleep call
..

Fix sleep call

sleep() takes an integer argument, so passing a floating number actually
just rounds down to 0 and it doesn't sleep at all.

Use usleep() instead, which takes microseconds instead of seconds.

Change-Id: I11658a705186d9198077cee8b4391e1c32a46823
---
M cli/wm-scripts/bv2013/sendMails.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/cli/wm-scripts/bv2013/sendMails.php 
b/cli/wm-scripts/bv2013/sendMails.php
index bba8f00..3a7a2dd 100644
--- a/cli/wm-scripts/bv2013/sendMails.php
+++ b/cli/wm-scripts/bv2013/sendMails.php
@@ -66,5 +66,5 @@
UserMailer::send( $address, $sender, $subject, $content );
print "Sent to $name <$address> in $lang\n";
 
-   sleep( 0.1 );
+   usleep( 10 );
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Vendor update, SIlverpopXmlConnector

[jenkins-bot (Code Review)]

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

Change subject: Vendor update, SIlverpopXmlConnector
..


Vendor update, SIlverpopXmlConnector

Change-Id: Ieceee0627b6b8ae8a3d5ced7835e5c2fd56926cf
---
M composer/installed.json
M 
mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
2 files changed, 47 insertions(+), 47 deletions(-)

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



diff --git a/composer/installed.json b/composer/installed.json
index b9c6da6..f613e45 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1858,52 +1858,6 @@
 ]
 },
 {
-"name": "mrmarkfrench/silverpop-php-connector",
-"version": "dev-master",
-"version_normalized": "999-dev",
-"source": {
-"type": "git",
-"url": 
"https://github.com/eileenmcnaughton/silverpop-php-connector;,
-"reference": "da4275f3a44888954e72068642956056fdc74a9b"
-},
-"require": {
-"ext-curl": "*",
-"ext-xml": "*",
-"guzzlehttp/guzzle": "*",
-"php": "^5.5 || ^7.0",
-"phpseclib/phpseclib": "~2.0"
-},
-"require-dev": {
-"phpunit/phpunit": "~4.4 || ^6.1"
-},
-"time": "2017-07-06T03:06:53+00:00",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"psr-4": {
-"SilverpopConnector\\": "src/SilverpopConnector"
-}
-},
-"autoload-dev": {
-"psr-4": {
-"SilverpopConnector\\Tests\\": "test/tests"
-}
-},
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Mark French"
-}
-],
-"description": "A connector SDK library for applications integrating 
with Silverpop, including the Silverpop Universal Behavior API",
-"homepage": "https://github.com/mrmarkfrench/silverpop-php-connector;,
-"keywords": [
-"Silverpop"
-]
-},
-{
 "name": "league/csv",
 "version": "8.2.1",
 "version_normalized": "8.2.1.0",
@@ -2010,5 +1964,51 @@
 "omnimail",
 "silverpop"
 ]
+},
+{
+"name": "mrmarkfrench/silverpop-php-connector",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://github.com/eileenmcnaughton/silverpop-php-connector;,
+"reference": "6cbb9e1760c3927f871109ed588e6056b58fd7d2"
+},
+"require": {
+"ext-curl": "*",
+"ext-xml": "*",
+"guzzlehttp/guzzle": "*",
+"php": "^5.5 || ^7.0",
+"phpseclib/phpseclib": "~2.0"
+},
+"require-dev": {
+"phpunit/phpunit": "~4.4 || ^6.1"
+},
+"time": "2017-07-24T07:31:30+00:00",
+"type": "library",
+"installation-source": "source",
+"autoload": {
+"psr-4": {
+"SilverpopConnector\\": "src/SilverpopConnector"
+}
+},
+"autoload-dev": {
+"psr-4": {
+"SilverpopConnector\\Tests\\": "test/tests"
+}
+},
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Mark French"
+}
+],
+"description": "A connector SDK library for applications integrating 
with Silverpop, including the Silverpop Universal Behavior API",
+"homepage": "https://github.com/mrmarkfrench/silverpop-php-connector;,
+"keywords": [
+"Silverpop"
+]
 }
 ]
diff --git 
a/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
 
b/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
index 5dc6ed1..0b8abc2 100644
--- 
a/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
+++ 
b/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
@@ -12,7 +12,7 @@
 use SilverpopConnector\Xml\GetAggregateTrackingForMailing;
 use SilverpopConnector\Xml\CalculateQuery;
 use SilverpopConnector\Xml\GetSentMailingsForOrg;
-use phpseclib\Net\Sftp;
+use phpseclib\Net\SFTP;
 use GuzzleHttp\Client;
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieceee0627b6b8ae8a3d5ced7835e5c2fd56926cf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Vendor update

[Eileen (Code Review)]

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

Change subject: Vendor update
..

Vendor update

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/01/367601/1

diff --git a/vendor b/vendor
index c4c13cc..9673cc8 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit c4c13ccde740425210bf945188cedaf79a5333ce
+Subproject commit 9673cc835b4410331258f291ecb37db0c6264d29

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Vendor update, SIlverpopXmlConnector

[Eileen (Code Review)]

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

Change subject: Vendor update, SIlverpopXmlConnector
..

Vendor update, SIlverpopXmlConnector

Change-Id: Ieceee0627b6b8ae8a3d5ced7835e5c2fd56926cf
---
M composer/installed.json
M 
mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
2 files changed, 47 insertions(+), 47 deletions(-)


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

diff --git a/composer/installed.json b/composer/installed.json
index b9c6da6..f613e45 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1858,52 +1858,6 @@
 ]
 },
 {
-"name": "mrmarkfrench/silverpop-php-connector",
-"version": "dev-master",
-"version_normalized": "999-dev",
-"source": {
-"type": "git",
-"url": 
"https://github.com/eileenmcnaughton/silverpop-php-connector;,
-"reference": "da4275f3a44888954e72068642956056fdc74a9b"
-},
-"require": {
-"ext-curl": "*",
-"ext-xml": "*",
-"guzzlehttp/guzzle": "*",
-"php": "^5.5 || ^7.0",
-"phpseclib/phpseclib": "~2.0"
-},
-"require-dev": {
-"phpunit/phpunit": "~4.4 || ^6.1"
-},
-"time": "2017-07-06T03:06:53+00:00",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"psr-4": {
-"SilverpopConnector\\": "src/SilverpopConnector"
-}
-},
-"autoload-dev": {
-"psr-4": {
-"SilverpopConnector\\Tests\\": "test/tests"
-}
-},
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Mark French"
-}
-],
-"description": "A connector SDK library for applications integrating 
with Silverpop, including the Silverpop Universal Behavior API",
-"homepage": "https://github.com/mrmarkfrench/silverpop-php-connector;,
-"keywords": [
-"Silverpop"
-]
-},
-{
 "name": "league/csv",
 "version": "8.2.1",
 "version_normalized": "8.2.1.0",
@@ -2010,5 +1964,51 @@
 "omnimail",
 "silverpop"
 ]
+},
+{
+"name": "mrmarkfrench/silverpop-php-connector",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://github.com/eileenmcnaughton/silverpop-php-connector;,
+"reference": "6cbb9e1760c3927f871109ed588e6056b58fd7d2"
+},
+"require": {
+"ext-curl": "*",
+"ext-xml": "*",
+"guzzlehttp/guzzle": "*",
+"php": "^5.5 || ^7.0",
+"phpseclib/phpseclib": "~2.0"
+},
+"require-dev": {
+"phpunit/phpunit": "~4.4 || ^6.1"
+},
+"time": "2017-07-24T07:31:30+00:00",
+"type": "library",
+"installation-source": "source",
+"autoload": {
+"psr-4": {
+"SilverpopConnector\\": "src/SilverpopConnector"
+}
+},
+"autoload-dev": {
+"psr-4": {
+"SilverpopConnector\\Tests\\": "test/tests"
+}
+},
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Mark French"
+}
+],
+"description": "A connector SDK library for applications integrating 
with Silverpop, including the Silverpop Universal Behavior API",
+"homepage": "https://github.com/mrmarkfrench/silverpop-php-connector;,
+"keywords": [
+"Silverpop"
+]
 }
 ]
diff --git 
a/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
 
b/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
index 5dc6ed1..0b8abc2 100644
--- 
a/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
+++ 
b/mrmarkfrench/silverpop-php-connector/src/SilverpopConnector/SilverpopXmlConnector.php
@@ -12,7 +12,7 @@
 use SilverpopConnector\Xml\GetAggregateTrackingForMailing;
 use SilverpopConnector\Xml\CalculateQuery;
 use SilverpopConnector\Xml\GetSentMailingsForOrg;
-use phpseclib\Net\Sftp;
+use phpseclib\Net\SFTP;
 use GuzzleHttp\Client;
 
 /**

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix ElasticTermResultTest for wikis w/o CirrusSearch

[Hoo man (Code Review)]

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

Change subject: Fix ElasticTermResultTest for wikis w/o CirrusSearch
..

Fix ElasticTermResultTest for wikis w/o CirrusSearch

I did this before in c82ce4db91adf4e757b1ed21c576a6c87f3ceb69.
Found by travis:
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/256993804

Change-Id: I14ff7b6aa6e75c6e4c318cdc51344bb9dd2521ee
---
M repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git 
a/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php 
b/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
index 3622078..f8f1fef 100644
--- a/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
+++ b/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
@@ -16,6 +16,14 @@
  */
 class ElasticTermResultTest extends MediaWikiTestCase {
 
+   public function setUp() {
+   parent::setUp();
+
+   if ( !class_exists( CirrusSearch::class ) ) {
+   $this->markTestSkipped( 'CirrusSearch needed.' );
+   }
+   }
+
public function termResultsProvider() {
return [
'simple' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14ff7b6aa6e75c6e4c318cdc51344bb9dd2521ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialUndelete: Don't try to add a form to the page unless ...

[Jforrester (Code Review)]

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

Change subject: SpecialUndelete: Don't try to add a form to the page unless it 
exists
..

SpecialUndelete: Don't try to add a form to the page unless it exists

Bug: T171523
Change-Id: I1083ce168797a698c76c3fdff4eac06edfb0ac6a
---
M includes/specials/SpecialUndelete.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/367562/1

diff --git a/includes/specials/SpecialUndelete.php 
b/includes/specials/SpecialUndelete.php
index 810f8fb..cd218e6 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -858,9 +858,9 @@
$misc = Html::hidden( 'target', $this->mTarget );
$misc .= Html::hidden( 'wpEditToken', 
$this->getUser()->getEditToken() );
$history .= $misc;
-   }
 
-   $form->appendContent( new OOUI\HtmlSnippet( $history ) );
+   $form->appendContent( new OOUI\HtmlSnippet( $history ) 
);
+   }
 
$out->addHTML( $form );
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update for CiviCRM

[jenkins-bot (Code Review)]

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

Change subject: Submodule update for CiviCRM
..


Submodule update for CiviCRM

223d0d2 CRM-20953 Importing contacts with deceased_date not setting is_deceased
837e41c CRM-20759 (follow up fix) Primary address is 'distributed' over several 
ID
c43fe03 CRM-20950 Contact import mapping to wrong location type
669d300 CRM-19888 fix import to prefer default country when resolving states.

Change-Id: I5e2b8e693f830e3b7a5e57e3e3bac3cc97ba2815
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index b151a5f..223d0d2 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b151a5ff21b69ff7e58a0ee12cef608982848916
+Subproject commit 223d0d29b84e9c444501eaba258170b9522d71df

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add a global email blacklist

[jenkins-bot (Code Review)]

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

Change subject: Add a global email blacklist
..


Add a global email blacklist

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index bfb6e84..d913d60 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -815,6 +815,11 @@
 if ( $wmgUseSpamBlacklist ) {
wfLoadExtension( 'SpamBlacklist' );
$wgBlacklistSettings = [
+   'email' => [
+   'files' => [
+   
'https://meta.wikimedia.org/w/index.php?title=MediaWiki:Email-blacklist=raw_ver=1'
+   ],
+   ],
'spam' => [
'files' => [

'https://meta.wikimedia.org/w/index.php?title=Spam_blacklist=raw_ver=1'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1c1d00c12953b69bc18fd9084cc0eab09f9fdf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
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]: Add a global email blacklist

[Reedy (Code Review)]

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

Change subject: Add a global email blacklist
..

Add a global email blacklist

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index bfb6e84..d913d60 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -815,6 +815,11 @@
 if ( $wmgUseSpamBlacklist ) {
wfLoadExtension( 'SpamBlacklist' );
$wgBlacklistSettings = [
+   'email' => [
+   'files' => [
+   
'https://meta.wikimedia.org/w/index.php?title=MediaWiki:Email-blacklist=raw_ver=1'
+   ],
+   ],
'spam' => [
'files' => [

'https://meta.wikimedia.org/w/index.php?title=Spam_blacklist=raw_ver=1'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1c1d00c12953b69bc18fd9084cc0eab09f9fdf3
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] wikimedia...crm[master]: Submodule update for CiviCRM

[Eileen (Code Review)]

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

Change subject: Submodule update for CiviCRM
..

Submodule update for CiviCRM

223d0d2 CRM-20953 Importing contacts with deceased_date not setting is_deceased
837e41c CRM-20759 (follow up fix) Primary address is 'distributed' over several 
ID
c43fe03 CRM-20950 Contact import mapping to wrong location type
669d300 CRM-19888 fix import to prefer default country when resolving states.

Change-Id: I5e2b8e693f830e3b7a5e57e3e3bac3cc97ba2815
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/36/367536/1

diff --git a/civicrm b/civicrm
index b151a5f..223d0d2 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b151a5ff21b69ff7e58a0ee12cef608982848916
+Subproject commit 223d0d29b84e9c444501eaba258170b9522d71df

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove unused global LESS vars wgMFThumbnailTiny an...

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Remove unused global LESS vars wgMFThumbnailTiny and 
wgMFThumbnailSmall
..


Hygiene: Remove unused global LESS vars wgMFThumbnailTiny and wgMFThumbnailSmall

No matches in any other repo in Wikimedia Git, including commit messages.

Bug: T171365
Change-Id: I25246f1188a7c2e6c3a2e530efdabdc9001e90dc
---
M includes/MobileFrontend.hooks.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 5a9ad14..b71ee66 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1034,8 +1034,6 @@
$lessVars = array_merge( $lessVars,
[
'wgMFDeviceWidthMobileSmall' => "{$config->get( 
'MFDeviceWidthMobileSmall' )}px",
-   'wgMFThumbnailTiny' =>  
MobilePage::TINY_IMAGE_WIDTH . 'px',
-   'wgMFThumbnailSmall' =>  
MobilePage::SMALL_IMAGE_WIDTH . 'px'
]
);
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25246f1188a7c2e6c3a2e530efdabdc9001e90dc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jdlrobson 
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] wikimedia...crm[master]: Guard against undefined username/pw

[jenkins-bot (Code Review)]

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

Change subject: Guard against undefined username/pw
..


Guard against undefined username/pw

Change-Id: I4a3e008f3a4f4798e568b05b043d09a187f449a0
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
1 file changed, 8 insertions(+), 5 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
index 781382c..0c827ee 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
@@ -15,12 +15,10 @@
  */
 function civicrm_api3_omnimailing_load($params) {
   $values = array();
-  $mailings = civicrm_api3('Omnimailing', 'get', array(
-'mail_provider' => 'Silverpop',
+  $getParams = array(
+'mail_provider' => $params['mail_provider'],
 'start_date' => $params['start_date'],
 'end_date' => $params['end_date'],
-'username' => $params['username'],
-'password' => $params['password'],
 'return' => array(
   'external_identifier',
   'subject',
@@ -38,7 +36,12 @@
   'number_bounced',
   'number_sent',
 ),
-  ));
+  );
+  if (isset($params['username']) && isset($params['password'])) {
+$getParams['username'] = $params['username'];
+$getParams['password'] = $params['password'];
+  }
+  $mailings = civicrm_api3('Omnimailing', 'get', $getParams);
 
   foreach ($mailings['values']  as $mailing) {
 $campaign = civicrm_api3('Campaign', 'replace', array(

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Omnimail, enable view tab into mailing events.

[jenkins-bot (Code Review)]

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

Change subject: Omnimail, enable view tab into mailing events.
..


Omnimail, enable view tab into mailing events.

Requires https://github.com/civicrm/civicrm-core/pull/10599 in CiviCRM repo

Change-Id: Ica3827b59442e4092b8b868795b24c9b7f6ef309
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Page/MailingsView.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/MailingProviderData.php
M sites/default/civicrm/extensions/org.wikimedia.omnimail/omnimail.civix.php
M sites/default/civicrm/extensions/org.wikimedia.omnimail/omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/templates/CRM/Omnimail/Page/MailingsView.tpl
A 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientGetTest.php
8 files changed, 122 insertions(+), 19 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Page/MailingsView.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Page/MailingsView.php
index 152515e..7d101a2 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Page/MailingsView.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Page/MailingsView.php
@@ -8,12 +8,22 @@
 
 $mailings = civicrm_api3('MailingProviderData', 'get', array(
   'contact_id' => CRM_Utils_Request::retrieve('cid', 'Integer'),
-  'return' => array('event_type', 'mailing_identifier', 'email', 
'recipient_action_datetime'),
+  'return' => array('event_type', 'mailing_identifier', 'email', 
'recipient_action_datetime', 'mailing_identifier.name', 
'mailing_identifier.id'),
   'sequential' => 1,
   'options' => array('limit' => 500, 'sort' => 'recipient_action_datetime 
DESC')
 ));
+$mailings = $mailings['values'];
+
+foreach ($mailings as $index => $mailing) {
+  $mailings[$index]['mailing_identifier'] = array(
+'display' => (isset($mailing['mailing_identifier.id']) ? ' ' . $mailing['mailing_identifier.name'] . '': 
$mailing['mailing_identifier']),
+'name' => (isset($mailing['mailing_identifier.name']) ? 
$mailing['mailing_identifier.name'] : $mailing['mailing_identifier']),
+  );
+}
 //CRM_Core_Resources::singleton()->ad
-$this->assign('mailings', json_encode($mailings['values']));
+$this->assign('mailings', json_encode($mailings));
 
 parent::run();
   }
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/MailingProviderData.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/MailingProviderData.php
index 01f051e..fc31b08 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/MailingProviderData.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/MailingProviderData.php
@@ -42,8 +42,20 @@
  * @throws API_Exception
  */
 function civicrm_api3_mailing_provider_data_get($params) {
-  $bao = new CRM_Omnimail_BAO_MailingProviderData();
-  _civicrm_api3_dao_set_filter($bao, $params, TRUE);
-  $bao->selectAdd('CONCAT(contact_identifier, mailing_identifier, 
recipient_action_datetime) as id');
-  return civicrm_api3_create_success(_civicrm_api3_dao_to_array($bao, $params, 
FALSE, 'MailingProviderData'), $params, 'MailingProviderData', 'get');
+  $sql = CRM_Utils_SQL_Select::fragment();
+  $sql->select('CONCAT(contact_identifier, mailing_identifier, 
recipient_action_datetime) as id');
+  return 
civicrm_api3_create_success(_civicrm_api3_basic_get('CRM_Omnimail_BAO_MailingProviderData',
 $params, FALSE, 'MailingProviderData', $sql, FALSE), $params, 
'MailingProviderData', 'get');
+}
+
+/**
+ * Metadata for MailingProviderData.get API
+ *
+ * @param array $params
+ *
+ * @throws API_Exception
+ */
+function _civicrm_api3_mailing_provider_data_get_spec(&$params) {
+  $params['mailing_identifier']['FKClassName'] = 'CRM_Mailing_BAO_Mailing';
+  $params['mailing_identifier']['FKApiName'] = 'Mailing';
+  $params['mailing_identifier']['FKKeyColumn'] = 'hash';
 }
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/omnimail.civix.php 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/omnimail.civix.php
index 319776f..dd14e08 100644
--- a/sites/default/civicrm/extensions/org.wikimedia.omnimail/omnimail.civix.php
+++ b/sites/default/civicrm/extensions/org.wikimedia.omnimail/omnimail.civix.php
@@ -355,14 +355,13 @@
  * @link 
http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
  */
 function 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Allow us to run mobile formatter on desktop skin

[jenkins-bot (Code Review)]

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

Change subject: Allow us to run mobile formatter on desktop skin
..


Allow us to run mobile formatter on desktop skin

We won't use this in production but the new config variable
MFAlwaysUseMobileFormatter will allow us to test the new print
styles on real world content with the following three lines:

$wgMFContentProviderClass = 
'MobileFrontend\ContentProviders\MwApiContentProvider';
$wgMFMwApiContentProviderBaseUri = "https://en.m.wikipedia.org/w/api.php;;
$wgMFAlwaysUseMobileFormatter = true;

Change-Id: Id600e1f06b0f59de0134d91d77fd68991d45f4a3
---
M README.md
M extension.json
M includes/MobileFrontend.hooks.php
3 files changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 3a5e24f..07b303d 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,13 @@
 * Type: `string`
 * Default: `https://en.wikipedia.org/w/api.php`
 
+ $wgMFAlwaysUseMobileFormatter
+
+When enabled the MobileFormatter will run on desktop views as well as mobile 
views.
+
+* Type: `boolean`
+* Default: `false`
+
  $wgMFMobileFormatterHeadings
 
 This is a list of html tags, that could be recognized as the first heading of
diff --git a/extension.json b/extension.json
index 3772ed9..473a130 100644
--- a/extension.json
+++ b/extension.json
@@ -1272,6 +1272,7 @@
"_merge_strategy": "array_plus_2d"
},
"MFEnableJSConsoleRecruitment": false,
+   "MFAlwaysUseMobileFormatter": false,
"MFMobileFormatterHeadings": [
"h1",
"h2",
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 5a9ad14..6051928 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -193,13 +193,14 @@
public static function onOutputPageBeforeHTML( &$out, &$text ) {
$context = MobileContext::singleton();
$title = $context->getTitle();
+   $config =  $context->getMFConfig();
 
if ( !$title ) {
return true;
}
 
// Perform a few extra changes if we are in mobile mode
-   if ( $context->shouldDisplayMobileView() ) {
+   if ( $context->shouldDisplayMobileView() || $config->get( 
'MFAlwaysUseMobileFormatter' ) ) {
$text = ExtMobileFrontend::DOMParse( $out, $text );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id600e1f06b0f59de0134d91d77fd68991d45f4a3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-20953 Importing contacts with deceased_date not setting ...

[jenkins-bot (Code Review)]

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

Change subject: CRM-20953 Importing contacts with deceased_date not setting 
is_deceased
..


CRM-20953 Importing contacts with deceased_date not setting is_deceased

Upstream : https://github.com/civicrm/civicrm-core/pull/10742

Bug: T169025
Change-Id: I0315f95ab0c5e83013f363ca488c36d60d42afab
---
M CRM/Contact/Import/Parser/Contact.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/CRM/Contact/Import/Parser/Contact.php 
b/CRM/Contact/Import/Parser/Contact.php
index 2ca2e2b..dd3807d 100644
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -1918,6 +1918,7 @@
   }
   elseif ($key == 'deceased_date' && $val) {
 CRM_Utils_Date::convertToDefaultDate($params, $dateType, $key);
+$params['is_deceased'] = 1;
   }
   elseif ($key == 'is_deceased' && $val) {
 $params[$key] = CRM_Utils_String::strtoboolstr($val);

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: welcome.py: TypeError: decoding str is not supported

[Mpaa (Code Review)]

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

Change subject: welcome.py: TypeError: decoding str is not supported
..

welcome.py: TypeError: decoding str is not supported

Fix "TypeError: decoding str is not supported" (python3).

Bug: T171051
Change-Id: I8513da1dace94294f983af72dd181dad853e6cdb
---
M scripts/welcome.py
1 file changed, 5 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/93/367493/1

diff --git a/scripts/welcome.py b/scripts/welcome.py
index 7297944..977923c 100755
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -180,10 +180,7 @@
 
 from pywikibot import config, i18n
 from pywikibot.tools.formatter import color_format
-from pywikibot.tools import issue_deprecation_warning
-
-if sys.version_info[0] > 2:
-unicode = str
+from pywikibot.tools import issue_deprecation_warning, UnicodeType
 
 locale.setlocale(locale.LC_ALL, '')
 
@@ -831,10 +828,10 @@
 if globalvar.recursive:
 showStatus()
 if locale.getlocale()[1]:
-strfstr = unicode(
-time.strftime(u"%d %b %Y %H:%M:%S (UTC)",
-  time.gmtime()),
-locale.getlocale()[1])
+strfstr = time.strftime(
+'%d %b %Y %H:%M:%S (UTC)', time.gmtime())
+if not isinstance(strfstr, UnicodeType):  # py2-py3 
compatibility
+strfstr = strfstr.decode(locale.getlocale()[1])
 else:
 strfstr = time.strftime(
 u"%d %b %Y %H:%M:%S (UTC)", time.gmtime())

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8513da1dace94294f983af72dd181dad853e6cdb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-20759 (follow up fix) Primary address is 'distributed' o...

[jenkins-bot (Code Review)]

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

Change subject: CRM-20759 (follow up fix) Primary address is 'distributed' over 
several ID
..


CRM-20759 (follow up fix) Primary address is 'distributed' over several ID

Upstream: https://github.com/civicrm/civicrm-core/pull/10738

This wasn't picked up originally in the test as it was only using one field of 
the primary type.

The old code was indexing by 'addressCnt' (checking that the location type id 
was different each time). I
have switched to index by location_type_id - we should only have one address 
per location type per contact.

I also removed the code that sets 'is_primary' if we are importing the first 
address for a contact.
That has been handled by the BAO for some time

Bug: T169025

Change-Id: I13cd3b8f6e258bf6bf222eb433e47b8ca867df7f
---
M CRM/Contact/Import/Parser/Contact.php
1 file changed, 4 insertions(+), 20 deletions(-)

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



diff --git a/CRM/Contact/Import/Parser/Contact.php 
b/CRM/Contact/Import/Parser/Contact.php
index b93ac56..2ca2e2b 100644
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -2464,17 +2464,6 @@
 $params['address'] = array();
   }
 
-  $addressCnt = 1;
-  foreach ($params['address'] as $cnt => $addressBlock) {
-if (CRM_Utils_Array::value('location_type_id', $values) ==
-  CRM_Utils_Array::value('location_type_id', $addressBlock)
-) {
-  $addressCnt = $cnt;
-  break;
-}
-$addressCnt++;
-  }
-
   if (!array_key_exists('Address', $fields)) {
 $fields['Address'] = CRM_Core_DAO_Address::fields();
   }
@@ -2527,7 +2516,7 @@
 $values = $newValues;
   }
 
-  _civicrm_api3_store_values($fields['Address'], $values, 
$params['address'][$addressCnt]);
+  _civicrm_api3_store_values($fields['Address'], $values, 
$params['address'][$values['location_type_id']]);
 
   $addressFields = array(
 'county',
@@ -2544,7 +2533,7 @@
   if (!array_key_exists('address', $params)) {
 $params['address'] = array();
   }
-  $params['address'][$addressCnt][$field] = $values[$field];
+  $params['address'][$values['location_type_id']][$field] = 
$values[$field];
 }
   }
 
@@ -2553,14 +2542,9 @@
   $primary = civicrm_api3('Address', 'get', array('return' => 
'location_type_id', 'contact_id' => $params['id'], 'is_primary' => 1, 
'sequential' => 1));
 }
 $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
-$params['address'][$addressCnt]['location_type_id'] = (isset($primary) 
&& $primary['count']) ? $primary['values'][0]['location_type_id'] : 
$defaultLocationType->id;
-$params['address'][$addressCnt]['is_primary'] = 1;
+$params['address'][$values['location_type_id']]['location_type_id'] = 
(isset($primary) && $primary['count']) ? 
$primary['values'][0]['location_type_id'] : $defaultLocationType->id;
+$params['address'][$values['location_type_id']]['is_primary'] = 1;
 
-  }
-
-  if ($addressCnt == 1) {
-
-$params['address'][$addressCnt]['is_primary'] = TRUE;
   }
   return TRUE;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13cd3b8f6e258bf6bf222eb433e47b8ca867df7f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
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]: SiteStats::jobs fix when there is a single job

[jenkins-bot (Code Review)]

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

Change subject: SiteStats::jobs fix when there is a single job
..


SiteStats::jobs fix when there is a single job

wfSpecialStatistics() used a database to store the jobs. When estimating
the number of row in the `job` table, even when there is no row MySQL
would still do a single row read. Hence it erroneously returned 1.

That got fixed in 7cd0b2e0b (T12228) with a hack.

Nowadays, the functionality has been moved to SiteStats which is backed
up by a JobQueueGroup.  It now returns the exact number of jobs and the
hack is no more needed.  We failed to remove it when porting it to the
JobQueue system.

Change-Id: I6ef55b3dcff3e47a92e2eeeddcbae078654f815a
---
M includes/SiteStats.php
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 6ce1aed..86a4f63 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -222,13 +222,6 @@
} catch ( JobQueueError $e ) {
self::$jobs = 0;
}
-   /**
-* Zero rows still do single row read for row that 
doesn't exist,
-* but people are annoyed by that
-*/
-   if ( self::$jobs == 1 ) {
-   self::$jobs = 0;
-   }
}
return self::$jobs;
}

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-20950 Contact import mapping to wrong location type

[jenkins-bot (Code Review)]

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

Change subject: CRM-20950 Contact import mapping to wrong location type
..


CRM-20950 Contact import mapping to wrong location type

This incorporates PRs

https://github.com/civicrm/civicrm-core/pull/10736

and

https://github.com/civicrm/civicrm-core/pull/10735

Which fix a mistake (not in a stable CiviCRM release) from my earlier primary 
address
update. This causes the bug where Leanne is saying addresses are going to
old 2014 rather than old 2017

Bug: T169025

Change-Id: Ida5ad1a7564b3233b8fb4c75b8d56a46447e1a98
---
M CRM/Contact/Import/Form/MapField.php
M CRM/Contact/Import/ImportJob.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/CRM/Contact/Import/Form/MapField.php 
b/CRM/Contact/Import/Form/MapField.php
index 838efaa..38f13b8 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -249,7 +249,7 @@
 $dataPatterns = $this->get('dataPatterns');
 $hasLocationTypes = $this->get('fieldTypes');
 
-$this->_location_types = array_merge(array('Primary' => ts('Primary')), 
CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id'));
+$this->_location_types = array('Primary' => ts('Primary')) + 
CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
 $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
 
 // Pass default location to js
diff --git a/CRM/Contact/Import/ImportJob.php b/CRM/Contact/Import/ImportJob.php
index a8bb859..781b1ad 100644
--- a/CRM/Contact/Import/ImportJob.php
+++ b/CRM/Contact/Import/ImportJob.php
@@ -143,7 +143,7 @@
 $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 
'phone_type_id');
 $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 
'provider_id');
 $websiteTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Website', 
'website_type_id');
-$locationTypes = array_merge(array('Primary' => ts('Primary')), 
CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id'));
+$locationTypes = array('Primary' => ts('Primary')) + 
CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
 
 foreach ($mapper as $key => $value) {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida5ad1a7564b3233b8fb4c75b8d56a46447e1a98
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
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]: Bump mobile-sections content format version to 0.12.0

[Mholloway (Code Review)]

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

Change subject: Bump mobile-sections content format version to 0.12.0
..

Bump mobile-sections content format version to 0.12.0

This will get us a boolean "disambiguation" flag in the RB page lead.

This has always been in the RbPageLead model object on our side but was
apparently never provided and was always defaulting to false...

Change-Id: I2baf4aa8b7cec6ca03fd637a4a5b9f764cfcb16d
---
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java 
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
index 5b53ada..f3c984a 100644
--- 
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
+++ 
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
@@ -22,7 +22,7 @@
  * Retrofit service for mobile content service endpoints.
  */
 public interface RbPageService {
-String ACCEPT_HEADER_MOBILE_SECTIONS = ACCEPT_HEADER_PREFIX + 
"mobile-sections/0.11.0\"";
+String ACCEPT_HEADER_MOBILE_SECTIONS = ACCEPT_HEADER_PREFIX + 
"mobile-sections/0.12.0\"";
 String ACCEPT_HEADER_DEFINITION = ACCEPT_HEADER_PREFIX + 
"definition/0.7.2\"";
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ThrottleOverride[master]: phpcs.xml: Remove exclude-pattern

[Umherirrender (Code Review)]

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

Change subject: phpcs.xml: Remove exclude-pattern
..

phpcs.xml: Remove exclude-pattern

The .git is wrong, see T129664

Change-Id: Ifde4626a91e867ed98bff030e9ae0a727a3ef8c8
---
M phpcs.xml
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/phpcs.xml b/phpcs.xml
index fb5a264..273bfe6 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -9,8 +9,6 @@


.
-   
+   

-   vendor/
-   .git
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifde4626a91e867ed98bff030e9ae0a727a3ef8c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ThrottleOverride
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-19888 fix import to prefer default country when resolvin...

[jenkins-bot (Code Review)]

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

Change subject: CRM-19888 fix import to prefer default country when resolving 
states.
..


CRM-19888 fix import to prefer default country when resolving states.

Bug: T169025

Change-Id: I89f2d84d4742aa73ae2ffa1f4bdf7a189d3c8168
---
M CRM/Contact/BAO/Contact.php
M CRM/Core/PseudoConstant.php
M CRM/Utils/Array.php
3 files changed, 112 insertions(+), 34 deletions(-)

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



diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index c5f82fc..0460b22 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -537,6 +537,82 @@
   }
 
   /**
+   * Resolve a state province string (UT or Utah) to an ID.
+   *
+   * If country has been passed in we should select a state belonging to that 
country.
+   *
+   * Alternatively we should choose from enabled countries, prioritising the 
default country.
+   *
+   * @param array $values
+   * @param int|NULL $countryID
+   *
+   * @return int|null
+   */
+  protected static function resolveStateProvinceID($values, $countryID) {
+
+if ($countryID) {
+  $stateProvinceList = 
CRM_Core_PseudoConstant::stateProvinceForCountry($countryID);
+  if (CRM_Utils_Array::lookupValue($values,
+'state_province',
+$stateProvinceList,
+TRUE
+  )) {
+return $values['state_province_id'];
+  }
+  $stateProvinceList = 
CRM_Core_PseudoConstant::stateProvinceForCountry($countryID, 'abbreviation');
+  if (CRM_Utils_Array::lookupValue($values,
+'state_province',
+$stateProvinceList,
+TRUE
+  )) {
+return $values['state_province_id'];
+  }
+  return NULL;
+}
+else {
+  // The underlying lookupValue function needs some de-fanging. Until that 
has been unravelled we
+  // continue to resolve stateprovince lists in descending order of 
preference & just 'keep trying'.
+  // prefer matching country..
+  $stateProvinceList = 
CRM_Core_BAO_Address::buildOptions('state_province_id', NULL, 
array('country_id' => Civi::settings()->get('defaultContactCountry')));
+  if (CRM_Utils_Array::lookupValue($values,
+'state_province',
+$stateProvinceList,
+TRUE
+  )) {
+return $values['state_province_id'];
+  }
+
+  $stateProvinceList = CRM_Core_PseudoConstant::stateProvince();
+  if (CRM_Utils_Array::lookupValue($values,
+'state_province',
+$stateProvinceList,
+TRUE
+  )) {
+return $values['state_province_id'];
+  }
+
+  $stateProvinceList = 
CRM_Core_PseudoConstant::stateProvinceAbbreviationForDefaultCountry();
+  if (CRM_Utils_Array::lookupValue($values,
+'state_province',
+$stateProvinceList,
+TRUE
+  )) {
+return $values['state_province_id'];
+  }
+  $stateProvinceList = 
CRM_Core_PseudoConstant::stateProvinceAbbreviation();
+  if (CRM_Utils_Array::lookupValue($values,
+'state_province',
+$stateProvinceList,
+TRUE
+  )) {
+return $values['state_province_id'];
+  }
+}
+
+return NULL;
+  }
+
+  /**
* Create last viewed link to recently updated contact.
*
* @param array $crudLinkSpec
@@ -580,10 +656,15 @@
   /**
* Get the values for pseudoconstants for name->value and reverse.
*
+   * @deprecated
+   *
+   * This is called specifically from the contact import parser & should be 
moved there
+   * as it is not truly a generic function.
+   *
* @param array $defaults
*   (reference) the default values, some of which need to be resolved.
* @param bool $reverse
-   *   True if we want to resolve the values in the reverse direction (value 
-> name).
+   *   Always true as this function is only called from one place..
*/
   public static function resolveDefaults(&$defaults, $reverse = FALSE) {
 // Hack for birth_date.
@@ -639,36 +720,9 @@
   $reverse
 );
   }
-
-  // CRM-7597
-  // if we find a country id above, we need to restrict it to that 
country
-  // rather than the list of all countries
-
-  if (!empty($values['country_id'])) {
-$stateProvinceList = 
CRM_Core_PseudoConstant::stateProvinceForCountry($values['country_id']);
-  }
-  else {
-$stateProvinceList = CRM_Core_PseudoConstant::stateProvince();
-  }
-  if (!CRM_Utils_Array::lookupValue($values,
-  'state_province',
-  $stateProvinceList,
-  $reverse
-) &&
-$reverse
-  ) {
-
-if (!empty($values['country_id'])) {
-  $stateProvinceList = 
CRM_Core_PseudoConstant::stateProvinceForCountry($values['country_id'], 
'abbreviation');

[MediaWiki-commits] [Gerrit] mediawiki...OATHAuth[master]: phpcs.xml: Remove exclude-pattern

[Umherirrender (Code Review)]

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

Change subject: phpcs.xml: Remove exclude-pattern
..

phpcs.xml: Remove exclude-pattern

The .git is wrong, see T129664

Change-Id: I6c864c1c2d8745633daf47cc3859bc5a0fd5174f
---
M phpcs.xml
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth 
refs/changes/86/367486/1

diff --git a/phpcs.xml b/phpcs.xml
index 25f3c87..4917665 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,8 +11,5 @@
.


-   vendor/
-   node_modules/
-   lib/
-   .git
+   ^lib
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c864c1c2d8745633daf47cc3859bc5a0fd5174f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: phpcs.xml: Escape . in exclude-pattern

[Umherirrender (Code Review)]

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

Change subject: phpcs.xml: Escape . in exclude-pattern
..

phpcs.xml: Escape . in exclude-pattern

See T129664

Change-Id: If7e15aed1bd981008e5094358ce7938bc2500d70
---
M phpcs.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/85/367485/1

diff --git a/phpcs.xml b/phpcs.xml
index f89e22f..b0234eb 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,7 +1,7 @@
 
 
.
-   
+   



@@ -44,5 +44,5 @@

tests/perfs/results
vendor
-   .git
+   \.git
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7e15aed1bd981008e5094358ce7938bc2500d70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...LifeWeb[master]: phpcs.xml: Remove exclude-pattern

[Umherirrender (Code Review)]

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

Change subject: phpcs.xml: Remove exclude-pattern
..

phpcs.xml: Remove exclude-pattern

The .git is wrong, see T129664

Change-Id: I8741fb620cfb3b826266ed74b03962f6923f51a3
---
M phpcs.xml
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LifeWeb 
refs/changes/84/367484/1

diff --git a/phpcs.xml b/phpcs.xml
index 252942b..d53e28e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,6 +11,4 @@
.


-   vendor/
-   .git
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8741fb620cfb3b826266ed74b03962f6923f51a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LifeWeb
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Localisation updates from https://translatewiki.net."

[Raimond Spekking (Code Review)]

Hello L10n-bot,

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

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

to review the following change.


Change subject: Revert "Localisation updates from https://translatewiki.net.;
..

Revert "Localisation updates from https://translatewiki.net.;

Overwrites other patch

This reverts commit 21ff077363096ea72bd618fb5b46277276b59d30.

Change-Id: I3d1f5409209b0a1a2ef97e6750cbfb0b192a0a50
---
M includes/installer/i18n/csb.json
M languages/i18n/ace.json
M languages/i18n/af.json
M languages/i18n/an.json
M languages/i18n/ar.json
M languages/i18n/arc.json
M languages/i18n/arz.json
M languages/i18n/as.json
M languages/i18n/ast.json
M languages/i18n/awa.json
M languages/i18n/azb.json
M languages/i18n/ba.json
M languages/i18n/bar.json
M languages/i18n/bcc.json
M languages/i18n/bcl.json
M languages/i18n/be-tarask.json
M languages/i18n/be.json
M languages/i18n/bg.json
M languages/i18n/bgn.json
M languages/i18n/bho.json
M languages/i18n/bjn.json
M languages/i18n/bn.json
M languages/i18n/br.json
M languages/i18n/bs.json
M languages/i18n/ca.json
M languages/i18n/ce.json
M languages/i18n/ckb.json
M languages/i18n/cs.json
M languages/i18n/cy.json
M languages/i18n/da.json
M languages/i18n/de.json
M languages/i18n/diq.json
M languages/i18n/dsb.json
M languages/i18n/dty.json
M languages/i18n/el.json
M languages/i18n/eo.json
M languages/i18n/es.json
M languages/i18n/et.json
M languages/i18n/eu.json
M languages/i18n/fa.json
M languages/i18n/fi.json
M languages/i18n/fr.json
M languages/i18n/frp.json
M languages/i18n/frr.json
M languages/i18n/fur.json
M languages/i18n/fy.json
M languages/i18n/gd.json
M languages/i18n/gl.json
M languages/i18n/grc.json
M languages/i18n/gsw.json
M languages/i18n/gu.json
M languages/i18n/he.json
M languages/i18n/hi.json
M languages/i18n/hif-latn.json
M languages/i18n/hr.json
M languages/i18n/hrx.json
M languages/i18n/hsb.json
M languages/i18n/hu.json
M languages/i18n/hy.json
M languages/i18n/ia.json
M languages/i18n/id.json
M languages/i18n/ilo.json
M languages/i18n/is.json
M languages/i18n/it.json
M languages/i18n/ja.json
M languages/i18n/jv.json
M languages/i18n/ka.json
M languages/i18n/kab.json
M languages/i18n/kiu.json
M languages/i18n/kk-arab.json
M languages/i18n/kk-cyrl.json
M languages/i18n/kk-latn.json
M languages/i18n/km.json
M languages/i18n/ko.json
M languages/i18n/krc.json
M languages/i18n/ksh.json
M languages/i18n/ku-latn.json
M languages/i18n/lb.json
M languages/i18n/li.json
M languages/i18n/lij.json
M languages/i18n/lki.json
M languages/i18n/lrc.json
M languages/i18n/lt.json
M languages/i18n/lv.json
M languages/i18n/lzh.json
M languages/i18n/mai.json
M languages/i18n/mdf.json
M languages/i18n/mg.json
M languages/i18n/min.json
M languages/i18n/mk.json
M languages/i18n/ml.json
M languages/i18n/mn.json
M languages/i18n/mr.json
M languages/i18n/ms.json
M languages/i18n/mt.json
M languages/i18n/my.json
M languages/i18n/nah.json
M languages/i18n/nap.json
M languages/i18n/nb.json
M languages/i18n/nds-nl.json
M languages/i18n/nds.json
M languages/i18n/ne.json
M languages/i18n/nl.json
M languages/i18n/nn.json
M languages/i18n/oc.json
M languages/i18n/or.json
M languages/i18n/pcd.json
M languages/i18n/pl.json
M languages/i18n/pms.json
M languages/i18n/pnb.json
M languages/i18n/prg.json
M languages/i18n/ps.json
M languages/i18n/pt-br.json
M languages/i18n/pt.json
M languages/i18n/qqq.json
M languages/i18n/qu.json
M languages/i18n/rm.json
M languages/i18n/ro.json
M languages/i18n/roa-tara.json
M languages/i18n/ru.json
M languages/i18n/rue.json
M languages/i18n/sa.json
M languages/i18n/sah.json
M languages/i18n/scn.json
M languages/i18n/sco.json
M languages/i18n/ses.json
M languages/i18n/sgs.json
M languages/i18n/sh.json
M languages/i18n/si.json
M languages/i18n/sk.json
M languages/i18n/skr-arab.json
M languages/i18n/sli.json
M languages/i18n/sq.json
M languages/i18n/sr-ec.json
M languages/i18n/sr-el.json
M languages/i18n/stq.json
M languages/i18n/su.json
M languages/i18n/sv.json
M languages/i18n/sw.json
M languages/i18n/szl.json
M languages/i18n/ta.json
M languages/i18n/te.json
M languages/i18n/th.json
M languages/i18n/tk.json
M languages/i18n/tl.json
M languages/i18n/tr.json
M languages/i18n/tt-cyrl.json
M languages/i18n/tt-latn.json
M languages/i18n/ug-arab.json
M languages/i18n/uk.json
M languages/i18n/ur.json
M languages/i18n/vec.json
M languages/i18n/vep.json
M languages/i18n/vi.json
M languages/i18n/vo.json
M languages/i18n/vro.json
M languages/i18n/xmf.json
M languages/i18n/yi.json
M languages/i18n/yo.json
M languages/i18n/yue.json
M languages/i18n/zh-hans.json
M languages/i18n/zh-hant.json
162 files changed, 1,317 insertions(+), 254 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/367481/1


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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update Silverpopconnector

[jenkins-bot (Code Review)]

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

Change subject: Update Silverpopconnector
..


Update Silverpopconnector

I have changed the casing on use phpseclib\Net\SFTP; as the camel
case variant worked locally, but not remotely

Bug: T161762

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

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



diff --git a/composer.lock b/composer.lock
index 730ec94..b89b1ac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -88,7 +88,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17T00:44:20+00:00"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -198,7 +198,7 @@
 "queue",
 "transaction"
 ],
-"time": "2017-04-17T14:11:55+00:00"
+"time": "2017-04-17 14:11:55"
 },
 {
 "name": "cogpowered/finediff",
@@ -655,7 +655,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/silverpop-php-connector;,
-"reference": "da4275f3a44888954e72068642956056fdc74a9b"
+"reference": "6cbb9e1760c3927f871109ed588e6056b58fd7d2"
 },
 "require": {
 "ext-curl": "*",
@@ -691,7 +691,7 @@
 "keywords": [
 "Silverpop"
 ],
-"time": "2017-07-06 03:06:53"
+"time": "2017-07-24 07:31:30"
 },
 {
 "name": "neitanod/forceutf8",
@@ -1791,7 +1791,7 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library",
-"time": "2017-04-13T00:15:19+00:00"
+"time": "2017-04-13 00:15:19"
 },
 {
 "name": "wikimedia/omnimail-silverpop",
@@ -1897,7 +1897,7 @@
 "donations",
 "payments"
 ],
-"time": "2017-04-22T00:12:45+00:00"
+"time": "2017-04-22 00:12:45"
 },
 {
 "name": "zordius/lightncandy",

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Update mobileapps to b608ec8
..


Update mobileapps to b608ec8

List of changes:
a3284c9 Hygiene: updates diff test results for Media links
64e8f23 Hygiene: update mediawiki-title dependency
d29c9c1 Refactor: Generalise hideRedLinks
6f5655e Expose disambiguation flag on pages
fb77533 Refactor: DRY and document
9f89f87 Refactor: rmElementsWithSelector transform is in its own file
e5b18f2 Use mobile content service instead of TextExtracts to generate summaries
c661a1a Expose content model in response
b608ec8 mobile-sections 0.12.0
xxx Update node module dependencies

Change-Id: I2eef48b4eb05257522f145ddebddd883f85109f8
---
M node_modules/bl/package.json
M node_modules/kad/package.json
M node_modules/mediawiki-title/lib/index.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M node_modules/msgpack5/.travis.yml
M node_modules/msgpack5/example.js
M node_modules/msgpack5/index.js
M node_modules/msgpack5/lib/encoder.js
M node_modules/msgpack5/lib/streams.js
M node_modules/msgpack5/package.json
M node_modules/msgpack5/test/1-byte-length-buffers.js
M node_modules/msgpack5/test/1-byte-length-exts.js
M node_modules/msgpack5/test/1-byte-length-strings.js
M node_modules/msgpack5/test/15-elements-arrays.js
M node_modules/msgpack5/test/15-elements-maps.js
M node_modules/msgpack5/test/16-bits-signed-integers.js
M node_modules/msgpack5/test/16-bits-unsigned-integers.js
M node_modules/msgpack5/test/2-bytes-length-arrays.js
M node_modules/msgpack5/test/2-bytes-length-buffers.js
M node_modules/msgpack5/test/2-bytes-length-exts.js
M node_modules/msgpack5/test/2-bytes-length-maps.js
M node_modules/msgpack5/test/2-bytes-length-strings.js
M node_modules/msgpack5/test/31-chars-strings.js
M node_modules/msgpack5/test/32-bits-signed-integers.js
M node_modules/msgpack5/test/32-bits-unsigned-integers.js
M node_modules/msgpack5/test/32-bytes-strings.js
M node_modules/msgpack5/test/4-bytes-length-arrays.js
M node_modules/msgpack5/test/4-bytes-length-buffers.js
M node_modules/msgpack5/test/4-bytes-length-exts.js
M node_modules/msgpack5/test/4-bytes-length-strings.js
M node_modules/msgpack5/test/5-bits-negative-integers.js
M node_modules/msgpack5/test/64-bits-signed-integers.js
M node_modules/msgpack5/test/64-bits-unsigned-integers.js
M node_modules/msgpack5/test/7-bits-positive-integers.js
M node_modules/msgpack5/test/8-bits-positive-integers.js
M node_modules/msgpack5/test/8-bits-signed-integers.js
M node_modules/msgpack5/test/booleans.js
M node_modules/msgpack5/test/doubles.js
M node_modules/msgpack5/test/ext-custom-encode-check.js
M node_modules/msgpack5/test/fixexts.js
M node_modules/msgpack5/test/floats.js
M node_modules/msgpack5/test/null.js
M node_modules/msgpack5/test/object-with-buffers.js
M node_modules/msgpack5/test/streams.js
M node_modules/safe-buffer/package.json
M node_modules/semver/package.json
M node_modules/semver/semver.js
M src
49 files changed, 425 insertions(+), 231 deletions(-)

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



diff --git a/node_modules/bl/package.json b/node_modules/bl/package.json
index 3741bf2..fac8bc9 100644
--- a/node_modules/bl/package.json
+++ b/node_modules/bl/package.json
@@ -2,18 +2,18 @@
   "_args": [
 [
   {
-"raw": "bl@^1.0.0",
+"raw": "bl@^1.2.1",
 "scope": null,
 "escapedName": "bl",
 "name": "bl",
-"rawSpec": "^1.0.0",
-"spec": ">=1.0.0 <2.0.0",
+"rawSpec": "^1.2.1",
+"spec": ">=1.2.1 <2.0.0",
 "type": "range"
   },
   "/opt/service/node_modules/msgpack5"
 ]
   ],
-  "_from": "bl@>=1.0.0 <2.0.0",
+  "_from": "bl@>=1.2.1 <2.0.0",
   "_id": "bl@1.2.1",
   "_inCache": true,
   "_location": "/bl",
@@ -29,12 +29,12 @@
   "_npmVersion": "3.10.10",
   "_phantomChildren": {},
   "_requested": {
-"raw": "bl@^1.0.0",
+"raw": "bl@^1.2.1",
 "scope": null,
 "escapedName": "bl",
 "name": "bl",
-"rawSpec": "^1.0.0",
-"spec": ">=1.0.0 <2.0.0",
+"rawSpec": "^1.2.1",
+"spec": ">=1.2.1 <2.0.0",
 "type": "range"
   },
   "_requiredBy": [
@@ -43,7 +43,7 @@
   "_resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz;,
   "_shasum": "cac328f7bee45730d404b692203fcb590e172d5e",
   "_shrinkwrap": null,
-  "_spec": "bl@^1.0.0",
+  "_spec": "bl@^1.2.1",
   "_where": "/opt/service/node_modules/msgpack5",
   "authors": [
 "Rod Vagg  (https://github.com/rvagg)",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 2921c36..e7a0768 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": 

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Core] Add new key to ignore

[Raimond Spekking (Code Review)]

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

Change subject: [Core] Add new key to ignore
..


[Core] Add new key to ignore

Change-Id: I9004d9e542a0219419df6ed15c52235e48a838c1
---
M groups/MediaWiki/MediaWiki.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml
index 89757fa..222b391 100644
--- a/groups/MediaWiki/MediaWiki.yaml
+++ b/groups/MediaWiki/MediaWiki.yaml
@@ -526,6 +526,7 @@
 - sp-contributions-footer
 - sp-contributions-footer-anon
 - sp-contributions-footer-newbies
+- specialpages-note-cached
 - specialpages-summary
 - statistics-articles-desc
 - statistics-footer

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9004d9e542a0219419df6ed15c52235e48a838c1
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]: [Core] Add new key to ignore

[Raimond Spekking (Code Review)]

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

Change subject: [Core] Add new key to ignore
..

[Core] Add new key to ignore

Change-Id: I9004d9e542a0219419df6ed15c52235e48a838c1
---
M groups/MediaWiki/MediaWiki.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/79/367479/1

diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml
index 89757fa..222b391 100644
--- a/groups/MediaWiki/MediaWiki.yaml
+++ b/groups/MediaWiki/MediaWiki.yaml
@@ -526,6 +526,7 @@
 - sp-contributions-footer
 - sp-contributions-footer-anon
 - sp-contributions-footer-newbies
+- specialpages-note-cached
 - specialpages-summary
 - statistics-articles-desc
 - statistics-footer

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9004d9e542a0219419df6ed15c52235e48a838c1
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...deploy[master]: Update mobileapps to b608ec8

[BearND (Code Review)]

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

Change subject: Update mobileapps to b608ec8
..

Update mobileapps to b608ec8

List of changes:
a3284c9 Hygiene: updates diff test results for Media links
64e8f23 Hygiene: update mediawiki-title dependency
d29c9c1 Refactor: Generalise hideRedLinks
6f5655e Expose disambiguation flag on pages
fb77533 Refactor: DRY and document
9f89f87 Refactor: rmElementsWithSelector transform is in its own file
e5b18f2 Use mobile content service instead of TextExtracts to generate summaries
c661a1a Expose content model in response
b608ec8 mobile-sections 0.12.0
xxx Update node module dependencies

Change-Id: I2eef48b4eb05257522f145ddebddd883f85109f8
---
M node_modules/bl/package.json
M node_modules/kad/package.json
M node_modules/mediawiki-title/lib/index.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M node_modules/msgpack5/.travis.yml
M node_modules/msgpack5/example.js
M node_modules/msgpack5/index.js
M node_modules/msgpack5/lib/encoder.js
M node_modules/msgpack5/lib/streams.js
M node_modules/msgpack5/package.json
M node_modules/msgpack5/test/1-byte-length-buffers.js
M node_modules/msgpack5/test/1-byte-length-exts.js
M node_modules/msgpack5/test/1-byte-length-strings.js
M node_modules/msgpack5/test/15-elements-arrays.js
M node_modules/msgpack5/test/15-elements-maps.js
M node_modules/msgpack5/test/16-bits-signed-integers.js
M node_modules/msgpack5/test/16-bits-unsigned-integers.js
M node_modules/msgpack5/test/2-bytes-length-arrays.js
M node_modules/msgpack5/test/2-bytes-length-buffers.js
M node_modules/msgpack5/test/2-bytes-length-exts.js
M node_modules/msgpack5/test/2-bytes-length-maps.js
M node_modules/msgpack5/test/2-bytes-length-strings.js
M node_modules/msgpack5/test/31-chars-strings.js
M node_modules/msgpack5/test/32-bits-signed-integers.js
M node_modules/msgpack5/test/32-bits-unsigned-integers.js
M node_modules/msgpack5/test/32-bytes-strings.js
M node_modules/msgpack5/test/4-bytes-length-arrays.js
M node_modules/msgpack5/test/4-bytes-length-buffers.js
M node_modules/msgpack5/test/4-bytes-length-exts.js
M node_modules/msgpack5/test/4-bytes-length-strings.js
M node_modules/msgpack5/test/5-bits-negative-integers.js
M node_modules/msgpack5/test/64-bits-signed-integers.js
M node_modules/msgpack5/test/64-bits-unsigned-integers.js
M node_modules/msgpack5/test/7-bits-positive-integers.js
M node_modules/msgpack5/test/8-bits-positive-integers.js
M node_modules/msgpack5/test/8-bits-signed-integers.js
M node_modules/msgpack5/test/booleans.js
M node_modules/msgpack5/test/doubles.js
M node_modules/msgpack5/test/ext-custom-encode-check.js
M node_modules/msgpack5/test/fixexts.js
M node_modules/msgpack5/test/floats.js
M node_modules/msgpack5/test/null.js
M node_modules/msgpack5/test/object-with-buffers.js
M node_modules/msgpack5/test/streams.js
M node_modules/safe-buffer/package.json
M node_modules/semver/package.json
M node_modules/semver/semver.js
M src
49 files changed, 425 insertions(+), 231 deletions(-)


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

diff --git a/node_modules/bl/package.json b/node_modules/bl/package.json
index 3741bf2..fac8bc9 100644
--- a/node_modules/bl/package.json
+++ b/node_modules/bl/package.json
@@ -2,18 +2,18 @@
   "_args": [
 [
   {
-"raw": "bl@^1.0.0",
+"raw": "bl@^1.2.1",
 "scope": null,
 "escapedName": "bl",
 "name": "bl",
-"rawSpec": "^1.0.0",
-"spec": ">=1.0.0 <2.0.0",
+"rawSpec": "^1.2.1",
+"spec": ">=1.2.1 <2.0.0",
 "type": "range"
   },
   "/opt/service/node_modules/msgpack5"
 ]
   ],
-  "_from": "bl@>=1.0.0 <2.0.0",
+  "_from": "bl@>=1.2.1 <2.0.0",
   "_id": "bl@1.2.1",
   "_inCache": true,
   "_location": "/bl",
@@ -29,12 +29,12 @@
   "_npmVersion": "3.10.10",
   "_phantomChildren": {},
   "_requested": {
-"raw": "bl@^1.0.0",
+"raw": "bl@^1.2.1",
 "scope": null,
 "escapedName": "bl",
 "name": "bl",
-"rawSpec": "^1.0.0",
-"spec": ">=1.0.0 <2.0.0",
+"rawSpec": "^1.2.1",
+"spec": ">=1.2.1 <2.0.0",
 "type": "range"
   },
   "_requiredBy": [
@@ -43,7 +43,7 @@
   "_resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz;,
   "_shasum": "cac328f7bee45730d404b692203fcb590e172d5e",
   "_shrinkwrap": null,
-  "_spec": "bl@^1.0.0",
+  "_spec": "bl@^1.2.1",
   "_where": "/opt/service/node_modules/msgpack5",
   "authors": [
 "Rod Vagg  (https://github.com/rvagg)",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 2921c36..e7a0768 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Log more and catch errors on duplicate invoice ID

[jenkins-bot (Code Review)]

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

Change subject: Log more and catch errors on duplicate invoice ID
..


Log more and catch errors on duplicate invoice ID

TODO: tests

Bug: T171349
Change-Id: I0e71426e21fc3f642aab34aa3adfd304f01ec5ff
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 23 insertions(+), 10 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 025335e..a692882 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -443,21 +443,34 @@
   watchdog('wmf_civicrm', 'Contribution result from 
civicrm_contribution_add(): ' . print_r($contribution_result, TRUE), NULL, 
WATCHDOG_DEBUG);
 }
 catch (CiviCRM_API3_Exception $e) {
+watchdog( 'wmf_civicrm', 'Error inserting contribution: ' . 
$e->getMessage(), NULL, WATCHDOG_INFO );
 $duplicate = null;
-if (array_key_exists('invoice_id', $contribution)) {
-$invoice_id = $contribution['invoice_id'];
-$duplicate = civicrm_api3("Contribution", "getSingle", 
array("invoice_id" => $invoice_id));
+
+try {
+if ( array_key_exists( 'invoice_id', $contribution ) ) {
+watchdog( 'wmf_civicrm', 'Checking for duplicate on invoice ID 
' . $contribution['invoice_id'], NULL, WATCHDOG_INFO );
+$invoice_id = $contribution['invoice_id'];
+$duplicate = civicrm_api3( "Contribution", "getSingle", array( 
"invoice_id" => $invoice_id ) );
+}
+if ( $duplicate ) {
+$contribution['invoice_id'] = $contribution['invoice_id'] . 
'|dup-' . UtcDate::getUtcTimeStamp();
+watchdog( 'wmf_civicrm', 'Found duplicate invoice ID, changing 
this one to ' . $contribution['invoice_id'], NULL, WATCHDOG_INFO );
+$contribution_result = civicrm_api3( "Contribution", "Create", 
$contribution );
+watchdog( 'wmf_civicrm', 'Contribution result from 
civicrm_contribution_add(): ' . print_r( $contribution_result, TRUE ), NULL, 
WATCHDOG_DEBUG );
+$msg['contribution_tags'][] = 'DuplicateInvoiceId';
+} else {
+throw new WmfException(
+'INVALID_MESSAGE',
+'Cannot create contribution, civi error!',
+$e->getExtraParams()
+);
+}
 }
-if ($duplicate){
-$contribution['invoice_id'] = $contribution['invoice_id'] . 
'|dup-' . UtcDate::getUtcTimeStamp();
-$contribution_result = civicrm_api3("Contribution", "Create", 
$contribution);
-$msg['contribution_tags'][] = 'DuplicateInvoiceId';
-}
-else {
+catch ( CiviCRM_API3_Exception $eInner ) {
 throw new WmfException(
 'INVALID_MESSAGE',
 'Cannot create contribution, civi error!',
-$e->getExtraParams()
+$eInner->getExtraParams()
 );
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e71426e21fc3f642aab34aa3adfd304f01ec5ff
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: SkinMinerva should deal with edit section link not MobileFor...

[Jdlrobson (Code Review)]

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

Change subject: SkinMinerva should deal with edit section link not 
MobileFormatter
..

SkinMinerva should deal with edit section link not MobileFormatter

Bug: T171519
Change-Id: Ic4dcf24e6036c00277ee3c436de43983cd0397ca
---
M extension.json
M includes/MobileFormatter.php
2 files changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/extension.json b/extension.json
index 473a130..e80cc56 100644
--- a/extension.json
+++ b/extension.json
@@ -1287,7 +1287,6 @@
"beta": [],
"base": [
".toc",
-   ".mw-editsection",
".navbox",
".nomobile"
]
diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 9f1d7d1..4e16d15 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -742,11 +742,6 @@
if ( $isCollapsible ) {
$heading->setAttribute( 'onclick', 
'javascript:mfTempOpenSection(' . $sectionNumber . ')' );
}
-
-   // prepend indicator
-   $indicator = $doc->createElement( 'div' );
-   $indicator->setAttribute( 'class', MobileUI::iconClass( '', 
'element', 'indicator' ) );
-   $heading->insertBefore( $indicator, $heading->firstChild );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: config: Add more EtcdConfig::fetchAllFromEtcdServer tests

[Krinkle (Code Review)]

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

Change subject: config: Add more EtcdConfig::fetchAllFromEtcdServer tests
..

config: Add more EtcdConfig::fetchAllFromEtcdServer tests

Bug: T156924
Change-Id: I88a1c97b6921b59cce93f22d473dd7cea6f4931c
---
M tests/phpunit/includes/config/EtcdConfigTest.php
1 file changed, 109 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/367476/1

diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php 
b/tests/phpunit/includes/config/EtcdConfigTest.php
index e0694db..19cffa2 100644
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/includes/config/EtcdConfigTest.php
@@ -364,7 +364,86 @@
 
public static function provideFetchFromServer() {
return [
-   '200 OK - Empty' => [
+   '200 OK - Success' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => json_encode( [ 'node' => [ 
'nodes' => [
+   [
+   'key' => '/example/foo',
+   'value' => json_encode( 
[ 'val' => true ] )
+   ],
+   ] ] ] ),
+   'error' => '',
+   ],
+   'expect' => [
+   [ 'foo' => true ], // data
+   null,
+   false // retry
+   ],
+   ],
+   '200 OK - Skip dir' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => json_encode( [ 'node' => [ 
'nodes' => [
+   [
+   'key' => '/example/foo',
+   'value' => json_encode( 
[ 'val' => true ] )
+   ],
+   [
+   'key' => '/example/sub',
+   'dir' => true
+   ],
+   [
+   'key' => '/example/bar',
+   'value' => json_encode( 
[ 'val' => false ] )
+   ],
+   ] ] ] ),
+   'error' => '',
+   ],
+   'expect' => [
+   [ 'foo' => true, 'bar' => false ], // 
data
+   null,
+   false // retry
+   ],
+   ],
+   '200 OK - Bad value' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => json_encode( [ 'node' => [ 
'nodes' => [
+   [
+   'key' => '/example/foo',
+   'value' => 
';"broken{value'
+   ]
+   ] ] ] ),
+   'error' => '',
+   ],
+   'expect' => [
+   null, // data
+   "Failed to parse value for 'foo'.",
+   false // retry
+   ],
+   ],
+   '200 OK - Empty node list' => [
+   'http' => [
+   'code' => 200,
+   'reason' => 'OK',
+   'headers' => [],
+   'body' => 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: config: Fix invalid EtcdConfig return value after JSON parse...

[Krinkle (Code Review)]

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

Change subject: config: Fix invalid EtcdConfig return value after JSON parse 
error
..

config: Fix invalid EtcdConfig return value after JSON parse error

Follows-up 1f2daa913244, 9b459d29e0, 110a21ea18.

Bug: T156924
Change-Id: I79b7e11b32e5be46c8ebdfb5c937e38e46301c0e
---
M includes/config/EtcdConfig.php
M tests/phpunit/includes/config/EtcdConfigTest.php
2 files changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/367475/1

diff --git a/includes/config/EtcdConfig.php b/includes/config/EtcdConfig.php
index c57eba7..6605c38 100644
--- a/includes/config/EtcdConfig.php
+++ b/includes/config/EtcdConfig.php
@@ -243,7 +243,7 @@
 
$info = json_decode( $rbody, true );
if ( $info === null || !isset( $info['node']['nodes'] ) ) {
-   return [ null, $rcode, "Unexpected JSON response; 
missing 'nodes' list.", false ];
+   return [ null, "Unexpected JSON response; missing 
'nodes' list.", false ];
}
 
$config = [];
diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php 
b/tests/phpunit/includes/config/EtcdConfigTest.php
index 8e57a01..e0694db 100644
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/includes/config/EtcdConfigTest.php
@@ -364,22 +364,18 @@
 
public static function provideFetchFromServer() {
return [
-   [
+   '200 OK - Empty' => [
'http' => [
'code' => 200,
'reason' => 'OK',
-   'headers' => [
-   'content-length' => 0,
-   ],
+   'headers' => [ 'content-length' => 0 ],
'body' => '',
'error' => '(curl error: no status 
set)',
],
'expect' => [
-   // FIXME: Returning 4 values instead of 
3
-   null,
-   200,
+   null, // data
"Unexpected JSON response; missing 
'nodes' list.",
-   false
+   false // retry
],
],
];

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiEmailUser: Add parentheses to fix output

[jenkins-bot (Code Review)]

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

Change subject: ApiEmailUser: Add parentheses to fix output
..


ApiEmailUser: Add parentheses to fix output

Stupid PHP ternary operator being left-associative.

Bug: T171416
Change-Id: Iddcbe0d75d583e4021a3aab47be4a4912c492f03
---
M includes/api/ApiEmailUser.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php
index 72c7c35..4b4b76b 100644
--- a/includes/api/ApiEmailUser.php
+++ b/includes/api/ApiEmailUser.php
@@ -71,7 +71,7 @@
}
 
$result = array_filter( [
-   'result' => $retval->isGood() ? 'Success' : 
$retval->isOk() ? 'Warnings' : 'Failure',
+   'result' => $retval->isGood() ? 'Success' : ( 
$retval->isOk() ? 'Warnings' : 'Failure' ),
'warnings' => 
$this->getErrorFormatter()->arrayFromStatus( $retval, 'warning' ),
'errors' => 
$this->getErrorFormatter()->arrayFromStatus( $retval, 'error' ),
] );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Type hints

[Reedy (Code Review)]

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

Change subject: Type hints
..

Type hints

Change-Id: I92f7431789d57bb176c679b97c54f0f054327990
---
M tests/phpunit/QuestionTest.php
M tests/phpunit/QuizTest.php
2 files changed, 15 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/74/367474/1

diff --git a/tests/phpunit/QuestionTest.php b/tests/phpunit/QuestionTest.php
index 20608e5..a5c6975 100644
--- a/tests/phpunit/QuestionTest.php
+++ b/tests/phpunit/QuestionTest.php
@@ -2,10 +2,15 @@
 
 class QuestionTest extends MediaWikiLangTestCase {
 
+   /**
+* @var Parser $parser
+*/
private $parser;
+
+   /**
+* @var Question $question
+*/
private $question;
-   private $inputId;
-   private $request;
 
protected function setUp() {
parent::setUp();
@@ -37,6 +42,7 @@
global $wgRequest;
return $wgRequest;
}
+
public function testGetState() {
$this->question = $this->getQuestion( 1, 1, 2 );
$state = $this->question->getState();
diff --git a/tests/phpunit/QuizTest.php b/tests/phpunit/QuizTest.php
index a012526..561d575 100644
--- a/tests/phpunit/QuizTest.php
+++ b/tests/phpunit/QuizTest.php
@@ -2,7 +2,14 @@
 
 class QuizTest extends MediaWikiLangTestCase {
 
+   /**
+* @var Quiz $quiz
+*/
private $quiz;
+
+   /**
+* @var Parser $parser
+*/
private $parser;
 
protected function setUp() {

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

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

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