[MediaWiki-commits] [Gerrit] Create mechanism to handle redirects in entity revision lookups - change (mediawiki...Wikibase)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Create mechanism to handle redirects in entity revision lookups
..

Create mechanism to handle redirects in entity revision lookups

Needed for T69033

Change-Id: I4789a7bc9a940b2f0fda8b8a6b6c8ba74a6990ad
---
M lib/includes/store/CachingEntityRevisionLookup.php
A lib/includes/store/ChainRedirectHandler.php
M lib/includes/store/EntityRevision.php
M lib/includes/store/EntityRevisionLookup.php
A lib/includes/store/RedirectEntityRevision.php
A lib/includes/store/RedirectHandler.php
A lib/includes/store/ThrowingRedirectHandler.php
M lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M lib/tests/phpunit/MockRepository.php
M repo/includes/LinkedData/EntityDataRequestHandler.php
10 files changed, 171 insertions(+), 7 deletions(-)


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

diff --git a/lib/includes/store/CachingEntityRevisionLookup.php 
b/lib/includes/store/CachingEntityRevisionLookup.php
index d269868..817104d 100644
--- a/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/lib/includes/store/CachingEntityRevisionLookup.php
@@ -221,4 +221,12 @@
// XXX: if $this->lookup supports purging, purge?
}
 
+   /**
+* (non-PHPdoc)
+* @see \Wikibase\Lib\Store\EntityRevisionLookup::setRedirectHandler()
+*/
+   public function setRedirectHandler( RedirectHandler $handler ) {
+   $this->lookup->setRedirectHandler( $handler );
+   }
+
 }
diff --git a/lib/includes/store/ChainRedirectHandler.php 
b/lib/includes/store/ChainRedirectHandler.php
new file mode 100644
index 000..e96380c
--- /dev/null
+++ b/lib/includes/store/ChainRedirectHandler.php
@@ -0,0 +1,52 @@
+lookup = $lookup;
+   $this->maxResolutionDepth = $maxResolutionDepth;
+   }
+
+   /**
+* Handle redirect
+* Returns RedirectEntityRevision containing information about the 
source
+* and the target data.
+* @param EntityId $source
+* @param EntityId $target
+* @return RedirectEntityRevision|null
+*/
+   public function handleRedirect( EntityId $source, EntityId 
$target ) {
+   if( $this->maxResolutionDepth > 0 ) {
+   $this->maxResolutionDepth--;
+   $result = $this->lookup->getEntityRevision( $target );
+   if( $result ) {
+   if($result instanceof RedirectEntityRevision) {
+   $source = $result->getSource();
+   }
+   $result = new RedirectEntityRevision($result, 
$source);
+   }
+   return $result;
+   }
+
+   return (new ThrowingRedirectHandler())->handleRedirect( 
$source, $target );
+   }
+}
diff --git a/lib/includes/store/EntityRevision.php 
b/lib/includes/store/EntityRevision.php
index abc2d0d..f649e9b 100644
--- a/lib/includes/store/EntityRevision.php
+++ b/lib/includes/store/EntityRevision.php
@@ -18,17 +18,17 @@
/**
 * @var Entity
 */
-   private $entity;
+   protected $entity;
 
/**
 * @var int
 */
-   private $revisionId;
+   protected $revisionId;
 
/**
 * @var string
 */
-   private $mwTimestamp;
+   protected $mwTimestamp;
 
/**
 * @param Entity $entity
diff --git a/lib/includes/store/EntityRevisionLookup.php 
b/lib/includes/store/EntityRevisionLookup.php
index b43051b..1139f24 100644
--- a/lib/includes/store/EntityRevisionLookup.php
+++ b/lib/includes/store/EntityRevisionLookup.php
@@ -63,4 +63,9 @@
 */
public function getLatestRevisionId( EntityId $entityId, $mode = 
self::LATEST_FROM_SLAVE );
 
+   /**
+* Set redirect handler for the lookup.
+* @param RedirectHandler $handler
+*/
+   public function setRedirectHandler( RedirectHandler $handler );
 }
diff --git a/lib/includes/store/RedirectEntityRevision.php 
b/lib/includes/store/RedirectEntityRevision.php
new file mode 100644
index 000..9aa513d
--- /dev/null
+++ b/lib/includes/store/RedirectEntityRevision.php
@@ -0,0 +1,31 @@
+source;
+   }
+
+   public function __construct( EntityRevision $rev, EntityId $source ) {
+   $this->entity = $rev->entity;
+   $this->revisionId = $rev->revisionId;
+   $this->mwTimestamp = $rev->mwTimestamp;
+   $this->source = $source;
+   }
+}
diff --git a/lib/includes/store/RedirectHandler.php 
b/lib/includes/store/RedirectHandler.php
new file mode 100644
index 000..ce618a0
--- /dev/null
+++ b/lib/includes/store/RedirectHandler.php
@@ -0,0 +1,18 @@
+contentCodec = $contentCodec;
 
   

[MediaWiki-commits] [Gerrit] Pin generic 'phpunit' job to labs slaves - change (integration/config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Pin generic 'phpunit' job to labs slaves
..


Pin generic 'phpunit' job to labs slaves

Bug: T86659
Change-Id: I12c584221c2635a628b762cc075e759e72f30cd2
---
M jjb/job-templates.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 2d181a7..a225915 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -255,7 +255,7 @@
 
 - job:
 name: 'phpunit'
-node: hasSlaveScripts && UbuntuPrecise
+node: contintLabsSlave && UbuntuPrecise
 defaults: use-remote-zuul-shallow-clone
 triggers:
  - zuul

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12c584221c2635a628b762cc075e759e72f30cd2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
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] Use generic phpunit job for operations/mediawiki-config - change (integration/config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use generic phpunit job for operations/mediawiki-config
..


Use generic phpunit job for operations/mediawiki-config

Tested in


This also means it will no longer use a job that is pinned to gallium.

Bug: T86659
Change-Id: Ib515dd14622fdb5340cf0a4238cb15ef98c73f8d
---
D jjb/operations-mw-config.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 22 deletions(-)

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



diff --git a/jjb/operations-mw-config.yaml b/jjb/operations-mw-config.yaml
deleted file mode 100644
index 8b6fddb..000
--- a/jjb/operations-mw-config.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-- job-template:
-name: 'operations-mw-config-tests'
-# Repo has a reference to a git://github.com url which does not
-# work on 10.0.0.0/8 slaves :(
-#
-node: gallium
-defaults: use-remote-zuul
-concurrent: true
-
-triggers:
- - zuul
-builders:
- - phpunit-junit
-publishers:
- - phpunit-junit
-
-- project:
-name: 'operations-mw-config'
-jobs:
- - operations-mw-config-tests
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 10375e0..9b96644 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2651,11 +2651,11 @@
   - php-composer-validate
 test:
   - phplint
-  - operations-mw-config-tests
+  - phpunit
   - php-composer-validate
 gate-and-submit:
   - phplint
-  - operations-mw-config-tests
+  - phpunit
   - php-composer-validate
 experimental:
   - php-composer-test

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib515dd14622fdb5340cf0a4238cb15ef98c73f8d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
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] Made wfWaitForSlaves check all master connections for writes - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Made wfWaitForSlaves check all master connections for writes
..


Made wfWaitForSlaves check all master connections for writes

* Previously it just checked the main connection

Change-Id: If63498e4fa2800f8ffbde4c570c556f21b554473
---
M includes/GlobalFunctions.php
1 file changed, 7 insertions(+), 13 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3931be3..90460fd 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3766,20 +3766,14 @@
// time needed to wait on the next clusters.
$masterPositions = array_fill( 0, count( $lbs ), false );
foreach ( $lbs as $i => $lb ) {
-   // bug 27975 - Don't try to wait for slaves if there are none
-   // Prevents permission error when getting master position
-   if ( $lb->getServerCount() > 1 ) {
-   if ( $ifWritesSince && !$lb->hasMasterConnection() ) {
-   continue; // assume no writes done
-   }
-   // Use the empty string to not trigger selectDB() since 
the connection
-   // may have been to a server that does not have a DB 
for the current wiki.
-   $dbw = $lb->getConnection( DB_MASTER, array(), '' );
-   if ( $ifWritesSince && $dbw->lastDoneWrites() < 
$ifWritesSince ) {
-   continue; // no writes since the last wait
-   }
-   $masterPositions[$i] = $dbw->getMasterPos();
+   if ( $lb->getServerCount() <= 1 ) {
+   // Bug 27975 - Don't try to wait for slaves if there 
are none
+   // Prevents permission error when getting master 
position
+   continue;
+   } elseif ( $ifWritesSince && $lb->lastMasterChangeTimestamp() < 
$ifWritesSince ) {
+   continue; // no writes since the last wait
}
+   $masterPositions[$i] = $lb->getMasterPos();
}
 
$ok = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If63498e4fa2800f8ffbde4c570c556f21b554473
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] Made wfWaitForSlaves check all master connections for writes - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Made wfWaitForSlaves check all master connections for writes
..

Made wfWaitForSlaves check all master connections for writes

* Previously it just checked the main connection

Change-Id: If63498e4fa2800f8ffbde4c570c556f21b554473
---
M includes/GlobalFunctions.php
1 file changed, 9 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/204705/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3931be3..33f3ae9 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3766,20 +3766,16 @@
// time needed to wait on the next clusters.
$masterPositions = array_fill( 0, count( $lbs ), false );
foreach ( $lbs as $i => $lb ) {
-   // bug 27975 - Don't try to wait for slaves if there are none
-   // Prevents permission error when getting master position
-   if ( $lb->getServerCount() > 1 ) {
-   if ( $ifWritesSince && !$lb->hasMasterConnection() ) {
-   continue; // assume no writes done
-   }
-   // Use the empty string to not trigger selectDB() since 
the connection
-   // may have been to a server that does not have a DB 
for the current wiki.
-   $dbw = $lb->getConnection( DB_MASTER, array(), '' );
-   if ( $ifWritesSince && $dbw->lastDoneWrites() < 
$ifWritesSince ) {
-   continue; // no writes since the last wait
-   }
-   $masterPositions[$i] = $dbw->getMasterPos();
+   if ( $lb->getServerCount() <= 1 ) {
+   // Bug 27975 - Don't try to wait for slaves if there 
are none
+   // Prevents permission error when getting master 
position
+   continue;
+   } elseif ( $ifWritesSince && $lb->lastMasterChangeTimestamp() < 
$ifWritesSince ) {
+   continue; // no writes since the last wait
}
+   // Use the empty string to not trigger selectDB() since the 
connection
+   // may have been to a server that does not have a DB for the 
current wiki.
+   $masterPositions[$i] = $lb->getMasterPos();
}
 
$ok = true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If63498e4fa2800f8ffbde4c570c556f21b554473
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Sign Astropay transactions - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Sign Astropay transactions
..


Sign Astropay transactions

Also stage up full_name and invent a donor_id to satisfy Astropay's
customer ID requirement.
Add a test response so our fake curl doesn't error out.

Bug: T90503
Change-Id: Ia0acfd3ddd387792eac5dfbe7b7e11d891ddd845
---
M astropay_gateway/astropay.adapter.php
M tests/Adapter/Astropay/AstropayTest.php
A tests/includes/Responses/astropay/NewInvoice.testresponse
3 files changed, 88 insertions(+), 0 deletions(-)

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



diff --git a/astropay_gateway/astropay.adapter.php 
b/astropay_gateway/astropay.adapter.php
index 9557675..5dade1b 100644
--- a/astropay_gateway/astropay.adapter.php
+++ b/astropay_gateway/astropay.adapter.php
@@ -287,6 +287,48 @@
);
}
 
+   /**
+* Overriding @see GatewayAdapter::getTransactionSpecificValue to add a
+* calculated signature.
+* @param string $gateway_field_name
+* @param boolean $token
+* @return mixed
+*/
+   protected function getTransactionSpecificValue( $gateway_field_name, 
$token = false ) {
+   if ( $gateway_field_name === 'control' ) {
+   $message = $this->getData_Staged( 'order_id' ) . 'V'
+   . $this->getData_Staged( 'amount' ) . 'I'
+   . $this->getData_Staged( 'donor_id' ) . '2'
+   . $this->getData_Staged( 'bank_code' ) . '1'
+   . $this->getData_Staged( 'fiscal_number' ) . 'H'
+   . /* bdate omitted */ 'G'
+   . $this->getData_Staged( 'email' ) .'Y'
+   . $this->getData_Staged( 'zip' ) . 'A'
+   . $this->getData_Staged( 'street' ) . 'P'
+   . $this->getData_Staged( 'city' ) . 'S'
+   . $this->getData_Staged( 'state' ) . 'P';
+   return $this->calculateSignature( $message );
+   }
+   return parent::getTransactionSpecificValue( 
$gateway_field_name, $token );
+   }
+
+   /*
+* Seems more sane to do it this way than provide a single input box
+* and try to parse out fname and lname.
+*/
+   protected function stage_full_name() {
+   $this->staged_data['full_name'] = $this->unstaged_data['fname'] 
. ' ' . $this->unstaged_data['lname'];
+   }
+
+   /**
+* They need a 20 char string for a customer ID, so let's generate one 
from
+* the donor's email address.
+*/
+   protected function stage_donor_id() {
+   $hashed = sha1( $this->unstaged_data['email'] );
+   $this->staged_data['donor_id'] = substr( $hashed, 0, 20 );
+   }
+
function getResponseStatus( $response ) {
}
 
diff --git a/tests/Adapter/Astropay/AstropayTest.php 
b/tests/Adapter/Astropay/AstropayTest.php
index ef72dd8..ebb2a5e 100644
--- a/tests/Adapter/Astropay/AstropayTest.php
+++ b/tests/Adapter/Astropay/AstropayTest.php
@@ -56,4 +56,40 @@
'Not setting URL to transaction-specific value.'
);
}
+
+   /**
+* Test the NewInvoice transaction is making a sane request and signing
+* it correctly
+*/
+   function testNewInvoiceRequest() {
+   $init = $this->getDonorTestData( 'BR' );
+   $this->setLanguage( $init['language'] );
+   $_SESSION['Donor']['order_id'] = '123456789';
+   $gateway = $this->getFreshGatewayObject( $init );
+
+   $gateway->do_transaction( 'NewInvoice' );
+   parse_str( $gateway->curled[0], $actual );
+
+   $expected = array(
+   'x_login' => 'createlogin',
+   'x_trans_key' => 'createpass',
+   'x_invoice' => '123456789',
+   'x_amount' => '100.00',
+   'x_currency' => 'BRL',
+   'x_bank' => 'TE',
+   'x_country' => 'BR',
+   'x_description' => wfMessage( 
'donate_interface-donation-description' )->inLanguage( $init['language'] 
)->text(),
+   'x_iduser' => '08feb2d12771bbcfeb86',
+   'x_cpf' => '3456789',
+   'x_name' => 'Nome Apelido',
+   'x_email' => 'nob...@wikimedia.org',
+   'x_address' => 'Rua Falso 123',
+   'x_zip' => '01110-111',
+   'x_city' => 'São Paulo',
+   'x_state' => 'SP',
+   'control' => 
'5853FD808AA10839CB268ED2D1D6D4E8D8FECA88E4A8D66477369C0CA8AA4B42',
+

[MediaWiki-commits] [Gerrit] Use transaction-specific URLs for Astropay - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use transaction-specific URLs for Astropay
..


Use transaction-specific URLs for Astropay

And set up Astropay testing scaffold.

Can't use $this->fail from test helper class, so back to using
'echo' breakage.  Also make adapter type hint somewhat specific.

Bug: T90503
Change-Id: Ie258f8f8a0f7f79d01c2ef75332d6695f1f84a43
---
M DonationInterface.php
M gateway_common/gateway.adapter.php
A tests/Adapter/Astropay/AstropayTest.php
M tests/DonationInterfaceTestCase.php
M tests/TestConfiguration.php
A tests/includes/test_gateway/TestingAstropayAdapter.php
6 files changed, 180 insertions(+), 2 deletions(-)

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



diff --git a/DonationInterface.php b/DonationInterface.php
index 5f56ca6..94d7fd2 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -1091,6 +1091,7 @@
 
$wgAutoloadClasses['TestingAdyenAdapter'] = $testDir . 
'includes/test_gateway/TestingAdyenAdapter.php';
$wgAutoloadClasses['TestingAmazonAdapter'] = $testDir . 
'includes/test_gateway/TestingAmazonAdapter.php';
+   $wgAutoloadClasses['TestingAstropayAdapter'] = $testDir . 
'includes/test_gateway/TestingAstropayAdapter.php';
$wgAutoloadClasses['TestingAmazonGateway'] = $testDir . 
'includes/test_page/TestingAmazonGateway.php';
$wgAutoloadClasses['TestingDonationLogger'] = $testDir . 
'includes/TestingDonationLogger.php';
$wgAutoloadClasses['TestingGatewayPage'] = $testDir . 
'includes/TestingGatewayPage.php';
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 1376733..4d4c5e3 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1260,8 +1260,12 @@
//I chose to return this as a function so it's easy to override.
//TODO: probably this for all the junk I currently have stashed 
in the constructor.
//...maybe.
+   $path = $this->transaction_option( 'path' );
+   if ( !$path ) {
+   $path = '';
+   }
$opts = array(
-   CURLOPT_URL => $this->url,
+   CURLOPT_URL => $this->url . $path,
CURLOPT_USERAGENT => WmfFramework::getUserAgent(),
CURLOPT_HEADER => 1,
CURLOPT_RETURNTRANSFER => 1,
diff --git a/tests/Adapter/Astropay/AstropayTest.php 
b/tests/Adapter/Astropay/AstropayTest.php
new file mode 100644
index 000..ef72dd8
--- /dev/null
+++ b/tests/Adapter/Astropay/AstropayTest.php
@@ -0,0 +1,59 @@
+testAdapterClass = 'TestingAstropayAdapter';
+   }
+
+   function tearDown() {
+   TestingAstropayAdapter::clearGlobalsCache();
+   parent::tearDown();
+   }
+
+   /**
+* Ensure we're setting the right url for each transaction
+* @covers AstropayAdapter::getCurlBaseOpts
+*/
+   function testCurlUrl() {
+   $init = $this->getDonorTestData( 'BR' );
+   $gateway = $this->getFreshGatewayObject( $init );
+   $gateway->setCurrentTransaction( 'NewInvoice' );
+
+   $result = $gateway->getCurlBaseOpts();
+
+   $this->assertEquals(
+   
'https://sandbox.astropay.example.com/api_curl/streamline/NewInvoice',
+   $result[CURLOPT_URL],
+   'Not setting URL to transaction-specific value.'
+   );
+   }
+}
diff --git a/tests/DonationInterfaceTestCase.php 
b/tests/DonationInterfaceTestCase.php
index 4dbd95f..9ee358e 100644
--- a/tests/DonationInterfaceTestCase.php
+++ b/tests/DonationInterfaceTestCase.php
@@ -229,6 +229,19 @@
'amount' => '1.55',
'language' => 'en',
),
+   'BR' => array (
+   'city' => 'São Paulo',
+   'state' => 'SP',
+   'zip' => '01110-111',
+   'currency_code' => 'BRL',
+   'fiscal_number' => '3456789',
+   'bank_code' => 'TE',
+   'street' => 'Rua Falso 123',
+   'fname' => 'Nome',
+   'lname' => 'Apelido',
+   'amount' => '100',
+   'language' => 'pt',
+   ),
);
//default to US
if ( $country === '' ) {
@@ -382,7 +395,7 @@
 * the constructor of the gateway object that I can't get to without
 * refactoring the whole thing. @TODO: Refactor the gateway adapter
 * constructor.
-* @retu

[MediaWiki-commits] [Gerrit] Set "recentchanges" group for s2-s7 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Set "recentchanges" group for s2-s7
..


Set "recentchanges" group for s2-s7

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index d416af6..c1784c5 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -204,6 +204,9 @@
'watchlist' => array(
'db1036' => 1,
),
+   'recentchanges' => array(
+   'db1036' => 1,
+   ),
'recentchangeslinked' => array(
'db1036' => 1,
),
@@ -222,6 +225,9 @@
'db1019' => 1,
),
'watchlist' => array(
+   'db1015' => 1,
+   ),
+   'recentchanges' => array(
'db1015' => 1,
),
'recentchangeslinked' => array(
@@ -248,6 +254,9 @@
'watchlist' => array(
'db1053' => 1,
),
+   'recentchanges' => array(
+   'db1053' => 1,
+   ),
'recentchangeslinked' => array(
'db1053' => 1,
),
@@ -271,6 +280,9 @@
'watchlist' => array(
'db1026' => 1,
),
+   'recentchanges' => array(
+   'db1026' => 1,
+   ),
'recentchangeslinked' => array(
'db1026' => 1,
),
@@ -291,6 +303,9 @@
'watchlist' => array(
'db1030' => 1,
),
+   'recentchanges' => array(
+   'db1030' => 1,
+   ),
'recentchangeslinked' => array(
'db1030' => 1,
),
@@ -311,6 +326,9 @@
'watchlist' => array(
'db1041' => 1,
),
+   'recentchanges' => array(
+   'db1041' => 1,
+   ),
'recentchangeslinked' => array(
'db1041' => 1,
),

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

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

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

[MediaWiki-commits] [Gerrit] Set "recentchanges" group for s2-s7 - change (operations/mediawiki-config)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Set "recentchanges" group for s2-s7
..

Set "recentchanges" group for s2-s7

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index d416af6..c1784c5 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -204,6 +204,9 @@
'watchlist' => array(
'db1036' => 1,
),
+   'recentchanges' => array(
+   'db1036' => 1,
+   ),
'recentchangeslinked' => array(
'db1036' => 1,
),
@@ -222,6 +225,9 @@
'db1019' => 1,
),
'watchlist' => array(
+   'db1015' => 1,
+   ),
+   'recentchanges' => array(
'db1015' => 1,
),
'recentchangeslinked' => array(
@@ -248,6 +254,9 @@
'watchlist' => array(
'db1053' => 1,
),
+   'recentchanges' => array(
+   'db1053' => 1,
+   ),
'recentchangeslinked' => array(
'db1053' => 1,
),
@@ -271,6 +280,9 @@
'watchlist' => array(
'db1026' => 1,
),
+   'recentchanges' => array(
+   'db1026' => 1,
+   ),
'recentchangeslinked' => array(
'db1026' => 1,
),
@@ -291,6 +303,9 @@
'watchlist' => array(
'db1030' => 1,
),
+   'recentchanges' => array(
+   'db1030' => 1,
+   ),
'recentchangeslinked' => array(
'db1030' => 1,
),
@@ -311,6 +326,9 @@
'watchlist' => array(
'db1041' => 1,
),
+   'recentchanges' => array(
+   'db1041' => 1,
+   ),
'recentchangeslinked' => array(
'db1041' => 1,
),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5c3ffbc011a21fe1bc6e0d0e673e313f627398b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Fixing icons… again - change (apps...wikipedia)

[Fjalapeno (Code Review)]

Fjalapeno has uploaded a new change for review.

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

Change subject: Fixing icons… again
..

Fixing icons… again

A few problems to overcome this time:
Archives use symlinks for the app bundle, which can throw monkey wrenches in 
the process.
Looks like permissions have changed on build folders - can't reliably save to 
the app bundle during the process. So sidestepping.

New solution:
No longer manipulating the build folder, doing everything in the source 
directory.
Created a new icon set - source - which will always contain the unmolested 
icons.
The other icon set will be overwritten at build time with the overlaid icons.

Note: only one icons is copied to the app, the other is in the project only.

Change-Id: I39285429803b72d5caeda738fb82bc3d23406317
---
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
M Wikipedia/Images.xcassets/AppIcon.appiconset/icon...@2x.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/icon...@3x.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/Icon-72.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/icon...@2x.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/Icon-76.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/icon...@2x.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/Icon.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/i...@2x.png
M Wikipedia/Images.xcassets/AppIcon.appiconset/ios7_app_icon_iphone.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Contents.json
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@3x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-72.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-76.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small-50.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-small...@2x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-sm...@3x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Spotlight-40.png
A 
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x-1.png
A 
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x.png
A 
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@3x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/i...@2x.png
A 
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_app_icon_iphone.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_icon.png
A 
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_i...@2x.png
M scripts/process-icons.sh
32 files changed, 202 insertions(+), 193 deletions(-)


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

diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index e5004fa..50e3ed2 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -185,6 +185,7 @@
04F27B7818FE0F2E00EDD838 /* PageHistoryViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 04F27B7418FE0F2E00EDD838 /* 
PageHistoryViewController.m */; };
04F39590186CF80100B0D6FC /* TOCViewController.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 04F3958F186CF80100B0D6FC /* TOCViewController.m 
*/; };
08D631F71A69B1AB00D87AD0 /* WMFImageGalleryViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 08D631F61A69B1AB00D87AD0 /* 
WMFImageGalleryViewController.m */; };
+   0E36C2271AE0B59D00C58CFF /* Images.xcassets in Resources */ = 
{isa = PBXBuildFile; fileRef = D4991453181D51DE00E6073C /* Images.xcassets */; 
};
0EA4402E1AA6281200B09DBA /* NSDateFormatter+WMFExtensions.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 0EA4402D1AA6281200B09DBA /* 
NSDateFormatter+WMFExtensions.m */; };
0EBC56681AD3656900E82CDD /* WMFAsyncTestCase.m in Sources */ = 
{isa = PBXBuildFile; fileRef = BC7ACB631AB34C9C00791497 /* WMFAsyncTestCase.m 
*/; };
0EBC567F1AD442CC00E82CDD /* BITHockeyManager+WMFExtensions.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 0EBC567E1AD442CC00E82CDD /* 
BITHockeyManager+WMFExtensions.m */; };
@@ -323,7 +324,6 @@
D4991445181D51DE00E6073C /* main.m in Sources */ = {isa = 
PBXBuildFile; fileRef = D4991444181D51DE00E6073C /* main.m */; };
D4991449181D51DE00E6073C /* AppDelegate.m in Sources */ = {isa 
= PBXBuildFile; fileRef = D4991448181D51DE00E6073

[MediaWiki-commits] [Gerrit] tools: Register only with 'active' proxy - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: tools: Register only with 'active' proxy
..


tools: Register only with 'active' proxy

This will stop attempting to register with all present proxies
and register only with active proxy. Data will be replicated
between the proxies themselves via redis replication.

Bug: T96334
Change-Id: I3a483e03df433ca6938e6e08b54e8b7929b93495
---
M modules/toollabs/files/portgrabber.py
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/node/web.pp
3 files changed, 31 insertions(+), 33 deletions(-)

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



diff --git a/modules/toollabs/files/portgrabber.py 
b/modules/toollabs/files/portgrabber.py
index d0d6a95..330525a 100644
--- a/modules/toollabs/files/portgrabber.py
+++ b/modules/toollabs/files/portgrabber.py
@@ -1,14 +1,11 @@
 import sys
 import socket
 
-import yaml
 
-
-def get_proxies():
-"""Return the list of proxies to register with."""
-with open('/etc/portgrabber.yaml', 'r') as f:
-config = yaml.safe_load(f)
-return config['proxies']
+def get_active_proxy():
+"""Return the active master proxy to register with"""
+with open('/etc/portgrabber', 'r') as f:
+return f.read().strip()
 
 
 def get_open_port():
@@ -25,30 +22,30 @@
 
 
 def register(port):
-"""Register with the proxies."""
-for proxy in get_proxies():
-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-try:
-sock.connect((proxy, 8282))
-sock.sendall("register\n.*\nhttp://%s:%u\n"; % (socket.getfqdn(), 
port))
-res = sock.recv(1024)
-if res != 'ok':
-sys.stderr.write('port registration failed!')
-sys.exit(-1)
-finally:
-sock.close()
+"""Register with the master proxy."""
+proxy = get_active_proxy()
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+try:
+sock.connect((proxy, 8282))
+sock.sendall("register\n.*\nhttp://%s:%u\n"; % (socket.getfqdn(), port))
+res = sock.recv(1024)
+if res != 'ok':
+sys.stderr.write('port registration failed!')
+sys.exit(-1)
+finally:
+sock.close()
 
 
 def unregister():
-"""Unregister with the proxies."""
-for proxy in get_proxies():
-try:
-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-sock.connect((proxy, 8282))
-sock.sendall("unregister\n.*\n")
-res = sock.recv(1024)
-if res != 'ok':
-sys.stderr.write('port unregistration failed!')
-sys.exit(-1)
-finally:
-sock.close()
+"""Unregister with the master proxy."""
+proxy = get_active_proxy()
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+try:
+sock.connect((proxy, 8282))
+sock.sendall("unregister\n.*\n")
+res = sock.recv(1024)
+if res != 'ok':
+sys.stderr.write('port unregistration failed!')
+sys.exit(-1)
+finally:
+sock.close()
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 6e8bcb1..b057055 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -13,6 +13,7 @@
 #
 class toollabs (
 $proxies = ['tools-webproxy-01', 'tools-webproxy-02'],
+$active_proxy = 'tools-webproxy-01',
 ) {
 
 include labs_lvm
diff --git a/modules/toollabs/manifests/node/web.pp 
b/modules/toollabs/manifests/node/web.pp
index 23613b9..7624180 100644
--- a/modules/toollabs/manifests/node/web.pp
+++ b/modules/toollabs/manifests/node/web.pp
@@ -20,12 +20,12 @@
 config => 'toollabs/gridengine/host-web.erb',
 }
 
-file { '/etc/portgrabber.yaml':
+file { '/etc/portgrabber':
 ensure  => file,
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => inline_template("<%= { 'proxies' => @proxies }.to_yaml 
%>\n"),
+content => $active_proxy,
 }
 
 file { '/usr/local/lib/python2.7/dist-packages/portgrabber.py':

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

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

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

[MediaWiki-commits] [Gerrit] tools: Register only with 'active' proxy - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Register only with 'active' proxy
..

tools: Register only with 'active' proxy

This will stop attempting to register with all present proxies
and register only with active proxy. Data will be replicated
between the proxies themselves via redis replication.

Bug: T96334
Change-Id: I3a483e03df433ca6938e6e08b54e8b7929b93495
---
M modules/toollabs/files/portgrabber.py
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/node/web.pp
3 files changed, 31 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/204702/1

diff --git a/modules/toollabs/files/portgrabber.py 
b/modules/toollabs/files/portgrabber.py
index d0d6a95..330525a 100644
--- a/modules/toollabs/files/portgrabber.py
+++ b/modules/toollabs/files/portgrabber.py
@@ -1,14 +1,11 @@
 import sys
 import socket
 
-import yaml
 
-
-def get_proxies():
-"""Return the list of proxies to register with."""
-with open('/etc/portgrabber.yaml', 'r') as f:
-config = yaml.safe_load(f)
-return config['proxies']
+def get_active_proxy():
+"""Return the active master proxy to register with"""
+with open('/etc/portgrabber', 'r') as f:
+return f.read().strip()
 
 
 def get_open_port():
@@ -25,30 +22,30 @@
 
 
 def register(port):
-"""Register with the proxies."""
-for proxy in get_proxies():
-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-try:
-sock.connect((proxy, 8282))
-sock.sendall("register\n.*\nhttp://%s:%u\n"; % (socket.getfqdn(), 
port))
-res = sock.recv(1024)
-if res != 'ok':
-sys.stderr.write('port registration failed!')
-sys.exit(-1)
-finally:
-sock.close()
+"""Register with the master proxy."""
+proxy = get_active_proxy()
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+try:
+sock.connect((proxy, 8282))
+sock.sendall("register\n.*\nhttp://%s:%u\n"; % (socket.getfqdn(), port))
+res = sock.recv(1024)
+if res != 'ok':
+sys.stderr.write('port registration failed!')
+sys.exit(-1)
+finally:
+sock.close()
 
 
 def unregister():
-"""Unregister with the proxies."""
-for proxy in get_proxies():
-try:
-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-sock.connect((proxy, 8282))
-sock.sendall("unregister\n.*\n")
-res = sock.recv(1024)
-if res != 'ok':
-sys.stderr.write('port unregistration failed!')
-sys.exit(-1)
-finally:
-sock.close()
+"""Unregister with the master proxy."""
+proxy = get_active_proxy()
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+try:
+sock.connect((proxy, 8282))
+sock.sendall("unregister\n.*\n")
+res = sock.recv(1024)
+if res != 'ok':
+sys.stderr.write('port unregistration failed!')
+sys.exit(-1)
+finally:
+sock.close()
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 6e8bcb1..b057055 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -13,6 +13,7 @@
 #
 class toollabs (
 $proxies = ['tools-webproxy-01', 'tools-webproxy-02'],
+$active_proxy = 'tools-webproxy-01',
 ) {
 
 include labs_lvm
diff --git a/modules/toollabs/manifests/node/web.pp 
b/modules/toollabs/manifests/node/web.pp
index 23613b9..7624180 100644
--- a/modules/toollabs/manifests/node/web.pp
+++ b/modules/toollabs/manifests/node/web.pp
@@ -20,12 +20,12 @@
 config => 'toollabs/gridengine/host-web.erb',
 }
 
-file { '/etc/portgrabber.yaml':
+file { '/etc/portgrabber':
 ensure  => file,
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => inline_template("<%= { 'proxies' => @proxies }.to_yaml 
%>\n"),
+content => $active_proxy,
 }
 
 file { '/usr/local/lib/python2.7/dist-packages/portgrabber.py':

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

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

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

[MediaWiki-commits] [Gerrit] tools: Allow redis access between proxies - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: tools: Allow redis access between proxies
..


tools: Allow redis access between proxies

This allows replication between the redis instances!

Bug: T96335
Change-Id: I2807df8300819b96871c92ae2c56f79da7a8ec39
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 8189565..17c81f8 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -22,6 +22,14 @@
 ssl_certificate_name => $ssl_certificate_name,
 }
 
+$proxy_nodes = join($proxies, ' ') # $proxies comes from toollabs base 
class
+# Open up redis to all proxies!
+ferm::service { 'redis-replication':
+proto  => 'tcp',
+port   => '6379',
+srange => "@resolve(($proxy_nodes))",
+}
+
 file { '/usr/local/sbin/proxylistener':
 ensure  => file,
 owner   => 'root',

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

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

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

[MediaWiki-commits] [Gerrit] tools: Allow redis access between proxies - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Allow redis access between proxies
..

tools: Allow redis access between proxies

This allows replication between the redis instances!

Bug: T96335
Change-Id: I2807df8300819b96871c92ae2c56f79da7a8ec39
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 8189565..17c81f8 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -22,6 +22,14 @@
 ssl_certificate_name => $ssl_certificate_name,
 }
 
+$proxy_nodes = join($proxies, ' ') # $proxies comes from toollabs base 
class
+# Open up redis to all proxies!
+ferm::service { 'redis-replication':
+proto  => 'tcp',
+port   => '6379',
+srange => "@resolve(($proxy_nodes))",
+}
+
 file { '/usr/local/sbin/proxylistener':
 ensure  => file,
 owner   => 'root',

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

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

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

[MediaWiki-commits] [Gerrit] tools: Install redis-tools on trusty bastions - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: tools: Install redis-tools on trusty bastions
..


tools: Install redis-tools on trusty bastions

Change-Id: I7a7e2e82d848bf2531c0c7fa723f56c69e31a20b
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/dev_environ.pp 
b/modules/toollabs/manifests/dev_environ.pp
index cbd143a..8861730 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -26,6 +26,7 @@
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759309
 'libmysqlclient-dev',
 'libboost-python1.54-dev',
+'redis-tools',
 ]:
 ensure  => latest,
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a7e2e82d848bf2531c0c7fa723f56c69e31a20b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] tools: Install redis-tools on trusty bastions - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Install redis-tools on trusty bastions
..

tools: Install redis-tools on trusty bastions

Change-Id: I7a7e2e82d848bf2531c0c7fa723f56c69e31a20b
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/204700/1

diff --git a/modules/toollabs/manifests/dev_environ.pp 
b/modules/toollabs/manifests/dev_environ.pp
index cbd143a..8861730 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -26,6 +26,7 @@
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759309
 'libmysqlclient-dev',
 'libboost-python1.54-dev',
+'redis-tools',
 ]:
 ensure  => latest,
 }

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Don't open up proxy api only to internal users - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Don't open up proxy api only to internal users
..


dynamicproxy: Don't open up proxy api only to internal users

Open it to everyone! Rely on security groups to restrict it.
This is being read up from wikitech.

Change-Id: Ib2aedccae922ccf42c32262ff7c7c6510d888730
---
M modules/dynamicproxy/manifests/api.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 8ee8f64..927a882 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -6,7 +6,6 @@
 }
 
 ferm::service { 'dynamicproxy-api-http':
-srange => '$INTERNAL',  # Use security groups for actual access control
 port   => $port,
 proto  => 'tcp',
 desc   => 'API for adding / removing proxies from dynamicproxy 
domainproxy'

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Do not bind redis only on localhost - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Do not bind redis only on localhost
..


dynamicproxy: Do not bind redis only on localhost

This allows specific opening up of redis to elsewhere for
replication

Bug: T96335
Change-Id: I97a9641678563804881f06c6014d9fc72df8ad67
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index f43dd80..f9e108c 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -25,7 +25,6 @@
 persist   => 'aof',
 dir   => '/var/lib/redis',
 maxmemory => $redis_maxmemory,
-redis_options => ['bind 127.0.0.1'],
 }
 
 # The redis module intentionally does not restart the redis

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Don't open up proxy only to internal users - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: dynamicproxy: Don't open up proxy only to internal users
..

dynamicproxy: Don't open up proxy only to internal users

Open it to everyone! Rely on security groups to restrict it.
This is being read up from wikitech.

Change-Id: Ib2aedccae922ccf42c32262ff7c7c6510d888730
---
M modules/dynamicproxy/manifests/api.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/204699/1

diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 8ee8f64..927a882 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -6,7 +6,6 @@
 }
 
 ferm::service { 'dynamicproxy-api-http':
-srange => '$INTERNAL',  # Use security groups for actual access control
 port   => $port,
 proto  => 'tcp',
 desc   => 'API for adding / removing proxies from dynamicproxy 
domainproxy'

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Include firewall for base proxy - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Include firewall for base proxy
..


dynamicproxy: Include firewall for base proxy

Everything should be opened up already.

Bug: T96335
Change-Id: Iba3902ef2fcc08f8f3992319cc5c17088e7739fd
---
M manifests/role/labsproxy.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index f8e89b5..0cd 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -4,6 +4,8 @@
 privatekey => false
 }
 
+include base::firewall
+
 class { '::dynamicproxy':
 ssl_certificate_name => 'star.wmflabs.org',
 ssl_settings => ssl_ciphersuite('nginx', 'compat'),

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Do not bind redis only on localhost - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: dynamicproxy: Do not bind redis only on localhost
..

dynamicproxy: Do not bind redis only on localhost

This allows specific opening up of redis to elsewhere for
replication

Bug: T96335
Change-Id: I97a9641678563804881f06c6014d9fc72df8ad67
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/204698/1

diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index f43dd80..f9e108c 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -25,7 +25,6 @@
 persist   => 'aof',
 dir   => '/var/lib/redis',
 maxmemory => $redis_maxmemory,
-redis_options => ['bind 127.0.0.1'],
 }
 
 # The redis module intentionally does not restart the redis

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Include firewall for base proxy - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: dynamicproxy: Include firewall for base proxy
..

dynamicproxy: Include firewall for base proxy

Everything should be opened up already.

Bug: T96335
Change-Id: Iba3902ef2fcc08f8f3992319cc5c17088e7739fd
---
M manifests/role/labsproxy.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/204697/1

diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index f8e89b5..0cd 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -4,6 +4,8 @@
 privatekey => false
 }
 
+include base::firewall
+
 class { '::dynamicproxy':
 ssl_certificate_name => 'star.wmflabs.org',
 ssl_settings => ssl_ciphersuite('nginx', 'compat'),

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

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

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

[MediaWiki-commits] [Gerrit] lots of indentation fixes - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: lots of indentation fixes
..

lots of indentation fixes

more fixes that are all just indentation of arrows, for:

Bug:T93645
Change-Id: I9c35a260ae08ea57548d612ad0536c44383510d4
---
M modules/apt/manifests/init.pp
M modules/chromium/manifests/init.pp
M modules/dataset/manifests/dirs.pp
M modules/ganeti/manifests/init.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
M modules/ganglia_new/tests/gmetad.pp
M modules/geoip/manifests/data/maxmind.pp
M modules/git/manifests/clone.pp
M modules/git/manifests/install.pp
M modules/icinga/manifests/ircbot.pp
M modules/install-server/manifests/apt-repository.pp
M modules/install-server/manifests/dhcp-server.pp
M modules/install-server/manifests/tftp-server.pp
M modules/ipython/manifests/notebook.pp
M modules/ircyall/manifests/init.pp
M modules/java/manifests/tools.pp
M modules/kibana/manifests/init.pp
M modules/labs_vmbuilder/manifests/init.pp
M modules/logstash/manifests/init.pp
M modules/logstash/manifests/output/elasticsearch.pp
M modules/mediawiki/manifests/web/modules.pp
M modules/mysql_wmf/manifests/monitor/percona.pp
M modules/planet/manifests/config.pp
M modules/protoproxy/manifests/ocsp_updater.pp
M modules/publichtml/manifests/init.pp
M modules/puppet/manifests/self/client.pp
M modules/puppet/manifests/self/gitclone.pp
M modules/puppet_compiler/manifests/init.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/manifests/monitoring.pp
M modules/puppetmaster/manifests/scripts.pp
M modules/rancid/manifests/init.pp
M modules/rsyslog/manifests/init.pp
M modules/salt/manifests/minion.pp
M modules/spamassassin/manifests/init.pp
M modules/ssh/manifests/userkey.pp
M modules/statsite/manifests/init.pp
M modules/swift_new/manifests/init.pp
M modules/tor/manifests/init.pp
M modules/txstatsd/manifests/init.pp
M modules/wdq-mm/manifests/init.pp
M modules/wikistats/manifests/web.pp
M modules/zuul/manifests/init.pp
M modules/zuul/manifests/merger.pp
M modules/zuul/manifests/server.pp
45 files changed, 294 insertions(+), 294 deletions(-)


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

diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 3ea9206..1bb37fd 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -59,8 +59,8 @@
 # process (either labs vmbuilder or d-i). Given the ones below exist, it is
 # no longer needed after the installation is over
 file { '/etc/apt/apt.conf':
-ensure  => absent,
-notify  => Exec['apt-get update'],
+ensure => absent,
+notify => Exec['apt-get update'],
 }
 
 apt::conf { 'wikimedia-proxy':
diff --git a/modules/chromium/manifests/init.pp 
b/modules/chromium/manifests/init.pp
index 1699cc0..31a8c79 100644
--- a/modules/chromium/manifests/init.pp
+++ b/modules/chromium/manifests/init.pp
@@ -64,7 +64,7 @@
 }
 
 service { 'chromium':
-ensure=> ensure_service($ensure),
-provider  => 'upstart',
+ensure   => ensure_service($ensure),
+provider => 'upstart',
 }
 }
diff --git a/modules/dataset/manifests/dirs.pp 
b/modules/dataset/manifests/dirs.pp
index 3894f54..609f2bc 100644
--- a/modules/dataset/manifests/dirs.pp
+++ b/modules/dataset/manifests/dirs.pp
@@ -9,51 +9,51 @@
 $otherdir_wikibase_wikidatawiki = 
'/data/xmldatadumps/public/other/wikibase/wikidatawiki'
 
 file { $datadir:
-mode=> '0755',
-ensure  => 'directory',
-owner   => 'root',
-group   => 'root',
+mode   => '0755',
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
 }
 
 file { $publicdir:
-mode=> '0775',
-ensure  => 'directory',
-owner   => 'datasets',
-group   => 'datasets',
+mode   => '0775',
+ensure => 'directory',
+owner  => 'datasets',
+group  => 'datasets',
 }
 
 file { $otherdir:
-mode=> '0755',
-ensure  => 'directory',
-owner   => 'datasets',
-group   => 'datasets',
+mode   => '0755',
+ensure => 'directory',
+owner  => 'datasets',
+group  => 'datasets',
 }
 
 file { $otherdir_wikibase:
-mode=> '0755',
-ensure  => 'directory',
-owner   => 'datasets',
-group   => 'datasets',
+mode   => '0755',
+ensure => 'directory',
+owner  => 'datasets',
+group  => 'datasets',
 }
 
 file { $otherdir_wikibase_wikidatawiki:
-mode=> '0755',
-ensure  => 'directory',
-owner   => 'datasets',
-group   => 'datasets',
+mode   => '0755',
+ensure => 'directory',
+owner  => 'datasets',
+group  => 'datasets',
 }
 
 # T72385
  

[MediaWiki-commits] [Gerrit] dynamicproxy: Explicitly open port for dynamicproxy-api - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Explicitly open port for dynamicproxy-api
..


dynamicproxy: Explicitly open port for dynamicproxy-api

Change-Id: Ifd620151d00a2df583ca17bd9b4732feec18961f
---
M modules/dynamicproxy/manifests/api.pp
M modules/dynamicproxy/templates/api.conf
2 files changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 6b6c875..8ee8f64 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -1,8 +1,17 @@
-class dynamicproxy::api {
+class dynamicproxy::api(
+$port = 5668,
+) {
 nginx::site { 'api':
 content => template('dynamicproxy/api.conf'),
 }
 
+ferm::service { 'dynamicproxy-api-http':
+srange => '$INTERNAL',  # Use security groups for actual access control
+port   => $port,
+proto  => 'tcp',
+desc   => 'API for adding / removing proxies from dynamicproxy 
domainproxy'
+}
+
 package { 'python-flask':
 ensure  => latest,
 require => Class['misc::labsdebrepo'],
diff --git a/modules/dynamicproxy/templates/api.conf 
b/modules/dynamicproxy/templates/api.conf
index 7d7d010..34eec5f 100644
--- a/modules/dynamicproxy/templates/api.conf
+++ b/modules/dynamicproxy/templates/api.conf
@@ -1,7 +1,7 @@
 # Run the proxy api on port 5668; a firewall rule
 # will open this only for wikitech.
 server {
-listen   5668;
+listen   <%= @port %>;
 
 location /dynamicproxy-api {
 include uwsgi_params;

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

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

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

[MediaWiki-commits] [Gerrit] labmon: Enable extended statsite counters for labs - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: labmon: Enable extended statsite counters for labs
..

labmon: Enable extended statsite counters for labs

Bug: T95703
Change-Id: Ib14c0e1d2ced05c9fbefb94c630eedd06a44ed55
---
M hieradata/hosts/labmon1001.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/labmon1001.yaml b/hieradata/hosts/labmon1001.yaml
index 6649f65..7812d88 100644
--- a/hieradata/hosts/labmon1001.yaml
+++ b/hieradata/hosts/labmon1001.yaml
@@ -1 +1,2 @@
 statsite::instance::graphite_host: 'localhost'
+statsite::instance::extended_counters: 1

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Explicitly open port for dynamicproxy-api - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: dynamicproxy: Explicitly open port for dynamicproxy-api
..

dynamicproxy: Explicitly open port for dynamicproxy-api

Change-Id: Ifd620151d00a2df583ca17bd9b4732feec18961f
---
M modules/dynamicproxy/manifests/api.pp
M modules/dynamicproxy/templates/api.conf
2 files changed, 11 insertions(+), 2 deletions(-)


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

diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 6b6c875..8ee8f64 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -1,8 +1,17 @@
-class dynamicproxy::api {
+class dynamicproxy::api(
+$port = 5668,
+) {
 nginx::site { 'api':
 content => template('dynamicproxy/api.conf'),
 }
 
+ferm::service { 'dynamicproxy-api-http':
+srange => '$INTERNAL',  # Use security groups for actual access control
+port   => $port,
+proto  => 'tcp',
+desc   => 'API for adding / removing proxies from dynamicproxy 
domainproxy'
+}
+
 package { 'python-flask':
 ensure  => latest,
 require => Class['misc::labsdebrepo'],
diff --git a/modules/dynamicproxy/templates/api.conf 
b/modules/dynamicproxy/templates/api.conf
index 7d7d010..34eec5f 100644
--- a/modules/dynamicproxy/templates/api.conf
+++ b/modules/dynamicproxy/templates/api.conf
@@ -1,7 +1,7 @@
 # Run the proxy api on port 5668; a firewall rule
 # will open this only for wikitech.
 server {
-listen   5668;
+listen   <%= @port %>;
 
 location /dynamicproxy-api {
 include uwsgi_params;

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

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

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

[MediaWiki-commits] [Gerrit] Enable Hovercards by default on Catalan and Greek Wikipedias - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Enable Hovercards by default on Catalan and Greek Wikipedias
..


Enable Hovercards by default on Catalan and Greek Wikipedias

Bug: T88164
Change-Id: I6fa034f4a81e78e827b9996f50cd0909f2caacd1
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0e63514..719432e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1970,7 +1970,9 @@
 if ( $wmgUsePopups || ( $wmgPopupsBetaFeature && $wmgUseBetaFeatures ) ) {
require_once( "$IP/extensions/Popups/Popups.php" );
$wgPopupsSurveyLink = 
'https://wikimedia.qualtrics.com/SE/?SID=SV_d1irF0VbOxZREvr';
-   $wgPopupsBetaFeature = $wmgPopupsBetaFeature;
+
+   // Make sure we don't enable as a beta feature if we are set to be 
enabled by default.
+   $wgPopupsBetaFeature = $wmgPopupsBetaFeature && !$wmgUsePopups;
 }
 
 if ( $wmgUseVectorBeta ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5fe940b..b28ddcd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11624,6 +11624,8 @@
 
 'wmgUsePopups' => array(
'default' => false,
+   'cawiki' => true,  // T88164
+   'elwiki' => true,  // T88164
 ),
 
 'wmgPopupsBetaFeature' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fa034f4a81e78e827b9996f50cd0909f2caacd1
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Werdna 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tools: Enable firewall on webproxies - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: tools: Enable firewall on webproxies
..


tools: Enable firewall on webproxies

Bug: T96335
Change-Id: I118fb4871939ddb4c51d8fc99407b089f63fe6c2
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index c6c5863..8189565 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -6,6 +6,8 @@
 include toollabs::infrastructure
 include ::redis::client::python
 
+include base::firewall
+
 if $ssl_install_certificate {
 install_certificate { $ssl_certificate_name:
 privatekey => false,

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

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

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

[MediaWiki-commits] [Gerrit] tools: Enable firewall on webproxies - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Enable firewall on webproxies
..

tools: Enable firewall on webproxies

Bug: T96335
Change-Id: I118fb4871939ddb4c51d8fc99407b089f63fe6c2
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index c6c5863..8189565 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -6,6 +6,8 @@
 include toollabs::infrastructure
 include ::redis::client::python
 
+include base::firewall
+
 if $ssl_install_certificate {
 install_certificate { $ssl_certificate_name:
 privatekey => false,

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

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

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

[MediaWiki-commits] [Gerrit] Popups: enable as beta feature by default - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Popups: enable as beta feature by default
..


Popups: enable as beta feature by default

This brings the state of the world back to what it was prior to I7fde63453.

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

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5bf06ae..5fe940b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11627,7 +11627,7 @@
 ),
 
 'wmgPopupsBetaFeature' => array(
-   'default' => false,
+   'default' => true,
'nonbetafeatures' => false,
 ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95f8c010ea55bc958b7d75dda5dcbed5fde0d9bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Popups: enable as beta feature by default - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Popups: enable as beta feature by default
..

Popups: enable as beta feature by default

This brings the state of the world back to what it was prior to I7fde63453.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5bf06ae..5fe940b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11627,7 +11627,7 @@
 ),
 
 'wmgPopupsBetaFeature' => array(
-   'default' => false,
+   'default' => true,
'nonbetafeatures' => false,
 ),
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95f8c010ea55bc958b7d75dda5dcbed5fde0d9bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] PopUps: disabled by default; requires BetaFeatures if set as... - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: PopUps: disabled by default; requires BetaFeatures if set as 
beta feature
..


PopUps: disabled by default; requires BetaFeatures if set as beta feature

Change-Id: I7fde634536e6339abda5ea702001b25aad99c35c
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 11 insertions(+), 4 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f185d21..0e63514 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1967,9 +1967,10 @@
$wgImageMetricsCorsSamplingFactor = $wmgImageMetricsCorsSamplingFactor;
 }
 
-if ( $wmgUsePopups ) {
+if ( $wmgUsePopups || ( $wmgPopupsBetaFeature && $wmgUseBetaFeatures ) ) {
require_once( "$IP/extensions/Popups/Popups.php" );
$wgPopupsSurveyLink = 
'https://wikimedia.qualtrics.com/SE/?SID=SV_d1irF0VbOxZREvr';
+   $wgPopupsBetaFeature = $wmgPopupsBetaFeature;
 }
 
 if ( $wmgUseVectorBeta ) {
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index aa1b6d2..d8b8a93 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -537,6 +537,10 @@
'wmgUseCapiunto' => array(
'default' => true,
),
+
+   'wmgUsePopups' => array(
+   'default' => true,
+   ),
 );
 
 } # wmflLabsSettings()
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7012224..5bf06ae 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11622,10 +11622,12 @@
'default' => false,
 ),
 
-// NOTE: Extension:Popups has a hard dependency on TextExtracts and PageImages.
-// @todo The pattern "everywhere but loginwiki and votewiki" repeats 32 times 
in this file.
 'wmgUsePopups' => array(
-   'default' => true,
+   'default' => false,
+),
+
+'wmgPopupsBetaFeature' => array(
+   'default' => false,
'nonbetafeatures' => false,
 ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fde634536e6339abda5ea702001b25aad99c35c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update Popups for cherry-picks - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Update Popups for cherry-picks
..


Update Popups for cherry-picks

Change-Id: I8d337dd8c9a05194039a96569c17a113e679147d
---
M extensions/Popups
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/extensions/Popups b/extensions/Popups
index 1575f5f..043a78d 16
--- a/extensions/Popups
+++ b/extensions/Popups
-Subproject commit 1575f5f9e49ba9f75635e2dff1f7bb303b79863a
+Subproject commit 043a78d613f0b00cfe6ca401f2cd29851c63d829

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d337dd8c9a05194039a96569c17a113e679147d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf1
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update Popups for cherry-picks - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Update Popups for cherry-picks
..

Update Popups for cherry-picks

Change-Id: I1bc0dede31cf8237bbee64aa9252635457626c11
---
M extensions/Popups
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/204691/1

diff --git a/extensions/Popups b/extensions/Popups
index bd001c4..8f3eb1a 16
--- a/extensions/Popups
+++ b/extensions/Popups
-Subproject commit bd001c4876743b0123f05ec758581babf258a24b
+Subproject commit 8f3eb1a50fe61c1d46e0465ca28639ee53b057c5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bc0dede31cf8237bbee64aa9252635457626c11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Avoid (s) for unknown plural in a message - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Avoid (s) for unknown plural in a message
..


Avoid (s) for unknown plural in a message

Similar to I365d6279310cb2455e078de5677bf7fffa54d60d

Change-Id: If251f1dd46340d7f3b22621f41f890d28e8aae91
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 1dfe21d..3969656 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -786,7 +786,7 @@
"rev-showdeleted": "show",
"revisiondelete": "Delete/undelete revisions",
"revdelete-nooldid-title": "Invalid target revision",
-   "revdelete-nooldid-text": "You have either not specified a target 
revision(s) to perform this\nfunction, the specified revision does not exist, 
or you are attempting to hide the current revision.",
+   "revdelete-nooldid-text": "You have either not specified any target 
revision on which to perform this function, or the specified revision does not 
exist, or you are attempting to hide the current revision.",
"revdelete-no-file": "The file specified does not exist.",
"revdelete-show-file-confirm": "Are you sure you want to view a deleted 
revision of the file \"$1\" from $2 at $3?",
"revdelete-show-file-submit": "Yes",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If251f1dd46340d7f3b22621f41f890d28e8aae91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update Popups for cherry-picks - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Update Popups for cherry-picks
..


Update Popups for cherry-picks

Change-Id: I1bc0dede31cf8237bbee64aa9252635457626c11
---
M extensions/Popups
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/extensions/Popups b/extensions/Popups
index bd001c4..8f3eb1a 16
--- a/extensions/Popups
+++ b/extensions/Popups
-Subproject commit bd001c4876743b0123f05ec758581babf258a24b
+Subproject commit 8f3eb1a50fe61c1d46e0465ca28639ee53b057c5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bc0dede31cf8237bbee64aa9252635457626c11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update Popups for cherry-picks - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Update Popups for cherry-picks
..

Update Popups for cherry-picks

Change-Id: I8d337dd8c9a05194039a96569c17a113e679147d
---
M extensions/Popups
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/extensions/Popups b/extensions/Popups
index 1575f5f..043a78d 16
--- a/extensions/Popups
+++ b/extensions/Popups
-Subproject commit 1575f5f9e49ba9f75635e2dff1f7bb303b79863a
+Subproject commit 043a78d613f0b00cfe6ca401f2cd29851c63d829

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d337dd8c9a05194039a96569c17a113e679147d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf1
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Show correct counts in category-info on action=info - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Show correct counts in category-info on action=info
..


Show correct counts in category-info on action=info

The number of pages was always the total count of all members of that
category, not just pages. Correct that and also show the total count.

Change-Id: I246d92b35d508e10fd93f9c7209db11a6e0eeb7a
---
M includes/actions/InfoAction.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 17 insertions(+), 3 deletions(-)

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



diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 4f6efd4..de4f977 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -373,18 +373,30 @@
 
if ( $title->inNamespace( NS_CATEGORY ) ) {
$category = Category::newFromTitle( $title );
+
+   // $allCount is the total number of cat members,
+   // not the count of how many members are normal pages.
+   $allCount = (int)$category->getPageCount();
+   $subcatCount = (int)$category->getSubcatCount();
+   $fileCount = (int)$category->getFileCount();
+   $pagesCount = $allCount - $subcatCount - $fileCount;
+
$pageInfo['category-info'] = array(
array(
+   $this->msg( 'pageinfo-category-total' ),
+   $lang->formatNum( $allCount )
+   ),
+   array(
$this->msg( 'pageinfo-category-pages' ),
-   $lang->formatNum( 
$category->getPageCount() )
+   $lang->formatNum( $pagesCount )
),
array(
$this->msg( 'pageinfo-category-subcats' 
),
-   $lang->formatNum( 
$category->getSubcatCount() )
+   $lang->formatNum( $subcatCount )
),
array(
$this->msg( 'pageinfo-category-files' ),
-   $lang->formatNum( 
$category->getFileCount() )
+   $lang->formatNum( $fileCount )
)
);
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 1dfe21d..90ee16b 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2583,6 +2583,7 @@
"pageinfo-protect-cascading-yes": "Yes",
"pageinfo-protect-cascading-from": "Protections are cascading from",
"pageinfo-category-info": "Category information",
+   "pageinfo-category-total": "Total number of members",
"pageinfo-category-pages": "Number of pages",
"pageinfo-category-subcats": "Number of subcategories",
"pageinfo-category-files": "Number of files",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index d2da2b1..d7f2ebc 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2751,6 +2751,7 @@
"pageinfo-protect-cascading-yes": "Yes, protections are cascading from 
here\n*{{msg-mw|Pageinfo-protect-cascading}}\n*{{msg-mw|Pageinfo-protect-cascading-yes}}\n{{Identical|Yes}}",
"pageinfo-protect-cascading-from": "Key for a list of pages where 
protections are cascading from",
"pageinfo-category-info": "Showed on the page displaying information 
about the current page (add \"?action=info\" to the URL)",
+   "pageinfo-category-total": "See also:\n* 
{{msg-mw|Pageinfo-category-pages}}\n* {{msg-mw|Pageinfo-category-subcats}}\n* 
{{msg-mw|Pageinfo-category-files}}",
"pageinfo-category-pages": "See also:\n* 
{{msg-mw|Pageinfo-category-subcats}}\n* 
{{msg-mw|Pageinfo-category-files}}\n{{Identical|Number of pages}}",
"pageinfo-category-subcats": "See also:\n* 
{{msg-mw|Pageinfo-category-pages}}\n* {{msg-mw|Pageinfo-category-files}}",
"pageinfo-category-files": "See also:\n* 
{{msg-mw|Pageinfo-category-pages}}\n* {{msg-mw|Pageinfo-category-subcats}}",

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wik

[MediaWiki-commits] [Gerrit] PopUps: disabled by default; requires BetaFeatures if set as... - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: PopUps: disabled by default; requires BetaFeatures if set as 
beta feature
..

PopUps: disabled by default; requires BetaFeatures if set as beta feature

Change-Id: I7fde634536e6339abda5ea702001b25aad99c35c
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 11 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f185d21..0e63514 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1967,9 +1967,10 @@
$wgImageMetricsCorsSamplingFactor = $wmgImageMetricsCorsSamplingFactor;
 }
 
-if ( $wmgUsePopups ) {
+if ( $wmgUsePopups || ( $wmgPopupsBetaFeature && $wmgUseBetaFeatures ) ) {
require_once( "$IP/extensions/Popups/Popups.php" );
$wgPopupsSurveyLink = 
'https://wikimedia.qualtrics.com/SE/?SID=SV_d1irF0VbOxZREvr';
+   $wgPopupsBetaFeature = $wmgPopupsBetaFeature;
 }
 
 if ( $wmgUseVectorBeta ) {
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index aa1b6d2..d8b8a93 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -537,6 +537,10 @@
'wmgUseCapiunto' => array(
'default' => true,
),
+
+   'wmgUsePopups' => array(
+   'default' => true,
+   ),
 );
 
 } # wmflLabsSettings()
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7012224..5bf06ae 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11622,10 +11622,12 @@
'default' => false,
 ),
 
-// NOTE: Extension:Popups has a hard dependency on TextExtracts and PageImages.
-// @todo The pattern "everywhere but loginwiki and votewiki" repeats 32 times 
in this file.
 'wmgUsePopups' => array(
-   'default' => true,
+   'default' => false,
+),
+
+'wmgPopupsBetaFeature' => array(
+   'default' => false,
'nonbetafeatures' => false,
 ),
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fde634536e6339abda5ea702001b25aad99c35c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] tools: Explicitly open port for proxylistener - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: tools: Explicitly open port for proxylistener
..


tools: Explicitly open port for proxylistener

Bug: T96335
Change-Id: I7da34ffcbb13de1597c36f7186a389ed8bc9f6b3
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index b93fb4b..c6c5863 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -44,6 +44,13 @@
 require => File['/etc/init/proxylistener.conf'],
 }
 
+ferm::service { 'proxylistener-port':
+proto  => 'tcp',
+port   => '8282',
+srange => '$INTERNAL',
+desc   => 'Proxylistener port, open to just labs'
+}
+
 # Deploy root web.
 git::clone { 'labs/toollabs':
 ensure=> latest,

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

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

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

[MediaWiki-commits] [Gerrit] Set memory that oozie:launcher map task takes to 256MB - change (analytics/refinery)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Set memory that oozie:launcher map task takes to 256MB
..


Set memory that oozie:launcher map task takes to 256MB

This will hopefully allow for more room in the oozie launcher queue.
These mappers aren't doing much other than managing the submission of other 
apps.
A single oozie mapper currently asks for 3G of memory.

Change-Id: Iad74080f7521388e4c0a4333f7d9a4061daf7ed9
---
M oozie/mediacounts/archive/coordinator.xml
M oozie/mediacounts/archive/workflow.xml
M oozie/mediacounts/load/coordinator.xml
M oozie/mediacounts/load/workflow.xml
M oozie/mobile_apps/uniques/daily/coordinator.xml
M oozie/mobile_apps/uniques/daily/workflow.xml
M oozie/mobile_apps/uniques/monthly/coordinator.xml
M oozie/mobile_apps/uniques/monthly/workflow.xml
M oozie/pagecounts-all-sites/load/coordinator.xml
M oozie/pagecounts-all-sites/load/workflow.xml
M oozie/util/archive_job_output/workflow.xml
M oozie/util/hive/partition/add/workflow.xml
M oozie/webrequest/legacy_tsvs/bundle.xml
M oozie/webrequest/legacy_tsvs/coordinator_bits.xml
M oozie/webrequest/legacy_tsvs/coordinator_bits_misc_mobile_text.xml
M oozie/webrequest/legacy_tsvs/coordinator_misc.xml
M oozie/webrequest/legacy_tsvs/coordinator_mobile.xml
M oozie/webrequest/legacy_tsvs/coordinator_mobile_text.xml
M oozie/webrequest/legacy_tsvs/coordinator_mobile_text_upload.xml
M oozie/webrequest/legacy_tsvs/coordinator_text.xml
M oozie/webrequest/legacy_tsvs/coordinator_upload.xml
M oozie/webrequest/legacy_tsvs/workflow.xml
M oozie/webrequest/load/bundle.xml
M oozie/webrequest/load/check_sequence_statistics_workflow.xml
M oozie/webrequest/load/coordinator.xml
M oozie/webrequest/load/workflow.xml
M oozie/webrequest/refine/bundle.xml
M oozie/webrequest/refine/coordinator.xml
M oozie/webrequest/refine/workflow.xml
29 files changed, 199 insertions(+), 0 deletions(-)

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



diff --git a/oozie/mediacounts/archive/coordinator.xml 
b/oozie/mediacounts/archive/coordinator.xml
index 3399ecc..1bbd67c 100644
--- a/oozie/mediacounts/archive/coordinator.xml
+++ b/oozie/mediacounts/archive/coordinator.xml
@@ -15,6 +15,10 @@
 oozie_launcher_queue_name
 oozie
 
+
+oozie_launcher_memory
+256
+
 
 
 name_node
diff --git a/oozie/mediacounts/archive/workflow.xml 
b/oozie/mediacounts/archive/workflow.xml
index 4f083fb..cd9791f 100644
--- a/oozie/mediacounts/archive/workflow.xml
+++ b/oozie/mediacounts/archive/workflow.xml
@@ -12,6 +12,16 @@
 oozie
 
 
+oozie_launcher_memory
+256
+
+
+
+oozie_launcher_memory
+256
+
+
+
 extra_filter
 none
 
@@ -92,6 +102,11 @@
 ${oozie_launcher_queue_name}
 
 
+oozie.launcher.mapreduce.map.memory.mb
+${oozie_launcher_memory}
+
+
+
 mapreduce.job.queuename
 ${queue_name}
 
diff --git a/oozie/mediacounts/load/coordinator.xml 
b/oozie/mediacounts/load/coordinator.xml
index 9e29af4..5f1f750 100644
--- a/oozie/mediacounts/load/coordinator.xml
+++ b/oozie/mediacounts/load/coordinator.xml
@@ -15,6 +15,11 @@
 oozie_launcher_queue_name
 oozie
 
+
+oozie_launcher_memory
+256
+
+
 
 
 name_node
diff --git a/oozie/mediacounts/load/workflow.xml 
b/oozie/mediacounts/load/workflow.xml
index 4884260..d5306de 100644
--- a/oozie/mediacounts/load/workflow.xml
+++ b/oozie/mediacounts/load/workflow.xml
@@ -11,6 +11,11 @@
 oozie_launcher_queue_name
 oozie
 
+
+oozie_launcher_memory
+256
+
+
 
 
 name_node
@@ -72,6 +77,11 @@
 ${oozie_launcher_queue_name}
 
 
+oozie.launcher.mapreduce.map.memory.mb
+${oozie_launcher_memory}
+
+
+
 mapreduce.job.queuename
 ${queue_name}
 
diff --git a/oozie/mobile_apps/uniques/daily/coordinator.xml 
b/oozie/mobile_apps/uniques/daily/coordinator.xml
index 803e871..2f5c98d 100644
--- a/oozie/mobile_apps/uniques/daily/coordinator.xml
+++ b/oozie/mobile_apps/uniques/daily/coordinator.xml
@@ -13,6 +13,11 @@
 oozie_launcher_queue_name
 oozie
 
+
+oozie_launcher_memory
+256
+
+
 
 
 name_node
diff --git a/oozie/mobile_apps/uniques/daily/workflow.xml 
b/oozie/mobile_apps/uniques/daily/workflow.xml
index 1948794..5922e2d 100644
--- a/oozi

[MediaWiki-commits] [Gerrit] dynamicproxy: Add ferm rules for http / https - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Add ferm rules for http / https
..


dynamicproxy: Add ferm rules for http / https

Bug: T96335
Change-Id: I441bb25f91a4436c79d36771d82432d5186f262f
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index 2f09f9a..f43dd80 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -115,4 +115,16 @@
 diamond::collector { 'Redis':
 require => Class['::redis::client::python'],
 }
+
+ferm::service{ 'http':
+proto => 'tcp',
+port  => '80',
+desc  => 'HTTP webserver for the entire world',
+}
+
+ferm::service{ 'https':
+proto => 'tcp',
+port  => '443',
+desc  => 'HTTPS webserver for the entire world',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] tools: Explicitly open port for proxylistener - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Explicitly open port for proxylistener
..

tools: Explicitly open port for proxylistener

Bug: T96335
Change-Id: I7da34ffcbb13de1597c36f7186a389ed8bc9f6b3
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index fd2c5aa..54a5369 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -33,6 +33,13 @@
 source => 'puppet:///modules/toollabs/proxylistener.conf',
 }
 
+ferm::service { 'proxylistener-port':
+proto  => 'tcp',
+port   => '8282',
+srange => '$INTERNAL',
+desc   => 'Proxylistener port, open to just labs'
+}
+
 # Deploy root web.
 git::clone { 'labs/toollabs':
 ensure=> latest,

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

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

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

[MediaWiki-commits] [Gerrit] Act as a beta feature if so configured - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Act as a beta feature if so configured
..


Act as a beta feature if so configured

Add a configuration key, 'PopupsBetaFeature'. If true, Popups will act as a
beta-feature, and will depend on the BetaFeatures extension. Set to false by
default.

Bug: T88917
Bug: T88164
Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
(cherry picked from commit c7e057946d87d707bb8a79229ee09a0ceec10298)
---
M Popups.hooks.php
M Popups.php
2 files changed, 43 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Popups.hooks.php b/Popups.hooks.php
index 64b2c78..f945689 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -18,10 +18,15 @@
  * @file
  * @ingroup extensions
  */
+use MediaWiki\Logger\LoggerFactory;
 
 class PopupsHooks {
static function getPreferences( User $user, array &$prefs ){
global $wgExtensionAssetsPath;
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) !== true ) {
+   return;
+   }
 
$prefs['popups'] = array(
'label-message' => 'popups-message',
@@ -36,6 +41,17 @@
'javascript' => true,
),
);
+   }
+
+   /**
+* @return Config
+*/
+   public static function getConfig() {
+   static $config;
+   if ( !$config ) {
+   $config = 
ConfigFactory::getDefaultInstance()->makeConfig( 'popups' );
+   }
+   return $config;
}
 
/**
@@ -108,13 +124,28 @@
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin) {
// Enable only if the user has turned it on in Beta 
Preferences, or BetaFeatures is not installed.
// Will only be loaded if PageImages & TextExtracts extensions 
are installed.
-   if ( ( !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
-   && defined( 'TEXT_EXTRACTS_INSTALLED' )
-   && class_exists( 'ApiQueryPageImages' )
-   ) {
-   $out->addModules( array( 'ext.popups' ) );
-   $out->addModules( array( 'schema.Popups' ) );
+
+   if ( !defined( 'TEXT_EXTRACTS_INSTALLED' ) || !class_exists( 
'ApiQueryPageImages' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' );
+   $logger->error( 'Popups requires the PageImages and 
TextExtracts extensions.' );
+   return true;
}
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) === true ) {
+   if ( !class_exists( 'BetaFeatures' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' 
);
+   $logger->error( 'PopupsMode cannot be used as a 
beta feature unless ' .
+   'the 
BetaFeatures extension is present.' );
+   return true;
+   }
+   if ( !BetaFeatures::isFeatureEnabled( $skin->getUser(), 
'popups' ) ) {
+   return true;
+   }
+   }
+
+   $out->addModules( array( 'ext.popups', 'schema.Popups' ) );
+
+   return true;
}
 
/**
diff --git a/Popups.php b/Popups.php
index f6d9cf3..e2a9312 100644
--- a/Popups.php
+++ b/Popups.php
@@ -33,6 +33,12 @@
'license-name' => 'GPL-2.0+',
 );
 
+/**
+ * @var bool: Whether the extension should be enabled as an opt-in beta 
feature.
+ * If true, the BetaFeatures extension must be installed. False by default.
+ */
+$wgPopupsBetaFeature = false;
+
 $wgPopupsSurveyLink = false;
 $wgConfigRegistry['popups'] = 'GlobalVarConfig::newInstance';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Werdna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Act as a beta feature if so configured - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Act as a beta feature if so configured
..


Act as a beta feature if so configured

Add a configuration key, 'PopupsBetaFeature'. If true, Popups will act as a
beta-feature, and will depend on the BetaFeatures extension. Set to false by
default.

Bug: T88917
Bug: T88164
Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
(cherry picked from commit c7e057946d87d707bb8a79229ee09a0ceec10298)
---
M Popups.hooks.php
M Popups.php
2 files changed, 43 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Popups.hooks.php b/Popups.hooks.php
index 64b2c78..f945689 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -18,10 +18,15 @@
  * @file
  * @ingroup extensions
  */
+use MediaWiki\Logger\LoggerFactory;
 
 class PopupsHooks {
static function getPreferences( User $user, array &$prefs ){
global $wgExtensionAssetsPath;
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) !== true ) {
+   return;
+   }
 
$prefs['popups'] = array(
'label-message' => 'popups-message',
@@ -36,6 +41,17 @@
'javascript' => true,
),
);
+   }
+
+   /**
+* @return Config
+*/
+   public static function getConfig() {
+   static $config;
+   if ( !$config ) {
+   $config = 
ConfigFactory::getDefaultInstance()->makeConfig( 'popups' );
+   }
+   return $config;
}
 
/**
@@ -108,13 +124,28 @@
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin) {
// Enable only if the user has turned it on in Beta 
Preferences, or BetaFeatures is not installed.
// Will only be loaded if PageImages & TextExtracts extensions 
are installed.
-   if ( ( !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
-   && defined( 'TEXT_EXTRACTS_INSTALLED' )
-   && class_exists( 'ApiQueryPageImages' )
-   ) {
-   $out->addModules( array( 'ext.popups' ) );
-   $out->addModules( array( 'schema.Popups' ) );
+
+   if ( !defined( 'TEXT_EXTRACTS_INSTALLED' ) || !class_exists( 
'ApiQueryPageImages' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' );
+   $logger->error( 'Popups requires the PageImages and 
TextExtracts extensions.' );
+   return true;
}
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) === true ) {
+   if ( !class_exists( 'BetaFeatures' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' 
);
+   $logger->error( 'PopupsMode cannot be used as a 
beta feature unless ' .
+   'the 
BetaFeatures extension is present.' );
+   return true;
+   }
+   if ( !BetaFeatures::isFeatureEnabled( $skin->getUser(), 
'popups' ) ) {
+   return true;
+   }
+   }
+
+   $out->addModules( array( 'ext.popups', 'schema.Popups' ) );
+
+   return true;
}
 
/**
diff --git a/Popups.php b/Popups.php
index f6d9cf3..e2a9312 100644
--- a/Popups.php
+++ b/Popups.php
@@ -33,6 +33,12 @@
'license-name' => 'GPL-2.0+',
 );
 
+/**
+ * @var bool: Whether the extension should be enabled as an opt-in beta 
feature.
+ * If true, the BetaFeatures extension must be installed. False by default.
+ */
+$wgPopupsBetaFeature = false;
+
 $wgPopupsSurveyLink = false;
 $wgConfigRegistry['popups'] = 'GlobalVarConfig::newInstance';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.26wmf1
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Werdna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Act as a beta feature if so configured - change (mediawiki...Popups)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Act as a beta feature if so configured
..

Act as a beta feature if so configured

Add a configuration key, 'PopupsBetaFeature'. If true, Popups will act as a
beta-feature, and will depend on the BetaFeatures extension. Set to false by
default.

Bug: T88917
Bug: T88164
Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
(cherry picked from commit c7e057946d87d707bb8a79229ee09a0ceec10298)
---
M Popups.hooks.php
M Popups.php
2 files changed, 43 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/87/204687/1

diff --git a/Popups.hooks.php b/Popups.hooks.php
index 64b2c78..f945689 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -18,10 +18,15 @@
  * @file
  * @ingroup extensions
  */
+use MediaWiki\Logger\LoggerFactory;
 
 class PopupsHooks {
static function getPreferences( User $user, array &$prefs ){
global $wgExtensionAssetsPath;
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) !== true ) {
+   return;
+   }
 
$prefs['popups'] = array(
'label-message' => 'popups-message',
@@ -36,6 +41,17 @@
'javascript' => true,
),
);
+   }
+
+   /**
+* @return Config
+*/
+   public static function getConfig() {
+   static $config;
+   if ( !$config ) {
+   $config = 
ConfigFactory::getDefaultInstance()->makeConfig( 'popups' );
+   }
+   return $config;
}
 
/**
@@ -108,13 +124,28 @@
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin) {
// Enable only if the user has turned it on in Beta 
Preferences, or BetaFeatures is not installed.
// Will only be loaded if PageImages & TextExtracts extensions 
are installed.
-   if ( ( !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
-   && defined( 'TEXT_EXTRACTS_INSTALLED' )
-   && class_exists( 'ApiQueryPageImages' )
-   ) {
-   $out->addModules( array( 'ext.popups' ) );
-   $out->addModules( array( 'schema.Popups' ) );
+
+   if ( !defined( 'TEXT_EXTRACTS_INSTALLED' ) || !class_exists( 
'ApiQueryPageImages' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' );
+   $logger->error( 'Popups requires the PageImages and 
TextExtracts extensions.' );
+   return true;
}
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) === true ) {
+   if ( !class_exists( 'BetaFeatures' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' 
);
+   $logger->error( 'PopupsMode cannot be used as a 
beta feature unless ' .
+   'the 
BetaFeatures extension is present.' );
+   return true;
+   }
+   if ( !BetaFeatures::isFeatureEnabled( $skin->getUser(), 
'popups' ) ) {
+   return true;
+   }
+   }
+
+   $out->addModules( array( 'ext.popups', 'schema.Popups' ) );
+
+   return true;
}
 
/**
diff --git a/Popups.php b/Popups.php
index f6d9cf3..e2a9312 100644
--- a/Popups.php
+++ b/Popups.php
@@ -33,6 +33,12 @@
'license-name' => 'GPL-2.0+',
 );
 
+/**
+ * @var bool: Whether the extension should be enabled as an opt-in beta 
feature.
+ * If true, the BetaFeatures extension must be installed. False by default.
+ */
+$wgPopupsBetaFeature = false;
+
 $wgPopupsSurveyLink = false;
 $wgConfigRegistry['popups'] = 'GlobalVarConfig::newInstance';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Werdna 

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

[MediaWiki-commits] [Gerrit] Act as a beta feature if so configured - change (mediawiki...Popups)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Act as a beta feature if so configured
..

Act as a beta feature if so configured

Add a configuration key, 'PopupsBetaFeature'. If true, Popups will act as a
beta-feature, and will depend on the BetaFeatures extension. Set to false by
default.

Bug: T88917
Bug: T88164
Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
(cherry picked from commit c7e057946d87d707bb8a79229ee09a0ceec10298)
---
M Popups.hooks.php
M Popups.php
2 files changed, 43 insertions(+), 6 deletions(-)


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

diff --git a/Popups.hooks.php b/Popups.hooks.php
index 64b2c78..f945689 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -18,10 +18,15 @@
  * @file
  * @ingroup extensions
  */
+use MediaWiki\Logger\LoggerFactory;
 
 class PopupsHooks {
static function getPreferences( User $user, array &$prefs ){
global $wgExtensionAssetsPath;
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) !== true ) {
+   return;
+   }
 
$prefs['popups'] = array(
'label-message' => 'popups-message',
@@ -36,6 +41,17 @@
'javascript' => true,
),
);
+   }
+
+   /**
+* @return Config
+*/
+   public static function getConfig() {
+   static $config;
+   if ( !$config ) {
+   $config = 
ConfigFactory::getDefaultInstance()->makeConfig( 'popups' );
+   }
+   return $config;
}
 
/**
@@ -108,13 +124,28 @@
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin) {
// Enable only if the user has turned it on in Beta 
Preferences, or BetaFeatures is not installed.
// Will only be loaded if PageImages & TextExtracts extensions 
are installed.
-   if ( ( !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
-   && defined( 'TEXT_EXTRACTS_INSTALLED' )
-   && class_exists( 'ApiQueryPageImages' )
-   ) {
-   $out->addModules( array( 'ext.popups' ) );
-   $out->addModules( array( 'schema.Popups' ) );
+
+   if ( !defined( 'TEXT_EXTRACTS_INSTALLED' ) || !class_exists( 
'ApiQueryPageImages' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' );
+   $logger->error( 'Popups requires the PageImages and 
TextExtracts extensions.' );
+   return true;
}
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) === true ) {
+   if ( !class_exists( 'BetaFeatures' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' 
);
+   $logger->error( 'PopupsMode cannot be used as a 
beta feature unless ' .
+   'the 
BetaFeatures extension is present.' );
+   return true;
+   }
+   if ( !BetaFeatures::isFeatureEnabled( $skin->getUser(), 
'popups' ) ) {
+   return true;
+   }
+   }
+
+   $out->addModules( array( 'ext.popups', 'schema.Popups' ) );
+
+   return true;
}
 
/**
diff --git a/Popups.php b/Popups.php
index f6d9cf3..e2a9312 100644
--- a/Popups.php
+++ b/Popups.php
@@ -33,6 +33,12 @@
'license-name' => 'GPL-2.0+',
 );
 
+/**
+ * @var bool: Whether the extension should be enabled as an opt-in beta 
feature.
+ * If true, the BetaFeatures extension must be installed. False by default.
+ */
+$wgPopupsBetaFeature = false;
+
 $wgPopupsSurveyLink = false;
 $wgConfigRegistry['popups'] = 'GlobalVarConfig::newInstance';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.26wmf1
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Werdna 

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

[MediaWiki-commits] [Gerrit] Act as a beta feature if so configured - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Act as a beta feature if so configured
..


Act as a beta feature if so configured

Add a configuration key, 'PopupsBetaFeature'. If true, Popups will act as a
beta-feature, and will depend on the BetaFeatures extension. Set to false by
default.

Bug: T88917
Bug: T88164
Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
---
M Popups.hooks.php
M Popups.php
2 files changed, 43 insertions(+), 6 deletions(-)

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



diff --git a/Popups.hooks.php b/Popups.hooks.php
index 64b2c78..f945689 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -18,10 +18,15 @@
  * @file
  * @ingroup extensions
  */
+use MediaWiki\Logger\LoggerFactory;
 
 class PopupsHooks {
static function getPreferences( User $user, array &$prefs ){
global $wgExtensionAssetsPath;
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) !== true ) {
+   return;
+   }
 
$prefs['popups'] = array(
'label-message' => 'popups-message',
@@ -36,6 +41,17 @@
'javascript' => true,
),
);
+   }
+
+   /**
+* @return Config
+*/
+   public static function getConfig() {
+   static $config;
+   if ( !$config ) {
+   $config = 
ConfigFactory::getDefaultInstance()->makeConfig( 'popups' );
+   }
+   return $config;
}
 
/**
@@ -108,13 +124,28 @@
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin) {
// Enable only if the user has turned it on in Beta 
Preferences, or BetaFeatures is not installed.
// Will only be loaded if PageImages & TextExtracts extensions 
are installed.
-   if ( ( !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
-   && defined( 'TEXT_EXTRACTS_INSTALLED' )
-   && class_exists( 'ApiQueryPageImages' )
-   ) {
-   $out->addModules( array( 'ext.popups' ) );
-   $out->addModules( array( 'schema.Popups' ) );
+
+   if ( !defined( 'TEXT_EXTRACTS_INSTALLED' ) || !class_exists( 
'ApiQueryPageImages' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' );
+   $logger->error( 'Popups requires the PageImages and 
TextExtracts extensions.' );
+   return true;
}
+
+   if ( self::getConfig()->get( 'PopupsBetaFeature' ) === true ) {
+   if ( !class_exists( 'BetaFeatures' ) ) {
+   $logger = LoggerFactory::getInstance( 'popups' 
);
+   $logger->error( 'PopupsMode cannot be used as a 
beta feature unless ' .
+   'the 
BetaFeatures extension is present.' );
+   return true;
+   }
+   if ( !BetaFeatures::isFeatureEnabled( $skin->getUser(), 
'popups' ) ) {
+   return true;
+   }
+   }
+
+   $out->addModules( array( 'ext.popups', 'schema.Popups' ) );
+
+   return true;
}
 
/**
diff --git a/Popups.php b/Popups.php
index f6d9cf3..e2a9312 100644
--- a/Popups.php
+++ b/Popups.php
@@ -33,6 +33,12 @@
'license-name' => 'GPL-2.0+',
 );
 
+/**
+ * @var bool: Whether the extension should be enabled as an opt-in beta 
feature.
+ * If true, the BetaFeatures extension must be installed. False by default.
+ */
+$wgPopupsBetaFeature = false;
+
 $wgPopupsSurveyLink = false;
 $wgConfigRegistry['popups'] = 'GlobalVarConfig::newInstance';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4cc455fa6379dbc8ef700e4773bedfb49fcf813
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Werdna 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Se4598 
Gerrit-Reviewer: Werdna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Add ferm rules for http / https - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: dynamicproxy: Add ferm rules for http / https
..

dynamicproxy: Add ferm rules for http / https

Bug: T96335
Change-Id: I441bb25f91a4436c79d36771d82432d5186f262f
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/204685/1

diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index e618238..d1fd02c 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -97,4 +97,16 @@
 diamond::collector { 'Redis':
 require => Class['::redis::client::python'],
 }
+
+ferm::service{ 'http':
+proto => 'tcp',
+port  => '80',
+desc  => 'HTTP webserver for the entire world',
+}
+
+ferm::service{ 'https':
+proto => 'tcp',
+port  => '443',
+desc  => 'HTTPS webserver for the entire world',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] Add sqlite3 and pixz utilities on html dumps host - change (operations/puppet)

[GWicke (Code Review)]

GWicke has uploaded a new change for review.

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

Change subject: Add sqlite3 and pixz utilities on html dumps host
..

Add sqlite3 and pixz utilities on html dumps host

- The sqlite3 commandline tool is useful to inspect dump databases / verify
  correctness.
- pixz is used for multi-threaded lzma compression

Change-Id: I9ca5273261e08c4f75d1ec46747303b75c2337b1
---
M modules/dumps/manifests/zim.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/204684/1

diff --git a/modules/dumps/manifests/zim.pp b/modules/dumps/manifests/zim.pp
index 08ecd25..ece8c67 100644
--- a/modules/dumps/manifests/zim.pp
+++ b/modules/dumps/manifests/zim.pp
@@ -5,7 +5,7 @@
 ensure => present,
 }
 
-package { [ 'nodejs', 'nodejs-legacy', 'libsqlite3-0' ]:
+package { [ 'nodejs', 'nodejs-legacy', 'libsqlite3-0', 'sqlite3', 'pixz' ]:
 ensure => present,
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Fetch Storage from ManagerGroup every time - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Fetch Storage from ManagerGroup every time
..

Fetch Storage from ManagerGroup every time

Caching the storage object internally breaks the ManagerGroup's
cached list of managers that have been used since the last
ManagerGroup::clear() operation.  Just call it directly each time.

Change-Id: Ia4782d553fa07c45518871ea74ccffd8cc93fdba
---
M includes/Collection/AbstractCollection.php
1 file changed, 3 insertions(+), 12 deletions(-)


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

diff --git a/includes/Collection/AbstractCollection.php 
b/includes/Collection/AbstractCollection.php
index 4db16dc..320af64 100644
--- a/includes/Collection/AbstractCollection.php
+++ b/includes/Collection/AbstractCollection.php
@@ -20,11 +20,6 @@
protected $uuid;
 
/**
-* @var \Flow\Data\ObjectManager[]
-*/
-   protected $storage = array();
-
-   /**
 * Array of revisions for this object.
 *
 * @var AbstractRevision[]
@@ -100,13 +95,9 @@
$class = $this->getRevisionClass();
}
 
-   if ( !isset( $this->storage[$class] ) ) {
-   /** @var ManagerGroup $storage */
-   $storage = Container::get( 'storage' );
-   $this->storage[$class] = $storage->getStorage( $class );
-   }
-
-   return $this->storage[$class];
+   /** @var ManagerGroup $storage */
+   $storage = Container::get( 'storage' );
+   return $storage->getStorage( $class );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4782d553fa07c45518871ea74ccffd8cc93fdba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Return listpages results in query object - change (mediawiki...Gather)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Return listpages results in query object
..


Return listpages results in query object

All tests pass and api use already expects pages to be wrapped
in query object.

bug: T94124
Change-Id: I41cd540c3faa4de0be3da5e619c0f9c9cdeb2b05
---
M includes/api/ApiQueryListPages.php
M tests/phpunit/api/GatherTests.php
2 files changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/includes/api/ApiQueryListPages.php 
b/includes/api/ApiQueryListPages.php
index 767c031..197c6b0 100644
--- a/includes/api/ApiQueryListPages.php
+++ b/includes/api/ApiQueryListPages.php
@@ -41,8 +41,11 @@
  */
 class ApiQueryListPages extends ApiQueryGeneratorBase {
 
+   private $modulePath;
+
public function __construct( ApiQuery $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'lsp' );
+   $this->modulePath = array( 'query', $this->getModuleName() );
}
 
public function execute() {
@@ -114,9 +117,8 @@
$titles = $this->queryListItems( $params, 
$isGenerator );
}
}
-
if ( !$isGenerator ) {
-   $this->getResult()->setIndexedTagName_internal( 
$this->getModuleName(), 'wr' );
+   $this->getResult()->setIndexedTagName_internal( 
$this->modulePath, 'wr' );
} else {
$resultPageSet->populateFromTitles( $titles );
}
@@ -159,7 +161,7 @@
if ( !$isGenerator ) {
$vals = array();
ApiQueryBase::addTitleInfo( $vals, $t );
-   $fit = $this->getResult()->addValue( 
$this->getModuleName(), null, $vals );
+   $fit = $this->getResult()->addValue( 
$this->modulePath, null, $vals );
if ( !$fit ) {
$this->setContinueEnumParameter( 
'continue', $row->gli_order );
break;
@@ -225,7 +227,7 @@
if ( !$isGenerator ) {
$vals = array();
ApiQueryBase::addTitleInfo( $vals, $t );
-   $fit = $this->getResult()->addValue( 
$this->getModuleName(), null, $vals );
+   $fit = $this->getResult()->addValue( 
$this->modulePath, null, $vals );
if ( !$fit ) {
$this->setContinueEnumParameter( 
'continue', $row->wl_namespace . '|' . $row->wl_title );
break;
diff --git a/tests/phpunit/api/GatherTests.php 
b/tests/phpunit/api/GatherTests.php
index 4ac4fbc..c403dbe 100644
--- a/tests/phpunit/api/GatherTests.php
+++ b/tests/phpunit/api/GatherTests.php
@@ -1056,6 +1056,6 @@
private function assertPages( $message, $u, $id, $expected ) {
$params = $id === null ? '{}' : '"lspid":' . $id;
$res = $this->getPages( $message, $u, $params );
-   $this->getVal( $message, '"listpages"', $res, $expected );
+   $this->getVal( $message, '"query", "listpages"', $res, 
$expected );
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41cd540c3faa4de0be3da5e619c0f9c9cdeb2b05
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Robmoen 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] added asset tag mgmt dns for db2052-db2070 - change (operations/dns)

[Papaul (Code Review)]

Papaul has uploaded a new change for review.

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

Change subject: added asset tag  mgmt dns for db2052-db2070
..

added asset tag  mgmt dns for db2052-db2070

Change-Id: I3a3f14a8586553a25f17df04956b56cfc2370f54
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 38 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/82/204682/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index d0b2b5d..f41c6d1 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3632,24 +3632,43 @@
 139 1H IN PTR  db2051.mgmt.codfw.wmnet.
 139 1H IN PTR  wmf6270.mgmt.codfw.wmnet.
 140 1H IN PTR  db2052.mgmt.codfw.wmnet.
+140 1H IN PTR  wmf6276.mgmt.codfw.wmnet.
 141 1H IN PTR  db2053.mgmt.codfw.wmnet.
+141 1H IN PTR  wmf6277.mgmt.codfw.wmnet.
 142 1H IN PTR  db2054.mgmt.codfw.wmnet.
+142 1H IN PTR  wmf6278.mgmt.codfw.wmnet.
 143 1H IN PTR  db2055.mgmt.codfw.wmnet.
+143 1H IN PTR  wmf6279.mgmt.codfw.wmnet.
 144 1H IN PTR  db2056.mgmt.codfw.wmnet.
+144 1H IN PTR  wmf6280.mgmt.codfw.wmnet.
 145 1H IN PTR  db2057.mgmt.codfw.wmnet.
+145 1H IN PTR  wmf6281.mgmt.codfw.wmnet.
 146 1H IN PTR  db2058.mgmt.codfw.wmnet.
+146 1H IN PTR  wmf6282.mgmt.codfw.wmnet.
 147 1H IN PTR  db2059.mgmt.codfw.wmnet.
+147 1H IN PTR  wmf6283.mgmt.codfw.wmnet.
 148 1H IN PTR  db2060.mgmt.codfw.wmnet.
+148 1H IN PTR  wmf6284.mgmt.codfw.wmnet.
 149 1H IN PTR  db2061.mgmt.codfw.wmnet.
+149 1H IN PTR  wmf6285.mgmt.codfw.wmnet.
 150 1H IN PTR  db2062.mgmt.codfw.wmnet.
+150 1H IN PTR  wmf6286.mgmt.codfw.wmnet.
 151 1H IN PTR  db2063.mgmt.codfw.wmnet.
+151 1H IN PTR  wmf6287.mgmt.codfw.wmnet.
 152 1H IN PTR  db2064.mgmt.codfw.wmnet.
+152 1H IN PTR  wmf6288.mgmt.codfw.wmnet.
 153 1H IN PTR  db2065.mgmt.codfw.wmnet.
+153 1H IN PTR  wmf6289.mgmt.codfw.wmnet.
 154 1H IN PTR  db2066.mgmt.codfw.wmnet.
+154 1H IN PTR  wmf6290.mgmt.codfw.wmnet.
 155 1H IN PTR  db2067.mgmt.codfw.wmnet.
+155 1H IN PTR  wmf6291.mgmt.codfw.wmnet.
 156 1H IN PTR  db2068.mgmt.codfw.wmnet.
+156 1H IN PTR  wmf6292.mgmt.codfw.wmnet.
 157 1H IN PTR  db2069.mgmt.codfw.wmnet.
+157 1H IN PTR  wmf6293.mgmt.codfw.wmnet.
 158 1H IN PTR  db2070.mgmt.codfw.wmnet.
+158 1H IN PTR  wmf6294.mgmt.codfw.wmnet.
 159 1H IN PTR  rdb2001.mgmt.codfw.wmnet.
 159 1H IN PTR  WMF6271.mgmt.codfw.wmnet.
 160 1H IN PTR  rdb2002.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 01f5e36..baece0c 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3205,6 +3205,25 @@
 WMF6272 1H  IN A10.193.2.160
 WMF6273 1H  IN A10.193.2.161
 WMF6274 1H  IN A10.193.2.162
+WMF6276 1H  IN A10.193.2.140
+WMF6277 1H  IN A10.193.2.141
+WMF6278 1H  IN A10.193.2.142
+WMF6279 1H  IN A10.193.2.143
+WMF6280 1H  IN A10.193.2.144
+WMF6281 1H  IN A10.193.2.145
+WMF6282 1H  IN A10.193.2.146
+WMF6283 1H  IN A10.193.2.147
+WMF6284 1H  IN A10.193.2.148
+WMF6285 1H  IN A10.193.2.149
+WMF6286 1H  IN A10.193.2.150
+WMF6287 1H  IN A10.193.2.151
+WMF6288 1H  IN A10.193.2.152
+WMF6289 1H  IN A10.193.2.153
+WMF6290 1H  IN A10.193.2.154
+WMF6291 1H  IN A10.193.2.155
+WMF6292 1H  IN A10.193.2.156
+WMF6293 1H  IN A10.193.2.157
+WMF6294 1H  IN A10.193.2.158
 WMF6295 1H  IN A10.193.2.165
 WMF6296 1H  IN A10.193.2.166
 WMF6297 1H  IN A10.193.2.167

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Use mw-ui-icon in stable - change (mediawiki...MobileFrontend)

[Kaldari (Code Review)]

Kaldari has submitted this change and it was merged.

Change subject: Hygiene: Use mw-ui-icon in stable
..


Hygiene: Use mw-ui-icon in stable

* Make the bold switchover!
* Keep some css rules around where cached HTML might need those classes -
this only applies to hamburger icon and search when JS disabled

Bug: T95619
Bug: T91178
Bug: T52326
Change-Id: I5b46c433a08ca92d6e432a84ca78d8083595b785
---
M includes/MobileUI.php
M includes/Resources.php
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
M javascripts/Icon.js
M javascripts/init.js
M javascripts/modules/mainMenu/MainMenu.js
M less/Overlay.less
M less/drawer.less
M less/icons.less
M less/mainmenu.less
M less/modules/editor/editor.less
M less/modules/issues.less
M less/modules/references.less
M less/modules/toc/toc.less
M less/modules/toggle.less
M less/modules/uploads/PhotoUploaderButton.less
M less/pagelist.less
D less/specials/images/refresh.png
M less/specials/mobilediff.less
M less/specials/nearby.less
M less/specials/pagefeed.less
M less/specials/userprofile.less
M less/spinner.less
M less/tablet/common.less
M less/ui.less
26 files changed, 62 insertions(+), 483 deletions(-)

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



diff --git a/includes/MobileUI.php b/includes/MobileUI.php
index 9f07ebb..81e7f1d 100644
--- a/includes/MobileUI.php
+++ b/includes/MobileUI.php
@@ -19,16 +19,9 @@
 * @return string class name for use with HTML element
 */
public static function iconClass( $iconName, $iconType = 'element', 
$additionalClassNames = '' ) {
-   $ctx = MobileContext::singleton();
-   if ( $ctx->isBetaGroupMember() ) {
-   $base = 'mw-ui-icon';
-   $modifiers = 'mw-ui-icon-' . $iconType;
-   $modifiers .= ' mw-ui-icon-' . $iconName;
-   } else {
-   $base = 'icon';
-   $modifiers = $iconType === 'before' ? 'icon-text' : '';
-   $modifiers .= ' icon-' . $iconName;
-   }
+   $base = 'mw-ui-icon';
+   $modifiers = 'mw-ui-icon-' . $iconType;
+   $modifiers .= ' mw-ui-icon-' . $iconName;
return $base . ' ' . $modifiers . ' ' . $additionalClassNames;
}
 
diff --git a/includes/Resources.php b/includes/Resources.php
index bd224b5..83cb262 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -37,7 +37,9 @@
'less/pageactions.less',
'less/footer.less',
'less/common.less',
+   // FIXME: Remove and rename iconsNew when the cache has 
cleared
'less/icons.less',
+   'less/iconsNew.less',
'less/mainpage.less',
),
),
@@ -70,11 +72,6 @@
'styles' => array(
'less/tablet/common.less',
'less/tablet/hacks.less',
-   ),
-   ),
-   'skins.minerva.icons.styles' => $wgMFResourceFileModuleBoilerplate + 
array(
-   'styles' => array(
-   'less/iconsNew.less',
),
),
'skins.minerva.icons.images' => $wgMFResourceFileModuleBoilerplate + 
array(
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 705250e..303af28 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -988,6 +988,8 @@
'skins.minerva.content.styles',
'skins.minerva.drawers.styles',
'skins.minerva.tablet.styles',
+   'mediawiki.ui.icon',
+   'skins.minerva.icons.images',
// FIXME: This module should be loaded by any special 
page that needs it, not here
'mobile.pagelist.styles',
);
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index 1e40856..8f30066 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -137,9 +137,6 @@
 */
protected function getSkinStyles() {
$styles = parent::getSkinStyles();
-   $styles[] = 'mediawiki.ui.icon';
-   $styles[] = 'skins.minerva.icons.styles';
-   $styles[] = 'skins.minerva.icons.images';
$styles[] = 'skins.minerva.beta.styles';
$styles[] = 'skins.minerva.beta.images';
 
diff --git a/javascripts/Icon.js b/javascripts/Icon.js
index 1aa11eb..a0801df 100644
--- a/javascripts/Icon.js
+++ b/javascripts/Icon.js
@@ -1,8 +1,6 @@
 ( function ( M, $ ) {
 
var View = M.require( 'View' ),
-   context = M.requ

[MediaWiki-commits] [Gerrit] Hygiene: Remove dormant icon classes - change (mediawiki...MobileFrontend)

[Kaldari (Code Review)]

Kaldari has submitted this change and it was merged.

Change subject: Hygiene: Remove dormant icon classes
..


Hygiene: Remove dormant icon classes

These no longer do anything now mw-ui-icon is in stable

Change-Id: I9c07b9836a78cc9d74a07d07ef52c745fdce797b
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
M includes/specials/MobileSpecialPageFeed.php
M includes/specials/SpecialMobileContributions.php
M javascripts/modules/references/ReferencesDrawerBeta.js
M javascripts/modules/toggling/init.js
M javascripts/modules/watchstar/Watchstar.js
8 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Kaldari: Looks good to me, approved
  Phuedx: Looks good to me, approved



diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 4c2ec11..4ae58cc 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -47,7 +47,7 @@
$this->makeSearchButton(
'fulltext',
array(
-   'class' => 'fulltext-search no-js-only 
icon icon-search',
+   'class' => 'fulltext-search no-js-only',
)
) .
Html::closeElement( 'form' );
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 303af28..403e530 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -553,7 +553,7 @@
array(
'text' => wfMessage( 
'mobile-frontend-main-menu-login' )->escaped(),
'href' => $url,
-   'class' => MobileUI::iconClass( 
'anonymous-white', 'before', 'icon-anon' ),
+   'class' => MobileUI::iconClass( 
'anonymous-white', 'before' ),
'data-event-name' => 'login',
),
),
@@ -780,7 +780,7 @@
if ( $this->isAllowedPageAction( 'edit' ) ) {
$menu['edit'] = array( 'id' => 'ca-edit', 'text' => '',
'itemtitle' => $this->msg( 
'mobile-frontend-pageaction-edit-tooltip' ),
-   'class' => MobileUI::iconClass( 'edit', 
'element', 'icon-32px hidden' ),
+   'class' => MobileUI::iconClass( 'edit', 
'element', 'hidden' ),
);
}
 
@@ -791,7 +791,7 @@
) {
$menu['photo'] = array( 'id' => 'ca-upload', 'text' => 
'',
'itemtitle' => $this->msg( 
'mobile-frontend-pageaction-upload-tooltip' ),
-   'class' => MobileUI::iconClass( 'addimage', 
'element', 'icon-32px hidden' ),
+   'class' => MobileUI::iconClass( 'addimage', 
'element', 'hidden' ),
);
}
 
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index 8f30066..5c6ab86 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -121,7 +121,7 @@
$buttons['talk'] = array(
'attributes' => array(
'href' => $talkTitle->getLinkURL(),
-   'class' =>  MobileUI::iconClass( 
'talk', 'before', 'talk icon-32px' ),
+   'class' =>  MobileUI::iconClass( 
'talk', 'before', 'talk' ),
'data-title' => 
$talkTitle->getFullText(),
),
'label' => $talkButton,
diff --git a/includes/specials/MobileSpecialPageFeed.php 
b/includes/specials/MobileSpecialPageFeed.php
index f4e793b..6837704 100644
--- a/includes/specials/MobileSpecialPageFeed.php
+++ b/includes/specials/MobileSpecialPageFeed.php
@@ -85,9 +85,9 @@
$lang = $this->getLanguage();
 
if ( $isAnon ) {
-   $usernameClass = MobileUI::iconClass( 'anonymous', 
'before', 'icon-16px mw-mf-user mw-mf-anon' );
+   $usernameClass = MobileUI::iconClass( 'anonymous', 
'before', 'mw-mf-user mw-mf-anon' );
} else {
-   $usernameClass = MobileUI::iconClass( 'user', 'before', 
'icon-16px mw-mf-user' );
+   $usernameClass = MobileUI::iconClass( 'user', 'before', 
'mw-mf-user' );
}
 
$html = Html::openElement( 'li', array( 'class' => 
'page-summary' ) );
diff --git a/inc

[MediaWiki-commits] [Gerrit] Hygiene: Refactor how watchstar works - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Refactor how watchstar works
..


Hygiene: Refactor how watchstar works

It should be agnostic to the way the icon is implemented

Change-Id: Ic758078428812c353b4c7d7ef507715ee6514645
---
M javascripts/modules/watchstar/Watchstar.js
M less/modules/watchstar.less
2 files changed, 4 insertions(+), 18 deletions(-)

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



diff --git a/javascripts/modules/watchstar/Watchstar.js 
b/javascripts/modules/watchstar/Watchstar.js
index 42422eb..202209d 100644
--- a/javascripts/modules/watchstar/Watchstar.js
+++ b/javascripts/modules/watchstar/Watchstar.js
@@ -11,7 +11,7 @@
} ),
watchedIcon = new Icon( {
name: 'watched',
-   additionalClassNames: 'icon-32px watch-this-article'
+   additionalClassNames: 'icon-32px watch-this-article 
watched'
} ),
toast = M.require( 'toast' ),
user = M.require( 'user' ),
@@ -87,7 +87,7 @@
postRender: function ( options ) {
var self = this,
unwatchedClass = watchIcon.getGlyphClassName(),
-   watchedClass = watchedIcon.getGlyphClassName(),
+   watchedClass = watchedIcon.getGlyphClassName() 
+ ' watched',
page = options.page,
$el = self.$el;
 
diff --git a/less/modules/watchstar.less b/less/modules/watchstar.less
index b5e1e3c..478b773 100644
--- a/less/modules/watchstar.less
+++ b/less/modules/watchstar.less
@@ -1,24 +1,10 @@
 @import "minerva.variables";
 @import "minerva.mixins";
 
-@watchThisArticleSize: 48px;
-
-// watchlist and search results
-.page-list .watch-this-article {
-   position: absolute;
-   right: 0;
-   top: 50%;
-   margin-top: -(@watchThisArticleSize / 2);
-   width: @watchThisArticleSize;
-}
-
 .animations {
-   .mw-ui-icon.watch-this-article,
-   .icon.watch-this-article {
+   .watch-this-article {
.transition-transform( .5s );
-
-   &.mw-ui-icon-watched,
-   &.icon-watched {
+   &.watched {
.transform( rotate(72deg) );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic758078428812c353b4c7d7ef507715ee6514645
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add url Special:Gather/id/{id} number - change (mediawiki...Gather)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Add url Special:Gather/id/{id} number
..

Add url Special:Gather/id/{id} number

This is needed to make CheckUser / Special:Log work better and
more cleanly.

Change-Id: I2b7331b8c5ff72abfd5c2f1903b058c6fa1bf4ea
---
M includes/specials/SpecialGather.php
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/79/204679/1

diff --git a/includes/specials/SpecialGather.php 
b/includes/specials/SpecialGather.php
index 8d2755c..2cdd4af 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -58,7 +58,11 @@
} else {
$this->renderUserCollectionsList( $user );
}
-
+   } elseif ( preg_match( '/^id\/(?\d+)$/', $subpage, $matches 
) ) {
+   // Collection page
+   // /id/:id
+   $id = (int)$matches['id'];
+   $this->renderUserCollection( $id );
} elseif ( preg_match( '/^by\/(?[^\/]+)\/(?\d+)$/', 
$subpage, $matches ) ) {
// Collection page
// /by/:user/:id
@@ -69,7 +73,7 @@
// Invalid user
$this->renderError( new views\NotFound() );
} else {
-   $this->renderUserCollection( $user, $id );
+   $this->renderUserCollection( $id );
}
 
} elseif ( preg_match( '/^all(\/(?[^\/]+))?\/?$/', 
$subpage, $matches ) ) {
@@ -106,14 +110,15 @@
 * @param User $user collection owner
 * @param int $id collection id
 */
-   public function renderUserCollection( User $user, $id ) {
+   public function renderUserCollection( $id ) {
if ( !is_int( $id ) ) {
throw new InvalidArgumentException(
__METHOD__ . ' requires the second parameter to 
be an integer, '
. gettype( $id ) . ' given.'
);
}
-   $collection = models\Collection::newFromApi( $id, $user, 
$this->getRequest()->getValues() );
+   $collection = models\Collection::newFromApi( $id, null,
+   $this->getRequest()->getValues() );
 
if ( $collection === null ||
// If collection is private and current user doesn't 
own it

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b7331b8c5ff72abfd5c2f1903b058c6fa1bf4ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Write log entries for showlist and hidelist to Special:Log - change (mediawiki...Gather)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Write log entries for showlist and hidelist to Special:Log
..

Write log entries for showlist and hidelist to Special:Log

http://localhost:/w/index.php?title=Special%3ALog&type=&user=&page=special%3AGather&pattern=1
will now show hidelist and showlist actions.
* Also clean up some broken data - invalid url and irrelevant parameter
left over from testing.

Bug: T95250
Change-Id: I8f27acd82916ab799277a4fce21e7b9d407afab7
---
M includes/api/ApiEditList.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/80/204680/1

diff --git a/includes/api/ApiEditList.php b/includes/api/ApiEditList.php
index 361992f..05cc51e 100644
--- a/includes/api/ApiEditList.php
+++ b/includes/api/ApiEditList.php
@@ -150,17 +150,20 @@
// If CheckUser installed, give it a heads up
if ( is_callable( '\CheckUserHooks::updateCheckUserData' ) ) {
$user = $this->getUser();
-   $target = SpecialPage::getTitleFor( 'Gather' 
)->getSubPage( 'by' )
-   ->getSubPage( $user->getName() )->getSubPage( 
$id  );
+   $target = SpecialPage::getTitleFor( 'Gather' 
)->getSubPage( 'id' )
+   ->getSubPage( $id  );
$entry = new ManualLogEntry( 'gather', 'action' );
$entry->setPerformer( $user );
$entry->setTarget( $target );
$params = array(
-   'username' => 'bob',
'action' => $action,
);
$entry->setParameters( $params );
$rc = $entry->getRecentChange();
+   // Surface hide and unhide actions in Special:Log
+   if ( $action === 'hidelist' || $action === 'showlist' ) 
{
+   $entry->insert();
+   }
\CheckUserHooks::updateCheckUserData( $rc );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f27acd82916ab799277a4fce21e7b9d407afab7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Code cleanup in XMLSerializer: cb --> accum + style fixes - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Code cleanup in XMLSerializer: cb --> accum + style fixes
..


Code cleanup in XMLSerializer: cb --> accum + style fixes

Change-Id: I56030c27e531f901cd91f4fbd0e71e4829acfd39
---
M lib/XMLSerializer.js
1 file changed, 34 insertions(+), 34 deletions(-)

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



diff --git a/lib/XMLSerializer.js b/lib/XMLSerializer.js
index afcc03f..77bbed3 100644
--- a/lib/XMLSerializer.js
+++ b/lib/XMLSerializer.js
@@ -1,22 +1,22 @@
 /**
  * Stand-alone XMLSerializer for DOM3 documents
  */
-"use strict";
+'use strict';
 
-var htmlns = 'http://www.w3.org/1999/xhtml',
+var htmlns = 'http://www.w3.org/1999/xhtml';
// nodeType constants
-   ELEMENT_NODE = 1,
-   ATTRIBUTE_NODE = 2,
-   TEXT_NODE = 3,
-   CDATA_SECTION_NODE = 4,
-   ENTITY_REFERENCE_NODE = 5,
-   ENTITY_NODE = 6,
-   PROCESSING_INSTRUCTION_NODE = 7,
-   COMMENT_NODE = 8,
-   DOCUMENT_NODE = 9,
-   DOCUMENT_TYPE_NODE = 10,
-   DOCUMENT_FRAGMENT_NODE = 11,
-   NOTATION_NODE = 12;
+var ELEMENT_NODE = 1;
+var ATTRIBUTE_NODE = 2;
+var TEXT_NODE = 3;
+var CDATA_SECTION_NODE = 4;
+var ENTITY_REFERENCE_NODE = 5;
+var ENTITY_NODE = 6;
+var PROCESSING_INSTRUCTION_NODE = 7;
+var COMMENT_NODE = 8;
+var DOCUMENT_NODE = 9;
+var DOCUMENT_TYPE_NODE = 10;
+var DOCUMENT_FRAGMENT_NODE = 11;
+var NOTATION_NODE = 12;
 
 /**
  * HTML5 void elements
@@ -78,7 +78,7 @@
}
 }
 
-function serializeToString(node, options, cb) {
+function serializeToString(node, options, accum) {
var child;
switch (node.nodeType){
case ELEMENT_NODE:
@@ -87,7 +87,7 @@
var len = attrs.length;
var nodeName = node.tagName.toLowerCase(),
localName = node.localName;
-   cb('<' + localName);
+   accum('<' + localName);
for (var i = 0;i < len;i++) {
var attr = attrs.item(i),
singleQuotes, doubleQuotes,
@@ -97,16 +97,16 @@
(attr.value.match(/"/g) || []).length >
(attr.value.match(/'/g) || []).length) {
// use single quotes
-   cb(' ' + attr.name + "='"
+   accum(' ' + attr.name + "='"
+ attr.value.replace(/[<&']/g, 
_xmlEncoder) + "'");
} else {
// use double quotes
-   cb(' ' + attr.name + '="'
+   accum(' ' + attr.name + '="'
+ attr.value.replace(/[<&"]/g, 
_xmlEncoder) + '"');
}
}
if (child || !emptyElements[nodeName]) {
-   cb('>');
+   accum('>');
// if is cdata child node
if (hasRawContent[nodeName]) {
// TODO: perform context-sensitive escaping?
@@ -117,7 +117,7 @@
// * < to \3c in 

[MediaWiki-commits] [Gerrit] API: Update ApiTag, fix error handling - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: API: Update ApiTag, fix error handling
..


API: Update ApiTag, fix error handling

Change I7b37295e didn't get rebased to take into account the new ApiTag
module added the same day. So update it now.

Also fix some errors in error handling noticed while testing this
update.

Bug: T96251
Bug: T96252
Change-Id: If8b63af91547e117b9d7d88e2ec9739131ee09b7
---
M includes/api/ApiTag.php
1 file changed, 10 insertions(+), 11 deletions(-)

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



diff --git a/includes/api/ApiTag.php b/includes/api/ApiTag.php
index fcf0ac1..527c6cb 100644
--- a/includes/api/ApiTag.php
+++ b/includes/api/ApiTag.php
@@ -40,26 +40,25 @@
 
// validate and process each revid, rcid and logid
$this->requireAtLeastOneParameter( $params, 'revid', 'rcid', 
'logid' );
-   $result = $this->getResult();
$ret = array();
if ( $params['revid'] ) {
foreach ( $params['revid'] as $id ) {
-   $ret[] = $this->processIndividual( 'revid', 
$params, $id, $result );
+   $ret[] = $this->processIndividual( 'revid', 
$params, $id );
}
}
if ( $params['rcid'] ) {
foreach ( $params['rcid'] as $id ) {
-   $ret[] = $this->processIndividual( 'rcid', 
$params, $id, $result );
+   $ret[] = $this->processIndividual( 'rcid', 
$params, $id );
}
}
if ( $params['logid'] ) {
foreach ( $params['logid'] as $id ) {
-   $ret[] = $this->processIndividual( 'logid', 
$params, $id, $result );
+   $ret[] = $this->processIndividual( 'logid', 
$params, $id );
}
}
 
-   $result->setIndexedTagName( $ret, 'result' );
-   $result->addValue( null, $this->getModuleName(), $ret );
+   ApiResult::setIndexedTagName( $ret, 'result' );
+   $this->getResult()->addValue( null, $this->getModuleName(), 
$ret );
}
 
protected static function validateLogId( $logid ) {
@@ -69,7 +68,7 @@
return (bool)$result;
}
 
-   protected function processIndividual( $type, $params, $id, &$result ) {
+   protected function processIndividual( $type, $params, $id ) {
$idResult = array( $type => $id );
 
// validate the ID
@@ -102,11 +101,11 @@
$this->getUser() );
 
if ( !$status->isOK() ) {
-   if ( $status->hasWarning( 'actionthrottledtext' ) ) {
+   if ( $status->hasMessage( 'actionthrottledtext' ) ) {
$idResult['status'] = 'skipped';
} else {
$idResult['status'] = 'failure';
-   $ret['errors'] = $result->convertStatusToArray( 
$status, 'error' );
+   $idResult['errors'] = 
$this->getErrorFormatter()->arrayFromStatus( $status, 'error' );
}
} else {
$idResult['status'] = 'success';
@@ -115,9 +114,9 @@
} else {
$idResult['actionlogid'] = 
$status->value->logId;
$idResult['added'] = $status->value->addedTags;
-   $result->setIndexedTagName( $idResult['added'], 
't' );
+   ApiResult::setIndexedTagName( 
$idResult['added'], 't' );
$idResult['removed'] = 
$status->value->removedTags;
-   $result->setIndexedTagName( 
$idResult['removed'], 't' );
+   ApiResult::setIndexedTagName( 
$idResult['removed'], 't' );
}
}
return $idResult;

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

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

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

[MediaWiki-commits] [Gerrit] Use the Workflow mapper in UrlGenerator - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Use the Workflow mapper in UrlGenerator
..

Use the Workflow mapper in UrlGenerator

The UrlGenerator + Listener were building up a list of workflows
that are currently loaded, but that information is already stored
in the Workflow mapper.  Just use that instead.

Change-Id: If4877a985cf77b5588cbb12ad70b38846db6a37b
---
M autoload.php
M container.php
D includes/Data/Listener/UrlGenerationListener.php
M includes/UrlGenerator.php
4 files changed, 9 insertions(+), 57 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index 0fccd6b..40e1bae 100644
--- a/autoload.php
+++ b/autoload.php
@@ -75,7 +75,6 @@
'Flow\\Data\\Listener\\OccupationListener' => __DIR__ . 
'/includes/Data/Listener/OccupationListener.php',
'Flow\\Data\\Listener\\RecentChangesListener' => __DIR__ . 
'/includes/Data/Listener/RecentChangesListener.php',
'Flow\\Data\\Listener\\ReferenceRecorder' => __DIR__ . 
'/includes/Data/Listener/ReferenceRecorder.php',
-   'Flow\\Data\\Listener\\UrlGenerationListener' => __DIR__ . 
'/includes/Data/Listener/UrlGenerationListener.php',
'Flow\\Data\\Listener\\UserNameListener' => __DIR__ . 
'/includes/Data/Listener/UserNameListener.php',
'Flow\\Data\\Listener\\WorkflowTopicListListener' => __DIR__ . 
'/includes/Data/Listener/WorkflowTopicListListener.php',
'Flow\\Data\\ManagerGroup' => __DIR__ . 
'/includes/Data/ManagerGroup.php',
diff --git a/container.php b/container.php
index fc101ae..b008320 100644
--- a/container.php
+++ b/container.php
@@ -43,13 +43,8 @@
 };
 
 $c['url_generator'] = function( $c ) {
-   return new Flow\UrlGenerator();
-};
-// listener is attached to storage.workflow, it
-// notifies the url generator about all loaded workflows.
-$c['listener.url_generator'] = function( $c ) {
-   return new Flow\Data\Listener\UrlGenerationListener(
-   $c['url_generator']
+   return new Flow\UrlGenerator(
+   $c['storage.workflow.mapper']
);
 };
 
@@ -207,7 +202,6 @@
 $c['storage.workflow.listeners'] = function( $c ) {
return array(
'listener.occupation' => $c['listener.occupation'],
-   'listener.url_generator' => $c['listener.url_generator'],
'storage.workflow.listeners.topiclist' => 
$c['storage.workflow.listeners.topiclist'],
);
 };
diff --git a/includes/Data/Listener/UrlGenerationListener.php 
b/includes/Data/Listener/UrlGenerationListener.php
deleted file mode 100644
index 706341d..000
--- a/includes/Data/Listener/UrlGenerationListener.php
+++ /dev/null
@@ -1,36 +0,0 @@
-urlGenerator = $urlGenerator;
-   }
-
-   public function onAfterLoad( $object, array $old ) {
-   if ( $object instanceof Workflow ) {
-   $this->urlGenerator->withWorkflow( $object );
-   }
-   }
-
-   public function onAfterInsert( $object, array $new, array $metadata ) {
-   if ( $object instanceof Workflow ) {
-   $this->urlGenerator->withWorkflow( $object );
-   }
-   }
-}
diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index 4bcb8d2..5304e73 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -23,16 +23,9 @@
  * Anchor instances..
  */
 class UrlGenerator {
-   /**
-* @var Workflow[] Map from alphadecimal workflow id to Workflow 
instance
-*/
-   protected $workflows = array();
 
-   /**
-* @param Workflow $workflow
-*/
-   public function withWorkflow( Workflow $workflow ) {
-   $this->workflows[$workflow->getId()->getAlphadecimal()] = 
$workflow;
+   public function __construct( CachingObjectMapper $workflowMapper ) {
+   $this->workflowMapper = $workflowMapper;
}
 
/**
@@ -50,11 +43,13 @@
}
 
$alpha = $workflowId->getAlphadecimal();
-   if ( !isset( $this->workflows[$alpha] ) ) {
+   $workflow = $this->workflowMapper->get( array(
+   'workflow_id' => $alpha,
+   ) );
+   if ( $workflow === null ) {
throw new InvalidInputException( 'Unloaded workflow:' . 
$alpha, 'invalid-workflow' );
}
-
-   return $this->workflows[$alpha]->getArticleTitle();
+   return $workflow->getArticleTitle();
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4877a985cf77b5588cbb12ad70b38846db6a37b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master

[MediaWiki-commits] [Gerrit] Add an onAfterClear data event - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Add an onAfterClear data event
..

Add an onAfterClear data event

Listeners can trigger various data to load and stay loaded.  This new
onAfterClear() event allows listeners to clear that out so when we
clear an ObjectManager we are removing as much old cruft from memory
as possible.

Change-Id: I1eff6195b9d2f2401ecad4bb2529c41ac61761ea
---
M includes/Collection/CollectionCache.php
M includes/Data/Index/FeatureIndex.php
M includes/Data/LifecycleHandler.php
M includes/Data/Listener/AbstractListener.php
M includes/Data/Listener/DeferredInsertLifecycleHandler.php
M includes/Data/Listener/UserNameListener.php
M includes/Data/ObjectManager.php
M includes/Repository/UserNameBatch.php
8 files changed, 35 insertions(+), 0 deletions(-)


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

diff --git a/includes/Collection/CollectionCache.php 
b/includes/Collection/CollectionCache.php
index 58089ef..074c3bb 100644
--- a/includes/Collection/CollectionCache.php
+++ b/includes/Collection/CollectionCache.php
@@ -58,6 +58,10 @@
return $revision->getCollectionId()->getAlphadecimal() . '-' . 
$revision->getRevisionType() . '-last-rev';
}
 
+   public function onAfterClear() {
+   $this->lastRevCache = new MapCacheLRU( self::LAST_REV_CACHE_MAX 
);
+   }
+
public function onAfterInsert( $object, array $new, array $metadata ) {
if ( $object instanceof AbstractRevision ) {
$this->lastRevCache->clear( $this->getLastRevCacheKey( 
$object ) );
diff --git a/includes/Data/Index/FeatureIndex.php 
b/includes/Data/Index/FeatureIndex.php
index 8d56cfd..61dc07d 100644
--- a/includes/Data/Index/FeatureIndex.php
+++ b/includes/Data/Index/FeatureIndex.php
@@ -360,6 +360,13 @@
/**
 * {@inheritDoc}
 */
+   public function onAfterClear() {
+   // nothing to do
+   }
+
+   /**
+* {@inheritDoc}
+*/
public function find( array $attributes, array $options = array() ) {
$results = $this->findMulti( array( $attributes ), $options );
return reset( $results );
diff --git a/includes/Data/LifecycleHandler.php 
b/includes/Data/LifecycleHandler.php
index b1ee3a8..2c0612d 100644
--- a/includes/Data/LifecycleHandler.php
+++ b/includes/Data/LifecycleHandler.php
@@ -11,4 +11,5 @@
function onAfterInsert( $object, array $new, array $metadata );
function onAfterUpdate( $object, array $old, array $new, array 
$metadata );
function onAfterRemove( $object, array $old, array $metadata );
+   function onAfterClear();
 }
diff --git a/includes/Data/Listener/AbstractListener.php 
b/includes/Data/Listener/AbstractListener.php
index 62637b0..079f70a 100644
--- a/includes/Data/Listener/AbstractListener.php
+++ b/includes/Data/Listener/AbstractListener.php
@@ -40,4 +40,10 @@
 */
public function onAfterInsert( $revision, array $row, array $metadata ) 
{
}
+
+   /**
+* {@inheritDoc}
+*/
+   public function onAfterClear() {
+   }
 }
diff --git a/includes/Data/Listener/DeferredInsertLifecycleHandler.php 
b/includes/Data/Listener/DeferredInsertLifecycleHandler.php
index 23332fb..02c16f3 100644
--- a/includes/Data/Listener/DeferredInsertLifecycleHandler.php
+++ b/includes/Data/Listener/DeferredInsertLifecycleHandler.php
@@ -63,4 +63,9 @@
public function onAfterLoad( $object, array $old ) {
$this->nested->onAfterLoad( $object, $old );
}
+
+   public function onAfterClear() {
+   // Not clearing $this->queue, this is not data but actual code
+   // that needs to be run.
+   }
 }
diff --git a/includes/Data/Listener/UserNameListener.php 
b/includes/Data/Listener/UserNameListener.php
index abb70c9..7655c1e 100644
--- a/includes/Data/Listener/UserNameListener.php
+++ b/includes/Data/Listener/UserNameListener.php
@@ -33,6 +33,10 @@
}
}
 
+   public function onAfterClear() {
+   $this->batch->clear();
+   }
+
/**
 * Load any user ids in $row into the username batch
 */
diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php
index 7e604d5..ab1a36b 100644
--- a/includes/Data/ObjectManager.php
+++ b/includes/Data/ObjectManager.php
@@ -100,6 +100,9 @@
public function clear() {
$this->loaded = new SplObjectStorage;
$this->mapper->clear();
+   foreach ( $this->lifecycleHandlers as $handler ) {
+   $handler->onAfterClear();
+   }
}
 
/**
diff --git a/includes/Repository/UserNameBatch.php 
b/includes/Repository/UserNameBatch.php
index 72a0448..e3a86ee 1006

[MediaWiki-commits] [Gerrit] Add an AbstractListener base class - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Add an AbstractListener base class
..

Add an AbstractListener base class

Most of these listeners have some unimplemented methods that they
don't need.  Instead of having all these empty methods, and adding
new empty methods for any new events, just inherit from a base class.

Change-Id: I9da02f2667d5d85d1c28443f87e08e53aa0628c6
---
M autoload.php
M includes/Collection/CollectionCache.php
A includes/Data/Listener/AbstractListener.php
M includes/Data/Listener/EditCountListener.php
M includes/Data/Listener/ModerationLoggingListener.php
M includes/Data/Listener/NotificationListener.php
M includes/Data/Listener/OccupationListener.php
M includes/Data/Listener/RecentChangesListener.php
M includes/Data/Listener/ReferenceRecorder.php
M includes/Data/Listener/UrlGenerationListener.php
M includes/Data/Listener/UserNameListener.php
M includes/Data/Listener/WatchTopicListener.php
M includes/Data/Listener/WorkflowTopicListListener.php
13 files changed, 56 insertions(+), 101 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index 314947b..0fccd6b 100644
--- a/autoload.php
+++ b/autoload.php
@@ -65,6 +65,7 @@
'Flow\\Data\\Index\\TopicHistoryIndex' => __DIR__ . 
'/includes/Data/Index/TopicHistoryIndex.php',
'Flow\\Data\\Index\\UniqueFeatureIndex' => __DIR__ . 
'/includes/Data/Index/UniqueFeatureIndex.php',
'Flow\\Data\\LifecycleHandler' => __DIR__ . 
'/includes/Data/LifecycleHandler.php',
+   'Flow\\Data\\Listener\\AbstractListener' => __DIR__ . 
'/includes/Data/Listener/AbstractListener.php',
'Flow\\Data\\Listener\\AbstractTopicInsertListener' => __DIR__ . 
'/includes/Data/Listener/WatchTopicListener.php',
'Flow\\Data\\Listener\\DeferredInsertLifecycleHandler' => __DIR__ . 
'/includes/Data/Listener/DeferredInsertLifecycleHandler.php',
'Flow\\Data\\Listener\\EditCountListener' => __DIR__ . 
'/includes/Data/Listener/EditCountListener.php',
diff --git a/includes/Collection/CollectionCache.php 
b/includes/Collection/CollectionCache.php
index b05b95b..58089ef 100644
--- a/includes/Collection/CollectionCache.php
+++ b/includes/Collection/CollectionCache.php
@@ -2,7 +2,7 @@
 
 namespace Flow\Collection;
 
-use Flow\Data\LifecycleHandler;
+use Flow\Data\Listener\AbstractListener;
 use Flow\Model\AbstractRevision;
 use MapCacheLRU;
 
@@ -11,7 +11,7 @@
  * insert/update/remove to keep the internal cache up to date and reduce
  * requests deeper into the stack.
  */
-class CollectionCache implements LifecycleHandler {
+class CollectionCache extends AbstractListener {
 
/**
 * Max to cache collection's last revision
@@ -57,8 +57,6 @@
protected function getLastRevCacheKey( AbstractRevision $revision ) {
return $revision->getCollectionId()->getAlphadecimal() . '-' . 
$revision->getRevisionType() . '-last-rev';
}
-
-   public function onAfterLoad( $object, array $row ) {}
 
public function onAfterInsert( $object, array $new, array $metadata ) {
if ( $object instanceof AbstractRevision ) {
diff --git a/includes/Data/Listener/AbstractListener.php 
b/includes/Data/Listener/AbstractListener.php
new file mode 100644
index 000..62637b0
--- /dev/null
+++ b/includes/Data/Listener/AbstractListener.php
@@ -0,0 +1,43 @@
+actions = $actions;
-   }
-
-   public function onAfterLoad( $object, array $old ) {
-   // Nuthin
}
 
public function onAfterInsert( $revision, array $new, array $metadata ) 
{
@@ -32,13 +27,5 @@
if ( $increase ) {
$revision->getUser()->incEditCount();
}
-   }
-
-   public function onAfterUpdate( $object, array $old, array $new, array 
$metadata ) {
-   // Nuthin
-   }
-
-   public function onAfterRemove( $object, array $old, array $metadata ) {
-   // Nuthin
}
 }
diff --git a/includes/Data/Listener/ModerationLoggingListener.php 
b/includes/Data/Listener/ModerationLoggingListener.php
index a243a96..3748ca9 100644
--- a/includes/Data/Listener/ModerationLoggingListener.php
+++ b/includes/Data/Listener/ModerationLoggingListener.php
@@ -2,13 +2,12 @@
 
 namespace Flow\Data\Listener;
 
-use Flow\Data\LifecycleHandler;
 use Flow\Log\ModerationLogger;
 use Flow\Model\AbstractRevision;
 use Flow\Model\PostRevision;
 use Flow\Model\Workflow;
 
-class ModerationLoggingListener implements LifecycleHandler {
+class ModerationLoggingListener extends AbstractListener {
 
/**
 * @var ModerationLogger
@@ -28,18 +27,6 @@
if ( $object instanceof PostRevision ) {
$this->log( $object, $metadata['workflow'] );
}
-   }
-
-   func

[MediaWiki-commits] [Gerrit] coal: pass a materialized list to numpy.median - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: coal: pass a materialized list to numpy.median
..

coal: pass a materialized list to numpy.median

numpy.median() doesn't like generator inputs.

Change-Id: I9ed218ed27acc32897239778617fec78433e542f
---
M modules/webperf/files/coal
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/204674/1

diff --git a/modules/webperf/files/coal b/modules/webperf/files/coal
index 642f131..b4ad7dd 100755
--- a/modules/webperf/files/coal
+++ b/modules/webperf/files/coal
@@ -198,7 +198,8 @@
 def current_value(self):
 """Returns a copy of the list of items in the window."""
 self.prune()
-return self.aggregate(value for timestamp, value in self.heap)
+values = [value for timestamp, value in self.heap]
+return self.aggregate(values)
 
 
 if __name__ == '__main__':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ed218ed27acc32897239778617fec78433e542f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] coal: pass a materialized list to numpy.median - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: coal: pass a materialized list to numpy.median
..


coal: pass a materialized list to numpy.median

numpy.median() doesn't like generator inputs.

Change-Id: I9ed218ed27acc32897239778617fec78433e542f
---
M modules/webperf/files/coal
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/webperf/files/coal b/modules/webperf/files/coal
index 642f131..b4ad7dd 100755
--- a/modules/webperf/files/coal
+++ b/modules/webperf/files/coal
@@ -198,7 +198,8 @@
 def current_value(self):
 """Returns a copy of the list of items in the window."""
 self.prune()
-return self.aggregate(value for timestamp, value in self.heap)
+values = [value for timestamp, value in self.heap]
+return self.aggregate(values)
 
 
 if __name__ == '__main__':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ed218ed27acc32897239778617fec78433e542f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] API: Document parameter types - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: API: Document parameter types
..


API: Document parameter types

Two things here:
* Identify the parameter types when they're not simple strings (or
  already identified).
* Add a section to the 'main' module documentation that describes
  booleans and timestamp formats.

Bug: T93982
Bug: T47652
Change-Id: I67da4f4c026616eed5669256b208b03350e756c0
---
M includes/api/ApiHelp.php
M includes/api/ApiMain.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
4 files changed, 51 insertions(+), 7 deletions(-)

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



diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 00fc12e..1e30616 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -164,17 +164,17 @@
$old = $href;
$href = rawurldecode( $href );
} while ( $old !== $href );
-   if ( preg_match( '!Special:ApiHelp/([^&/|]+)!', $href, 
$m ) ) {
+   if ( preg_match( 
'!Special:ApiHelp/([^&/|#]+)((?:#.*)?)!', $href, $m ) ) {
if ( isset( $localModules[$m[1]] ) ) {
-   $href = '#' . $m[1];
+   $href = $m[2] === '' ? '#' . $m[1] : 
$m[2];
} elseif ( $helptitle !== null ) {
-   $href = Title::newFromText( 
str_replace( '$1', $m[1], $helptitle ) )
+   $href = Title::newFromText( 
str_replace( '$1', $m[1], $helptitle ) . $m[2] )
->getFullUrl();
} else {
$href = wfAppendQuery( wfScript( 'api' 
), array(
'action' => 'help',
'modules' => $m[1],
-   ) );
+   ) ) . $m[2];
}
$node->setAttribute( 'href', $href );
$node->removeAttribute( 'title' );
@@ -472,6 +472,8 @@

->params( $context->getLanguage()->commaList( $submodules ) )

->parse();

$hintPipeSeparated = false;
+   // No 
type message necessary, we have a list of values.
+   $type = 
null;
break;
 
case 
'namespace':
@@ -482,6 +484,8 @@

->params( $context->getLanguage()->commaList( $namespaces ) )

->parse();

$hintPipeSeparated = false;
+   // No 
type message necessary, we have a list of values.
+   $type = 
null;
break;
 
case 'limit':
@@ -524,7 +528,24 @@
case 'upload':
$info[] 
= $context->msg( 'api-help-param-upload' )

->parse();
+   // No 
type message necessary, api-help-param-upload should handle it.
+   $type = 
null;
break;
+
+   case 'string':
+   // 
Displaying a type message here would be useless.
+   $type = 
null;
+   break;
+   }
+   }
+
+   /

[MediaWiki-commits] [Gerrit] Update Gather to 1.26wmf2 HEAD - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update Gather to 1.26wmf2 HEAD
..


Update Gather to 1.26wmf2 HEAD

Change-Id: Id49f811923fb3e98f31f3010e387ab78f0e9035e
---
M extensions/Gather
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/Gather b/extensions/Gather
index 19e7bf0..0568ec8 16
--- a/extensions/Gather
+++ b/extensions/Gather
-Subproject commit 19e7bf06e0715f95b4173ef721defaec560a8437
+Subproject commit 0568ec80a25aa46b5efea07eee41683fa67b4828

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id49f811923fb3e98f31f3010e387ab78f0e9035e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
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] package_builder: Reflect rename of /etc/apt/preferences.d/wi... - change (operations/puppet)

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review.

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

Change subject: package_builder: Reflect rename of 
/etc/apt/preferences.d/wikimedia
..

package_builder: Reflect rename of /etc/apt/preferences.d/wikimedia

Change I1ebf184ccd7d4bf8575ca12d9fa51064147479c9 named apt preferences
consistently /etc/apt/preferences.d/*.pref, inter alia renaming
/etc/apt/preferences.d/wikimedia.  package_builder was created before
that change was merged.  This change updates it accordingly.

Change-Id: I422cdd9662519b1e7a2f979adaff3f4fce7a5e00
---
M modules/package_builder/templates/D01apt.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/package_builder/templates/D01apt.wikimedia.org.erb 
b/modules/package_builder/templates/D01apt.wikimedia.org.erb
index 9668c47..a9826ce 100644
--- a/modules/package_builder/templates/D01apt.wikimedia.org.erb
+++ b/modules/package_builder/templates/D01apt.wikimedia.org.erb
@@ -6,7 +6,7 @@
deb <%= @mirror %> <%= @distribution %>-wikimedia <%= @components %>
deb-src <%= @mirror %> <%= @distribution %>-wikimedia <%= @components %>
 EOF
-   cat > /etc/apt/preferences.d/wikimedia <<-'EOF'
+   cat > /etc/apt/preferences.d/wikimedia.pref <<-'EOF'
Package: *
Pin: release o=Wikimedia
Pin-Priority: 1001

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I422cdd9662519b1e7a2f979adaff3f4fce7a5e00
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] Update Gather to 1.26wmf2 HEAD - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Update Gather to 1.26wmf2 HEAD
..

Update Gather to 1.26wmf2 HEAD

Change-Id: Id49f811923fb3e98f31f3010e387ab78f0e9035e
---
M extensions/Gather
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/204672/1

diff --git a/extensions/Gather b/extensions/Gather
index 19e7bf0..0568ec8 16
--- a/extensions/Gather
+++ b/extensions/Gather
-Subproject commit 19e7bf06e0715f95b4173ef721defaec560a8437
+Subproject commit 0568ec80a25aa46b5efea07eee41683fa67b4828

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id49f811923fb3e98f31f3010e387ab78f0e9035e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Make Special:Gather show pages for that user - change (mediawiki...Gather)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Make Special:Gather show pages for that user
..


Make Special:Gather show pages for that user

We are checking if the parameter is empty but not if it is not set.
Whoops

Change-Id: Ib34244ee827a4fbd7d68d4367e554fc09cdafdff
(cherry picked from commit 6f20a8b69cc74afde53a2c09210cf566738c2c6d)
---
M includes/specials/SpecialGather.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialGather.php 
b/includes/specials/SpecialGather.php
index 36dcb03..1c4ce3b 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -40,7 +40,7 @@
'ext.gather.icons',
'ext.gather.styles',
) );
-   if ( $subpage === '' || $subpage === 'by' || $subpage === 'by/' 
) {
+   if ( !isset( $subpage ) || $subpage === '' || $subpage === 'by' 
|| $subpage === 'by/' ) {
// Root subpage. User owned collections.
// For listing own lists, you need to be logged in
$this->requireLogin( 'gather-anon-view-lists' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib34244ee827a4fbd7d68d4367e554fc09cdafdff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Jdlrobson 
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] Make Special:Gather show pages for that user - change (mediawiki...Gather)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Make Special:Gather show pages for that user
..

Make Special:Gather show pages for that user

We are checking if the parameter is empty but not if it is not set.
Whoops

Change-Id: Ib34244ee827a4fbd7d68d4367e554fc09cdafdff
(cherry picked from commit 6f20a8b69cc74afde53a2c09210cf566738c2c6d)
---
M includes/specials/SpecialGather.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/71/204671/1

diff --git a/includes/specials/SpecialGather.php 
b/includes/specials/SpecialGather.php
index 36dcb03..1c4ce3b 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -40,7 +40,7 @@
'ext.gather.icons',
'ext.gather.styles',
) );
-   if ( $subpage === '' || $subpage === 'by' || $subpage === 'by/' 
) {
+   if ( !isset( $subpage ) || $subpage === '' || $subpage === 'by' 
|| $subpage === 'by/' ) {
// Root subpage. User owned collections.
// For listing own lists, you need to be logged in
$this->requireLogin( 'gather-anon-view-lists' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib34244ee827a4fbd7d68d4367e554fc09cdafdff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Correct error handling for hide/show admin actions - change (mediawiki...Gather)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Correct error handling for hide/show admin actions
..

Correct error handling for hide/show admin actions

Bug: T96319
Change-Id: Ia167bc2b0c2ea2042e170809cd783dbb358f0e65
---
M resources/ext.gather.lists/init.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/70/204670/1

diff --git a/resources/ext.gather.lists/init.js 
b/resources/ext.gather.lists/init.js
index c92bab3..135f000 100644
--- a/resources/ext.gather.lists/init.js
+++ b/resources/ext.gather.lists/init.js
@@ -20,11 +20,11 @@
key = 'gather-lists-' + data.action + '-collection';
 
if ( window.confirm( mw.msg( key, data.label, data.owner ) ) ) {
-   api.setVisible( data.id, data.action === 'show' 
).always( function () {
+   api.setVisible( data.id, data.action === 'show' ).done( 
function () {
$button.closest( 'li' ).remove();
key = 'gather-lists-' + data.action + 
'-success-toast';
toast.show( mw.msg( key, data.label ), 'toast' 
);
-   }, function () {
+   } ).fail( function () {
key = 'gather-lists-' + data.action + 
'-failure-toast';
toast.show( mw.msg( key, data.label ), 'toast 
fail' );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia167bc2b0c2ea2042e170809cd783dbb358f0e65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Change how values/refs are handled - change (wikidata...rdf)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Change how values/refs are handled
..


Change how values/refs are handled

New approach goes as follows:
1. Collect the list of references and values linked to the entity
2. When munging, do not add statement for existing references/entities
3. Remove all references/entities mentioned by the new data from the list
4. Run the update for the statement data, deleting old statements
5. Run the delete query for non-connected references/values, taking them from 
the list in (3)

Change-Id: I0397dc10fb7fbaf0d11433c31728ed8e28f58d84
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
A 
tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.CleanUnused.sparql
A 
tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.GetRefs.sparql
A 
tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.GetValues.sparql
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.sync.sparql
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/UpdateBuilder.java
M 
tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/rdf/RdfRepositoryIntegrationTest.java
10 files changed, 209 insertions(+), 89 deletions(-)

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



diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 6f35f17..3882e59 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -11,6 +11,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -266,8 +267,14 @@
 return;
 }
 Collection statements = 
wikibase.fetchRdfForEntity(change.entityId());
-munger.munge(change.entityId(), statements);
+Set values = rdfRepository.getValues(change.entityId());
+Set refs = rdfRepository.getRefs(change.entityId());
+munger.munge(change.entityId(), statements, values, refs);
 rdfRepository.sync(change.entityId(), statements);
+List cleanupList = new ArrayList<>();
+cleanupList.addAll(values);
+cleanupList.addAll(refs);
+rdfRepository.cleanUnused(cleanupList);
 updateMeter.mark();
 }
 
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
index fcf573d..ccd2143 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -112,16 +113,34 @@
  * RDF exports into a more queryable form.
  *
  * @param statements statements to munge
+ * @param existingValues Existing value statements
+ * @param existingRefs Existing reference statements
  */
-public void munge(String entityId, Collection statements) 
throws ContainedException {
+public void munge(String entityId, Collection statements,
+  Collection existingValues, Collection existingRefs) 
throws ContainedException {
 if (statements.isEmpty()) {
 // Empty collection is a delete.
 return;
 }
-MungeOperation op = new MungeOperation(entityId, statements);
+MungeOperation op = new MungeOperation(entityId, statements, 
existingValues, existingRefs);
 op.munge();
+// remove all values that we have seen as they are used by statements
+existingValues.removeAll(op.extraValidSubjects);
+existingRefs.removeAll(op.extraValidSubjects);
 return;
 }
+
+/**
+ * Adds and removes entries from the statements collection to munge 
Wikibase
+ * RDF exports into a more queryable form.
+ *
+ * @param statements statements to munge
+ */
+@SuppressWarnings("unchecked")
+public void munge(String entityId, Collection statements) {
+munge(entityId, statements, Collections.EMPTY_SET, 
Collections.EMPTY_SET);
+}
+
 
 /**
  * Holds state during a single munge operation.
@@ -174,7 +193,10 @@
 private String subject;
 private String predicate;
 
-public MungeOperation(String entityId, Collection 
statements) {
+private final Collection

[MediaWiki-commits] [Gerrit] Remove $wgRUstart, unused - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove $wgRUstart, unused
..


Remove $wgRUstart, unused

Change-Id: Ia57f8fb2da4eed6b185ea0592d521e3119411f0e
---
M includes/WebStart.php
M includes/profiler/SectionProfiler.php
2 files changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/includes/WebStart.php b/includes/WebStart.php
index 9c71f3e..f97dc6a 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -78,7 +78,6 @@
 
 # Grab profiling functions
 require_once "$IP/includes/profiler/ProfilerFunctions.php";
-$wgRUstart = wfGetRusage() ?: array();
 
 # Start the autoloader, so that extensions can derive classes from core files
 require_once "$IP/includes/AutoLoader.php";
diff --git a/includes/profiler/SectionProfiler.php 
b/includes/profiler/SectionProfiler.php
index 245022d..bab8eba 100644
--- a/includes/profiler/SectionProfiler.php
+++ b/includes/profiler/SectionProfiler.php
@@ -451,15 +451,14 @@
}
 
/**
-* Get the initial time of the request, based either on $wgRequestTime 
or
-* $wgRUstart. Will return null if not able to find data.
+* Get the initial time of the request, based on getrusage()
 *
 * @param string|bool $metric Metric to use, with the following 
possibilities:
 *   - user: User CPU time (without system calls)
 *   - cpu: Total CPU time (user and system calls)
 *   - wall (or any other string): elapsed time
 *   - false (default): will fall back to default metric
-* @return float|null
+* @return float
 */
protected function getTime( $metric = 'wall' ) {
if ( $metric === 'cpu' || $metric === 'user' ) {

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

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

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

[MediaWiki-commits] [Gerrit] Update CentralAuth to 1.26wmf2 HEAD - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update CentralAuth to 1.26wmf2 HEAD
..


Update CentralAuth to 1.26wmf2 HEAD

Change-Id: Ibdda71c2048d50c52a79737af79edfed0636d2ea
---
M extensions/CentralAuth
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/CentralAuth b/extensions/CentralAuth
index 185a98f..5e8d0c5 16
--- a/extensions/CentralAuth
+++ b/extensions/CentralAuth
-Subproject commit 185a98f93a547e59740ab129f31c9503298d3493
+Subproject commit 5e8d0c5aa7c7b6041f5c436c9d40664aae5345ae

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdda71c2048d50c52a79737af79edfed0636d2ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
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] Add a mechanism to bundle for distribution - change (wikidata...rdf)

[Jdouglas (Code Review)]

Jdouglas has uploaded a new change for review.

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

Change subject: Add a mechanism to bundle for distribution
..

Add a mechanism to bundle for distribution

Fixes #T96148

This adds a new subproject that bundles everything into a nice little
package.  It also avoids the need to *mvn install* anything, as it gets
all its project references from the build, rather than from the local
Maven repo.

This makes redundant (and likely deprecates) the similar infrastructure
in *tools* which extracts the Blazegraph war, copies in the project
artifacts, and the shell scripts.  I've left that stuff alone for now,
since I'm not 100% certain it's no longer needed.  Either way, we can
prune it later as appropriate.

Change-Id: I144ecf4433c05e9223f208d7dec31d511eca13e5
---
A dist/README.md
A dist/pom.xml
A dist/src/assembly/dist.xml
A dist/src/script/RWStore.properties
A dist/src/script/runBlazegraph.sh
A dist/src/script/runUpdate.sh
M pom.xml
7 files changed, 191 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/69/204669/1

diff --git a/dist/README.md b/dist/README.md
new file mode 100644
index 000..4a0431c
--- /dev/null
+++ b/dist/README.md
@@ -0,0 +1,26 @@
+# Wikibase RDF Query Service
+
+## Installation
+
+To create a distributable artifact, tell Maven to package the parent project:
+
+```
+cd 
+mvn package
+```
+
+This handles all the prerequisites, and creates a distributable *.zip* package 
in *./dist/target/service-.zip*.  This package contains Blazegraph, 
Wikidata RDF Query extensions and libraries, and scripts to run both Blazegraph 
and the updater tool:
+
+```
+service-
+├── blazegraph/
+├── lib/
+├── jetty-runner-9.2.9.v20150224.jar
+├── runBlazegraph.sh
+├── runUpdate.sh
+└── RWStore.properties
+```
+
+Extract this package somewhere, and fire up Blazegraph with `runBlazegraph.sh`.
+
+Optionally extract this package somwhere else, and launch the updater tool via 
`./runUpdater.sh`.
diff --git a/dist/pom.xml b/dist/pom.xml
new file mode 100644
index 000..7ab554b
--- /dev/null
+++ b/dist/pom.xml
@@ -0,0 +1,66 @@
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+  
+org.wikidata.query.rdf
+parent
+0.0.1-SNAPSHOT
+  
+  service
+  pom
+
+  Wikibase RDF Query Service
+  Service to host Wikidata RDF Query Service.
+  
+
+  The Apache Software License, Version 2.0
+  http://www.apache.org/licenses/LICENSE-2.0.txt
+  repo
+
+  
+
+  
+
+  com.bigdata
+  bigdata
+  1.5.1
+  war
+
+
+  org.wikidata.query.rdf
+  common
+  ${project.parent.version}
+
+
+  org.wikidata.query.rdf
+  blazegraph
+  ${project.parent.version}
+
+
+  org.eclipse.jetty
+  jetty-runner
+  9.2.9.v20150224
+
+  
+ 
+  
+
+  
+org.apache.maven.plugins
+maven-assembly-plugin
+
+  src/assembly/dist.xml
+
+
+  
+package
+
+  single
+
+  
+
+  
+
+  
+
+
diff --git a/dist/src/assembly/dist.xml b/dist/src/assembly/dist.xml
new file mode 100644
index 000..398676e
--- /dev/null
+++ b/dist/src/assembly/dist.xml
@@ -0,0 +1,59 @@
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
+  dist
+
+  ${project.artifactId}-${pom.version}
+
+  
+zip
+  
+
+  
+
+
+  
+  ${project.basedir}/src/script
+
+
+
+  lib
+  ${project.basedir}/../tools/target
+  
+
wikidata-query-tools-0.0.1-SNAPSHOT-jar-with-dependencies.jar
+  
+
+
+  
+
+  
+
+
+  blazegraph
+  true
+  
+com.bigdata:bigdata:war
+  
+  false
+
+
+
+  blazegraph/WEB-INF/lib
+  
+${project.groupId}:*:jar
+  
+  false
+
+
+
+  
+  
+org.eclipse.jetty:jetty-runner:jar
+  
+  false
+
+
+  
+
+
diff --git a/dist/src/script/RWStore.properties 
b/dist/src/script/RWStore.properties
new file mode 100644
index 000..a41de06
--- /dev/null
+++ b/dist/src/script/RWStore.properties
@@ -0,0 +1,27 @@
+# Dump data in target.
+com.bigdata.journal.AbstractJournal.file=blazegraph.jnl
+com.bigdata.journal.AbstractJournal.bufferMode=DiskRW
+com.bigdata.service.AbstractTransactionService.minReleaseAge=1
+com.bigdata.btree.writeRetentionQueue.capacity=4000
+com.bigdata.btree.BTree.branchingFactor=128
+
+# Small (2M) initial extent for small test data.
+com.bigdata.journal

[MediaWiki-commits] [Gerrit] Update Gather to 1.26wmf2 HEAD - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update Gather to 1.26wmf2 HEAD
..


Update Gather to 1.26wmf2 HEAD

Change-Id: I45eb2c400425459fd025cbf9916fa5e10470f996
---
M extensions/Gather
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/Gather b/extensions/Gather
index 4db4b42..19e7bf0 16
--- a/extensions/Gather
+++ b/extensions/Gather
-Subproject commit 4db4b423bb9800f6149fcec74206aa2942160ec8
+Subproject commit 19e7bf06e0715f95b4173ef721defaec560a8437

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45eb2c400425459fd025cbf9916fa5e10470f996
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
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] Update CentralAuth to 1.26wmf1 HEAD - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update CentralAuth to 1.26wmf1 HEAD
..


Update CentralAuth to 1.26wmf1 HEAD

Change-Id: Id20e11784c23da2a14234cd521414c5da3332e86
---
M extensions/CentralAuth
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/CentralAuth b/extensions/CentralAuth
index 701ceb6..11433f1 16
--- a/extensions/CentralAuth
+++ b/extensions/CentralAuth
-Subproject commit 701ceb6e8f992642d981c0c3a8543523305d29ef
+Subproject commit 11433f131d47372aabf088166d484e859e2e6528

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id20e11784c23da2a14234cd521414c5da3332e86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf1
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] Support making collections private - change (mediawiki...Gather)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Support making collections private
..

Support making collections private

Bug: T94257
Change-Id: I2586b10807d3934ff6249336f518050e2f477424
---
M resources/ext.gather.api/CollectionsApi.js
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.collection.editor/content.hogan
3 files changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/68/204668/1

diff --git a/resources/ext.gather.api/CollectionsApi.js 
b/resources/ext.gather.api/CollectionsApi.js
index cb4a3fd..9c4b1dc 100644
--- a/resources/ext.gather.api/CollectionsApi.js
+++ b/resources/ext.gather.api/CollectionsApi.js
@@ -189,13 +189,16 @@
 * @param {Number} id unique identifier of collection
 * @param {String} title of collection
 * @param {String} description of collection
+* @param {Boolean} isPrivate whether it should be stored as 
private
+* @return {jQuery.Promise}
 */
-   editCollection: function ( id, title, description ) {
+   editCollection: function ( id, title, description, isPrivate ) {
return this.postWithToken( 'watch', {
action: 'editlist',
id: id,
label: title,
-   description: description
+   description: description,
+   perm: isPrivate ? 'private' : 'public'
} );
},
/**
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js 
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index 458a8cc..61b9083 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -190,13 +190,14 @@
onSaveClick: function () {
var title = this.$( 'input.title' ).val(),
self = this,
+   isPrivate = !this.$( '.privacy' ).is( 
':checked' );
description = this.$( '.description' ).val();
 
if ( this.isTitleValid( title ) && 
this.isDescriptionValid( description ) ) {
// disable button and inputs
this.showSpinner();
this.$( '.mw-ui-input, .save' ).prop( 
'disabled', true );
-   this.api.editCollection( this.id, title, 
description ).done( function () {
+   this.api.editCollection( this.id, title, 
description, isPrivate ).done( function () {
// Go back to the page we were and 
reload to avoid having to update the
// JavaScript state.
schema.log( {
diff --git a/resources/ext.gather.collection.editor/content.hogan 
b/resources/ext.gather.collection.editor/content.hogan
index f4226f0..f5e0378 100644
--- a/resources/ext.gather.collection.editor/content.hogan
+++ b/resources/ext.gather.collection.editor/content.hogan
@@ -12,9 +12,8 @@
{{collection.description}}

-   
-   {{publicLabel}}
+   
+   {{publicLabel}}

 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2586b10807d3934ff6249336f518050e2f477424
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Make the private checkbox to be a public checkbox - change (mediawiki...Gather)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Make the private checkbox to be a public checkbox
..

Make the private checkbox to be a public checkbox

Bug: T93391
Change-Id: I3fca2ed845ea28de8b11f590b1dd81058f5f9852
---
M i18n/en.json
M resources/Resources.php
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.collection.editor/content.hogan
4 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 45158f0..4f51dd1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -37,7 +37,7 @@
"gather-edit-collection-heading": "Edit collection",
"gather-edit-collection-label-name": "Name",
"gather-edit-collection-label-description": "Description",
-   "gather-edit-collection-label-privacy": "Private collection",
+   "gather-edit-collection-label-public": "Public collection",
"gather-edit-collection-save-label": "Done",
"gather-edit-collection-failed-error": "There was an issue with your 
attempted change, please try something else.",
"gather-edit-collection-clear-label": "Clear",
diff --git a/resources/Resources.php b/resources/Resources.php
index 2ca7056..9172e0b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -197,7 +197,7 @@
"gather-edit-collection-failed-error",
'gather-edit-collection-label-name',
'gather-edit-collection-label-description',
-   'gather-edit-collection-label-privacy',
+   'gather-edit-collection-label-public',
'gather-edit-collection-save-label',
'gather-error-unknown-collection',
'gather-overlay-continue',
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js 
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index 3323d2a..458a8cc 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -39,7 +39,7 @@
heading: mw.msg( 'gather-edit-collection-heading' ),
nameLabel: mw.msg( 'gather-edit-collection-label-name' 
),
descriptionLabel: mw.msg( 
'gather-edit-collection-label-description' ),
-   privateLabel: mw.msg( 
'gather-edit-collection-label-privacy' ),
+   publicLabel: mw.msg( 
'gather-edit-collection-label-public' ),
headerButtonsListClassName: 'overlay-action',
continueMsg: mw.msg( 'gather-overlay-continue' ),
editMsg: mw.msg( 'gather-edit-button' ),
diff --git a/resources/ext.gather.collection.editor/content.hogan 
b/resources/ext.gather.collection.editor/content.hogan
index cdb6e13..f4226f0 100644
--- a/resources/ext.gather.collection.editor/content.hogan
+++ b/resources/ext.gather.collection.editor/content.hogan
@@ -13,8 +13,8 @@
rows='2'>{{collection.description}}


-   {{privateLabel}}
+   {{publicLabel}}

 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fca2ed845ea28de8b11f590b1dd81058f5f9852
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Cleanup attribute expansion helpers + some style cleanup - change (mediawiki...parsoid)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Cleanup attribute expansion helpers + some style cleanup
..

Cleanup attribute expansion helpers + some style cleanup

* Cleaned up expandValuesToDOM helper to accept a wrapTemplates
  flag to handle scenarios where the expansion might be happening
  in the context of a nested template (See T93368. This can also
  happen when we are using native Parsoid template expansion code.)

* Remove direct use of processTokensToDOM code in LinkHandler where
  an attribute value was being expanded as well.

* Some minimal style cleanup.

Change-Id: If7e9b3e2ca7b84a5bf6e18433ec2011f4bc29a94
---
M lib/ext.core.AttributeExpander.js
M lib/ext.core.LinkHandler.js
M lib/mediawiki.Util.js
3 files changed, 47 insertions(+), 39 deletions(-)


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

diff --git a/lib/ext.core.AttributeExpander.js 
b/lib/ext.core.AttributeExpander.js
index 2693197..f8fb63e 100644
--- a/lib/ext.core.AttributeExpander.js
+++ b/lib/ext.core.AttributeExpander.js
@@ -206,22 +206,23 @@
  */
 AttributeExpander.prototype._returnAttributes = function( token, cb, 
expandedAttrs ) {
var env = this.manager.env;
+   var wrapTemplates = this.options.wrapTemplates;
 
env.dp( 'AttributeExpander._returnAttributes: ', expandedAttrs );
 
-   var modified = false,
-   metaTokens = [],
-   postNLToks = [],
-   skipRank = this.skipRank,
-   tmpDataMW,
-   oldAttrs = token.attribs,
+   var modified = false;
+   var metaTokens = [];
+   var postNLToks = [];
+   var skipRank = this.skipRank;
+   var tmpDataMW;
+   var oldAttrs = token.attribs;
// Build newAttrs lazily (on-demand) to avoid creating
// objects in the common case where nothing of significance
// happens in this code.
-   newAttrs = null,
-   nlTkPos = -1,
-   dp, i, l,
-   nlTkOkay = !token.isHTMLTag() && !Util.isTableTag(token);
+   var newAttrs = null;
+   var nlTkPos = -1;
+   var dp, i, l;
+   var nlTkOkay = !token.isHTMLTag() && !Util.isTableTag(token);
 
// Identify attributes that were generated in full or in part using 
templates
for (i = 0, l = oldAttrs.length; i < l; i++) {
@@ -296,16 +297,16 @@
// and probably use appropriately-named flags to convey 
type information.
if (Array.isArray(oldA.k)) {
if (!(expandedK.constructor === String && 
/(^|\s)mw:maybeContent(\s|$)/.test(expandedK))) {
-   nlTkPos = nlTkIndex(nlTkOkay, 
expandedK, this.options.wrapTemplates);
+   nlTkPos = nlTkIndex(nlTkOkay, 
expandedK, wrapTemplates);
if (nlTkPos !== -1) {
// Scenario 1 from the 
documentation comment above.
-   updatedK = splitTokens(env, 
token, nlTkPos, expandedK, this.options.wrapTemplates);
+   updatedK = splitTokens(env, 
token, nlTkPos, expandedK, wrapTemplates);
expandedK = updatedK.preNLBuf;
postNLToks = updatedK.postNLBuf;
metaTokens = 
updatedK.metaTokens;
} else {
// Scenario 2 from the 
documentation comment above.
-   updatedK = 
stripMetaTags(expandedK, this.options.wrapTemplates);
+   updatedK = 
stripMetaTags(expandedK, wrapTemplates);
expandedK = updatedK.value;
}
 
@@ -349,16 +350,16 @@
var attrValTokens = origV;
if ( expandedK.constructor === String && 
Array.isArray(oldA.v) ) {
if (!expandedK.match(/^mw:/)) {
-   nlTkPos = nlTkIndex(nlTkOkay, 
attrValTokens, this.options.wrapTemplates);
+   nlTkPos = nlTkIndex(nlTkOkay, 
attrValTokens, wrapTemplates);
if (nlTkPos !== -1) {
// Scenario 1 from the 
documentation comment above.
-   updatedV = splitTokens(env, 
token, nlTkPos, attrValTokens, this.options.wrapTemplates);
+   updatedV = splitTokens(en

[MediaWiki-commits] [Gerrit] Fix namespace fatals - change (mediawiki...Flow)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Fix namespace fatals
..

Fix namespace fatals

Now that https://gerrit.wikimedia.org/r/#/c/182858/ has been
merged, there are fatals due to namespace issues.

Change-Id: If64ebe90c6bd17e1244ad9834bde9684fc0d455a
---
M includes/Formatter/RevisionFormatter.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
3 files changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/includes/Formatter/RevisionFormatter.php 
b/includes/Formatter/RevisionFormatter.php
index a4730c6..3169c92 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -14,6 +14,7 @@
 use Flow\RevisionActionPermissions;
 use Flow\Templating;
 use Flow\UrlGenerator;
+use ApiResult;
 use GenderCache;
 use IContextSource;
 use Message;
@@ -182,8 +183,10 @@
$moderatedRevision = $this->templating->getModeratedRevision( 
$row->revision );
$ts = $row->revision->getRevisionId()->getTimestampObj();
$res = array(
-   // Change all '_BC_bools' to ApiResult::META_BC_BOOLS 
when core
-   // change is merged.
+   // Change all '_BC_bools' to ApiResult::META_BC_BOOLS, 
and remove
+   // checks for ApiResult::META_CONTENT (it should always 
be true)
+   // when core change 
(https://gerrit.wikimedia.org/r/#/c/182858/) rolls out
+   // everywhere.
'_BC_bools' => array(
// https://gerrit.wikimedia.org/r/#/c/182858/
'isOriginalContent',
diff --git a/includes/Import/LiquidThreadsApi/Objects.php 
b/includes/Import/LiquidThreadsApi/Objects.php
index 7bd7dc9..e74d6a7 100644
--- a/includes/Import/LiquidThreadsApi/Objects.php
+++ b/includes/Import/LiquidThreadsApi/Objects.php
@@ -11,6 +11,7 @@
 use Flow\Import\ImportException;
 use Flow\Import\IObjectRevision;
 use Flow\Import\IRevisionableObject;
+use ApiResult;
 use Iterator;
 use MWTimestamp;
 use Title;
diff --git a/includes/Import/LiquidThreadsApi/Source.php 
b/includes/Import/LiquidThreadsApi/Source.php
index 06a4955..080be24 100644
--- a/includes/Import/LiquidThreadsApi/Source.php
+++ b/includes/Import/LiquidThreadsApi/Source.php
@@ -4,6 +4,7 @@
 
 use ApiBase;
 use ApiMain;
+use ApiResult;
 use Exception;
 use FauxRequest;
 use Flow\Import\ImportException;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If64ebe90c6bd17e1244ad9834bde9684fc0d455a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Update Gather to 1.26wmf2 HEAD - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Update Gather to 1.26wmf2 HEAD
..

Update Gather to 1.26wmf2 HEAD

Change-Id: I45eb2c400425459fd025cbf9916fa5e10470f996
---
M extensions/Gather
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/204665/1

diff --git a/extensions/Gather b/extensions/Gather
index 4db4b42..19e7bf0 16
--- a/extensions/Gather
+++ b/extensions/Gather
-Subproject commit 4db4b423bb9800f6149fcec74206aa2942160ec8
+Subproject commit 19e7bf06e0715f95b4173ef721defaec560a8437

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45eb2c400425459fd025cbf9916fa5e10470f996
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Error in regex broke User lists pages - change (mediawiki...Gather)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Error in regex broke User lists pages
..


Error in regex broke User lists pages

Regex did not specify $ for end of match so everything after by was being
matched...

Introduced in patch: I69e58bd620db4e10c090f98da281197aadff88f2

Bug: T96245
Change-Id: I66e79042b9e6b38e15f58dd6c1faebf893a93fd6
(cherry picked from commit 8b268ea9b23d1bcbc603e5810f01418207289009)
---
M includes/specials/SpecialGather.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/includes/specials/SpecialGather.php 
b/includes/specials/SpecialGather.php
index 02eb63b..36dcb03 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -40,9 +40,8 @@
'ext.gather.icons',
'ext.gather.styles',
) );
-   if ( $subpage === '' || preg_match( '/^by\/?/', $subpage ) ) {
+   if ( $subpage === '' || $subpage === 'by' || $subpage === 'by/' 
) {
// Root subpage. User owned collections.
-   // / = /by = /by/
// For listing own lists, you need to be logged in
$this->requireLogin( 'gather-anon-view-lists' );
$user = $this->getUser();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66e79042b9e6b38e15f58dd6c1faebf893a93fd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jhernandez 
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] Error in regex broke User lists pages - change (mediawiki...Gather)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Error in regex broke User lists pages
..

Error in regex broke User lists pages

Regex did not specify $ for end of match so everything after by was being
matched...

Introduced in patch: I69e58bd620db4e10c090f98da281197aadff88f2

Bug: T96245
Change-Id: I66e79042b9e6b38e15f58dd6c1faebf893a93fd6
(cherry picked from commit 8b268ea9b23d1bcbc603e5810f01418207289009)
---
M includes/specials/SpecialGather.php
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/63/204663/1

diff --git a/includes/specials/SpecialGather.php 
b/includes/specials/SpecialGather.php
index 02eb63b..36dcb03 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -40,9 +40,8 @@
'ext.gather.icons',
'ext.gather.styles',
) );
-   if ( $subpage === '' || preg_match( '/^by\/?/', $subpage ) ) {
+   if ( $subpage === '' || $subpage === 'by' || $subpage === 'by/' 
) {
// Root subpage. User owned collections.
-   // / = /by = /by/
// For listing own lists, you need to be logged in
$this->requireLogin( 'gather-anon-view-lists' );
$user = $this->getUser();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66e79042b9e6b38e15f58dd6c1faebf893a93fd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jhernandez 

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

[MediaWiki-commits] [Gerrit] Set meta namespace on or.wiktionary - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Set meta namespace on or.wiktionary
..


Set meta namespace on or.wiktionary

Actual meta namespace name: ଉଇକିଅଭିଧାନ

This is a follow-up of change Ia5f315c0634a2600edbe1e5fd7eebf1274c8d806.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 80786ff..969dd03 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2195,7 +2195,7 @@
'ombudsmenwiki' => 'Project',
'orwiki' => 'ଉଇକିପିଡ଼ିଆ',
'orwikisource' => 'ଉଇକିପାଠାଗାର', // Bug T73875
-   'orwiktionary' => 'ଉଇକଅଭଧାନ', // T94142
+   'orwiktionary' => 'ଉଇକିଅଭିଧାନ', // T94142
'oswiki' => 'Википеди',
'otrs_wikiwiki' => 'Project',
'outreachwiki' => 'Wikimedia',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfaba405ca15118176ae04795881ba1ebf818e97
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Glaisher 
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] User rights configuration on ne.wikipedia - Filemover - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: User rights configuration on ne.wikipedia - Filemover
..


User rights configuration on ne.wikipedia - Filemover

New users' group:
* Name . filemover
* Rights ... movefile
* Can grant  sysop
* Can revoke ... bureaucrat

Bug: T95103
Change-Id: I0e9026029a04153ec6eca61dddada7a983d4a38c
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index adbec8a..89a160f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7604,6 +7604,7 @@
'autopatrolled' => array( 'autopatrol' => true ),  // T89816
'rollbacker' => array( 'rollback' => true ),   // T90888
'reviewer' => array ( 'patrol' => true ),  // T95101
+   'filemover' => array ( 'movefile' => true),// T95103
),
'nlwiki' => array(
'autoconfirmed' => array( 'patrol' => true ),
@@ -8547,6 +8548,7 @@
'rollbacker',   // T90888
'reviewer', // T95101
'abusefilter',  // T95102
+   'filemover',// T95103
),
),
'+nlwiki' => array(
@@ -9160,6 +9162,7 @@
'rollbacker',   // T90888
'reviewer', // T95101
'abusefilter',  // T95102
+   'filemover',// T95103
),
),
'+nlwiki' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e9026029a04153ec6eca61dddada7a983d4a38c
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Catrope 
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] User rights configuration on ne.wikipedia - Abusefilter - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: User rights configuration on ne.wikipedia - Abusefilter
..


User rights configuration on ne.wikipedia - Abusefilter

Abusefilter group configuration is amended:
* Rights ... abusefilter-modify, abusefilter-revert
* Can grant  sysop
* Can revoke ... bureaucrat

Bug: T95102
Change-Id: Id7961f480bea0eb4030f71166c39f725ad300463
---
M wmf-config/InitialiseSettings.php
M wmf-config/abusefilter.php
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 80786ff..adbec8a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8546,6 +8546,7 @@
'autopatrolled',// T89816
'rollbacker',   // T90888
'reviewer', // T95101
+   'abusefilter',  // T95102
),
),
'+nlwiki' => array(
@@ -9158,6 +9159,7 @@
'autopatrolled',// T89816
'rollbacker',   // T90888
'reviewer', // T95101
+   'abusefilter',  // T95102
),
),
'+nlwiki' => array(
diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index a37ce84..1dd37bd 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -283,6 +283,10 @@
case 'mrwiki':
$wgGroupPermissions['autoconfirmed']['abusefilter-log-detail'] 
= true; // Bug T42611
break;
+   case 'newiki':
+   $wgGroupPermissions['abusefilter']['abusefilter-modify'] = 
true; // T95102
+   $wgGroupPermissions['abusefilter']['abusefilter-revert'] = 
true; // T95102
+   break;
case 'nlwiki':
$wgGroupPermissions['*']['abusefilter-view'] = false;
$wgGroupPermissions['*']['abusefilter-log'] = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7961f480bea0eb4030f71166c39f725ad300463
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Alex Monk 
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] Hygiene: Refactor how watchstar works - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Refactor how watchstar works
..

Hygiene: Refactor how watchstar works

It should be agnostic to the way the icon is implemented

Change-Id: Ic758078428812c353b4c7d7ef507715ee6514645
---
M javascripts/modules/watchstar/Watchstar.js
M less/modules/watchstar.less
2 files changed, 4 insertions(+), 18 deletions(-)


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

diff --git a/javascripts/modules/watchstar/Watchstar.js 
b/javascripts/modules/watchstar/Watchstar.js
index 42422eb..202209d 100644
--- a/javascripts/modules/watchstar/Watchstar.js
+++ b/javascripts/modules/watchstar/Watchstar.js
@@ -11,7 +11,7 @@
} ),
watchedIcon = new Icon( {
name: 'watched',
-   additionalClassNames: 'icon-32px watch-this-article'
+   additionalClassNames: 'icon-32px watch-this-article 
watched'
} ),
toast = M.require( 'toast' ),
user = M.require( 'user' ),
@@ -87,7 +87,7 @@
postRender: function ( options ) {
var self = this,
unwatchedClass = watchIcon.getGlyphClassName(),
-   watchedClass = watchedIcon.getGlyphClassName(),
+   watchedClass = watchedIcon.getGlyphClassName() 
+ ' watched',
page = options.page,
$el = self.$el;
 
diff --git a/less/modules/watchstar.less b/less/modules/watchstar.less
index b5e1e3c..478b773 100644
--- a/less/modules/watchstar.less
+++ b/less/modules/watchstar.less
@@ -1,24 +1,10 @@
 @import "minerva.variables";
 @import "minerva.mixins";
 
-@watchThisArticleSize: 48px;
-
-// watchlist and search results
-.page-list .watch-this-article {
-   position: absolute;
-   right: 0;
-   top: 50%;
-   margin-top: -(@watchThisArticleSize / 2);
-   width: @watchThisArticleSize;
-}
-
 .animations {
-   .mw-ui-icon.watch-this-article,
-   .icon.watch-this-article {
+   .watch-this-article {
.transition-transform( .5s );
-
-   &.mw-ui-icon-watched,
-   &.icon-watched {
+   &.watched {
.transform( rotate(72deg) );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic758078428812c353b4c7d7ef507715ee6514645
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] Introduce PageHistoryPager::doBatchLookups hook. - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Introduce PageHistoryPager::doBatchLookups hook.
..


Introduce PageHistoryPager::doBatchLookups hook.

The intention of the new hook is to allow extensions to prefetch
any information that may be needed for displaying history rows.

In particular, this is needed by Wikibase to allow us to inject
localized entity labels into the edit summaries.

Bug: T95672
Change-Id: Ie10ef99154da35713a4f583e2de2162fba28eef2
---
M RELEASE-NOTES-1.26
M docs/hooks.txt
M includes/actions/HistoryAction.php
3 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 89dad11..bf9341d 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -34,6 +34,7 @@
 === Other changes in 1.26 ===
 * ChangeTags::tagDescription() will return false if the interface message
   for the tag is disabled.
+* Added PageHistoryPager::doBatchLookups hook.
 
 == Compatibility ==
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 877b7ed..6f59b2d 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2112,6 +2112,13 @@
 $pager: the pager
 $queryInfo: the query parameters
 
+'PageHistoryPager::doBatchLookups': Called after the pager query was run, 
before
+any output is generated, to allow batch lookups for prefetching information
+needed for display. If the hook handler returns false, the regular behavior of
+doBatchLookups() is skipped.
+$pager: the PageHistoryPager
+$result: a ResultWrapper representing the query result
+
 'PageRenderingHash': Alter the parser cache option hash key. A parser extension
 which depends on user options should install this hook and append its values to
 the key.
diff --git a/includes/actions/HistoryAction.php 
b/includes/actions/HistoryAction.php
index 6693178..83185e4 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -448,6 +448,10 @@
}
 
function doBatchLookups() {
+   if ( !Hooks::run( 'PageHistoryPager::doBatchLookups', array( 
$this, $this->mResult ) ) ) {
+   return;
+   }
+
# Do a link batch query
$this->mResult->seek( 0 );
$batch = new LinkBatch();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie10ef99154da35713a4f583e2de2162fba28eef2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: MarkAHershberger 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dumps::zim: fix nginx listening port and docroot - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: dumps::zim: fix nginx listening port and docroot
..


dumps::zim: fix nginx listening port and docroot

- with the previous setting nginx would not listen on 10.64.32.168
  but we want it to so dataset1001 can proxy to it

- the docroot being /srv/www/htmldumps we would try to get 
./htmldumps/htmldumps/
  when accessing http://dumps.wikimedia.org/htmldumps/ so that was a 404

Bug:T94457
Change-Id: I5380f9b5a70a2a5032d568cfc73f914cc7b07c66
---
M modules/dumps/templates/nginx.zim.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/dumps/templates/nginx.zim.conf.erb 
b/modules/dumps/templates/nginx.zim.conf.erb
index a66a8c0..5e18722 100644
--- a/modules/dumps/templates/nginx.zim.conf.erb
+++ b/modules/dumps/templates/nginx.zim.conf.erb
@@ -1,10 +1,10 @@
 limit_conn_zone $binary_remote_addr zone=addr:10m;
 
 server {
-   listen [::]:80 default;
+   listen 80;
server_name francium.eqiad.wmnet;
 
-   root /srv/www/htmldumps;
+   root /srv/www;
 
location / {
   index index.html index.htm;

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

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

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

[MediaWiki-commits] [Gerrit] dumps::zim: fix nginx listening port and docroot - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: dumps::zim: fix nginx listening port and docroot
..

dumps::zim: fix nginx listening port and docroot

- with the previous setting nginx would not listen on 10.64.32.168
  but we want it to so dataset1001 can proxy to it

- the docroot being /srv/www/htmldumps we would try to get 
./htmldumps/htmldumps/
  when accessing http://dumps.wikimedia.org/htmldumps/ so that was a 404

Bug:T94457
Change-Id: I5380f9b5a70a2a5032d568cfc73f914cc7b07c66
---
M modules/dumps/templates/nginx.zim.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/204661/1

diff --git a/modules/dumps/templates/nginx.zim.conf.erb 
b/modules/dumps/templates/nginx.zim.conf.erb
index a66a8c0..5e18722 100644
--- a/modules/dumps/templates/nginx.zim.conf.erb
+++ b/modules/dumps/templates/nginx.zim.conf.erb
@@ -1,10 +1,10 @@
 limit_conn_zone $binary_remote_addr zone=addr:10m;
 
 server {
-   listen [::]:80 default;
+   listen 80;
server_name francium.eqiad.wmnet;
 
-   root /srv/www/htmldumps;
+   root /srv/www;
 
location / {
   index index.html index.htm;

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

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

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

[MediaWiki-commits] [Gerrit] Aligh the version 'c' dialog in the middle of the page - change (mediawiki...WikiGrok)

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review.

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

Change subject: Aligh the version 'c' dialog in the middle of the page
..

Aligh the version 'c' dialog in the middle of the page

Also, remove the confusing isDrawer option.

Depends on Id171118c104a872f7e2e00de57cc125645cb4207

Change-Id: Ida0a26e59a6eef10855e9df83b635e104760f2ac
---
M resources/dialog.c/DialogC.less
M resources/dialog.c/WikiGrokDialogC.js
M resources/dialog/WikiGrokDialog.js
M resources/startup/init.js
4 files changed, 5 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiGrok 
refs/changes/60/204660/1

diff --git a/resources/dialog.c/DialogC.less b/resources/dialog.c/DialogC.less
index a53a386..7253fab 100644
--- a/resources/dialog.c/DialogC.less
+++ b/resources/dialog.c/DialogC.less
@@ -3,7 +3,7 @@
 
 .wikigrok.drawer {
padding: 0;
-   margin-bottom: 0;
+   margin: 0 auto;
 
.mw-ui-button {
margin-bottom: 0;
diff --git a/resources/dialog.c/WikiGrokDialogC.js 
b/resources/dialog.c/WikiGrokDialogC.js
index 6f8b742..2518a91 100644
--- a/resources/dialog.c/WikiGrokDialogC.js
+++ b/resources/dialog.c/WikiGrokDialogC.js
@@ -21,7 +21,6 @@
version: 'c',
closeOnScroll: false,
defaults: $.extend( Drawer.prototype.defaults, 
WikiGrokDialog.prototype.defaults, {
-   isDrawer: true,
continueBtnLbl: mw.msg( 
'wikigrok-dialog-c-continue-button-label' )
} ),
events: $.extend( {}, Drawer.prototype.events, 
WikiGrokDialog.prototype.events, {
diff --git a/resources/dialog/WikiGrokDialog.js 
b/resources/dialog/WikiGrokDialog.js
index 387dc75..5c62d96 100644
--- a/resources/dialog/WikiGrokDialog.js
+++ b/resources/dialog/WikiGrokDialog.js
@@ -60,7 +60,6 @@
noThanksBtnLbl: mw.msg( 
'wikigrok-dialog-no-thanks-button-label' ),
proceedBtnLbl: mw.msg( 
'wikigrok-dialog-proceed-button-label' ),
spinner: icons.spinner().toHtmlString(),
-   isDrawer: false
},
template: mw.template.get( 'ext.wikigrok.dialog', 
'Dialog.hogan' ),
events: {
@@ -512,14 +511,6 @@
 */
_showThanksPane: function () {
this._showPane( 'thanks' );
-   },
-
-   /**
-* Is this dialog a Drawer?
-* @returns {Boolean} Whether it's a drawer
-*/
-   isDrawer: function () {
-   return this.options.isDrawer;
},
 
/**
diff --git a/resources/startup/init.js b/resources/startup/init.js
index 93e888a..9ad894d 100644
--- a/resources/startup/init.js
+++ b/resources/startup/init.js
@@ -130,8 +130,7 @@
mw.loader.using( versionConfig.module ).done( function () {
var WikiGrokDialog = M.require( versionConfig.view ),
page = M.getCurrentPage(),
-   // Initialize the dialog and insert it into the 
page (but don't display yet)
-   // The version c is a drawer and is 
automatically inserted to the page and displayed
+   // Initialize the dialog and insert it into the 
page
dialog = new WikiGrokDialog( {
campaign: campaign,
itemId: wikidataID,
@@ -139,7 +138,9 @@
userToken: wikiGrokUser.getToken(),
testing: ( idOverride ) ? true : false
} );
-   if ( !dialog.isDrawer() ) {
+   // The version 'c' is a drawer and is automatically 
inserted to the page and displayed
+   // We need to insert the version 'b' into the page 
though
+   if ( dialog.version === 'b' ) {
// FIXME: If the table of contents code is not 
loaded the dialog will still
//   get added to the end of the lead section.
if ( $( '.toc-mobile' ).length ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida0a26e59a6eef10855e9df83b635e104760f2ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] Replace existing WikiGrok questions - change (mediawiki...WikiGrok)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Replace existing WikiGrok questions
..


Replace existing WikiGrok questions

Existing questions will also be filtered in the LinksUpdate handler, so use
Database#replace rather than #insert with an IGNORE flag in QuestionStore#store.

Bug: T94445
Change-Id: I425a8f746c3f25501a14f08170bf4e87b44c4c65
---
M includes/QuestionStore.php
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/includes/QuestionStore.php b/includes/QuestionStore.php
index eb4d416..a36309f 100644
--- a/includes/QuestionStore.php
+++ b/includes/QuestionStore.php
@@ -58,7 +58,14 @@
);
}
if ( $rows ) {
-   $dbw->insert( 'wikigrok_questions', $rows, __METHOD__, 
array( 'IGNORE' ) );
+   $dbw->replace(
+   'wikigrok_questions',
+   array(
+   array( 'wgq_page', 'wgq_campaign', 
'wgq_version' ),
+   ),
+   $rows,
+   __METHOD__
+   );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I425a8f746c3f25501a14f08170bf4e87b44c4c65
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Phuedx 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Kaldari2 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Save changes to members of collection only when done clicked - change (mediawiki...Gather)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Save changes to members of collection only when done clicked
..

Save changes to members of collection only when done clicked

* Throw confirm message when you try and exit.
* Add methods for adding/removing multiple titles

Bug: T95776
Change-Id: I333466cdc4ba0c838c9585739d311e6b4a35e170
---
M i18n/en.json
M i18n/qqq.json
M resources/ext.gather.api/CollectionsApi.js
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.page.search/CollectionPageList.js
M resources/ext.gather.page.search/CollectionSearchPanel.js
6 files changed, 126 insertions(+), 38 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index b6db092..9a2e684 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -63,6 +63,7 @@
"gather-add-to-collection-confirm": "Add to collection",
"gather-add-to-collection-cancel": "No thanks",
"gather-update-collection-success": "Collection was successfully 
updated.",
+   "gather-edit-collection-confirm": "You have made changes to your 
collection. Do you want to leave without saving them?",
"gather-remove-toast": "The page has been removed from your \"$1\" 
collection.",
"gather-no-such-action": "Sorry, the requested action doesn't exist.",
"gather-unknown-error": "Sorry, there was an unknown error while 
processing your request.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d30890d..ce41e56 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -68,6 +68,7 @@
"gather-add-to-collection-confirm": "Label for button that user can 
click if they would like to add the current page to a collection",
"gather-add-to-collection-cancel": "Label for button that user can 
click if they do not want to add to a collection.\n{{Identical|No thanks}}",
"gather-update-collection-success": "Message that shows when collection 
description and/or title changed.",
+   "gather-edit-collection-confirm": "Confirm message prompting you to 
save changes before exiting.",
"gather-remove-toast": "Message displayed when you remove an item from 
a collection. Parameters:\n* $1 - Name of collection.",
"gather-no-such-action": "Message used, if thse user tried to request a 
non-existent action on a collection.",
"gather-unknown-error": "Used as an error message, if there was an 
unknown error.",
diff --git a/resources/ext.gather.api/CollectionsApi.js 
b/resources/ext.gather.api/CollectionsApi.js
index 9a2b8d7..fb6d575 100644
--- a/resources/ext.gather.api/CollectionsApi.js
+++ b/resources/ext.gather.api/CollectionsApi.js
@@ -23,6 +23,20 @@
public: false
},
/**
+* Add a list of titles to existing collection.
+* @method
+* @param {Number} id Identifier of collection
+* @param {String[]} titles array
+* @return {jQuery.Deferred}
+*/
+   addPagesToCollection: function ( id, titles ) {
+   return this.postWithToken( 'watch', {
+   action: 'editlist',
+   id: id,
+   titles: titles
+   } );
+   },
+   /**
 * Add page to existing collection.
 * @method
 * @param {Number} id Identifier of collection
@@ -30,10 +44,21 @@
 * @return {jQuery.Deferred}
 */
addPageToCollection: function ( id, page ) {
+   return this.addPagesToCollection( id, [ page.getTitle() 
] );
+   },
+   /**
+* Remove a list of pages from existing collection.
+* @method
+* @param {Number} id Identifier of collection
+* @param {String[]} titles
+* @return {jQuery.Deferred}
+*/
+   removePagesFromCollection: function ( id, titles ) {
return this.postWithToken( 'watch', {
action: 'editlist',
id: id,
-   titles: [ page.getTitle() ]
+   mode: 'remove',
+   titles: titles
} );
},
/**
@@ -44,12 +69,7 @@
 * @return {jQuery.Deferred}
 */
removePageFromCollection: function ( id, page ) {
-   return this.postWithToken( 'watch', {
-   action: 'editlist',
-   id: id,
- 

[MediaWiki-commits] [Gerrit] Add LiquidThreads role (mainly to ease LQT -> Flow conversio... - change (mediawiki/vagrant)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Add LiquidThreads role (mainly to ease LQT -> Flow conversion 
setup)
..

Add LiquidThreads role (mainly to ease LQT -> Flow conversion setup)

Change-Id: I732a32cceaf449cb8d3d5a0acd70b3d6704722a2
---
A puppet/modules/role/manifests/liquidthreads.pp
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/58/204658/1

diff --git a/puppet/modules/role/manifests/liquidthreads.pp 
b/puppet/modules/role/manifests/liquidthreads.pp
new file mode 100644
index 000..d6b0c96
--- /dev/null
+++ b/puppet/modules/role/manifests/liquidthreads.pp
@@ -0,0 +1,13 @@
+# == Class: role::liquidthreads
+# Configures LiquidThreads, a MediaWiki discussion system (note:
+# LiquidThreads is not being actively developed)
+class role::liquidthreads {
+include ::role::echo
+include ::role::wikieditor
+
+mediawiki::extension { 'LiquidThreads':
+settings => {
+wgLqtTalkPages => false
+}
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] Add down indicator for text style toolgroup in VE - change (mediawiki...Flow)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Add down indicator for text style toolgroup in VE
..

Add down indicator for text style toolgroup in VE

Change-Id: I816fb02cc5c3dc4c1838a7a3e36310483b55a128
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js 
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
index 361c379..cb29092 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
@@ -27,6 +27,7 @@
{
type: 'list',
icon: 'textStyle',
+   indicator: 'down',
title: OO.ui.deferMsg( 
'visualeditor-toolbar-style-tooltip' ),
include: [ 'bold', 'italic' ],
forceExpand: [ 'bold', 'italic' ]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I816fb02cc5c3dc4c1838a7a3e36310483b55a128
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Update CentralAuth to 1.26wmf2 HEAD - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Update CentralAuth to 1.26wmf2 HEAD
..

Update CentralAuth to 1.26wmf2 HEAD

Change-Id: Ibdda71c2048d50c52a79737af79edfed0636d2ea
---
M extensions/CentralAuth
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/204656/1

diff --git a/extensions/CentralAuth b/extensions/CentralAuth
index 185a98f..5e8d0c5 16
--- a/extensions/CentralAuth
+++ b/extensions/CentralAuth
-Subproject commit 185a98f93a547e59740ab129f31c9503298d3493
+Subproject commit 5e8d0c5aa7c7b6041f5c436c9d40664aae5345ae

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdda71c2048d50c52a79737af79edfed0636d2ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] forceRenameUsers: Fail nicer if CentralAuth isn't installed - change (mediawiki...CentralAuth)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: forceRenameUsers: Fail nicer if CentralAuth isn't installed
..


forceRenameUsers: Fail nicer if CentralAuth isn't installed

Change-Id: I289ab37631a122455218cfb784b30e211639
---
M maintenance/forceRenameUsers.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/forceRenameUsers.php b/maintenance/forceRenameUsers.php
index 474f677..8d92b56 100644
--- a/maintenance/forceRenameUsers.php
+++ b/maintenance/forceRenameUsers.php
@@ -29,6 +29,9 @@
}
 
public function execute() {
+   if ( !class_exists( 'CentralAuthUser' ) ) {
+   $this->error( 'CentralAuth is not installed on this 
wiki.', 1 );
+   }
$dbw = CentralAuthUser::getCentralDB();
while ( true ) {
$rowsToRename = $this->findUsers( wfWikiID(), $dbw );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I289ab37631a122455218cfb784b30e211639
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update CentralAuth to 1.26wmf1 HEAD - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Update CentralAuth to 1.26wmf1 HEAD
..

Update CentralAuth to 1.26wmf1 HEAD

Change-Id: Id20e11784c23da2a14234cd521414c5da3332e86
---
M extensions/CentralAuth
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/204655/1

diff --git a/extensions/CentralAuth b/extensions/CentralAuth
index 701ceb6..11433f1 16
--- a/extensions/CentralAuth
+++ b/extensions/CentralAuth
-Subproject commit 701ceb6e8f992642d981c0c3a8543523305d29ef
+Subproject commit 11433f131d47372aabf088166d484e859e2e6528

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id20e11784c23da2a14234cd521414c5da3332e86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf1
Gerrit-Owner: Legoktm 

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