[MediaWiki-commits] [Gerrit] Fix MWOAuthRequest::fromRequest logging - change (mediawiki...OAuth)

[jenkins-bot (Code Review)]

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

Change subject: Fix MWOAuthRequest::fromRequest logging
..


Fix MWOAuthRequest::fromRequest logging

Logging was converted to use the logger interface in
I92ffac553b6552b26cb6f531c2d10d7bca777900, but this was done not taking
into account the fact that function is static.

Bug: T118372
Change-Id: Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
---
M backend/MWOAuthRequest.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index 9861ca3..b69611e 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -37,6 +37,7 @@
public static function fromRequest( \WebRequest $request ) {
$httpMethod = strtoupper( $request->getMethod() );
$httpUrl = $request->getFullRequestURL();
+   $logger = LoggerFactory::getInstance( 'OAuth' );
 
// Find request headers
$requestHeaders = MWOAuthUtils::getHeaders();
@@ -54,7 +55,7 @@
) === 0
) {
$postData = OAuthUtil::parse_parameters( 
$request->getRawPostString() );
-   $this->logger->debug( __METHOD__ . ': Post String = ' . 
implode( ',', $postData ) );
+   $logger->debug( __METHOD__ . ': Post String = ' . 
implode( ',', $postData ) );
$parameters = array_merge( $parameters, $postData );
}
 
@@ -68,7 +69,7 @@
);
$parameters = array_merge($parameters, 
$headerParameters);
}
-   $this->logger->debug( __METHOD__ . ": parameters:\n" . print_r( 
$parameters, true) );
+   $logger->debug( __METHOD__ . ": parameters:\n" . print_r( 
$parameters, true) );
 
return new self( $httpMethod, $httpUrl, $parameters, 
$request->getIP() );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: wmf/1.27.0-wmf.6
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8 - change (mediawiki...OAuth)

[jenkins-bot (Code Review)]

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

Change subject: Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
..


Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8

Where the relevant use keywords were missing.

Bug: T118372
Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
---
M backend/MWOAuthRequest.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index b69611e..f070165 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -2,6 +2,9 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
+
 /**
  * @file
  * @ingroup OAuth

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: wmf/1.27.0-wmf.6
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Unify !( $var instanceof Class ) coding style for readability - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Unify !( $var instanceof Class ) coding style for readability
..

Unify !( $var instanceof Class ) coding style for readability

Change-Id: If5d250ae600bc7dffe91a0e302a270fccfa5d0ac
---
M 
client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M client/includes/DataAccess/StatementTransclusionInteractor.php
M client/includes/Usage/PageEntityUsages.php
M 
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
M lib/includes/changes/ItemChange.php
M repo/includes/EditEntity.php
M repo/includes/Hooks/EditFilterHookRunner.php
M repo/includes/ParserOutput/GeoDataDataUpdater.php
M repo/includes/api/CreateClaim.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetQualifier.php
M repo/includes/content/PropertyHandler.php
13 files changed, 19 insertions(+), 14 deletions(-)


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

diff --git 
a/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
 
b/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
index 55a47f1..b6071a4 100644
--- 
a/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
+++ 
b/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
@@ -104,7 +104,7 @@
 * @throws MWException
 */
private function newLanguageAwareRenderer( $language, UsageAccumulator 
$usageAccumulator ) {
-   if ( !$language instanceof Language ) {
+   if ( !( $language instanceof Language ) ) {
wfDebugLog(
'T107711',
get_class( $language ) . ' is not a Language 
object.',
diff --git a/client/includes/DataAccess/StatementTransclusionInteractor.php 
b/client/includes/DataAccess/StatementTransclusionInteractor.php
index 0ad127c..8f77f0b 100644
--- a/client/includes/DataAccess/StatementTransclusionInteractor.php
+++ b/client/includes/DataAccess/StatementTransclusionInteractor.php
@@ -87,7 +87,7 @@
return '';
}
 
-   if ( !$entity instanceof StatementListProvider ) {
+   if ( !( $entity instanceof StatementListProvider ) ) {
return '';
}
 
diff --git a/client/includes/Usage/PageEntityUsages.php 
b/client/includes/Usage/PageEntityUsages.php
index f69f71f..edc19cb 100644
--- a/client/includes/Usage/PageEntityUsages.php
+++ b/client/includes/Usage/PageEntityUsages.php
@@ -68,7 +68,7 @@
 */
public function addUsages( array $usages ) {
foreach ( $usages as $usage ) {
-   if ( !$usage instanceof EntityUsage ) {
+   if ( !( $usage instanceof EntityUsage ) ) {
throw new InvalidArgumentException( '$usages 
must contain only EntityUsage objects' );
}
 
diff --git 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
index 50b3440..ad76337 100644
--- 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
@@ -32,7 +32,7 @@
$wikibaseClient = WikibaseClient::getDefaultInstance( 'reset' );
$store = $wikibaseClient->getStore();
 
-   if ( ! $store instanceof MockClientStore ) {
+   if ( !( $store instanceof MockClientStore ) ) {
$store = new MockClientStore( 'de' );
$wikibaseClient->overrideStore( $store );
}
diff --git a/lib/includes/changes/ItemChange.php 
b/lib/includes/changes/ItemChange.php
index 2796a5c..28577e0 100644
--- a/lib/includes/changes/ItemChange.php
+++ b/lib/includes/changes/ItemChange.php
@@ -22,7 +22,7 @@
public function getSiteLinkDiff() {
$diff = $this->getDiff();
 
-   if ( !$diff instanceof ItemDiff ) {
+   if ( !( $diff instanceof ItemDiff ) ) {
// This shouldn't happen, but we should be robust 
against corrupt, incomplete
// or obsolete instances in the database, etc.
 
diff --git a/repo/includes/EditEntity.php b/repo/includes/EditEntity.php
index 54358db..30d2980 100644
--- a/repo/includes/EditEntity.php
+++ b/repo/includes/EditEntity.php
@@ -202,7 +202,10 @@
$this->errorType = 0;
 

[MediaWiki-commits] [Gerrit] Fix MWOAuthRequest::fromRequest logging - change (mediawiki...OAuth)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Fix MWOAuthRequest::fromRequest logging
..

Fix MWOAuthRequest::fromRequest logging

Logging was converted to use the logger interface in
I92ffac553b6552b26cb6f531c2d10d7bca777900, but this was done not taking
into account the fact that function is static.

Bug: T118372
Change-Id: Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
---
M backend/MWOAuthRequest.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/07/252407/1

diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index 9861ca3..b69611e 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -37,6 +37,7 @@
public static function fromRequest( \WebRequest $request ) {
$httpMethod = strtoupper( $request->getMethod() );
$httpUrl = $request->getFullRequestURL();
+   $logger = LoggerFactory::getInstance( 'OAuth' );
 
// Find request headers
$requestHeaders = MWOAuthUtils::getHeaders();
@@ -54,7 +55,7 @@
) === 0
) {
$postData = OAuthUtil::parse_parameters( 
$request->getRawPostString() );
-   $this->logger->debug( __METHOD__ . ': Post String = ' . 
implode( ',', $postData ) );
+   $logger->debug( __METHOD__ . ': Post String = ' . 
implode( ',', $postData ) );
$parameters = array_merge( $parameters, $postData );
}
 
@@ -68,7 +69,7 @@
);
$parameters = array_merge($parameters, 
$headerParameters);
}
-   $this->logger->debug( __METHOD__ . ": parameters:\n" . print_r( 
$parameters, true) );
+   $logger->debug( __METHOD__ . ": parameters:\n" . print_r( 
$parameters, true) );
 
return new self( $httpMethod, $httpUrl, $parameters, 
$request->getIP() );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Fix MWOAuthRequest::fromRequest logging - change (mediawiki...OAuth)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Fix MWOAuthRequest::fromRequest logging
..

Fix MWOAuthRequest::fromRequest logging

Logging was converted to use the logger interface in
I92ffac553b6552b26cb6f531c2d10d7bca777900, but this was done not taking
into account the fact that function is static.

Bug: T118372
Change-Id: Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
---
M backend/MWOAuthRequest.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/08/252408/1

diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index 9861ca3..b69611e 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -37,6 +37,7 @@
public static function fromRequest( \WebRequest $request ) {
$httpMethod = strtoupper( $request->getMethod() );
$httpUrl = $request->getFullRequestURL();
+   $logger = LoggerFactory::getInstance( 'OAuth' );
 
// Find request headers
$requestHeaders = MWOAuthUtils::getHeaders();
@@ -54,7 +55,7 @@
) === 0
) {
$postData = OAuthUtil::parse_parameters( 
$request->getRawPostString() );
-   $this->logger->debug( __METHOD__ . ': Post String = ' . 
implode( ',', $postData ) );
+   $logger->debug( __METHOD__ . ': Post String = ' . 
implode( ',', $postData ) );
$parameters = array_merge( $parameters, $postData );
}
 
@@ -68,7 +69,7 @@
);
$parameters = array_merge($parameters, 
$headerParameters);
}
-   $this->logger->debug( __METHOD__ . ": parameters:\n" . print_r( 
$parameters, true) );
+   $logger->debug( __METHOD__ . ": parameters:\n" . print_r( 
$parameters, true) );
 
return new self( $httpMethod, $httpUrl, $parameters, 
$request->getIP() );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: wmf/1.27.0-wmf.6
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] swift: monitor mediawiki originals upload rate - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swift: monitor mediawiki originals upload rate
..


swift: monitor mediawiki originals upload rate

Bug: T92322
Change-Id: Ia48a07f6c8a2e97f7d84ca29805050a20fa92a5a
---
M modules/swift/manifests/monitoring/graphite_alerts.pp
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/swift/manifests/monitoring/graphite_alerts.pp 
b/modules/swift/manifests/monitoring/graphite_alerts.pp
index dab532f..763c356 100644
--- a/modules/swift/manifests/monitoring/graphite_alerts.pp
+++ b/modules/swift/manifests/monitoring/graphite_alerts.pp
@@ -20,4 +20,13 @@
 under   => true,
 nagios_critical => false,
 }
+
+monitoring::graphite_threshold { "mediawiki_${cluster}_media_uploads":
+description => "mediawiki originals uploads (hourly) for 
${cluster}",
+metric  => 
"summarize(nonNegativeDerivative(keepLastValue(swift.${cluster}.containers.mw-media.originals.objects)),
 '1h')",
+from=> '5h',
+warning => 2000,
+critical=> 3000,
+nagios_critical => false,
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia48a07f6c8a2e97f7d84ca29805050a20fa92a5a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Depool db1067 for maintenance - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Depool db1067 for maintenance
..


Depool db1067 for maintenance

Change-Id: I359a477eeb35a3f093a8c40cc7a549bb0276f675
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 2bff7f3..7677a34 100755
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -142,7 +142,7 @@
'db2046' => 100,
'db2053' => 100,
'db2060' => 100,
-   'db2067' => 100,
+#  'db2067' => 100,
),
's7' => array(
'db1033' => 0,   # 1.4TB  64GB,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I359a477eeb35a3f093a8c40cc7a549bb0276f675
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8 - change (mediawiki...OAuth)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
..


Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8

Where the relevant use keywords were missing.

Bug: T118372
Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
---
M backend/MWOAuthRequest.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index b69611e..f070165 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -2,6 +2,9 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
+
 /**
  * @file
  * @ingroup OAuth

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Assign salt grains for dbproxy systems - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for dbproxy systems
..

Assign salt grains for dbproxy systems

These don't use the role keyword (and are not straightforward to convert
since they instantiate parametrised classes), so define the Hiera values
via regex.yaml

Change-Id: Iec29602b52b83e9550f490ed442ba81af6dc838b
---
M hieradata/regex.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 016c66a..c2416f0 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -259,3 +259,8 @@
   debdeploy::grains:
 debdeploy-db-es-codfw:
   value: standard
+debdeploy_dbproxy:
+  __regex: !ruby/regexp /^dbproxy100\d\.eqiad\.wmnet$/
+  debdeploy::grains:
+debdeploy-db-dbproxy:
+  value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 839425e..7f91dce 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -64,7 +64,8 @@
 db-es-eqiad = debdeploy-db-es-eqiad:standard
 db-es-codfw = debdeploy-db-es-codfw:standard
 db-es = debdeploy-db-es-eqiad:standard, debdeploy-db-es-codfw:standard
-all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard, debdeploy-db-es-eqiad:standard, 
debdeploy-db-es-codfw:standard
+db-dbproxy = debdeploy-db-dbproxy:standard
+all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard, debdeploy-db-es-eqiad:standard, 
debdeploy-db-es-codfw:standard, debdeploy-db-dbproxy:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard

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

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

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

[MediaWiki-commits] [Gerrit] install_server: fix /srv restbase provisioning in codfw - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: install_server: fix /srv restbase provisioning in codfw
..


install_server: fix /srv restbase provisioning in codfw

Change-Id: I73273c0884a123b507c4265c630bee6b475c4af1
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 2a2fb31..14446e7 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -120,7 +120,6 @@
restbase100[3-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
-   restbase200[1-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
restbase200[12]) echo partman/cassandrahosts-4ssd-srv.cfg ;; \
restbase200[3-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73273c0884a123b507c4265c630bee6b475c4af1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
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 mobileapps to a07dc5c - change (mediawiki...deploy)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Update mobileapps to a07dc5c
..

Update mobileapps to a07dc5c

List of changes:
dd05904 Tests: Replace test.wp/Test with en.wp/Foobar
a07dc5c MW API: Use POST to issue requests
xxx Update node module dependencies

Change-Id: Iab39e85f8b5e5a2c2a48a1d1be59c8faf3cab9ab
---
R node_modules/ansi-regex/index.js
R node_modules/ansi-regex/license
R node_modules/ansi-regex/package.json
D node_modules/body-parser/node_modules/content-type/LICENSE
D node_modules/body-parser/node_modules/content-type/index.js
D node_modules/body-parser/node_modules/debug/.jshintrc
D node_modules/body-parser/node_modules/debug/.npmignore
D node_modules/body-parser/node_modules/debug/Makefile
D node_modules/body-parser/node_modules/debug/bower.json
D node_modules/body-parser/node_modules/debug/browser.js
D node_modules/body-parser/node_modules/debug/component.json
D node_modules/body-parser/node_modules/debug/debug.js
D node_modules/body-parser/node_modules/debug/node.js
D node_modules/body-parser/node_modules/debug/node_modules/ms/.npmignore
D node_modules/body-parser/node_modules/debug/node_modules/ms/LICENSE
D node_modules/body-parser/node_modules/debug/node_modules/ms/index.js
D node_modules/body-parser/node_modules/debug/node_modules/ms/package.json
D node_modules/body-parser/node_modules/debug/package.json
D 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
D 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
D 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
D 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
D 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
D node_modules/body-parser/node_modules/http-errors/package.json
D node_modules/body-parser/node_modules/on-finished/LICENSE
D node_modules/body-parser/node_modules/on-finished/index.js
D 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/LICENSE
D 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/index.js
D node_modules/body-parser/node_modules/type-is/LICENSE
D node_modules/body-parser/node_modules/type-is/index.js
D node_modules/body-parser/node_modules/type-is/node_modules/media-typer/LICENSE
D 
node_modules/body-parser/node_modules/type-is/node_modules/media-typer/index.js
D node_modules/body-parser/node_modules/type-is/node_modules/mime-types/LICENSE
D node_modules/body-parser/node_modules/type-is/node_modules/mime-types/index.js
D 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/LICENSE
D 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/db.json
D 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/index.js
D node_modules/body-parser/node_modules/type-is/package.json
D 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js
D 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/node_modules/wrappy/LICENSE
D 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/node_modules/wrappy/package.json
D 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/LICENSE
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/package.json
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/test/basic.js
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/wrappy.js
R node_modules/bytes/index.js
R node_modules/bytes/package.json
D node_modules/compression/node_modules/accepts/node_modules/mime-types/LICENSE
D node_modules/compression/node_modules/accepts/node_modules/mime-types/index.js
D 
node_modules/compression/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/LICENSE
D 
node_modules/compression/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/db.json
D 
node_modules/compression/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/index.js
D 
node_modules/compression/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/package.json
D 
node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json
D node_modules/compression/node_modules/bytes/index.js
D node_modules/compression/node_modules/bytes/package.json
D 
node_modules/compression/node_modules/compressible/node_modules/mime-db/package.json
D node_modules/compression/node_modules/debug/.jshintrc
D 

[MediaWiki-commits] [Gerrit] hiera: double-quote interpolating tokens - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: hiera: double-quote interpolating tokens
..

hiera: double-quote interpolating tokens

Change-Id: I87aa99763e1f2d945618d4bf0e32c6644e64eb5c
---
M hieradata/role/common/lvs/balancer.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/252405/1

diff --git a/hieradata/role/common/lvs/balancer.yaml 
b/hieradata/role/common/lvs/balancer.yaml
index 59d817a..1f184f7 100644
--- a/hieradata/role/common/lvs/balancer.yaml
+++ b/hieradata/role/common/lvs/balancer.yaml
@@ -1,3 +1,3 @@
 cluster: lvs
 # fqdn should resolve to the IP on eth0
-ssh::server::listen_address: %{::ipaddress_eth0}
+ssh::server::listen_address: "%{::ipaddress_eth0}"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87aa99763e1f2d945618d4bf0e32c6644e64eb5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] WIP [BrowserTest] Fix broken browser test - change (mediawiki...VisualEditor)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: WIP [BrowserTest] Fix broken browser test
..

WIP [BrowserTest] Fix broken browser test

The test fails when it tries to click external link button

Bug: T94162
Change-Id: Ie9cf88298096ecdbca99fa69f1f645da62ebcb4d
---
M modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
index 6a0af55..0fb28ff 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
@@ -64,6 +64,7 @@
} ),
new OO.ui.CardLayout( 'external', {
label: ve.msg( 
'visualeditor-linkinspector-button-link-external' ),
+   classes: ['ve-test-external-link-tab'],
expanded: false,
scrollable: false,
padded: true

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

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

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

[MediaWiki-commits] [Gerrit] Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8 - change (mediawiki...OAuth)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
..

Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8

Where the relevant use keywords were missing.

Bug: T118372
Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
---
M backend/MWOAuthRequest.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index b69611e..f070165 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -2,6 +2,9 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
+
 /**
  * @file
  * @ingroup OAuth

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-11-11T10:00:01+0000 - change (mediawiki...Wikidata)

[WikidataBuilder (Code Review)]

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-11-11T10:00:01+
..

New Wikidata Build - 2015-11-11T10:00:01+

Change-Id: Ia71cf3cf3bd4ee61025f188c2822abda10ab9f46
---
M Wikidata.php
M composer.lock
M 
extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
M extensions/Wikibase/docs/datatypes.wiki
M extensions/Wikibase/lib/includes/DataTypeDefinitions.php
M extensions/Wikibase/lib/tests/phpunit/DataTypeDefinitionsTest.php
M extensions/Wikibase/lib/tests/phpunit/store/HashSiteLinkStoreTest.php
M extensions/Wikibase/repo/WikibaseRepo.datatypes.php
M extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php
M 
extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M extensions/Wikibase/repo/includes/rdf/ComplexValueRdfBuilder.php
A extensions/Wikibase/repo/includes/rdf/DispatchingValueSnakRdfBuilder.php
M extensions/Wikibase/repo/includes/rdf/RdfBuilder.php
M extensions/Wikibase/repo/includes/rdf/SimpleValueRdfBuilder.php
M extensions/Wikibase/repo/includes/rdf/SnakRdfBuilder.php
R extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilder.php
A extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
M extensions/Wikibase/repo/includes/specials/SpecialEntityData.php
M extensions/Wikibase/repo/maintenance/dumpRdf.php
M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_props.nt
M 
extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Notifications/ChangeNotifierTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/WikibaseRepoTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/content/ItemContentTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/DispatchingValueSnakRdfBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/SimpleValueRdfBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/ValueSnakRdfBuilderFactoryTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlSiteLinkConflictLookupTest.php
M extensions/Wikibase/repo/tests/phpunit/maintenance/dumpRdfTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
41 files changed, 736 insertions(+), 133 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/16/252416/1

diff --git a/Wikidata.php b/Wikidata.php
index e1ee5f8..49542c6 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -38,7 +38,12 @@
 
// @note wikibase/external-validation is removed from 
composer.json for
// deployment builds, during the 'branch' grunt command. 
(pending security review)
-   if ( !empty( $wmgUseWikibaseQualityExternalValidation ) ) {
+   // jenkins builds for deployment branches have this set to 
true, but then we remove
+   // the code, so need to check the extension is there even on 
jenkins.
+   if (
+   !empty( $wmgUseWikibaseQualityExternalValidation )
+   && is_readable( 
"$wgWikidataBaseDir/extensions/ExternalValidation/WikibaseQualityExternalValidation.php"
 )
+   ) {
include_once 
"$wgWikidataBaseDir/extensions/ExternalValidation/WikibaseQualityExternalValidation.php";
}
}
diff --git a/composer.lock b/composer.lock
index 5815e37..bbff0c8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1448,12 +1448,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "dff7e42af26337fbec389e011a3be12a93091c8e"
+"reference": "3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/dff7e42af26337fbec389e011a3be12a93091c8e;,
-

[MediaWiki-commits] [Gerrit] Fix typo in regexp - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Fix typo in regexp
..

Fix typo in regexp

Change-Id: I62701e52219d4c0b38382cc91967e17f7fa15ead
---
M hieradata/regex.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/252415/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 330856c..3ec2c09 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -245,7 +245,7 @@
   ]
   swift_aux_partitions: ['/dev/sda3', '/dev/sdb3']
 debdeploy_dbstore:
-  __regex: !ruby/regexp /^dbstore[12]00[12]]\.(eqiad|codfw)\.wmnet$/
+  __regex: !ruby/regexp /^dbstore[12]00[12]\.(eqiad|codfw)\.wmnet$/
   debdeploy::grains:
 debdeploy-db-dbstore:
   value: standard

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

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

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

[MediaWiki-commits] [Gerrit] Fix typo in regexp - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Fix typo in regexp
..


Fix typo in regexp

Change-Id: I62701e52219d4c0b38382cc91967e17f7fa15ead
---
M hieradata/regex.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 330856c..3ec2c09 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -245,7 +245,7 @@
   ]
   swift_aux_partitions: ['/dev/sda3', '/dev/sdb3']
 debdeploy_dbstore:
-  __regex: !ruby/regexp /^dbstore[12]00[12]]\.(eqiad|codfw)\.wmnet$/
+  __regex: !ruby/regexp /^dbstore[12]00[12]\.(eqiad|codfw)\.wmnet$/
   debdeploy::grains:
 debdeploy-db-dbstore:
   value: standard

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

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

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

[MediaWiki-commits] [Gerrit] build: Upgrade to mediawiki-codesniffer 0.5.0 - change (mediawiki...PronunciationRecording)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: build: Upgrade to mediawiki-codesniffer 0.5.0
..

build: Upgrade to mediawiki-codesniffer 0.5.0

Change-Id: I1049a02ad0afaa17a5473497dc509e995247148a
---
M PronunciationRecording.i18n.php
M PronunciationRecording.php
M composer.json
3 files changed, 7 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PronunciationRecording 
refs/changes/01/252401/1

diff --git a/PronunciationRecording.i18n.php b/PronunciationRecording.i18n.php
index 1a41dd5..9f1bd74 100644
--- a/PronunciationRecording.i18n.php
+++ b/PronunciationRecording.i18n.php
@@ -15,7 +15,7 @@
function wfJsonI18nShimff4e87ecb165bd77( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
+   $fileName = __DIR__ . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents( 
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
diff --git a/PronunciationRecording.php b/PronunciationRecording.php
index cce6134..6ed4f77 100644
--- a/PronunciationRecording.php
+++ b/PronunciationRecording.php
@@ -1,6 +1,8 @@
  __FILE__,
@@ -29,9 +31,9 @@
'remoteExtPath' => 'PronunciationRecording/resources',
 );
 
-//Modules
+// Modules
 
-//"mediawiki.libs.recorderjs" is loaded as WebWorker.
+// "mediawiki.libs.recorderjs" is loaded as WebWorker.
 $wgResourceModules['mediawiki.libs.recorderjs'] = array(
'scripts' => '/mediawiki.libs.recorderjs/recorder.js',
 ) + $pronunciationRecordingModuleInfo;
diff --git a/composer.json b/composer.json
index 48e2014..99741dd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
-   "mediawiki/mediawiki-codesniffer": "0.3.0"
+   "mediawiki/mediawiki-codesniffer": "0.5.0"
},
"scripts": {
"test": [

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

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

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

[MediaWiki-commits] [Gerrit] Fix Hiera path for analytics::spark::standalone::worker role - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Fix Hiera path for analytics::spark::standalone::worker role
..


Fix Hiera path for analytics::spark::standalone::worker role

Change-Id: If1a123e749b05801fbe932f7dfea1110a8a61a40
---
R hieradata/role/common/analytics/spark/standalone/worker.yaml
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/analytics/spark/worker.yaml 
b/hieradata/role/common/analytics/spark/standalone/worker.yaml
similarity index 100%
rename from hieradata/role/common/analytics/spark/worker.yaml
rename to hieradata/role/common/analytics/spark/standalone/worker.yaml

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

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

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

[MediaWiki-commits] [Gerrit] Tests: Replace test.wp/Test with en.wp/Foobar - change (mediawiki...mobileapps)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Tests: Replace test.wp/Test with en.wp/Foobar
..


Tests: Replace test.wp/Test with en.wp/Foobar

CORS and CSP header check tests use testwiki's Test page which doesn't
exist any more. This commit replaces them with enwiki's Foobar page
which is stable and guaranteed to exist.

Bug: T118374
Change-Id: Iadeefd2756c9685b2f8e7d2e6f93b8d9960139a3
---
M test/features/mobile-html-sections-lead/pagecontent.js
M test/features/mobile-html-sections-remaining/pagecontent.js
M test/features/mobile-html-sections/pagecontent.js
M test/features/mobile-html/pagecontent.js
M test/features/mobile-text/pagecontent.js
M test/mocha.opts
6 files changed, 12 insertions(+), 11 deletions(-)

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



diff --git a/test/features/mobile-html-sections-lead/pagecontent.js 
b/test/features/mobile-html-sections-lead/pagecontent.js
index 9338407..1d1aa86 100644
--- a/test/features/mobile-html-sections-lead/pagecontent.js
+++ b/test/features/mobile-html-sections-lead/pagecontent.js
@@ -14,7 +14,7 @@
 before(function () { return server.start(); });
 
 it('should respond to GET request with expected headers, incl. CORS and 
CSP headers', function() {
-return headers.checkHeaders(server.config.uri + 
'test.wikipedia.org/v1/page/mobile-html-sections-lead/Test',
+return headers.checkHeaders(server.config.uri + 
'en.wikipedia.org/v1/page/mobile-html-sections-lead/Foobar',
 'application/json');
 });
 it('Sections/deep page should have a lead object with expected 
properties', function() {
diff --git a/test/features/mobile-html-sections-remaining/pagecontent.js 
b/test/features/mobile-html-sections-remaining/pagecontent.js
index ad49cd6..5c3a59e 100644
--- a/test/features/mobile-html-sections-remaining/pagecontent.js
+++ b/test/features/mobile-html-sections-remaining/pagecontent.js
@@ -14,7 +14,7 @@
 before(function () { return server.start(); });
 
 it('should respond to GET request with expected headers, incl. CORS and 
CSP headers', function() {
-return headers.checkHeaders(server.config.uri + 
'test.wikipedia.org/v1/page/mobile-html-sections-remaining/Test',
+return headers.checkHeaders(server.config.uri + 
'en.wikipedia.org/v1/page/mobile-html-sections-remaining/Foobar',
 'application/json');
 });
 it('Obama (redirect) should have at least one video, and many images', 
function() {
@@ -30,4 +30,4 @@
 assert.ok(remaining.sections[0].anchor.length > 3);
 });
 });
-});
\ No newline at end of file
+});
diff --git a/test/features/mobile-html-sections/pagecontent.js 
b/test/features/mobile-html-sections/pagecontent.js
index b5c6211..4970f31 100644
--- a/test/features/mobile-html-sections/pagecontent.js
+++ b/test/features/mobile-html-sections/pagecontent.js
@@ -14,13 +14,13 @@
 before(function () { return server.start(); });
 
 it('should respond to GET request with expected headers, incl. CORS and 
CSP headers', function() {
-return headers.checkHeaders(server.config.uri + 
'test.wikipedia.org/v1/page/mobile-html-sections/Test',
+return headers.checkHeaders(server.config.uri + 
'en.wikipedia.org/v1/page/mobile-html-sections/Foobar',
 'application/json');
 });
 
 it('return the sent ETag', function() {
 return preq.get({
-uri: server.config.uri + 
'test.wikipedia.org/v1/page/mobile-html-sections/Test',
+uri: server.config.uri + 
'en.wikipedia.org/v1/page/mobile-html-sections/Foobar',
 headers: { 'x-restbase-etag': 
'123456/c3421381-7109-11e5-ac43-8c7f067c3520' }
 }).then(function(res) {
 assert.status(res, 200);
diff --git a/test/features/mobile-html/pagecontent.js 
b/test/features/mobile-html/pagecontent.js
index 23fb1e9..f03a8ef 100644
--- a/test/features/mobile-html/pagecontent.js
+++ b/test/features/mobile-html/pagecontent.js
@@ -15,11 +15,11 @@
 before(function () { return server.start(); });
 
 it('should respond to GET request with expected headers, incl. CORS and 
CSP headers', function() {
-return headers.checkHeaders(server.config.uri + 
'test.wikipedia.org/v1/page/mobile-html/Test',
+return headers.checkHeaders(server.config.uri + 
'en.wikipedia.org/v1/page/mobile-html/Foobar',
 'text/html');
 });
 it('Test page should have right tags in HTML head', function() {
-return preq.get({ uri: server.config.uri + 
'test.wikipedia.org/v1/page/mobile-html/Test' })
+return preq.get({ uri: server.config.uri + 
'en.wikipedia.org/v1/page/mobile-html/Foobar' })
 .then(function(res) {
 assert.deepEqual(res.status, 200);
 var doc = domino.createDocument(res.body);
diff --git a/test/features/mobile-text/pagecontent.js 

[MediaWiki-commits] [Gerrit] MW API: Use POST to issue requests - change (mediawiki...mobileapps)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: MW API: Use POST to issue requests
..

MW API: Use POST to issue requests

The default way of issuing requests to the MW API is via POST, so use
that instead of GET. This commit fixes the problem seen in production
where some requests to the API would return a 414 - Request URI too
long.

Change-Id: I63675b9b1b065726b199e7f623b93e7cb9a1025f
---
M lib/mwapi.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/lib/mwapi.js b/lib/mwapi.js
index a330d58..7ca5169 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -78,9 +78,9 @@
  */
 function apiGet(domain, params) {
 // get the page from the MW API
-return preq.get({
+return preq.post({
 uri: 'https://' + domain + '/w/api.php',
-query: params
+body: params
 }).then(function(response) {
 //console.log(JSON.stringify(response, null, 2));
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63675b9b1b065726b199e7f623b93e7cb9a1025f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] fix stdout/stderr shell redirection syntax - take #2 - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: fix stdout/stderr shell redirection syntax - take #2
..


fix stdout/stderr shell redirection syntax - take #2

followup from Idbc339cafe0

Change-Id: I4e6add0a18eab686b1370fd404cbc1aed3648c83
---
M modules/elasticsearch/manifests/log/hot_threads.pp
M modules/mediawiki/manifests/maintenance/translationnotifications.pp
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/elasticsearch/manifests/log/hot_threads.pp 
b/modules/elasticsearch/manifests/log/hot_threads.pp
index 3594226..d201502 100644
--- a/modules/elasticsearch/manifests/log/hot_threads.pp
+++ b/modules/elasticsearch/manifests/log/hot_threads.pp
@@ -12,7 +12,7 @@
 }
 
 cron { 'elasticsearch-hot-threads-log':
-command => "python ${script} 2>&1 >> ${log}",
+command => "python ${script} >> ${log} 2>&1",
 #So the destination directory exists
 require => Package['elasticsearch'],
 user=> 'elasticsearch',
diff --git 
a/modules/mediawiki/manifests/maintenance/translationnotifications.pp 
b/modules/mediawiki/manifests/maintenance/translationnotifications.pp
index d25ff0d..1bd0c75 100644
--- a/modules/mediawiki/manifests/maintenance/translationnotifications.pp
+++ b/modules/mediawiki/manifests/maintenance/translationnotifications.pp
@@ -6,7 +6,7 @@
 cron { 'translationnotifications-metawiki':
 ensure  => $ensure,
 user=> $::mediawiki::users::web,
-command => '/usr/local/bin/mwscript 
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki metawiki 
2>&1 >> /var/log/translationnotifications/digests.log',
+command => '/usr/local/bin/mwscript 
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki metawiki 
>> /var/log/translationnotifications/digests.log 2>&1',
 weekday => 1, # Monday
 hour=> 10,
 minute  => 0,
@@ -15,7 +15,7 @@
 cron { 'translationnotifications-mediawikiwiki':
 ensure  => $ensure,
 user=> $::mediawiki::users::web,
-command => '/usr/local/bin/mwscript 
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki 
mediawikiwiki 2>&1 >> /var/log/translationnotifications/digests.log',
+command => '/usr/local/bin/mwscript 
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki 
mediawikiwiki >> /var/log/translationnotifications/digests.log 2>&1',
 weekday => 1, # Monday
 hour=> 10,
 minute  => 5,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e6add0a18eab686b1370fd404cbc1aed3648c83
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Assign salt grains for ipsec test hosts - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for ipsec test hosts
..

Assign salt grains for ipsec test hosts

Change-Id: I7c5f0cc27a6bf9397df117e8034435d908b1fb19
---
M hieradata/hosts/berkelium.yaml
M hieradata/hosts/curium.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/252404/1

diff --git a/hieradata/hosts/berkelium.yaml b/hieradata/hosts/berkelium.yaml
index 367063e..e8820f1 100644
--- a/hieradata/hosts/berkelium.yaml
+++ b/hieradata/hosts/berkelium.yaml
@@ -2,3 +2,6 @@
 role::ipsec::hosts:
   - 'berkelium.eqiad.wmnet'
   - 'curium.eqiad.wmnet'
+debdeploy::grains:
+  debdeploy-ipsec-test:
+value: standard
diff --git a/hieradata/hosts/curium.yaml b/hieradata/hosts/curium.yaml
index 367063e..e8820f1 100644
--- a/hieradata/hosts/curium.yaml
+++ b/hieradata/hosts/curium.yaml
@@ -2,3 +2,6 @@
 role::ipsec::hosts:
   - 'berkelium.eqiad.wmnet'
   - 'curium.eqiad.wmnet'
+debdeploy::grains:
+  debdeploy-ipsec-test:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index b5bafac..f0a299d 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -12,7 +12,7 @@
 misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, 
debdeploy-impala:standard, debdeploy-spark-worker:standard
 misc-others = debdeploy-spare:standard, debdeploy-testsystem:standard
 misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, 
debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, 
debdeploy-irc:standard, debdeploy-phabricator:standard, 
debdeploy-gerrit:standard, debdeploy-archiva:standard
-misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, 
debdeploy-installserver:standard, debdeploy-librenms:standard, 
debdeploy-backup-storage:standard
+misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, 
debdeploy-installserver:standard, debdeploy-librenms:standard, 
debdeploy-backup-storage:standard, debdeploy-ipsec-test:standard
 deployment-servers = debdeploy-deployment:standard
 hadoop-worker = debdeploy-hadoop-worker:standard, 
debdeploy-hadoop-worker:canary
 hadoop-worker-canary = debdeploy-hadoop-worker:canary

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

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

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

[MediaWiki-commits] [Gerrit] Tweak some server groups / grains - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Tweak some server groups / grains
..

Tweak some server groups / grains

Change-Id: I5a0fdee0a6dd2b075a18500968652264fcf7b752
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/252403/1

diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 2e9db3e..b5bafac 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -9,7 +9,7 @@
 misc-external-services = debdeploy-tor:standard, debdeploy-etherpad:standard, 
debdeploy-lists:standard, debdeploy-planet:standard, debdeploy-otrs:standard, 
debdeploy-ipv6relay:standard, debdeploy-people:standard, 
debdeploy-mysql-analytics:standard, debdeploy-nova-api:standard, 
debdeploy-impala:standard
 misc-monitoring = debdeploy-grafana:standard, debdeploy-syslog:standard, 
debdeploy-ganglia:standard, debdeploy-graphite:standard, 
debdeploy-labmon:standard, debdeploy-icinga:standard
 misc-virt = debdeploy-nova-control:standard, debdeploy-horizon:standard, 
debdeploy-nova-manager:standard, debdeploy-nova-api:standard, 
debdeploy-labsdns:standard
-misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, 
debdeploy-impala:standard
+misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, 
debdeploy-impala:standard, debdeploy-spark-worker:standard
 misc-others = debdeploy-spare:standard, debdeploy-testsystem:standard
 misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, 
debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, 
debdeploy-irc:standard, debdeploy-phabricator:standard, 
debdeploy-gerrit:standard, debdeploy-archiva:standard
 misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, 
debdeploy-installserver:standard, debdeploy-librenms:standard, 
debdeploy-backup-storage:standard
@@ -95,7 +95,6 @@
 labvirt = debdeploy-nova-compute:standard, debdeploy-nova-compute:canary
 labvirt-canary = debdeploy-nova-compute:canary
 wdqs = debdeploy-wdqs:standard
-spark = debdeploy-spark-worker:standard
 poolcounter = debdeploy-poolcounter-eqiad:standard, 
debdeploy-poolcounter-codfw:standard
 poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard
 poolcounter-codfw = debdeploy-poolcounter-codfw:standard
@@ -134,4 +133,4 @@
 redis-eqiad = debdeploy-redis-eqiad:standard
 redis-codfw = debdeploy-redis-codfw:standard
 redis-canary = debdeploy-redis-eqiad:canary
-redis = debdeploy-redis-eqiad:standard, debdeploy-redis-codfw:standard
+redis = debdeploy-redis-eqiad:standard, debdeploy-redis-codfw:standard, 
debdeploy-redis-eqiad:canary

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

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

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

[MediaWiki-commits] [Gerrit] Depool db1067 for maintenance - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Depool db1067 for maintenance
..

Depool db1067 for maintenance

Change-Id: I359a477eeb35a3f093a8c40cc7a549bb0276f675
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 2bff7f3..7677a34 100755
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -142,7 +142,7 @@
'db2046' => 100,
'db2053' => 100,
'db2060' => 100,
-   'db2067' => 100,
+#  'db2067' => 100,
),
's7' => array(
'db1033' => 0,   # 1.4TB  64GB,

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

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

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

[MediaWiki-commits] [Gerrit] fix stdout/stderr shell redirection syntax - take #2 - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: fix stdout/stderr shell redirection syntax - take #2
..

fix stdout/stderr shell redirection syntax - take #2

followup from Idbc339cafe0

Change-Id: I4e6add0a18eab686b1370fd404cbc1aed3648c83
---
M modules/elasticsearch/manifests/log/hot_threads.pp
M modules/mediawiki/manifests/maintenance/translationnotifications.pp
2 files changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/modules/elasticsearch/manifests/log/hot_threads.pp 
b/modules/elasticsearch/manifests/log/hot_threads.pp
index 3594226..d201502 100644
--- a/modules/elasticsearch/manifests/log/hot_threads.pp
+++ b/modules/elasticsearch/manifests/log/hot_threads.pp
@@ -12,7 +12,7 @@
 }
 
 cron { 'elasticsearch-hot-threads-log':
-command => "python ${script} 2>&1 >> ${log}",
+command => "python ${script} >> ${log} 2>&1",
 #So the destination directory exists
 require => Package['elasticsearch'],
 user=> 'elasticsearch',
diff --git 
a/modules/mediawiki/manifests/maintenance/translationnotifications.pp 
b/modules/mediawiki/manifests/maintenance/translationnotifications.pp
index d25ff0d..73739f4 100644
--- a/modules/mediawiki/manifests/maintenance/translationnotifications.pp
+++ b/modules/mediawiki/manifests/maintenance/translationnotifications.pp
@@ -6,7 +6,8 @@
 cron { 'translationnotifications-metawiki':
 ensure  => $ensure,
 user=> $::mediawiki::users::web,
-command => '/usr/local/bin/mwscript 
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki metawiki 
2>&1 >> /var/log/translationnotifications/digests.log',
+command => '/usr/local/bin/mwscript
+extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki 
metawiki >> /var/log/translationnotifications/digests.log 2>&1',
 weekday => 1, # Monday
 hour=> 10,
 minute  => 0,
@@ -15,7 +16,7 @@
 cron { 'translationnotifications-mediawikiwiki':
 ensure  => $ensure,
 user=> $::mediawiki::users::web,
-command => '/usr/local/bin/mwscript 
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki 
mediawikiwiki 2>&1 >> /var/log/translationnotifications/digests.log',
+command => '/usr/local/bin/mwscript 
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki 
mediawikiwiki >> /var/log/translationnotifications/digests.log 2>&1',
 weekday => 1, # Monday
 hour=> 10,
 minute  => 5,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e6add0a18eab686b1370fd404cbc1aed3648c83
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] hiera: double-quote interpolating tokens - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: hiera: double-quote interpolating tokens
..


hiera: double-quote interpolating tokens

Change-Id: I87aa99763e1f2d945618d4bf0e32c6644e64eb5c
---
M hieradata/role/common/lvs/balancer.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/lvs/balancer.yaml 
b/hieradata/role/common/lvs/balancer.yaml
index 59d817a..1f184f7 100644
--- a/hieradata/role/common/lvs/balancer.yaml
+++ b/hieradata/role/common/lvs/balancer.yaml
@@ -1,3 +1,3 @@
 cluster: lvs
 # fqdn should resolve to the IP on eth0
-ssh::server::listen_address: %{::ipaddress_eth0}
+ssh::server::listen_address: "%{::ipaddress_eth0}"

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-11-11T10:00:01+0000 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New Wikidata Build - 2015-11-11T10:00:01+
..


New Wikidata Build - 2015-11-11T10:00:01+

Change-Id: Ia71cf3cf3bd4ee61025f188c2822abda10ab9f46
---
M Wikidata.php
M composer.lock
M 
extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
M extensions/Wikibase/docs/datatypes.wiki
M extensions/Wikibase/lib/includes/DataTypeDefinitions.php
M extensions/Wikibase/lib/tests/phpunit/DataTypeDefinitionsTest.php
M extensions/Wikibase/lib/tests/phpunit/store/HashSiteLinkStoreTest.php
M extensions/Wikibase/repo/WikibaseRepo.datatypes.php
M extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php
M 
extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M extensions/Wikibase/repo/includes/rdf/ComplexValueRdfBuilder.php
A extensions/Wikibase/repo/includes/rdf/DispatchingValueSnakRdfBuilder.php
M extensions/Wikibase/repo/includes/rdf/RdfBuilder.php
M extensions/Wikibase/repo/includes/rdf/SimpleValueRdfBuilder.php
M extensions/Wikibase/repo/includes/rdf/SnakRdfBuilder.php
R extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilder.php
A extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
M extensions/Wikibase/repo/includes/specials/SpecialEntityData.php
M extensions/Wikibase/repo/maintenance/dumpRdf.php
M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_props.nt
M 
extensions/Wikibase/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Notifications/ChangeNotifierTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/WikibaseRepoTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/content/ItemContentTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/DispatchingValueSnakRdfBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/SimpleValueRdfBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/ValueSnakRdfBuilderFactoryTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlSiteLinkConflictLookupTest.php
M extensions/Wikibase/repo/tests/phpunit/maintenance/dumpRdfTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
41 files changed, 736 insertions(+), 133 deletions(-)

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



diff --git a/Wikidata.php b/Wikidata.php
index e1ee5f8..49542c6 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -38,7 +38,12 @@
 
// @note wikibase/external-validation is removed from 
composer.json for
// deployment builds, during the 'branch' grunt command. 
(pending security review)
-   if ( !empty( $wmgUseWikibaseQualityExternalValidation ) ) {
+   // jenkins builds for deployment branches have this set to 
true, but then we remove
+   // the code, so need to check the extension is there even on 
jenkins.
+   if (
+   !empty( $wmgUseWikibaseQualityExternalValidation )
+   && is_readable( 
"$wgWikidataBaseDir/extensions/ExternalValidation/WikibaseQualityExternalValidation.php"
 )
+   ) {
include_once 
"$wgWikidataBaseDir/extensions/ExternalValidation/WikibaseQualityExternalValidation.php";
}
}
diff --git a/composer.lock b/composer.lock
index 5815e37..bbff0c8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1448,12 +1448,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "dff7e42af26337fbec389e011a3be12a93091c8e"
+"reference": "3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/dff7e42af26337fbec389e011a3be12a93091c8e;,
-"reference": "dff7e42af26337fbec389e011a3be12a93091c8e",
+   

[MediaWiki-commits] [Gerrit] install_server: fix /srv restbase provisioning in codfw - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: install_server: fix /srv restbase provisioning in codfw
..

install_server: fix /srv restbase provisioning in codfw

Change-Id: I73273c0884a123b507c4265c630bee6b475c4af1
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/252420/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 2a2fb31..14446e7 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -120,7 +120,6 @@
restbase100[3-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
-   restbase200[1-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
restbase200[12]) echo partman/cassandrahosts-4ssd-srv.cfg ;; \
restbase200[3-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73273c0884a123b507c4265c630bee6b475c4af1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] MW API: Use POST to issue requests - change (mediawiki...mobileapps)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: MW API: Use POST to issue requests
..


MW API: Use POST to issue requests

The default way of issuing requests to the MW API is via POST, so use
that instead of GET. This commit fixes the problem seen in production
where some requests to the API would return a 414 - Request URI too
long.

Change-Id: I63675b9b1b065726b199e7f623b93e7cb9a1025f
---
M lib/mwapi.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/mwapi.js b/lib/mwapi.js
index a330d58..7ca5169 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -78,9 +78,9 @@
  */
 function apiGet(domain, params) {
 // get the page from the MW API
-return preq.get({
+return preq.post({
 uri: 'https://' + domain + '/w/api.php',
-query: params
+body: params
 }).then(function(response) {
 //console.log(JSON.stringify(response, null, 2));
 

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

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

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

[MediaWiki-commits] [Gerrit] Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8 - change (mediawiki...OAuth)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8
..

Fixup for Ib9b800d3d7ddd095856c5deaf88be82d64db0fb8

Where the relevant use keywords were missing.

Bug: T118372
Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
---
M backend/MWOAuthRequest.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index b69611e..f070165 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -2,6 +2,9 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
+
 /**
  * @file
  * @ingroup OAuth

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8d690da3f1cb45d2b247bd7a9c2a8d4abc01836
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: wmf/1.27.0-wmf.6
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Assign salt grains for es database servers - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for es database servers
..

Assign salt grains for es database servers

These don't use the role keyword (and are not straightforward to convert
since they instantiate parametrised classes), so define the Hiera values
via regex.yaml

Change-Id: Iccfeed7538042092f8641643b67c748af4cb6c42
---
M hieradata/regex.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/252417/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 3ec2c09..016c66a 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -249,3 +249,13 @@
   debdeploy::grains:
 debdeploy-db-dbstore:
   value: standard
+debdeploy_es-eqiad:
+  __regex: !ruby/regexp /^es1\d\d\d\.eqiad\.wmnet$/
+  debdeploy::grains:
+debdeploy-db-es-eqiad:
+  value: standard
+debdeploy_es-codfw:
+  __regex: !ruby/regexp /^es2\d\d\d\.codfw\.wmnet$/
+  debdeploy::grains:
+debdeploy-db-es-codfw:
+  value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index f0a299d..839425e 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -61,7 +61,10 @@
 db-labsdb = debdeploy-labsdb:standard
 db-misc-servers = debdeploy-db-analytics:standard, 
debdeploy-db-sanitarium:standard
 db-dbstore = debdeploy-db-dbstore:standard
-all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard
+db-es-eqiad = debdeploy-db-es-eqiad:standard
+db-es-codfw = debdeploy-db-es-codfw:standard
+db-es = debdeploy-db-es-eqiad:standard, debdeploy-db-es-codfw:standard
+all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard, debdeploy-db-es-eqiad:standard, 
debdeploy-db-es-codfw:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for dbproxy systems - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for dbproxy systems
..


Assign salt grains for dbproxy systems

These don't use the role keyword (and are not straightforward to convert
since they instantiate parametrised classes), so define the Hiera values
via regex.yaml

Change-Id: Iec29602b52b83e9550f490ed442ba81af6dc838b
---
M hieradata/regex.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 016c66a..c2416f0 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -259,3 +259,8 @@
   debdeploy::grains:
 debdeploy-db-es-codfw:
   value: standard
+debdeploy_dbproxy:
+  __regex: !ruby/regexp /^dbproxy100\d\.eqiad\.wmnet$/
+  debdeploy::grains:
+debdeploy-db-dbproxy:
+  value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 839425e..7f91dce 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -64,7 +64,8 @@
 db-es-eqiad = debdeploy-db-es-eqiad:standard
 db-es-codfw = debdeploy-db-es-codfw:standard
 db-es = debdeploy-db-es-eqiad:standard, debdeploy-db-es-codfw:standard
-all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard, debdeploy-db-es-eqiad:standard, 
debdeploy-db-es-codfw:standard
+db-dbproxy = debdeploy-db-dbproxy:standard
+all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard, debdeploy-db-es-eqiad:standard, 
debdeploy-db-es-codfw:standard, debdeploy-db-dbproxy:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard

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

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

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

[MediaWiki-commits] [Gerrit] cassandra: add restbase2001 instance - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: add restbase2001 instance
..

cassandra: add restbase2001 instance

also remove auto_bootstrap, codfw is fully up and running now

Bug: T95253
Change-Id: Ib3613b2a997f98437327ca16d5333cb9156bc409
---
M hieradata/hosts/restbase2001.yaml
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/hosts/restbase2001.yaml 
b/hieradata/hosts/restbase2001.yaml
index f70c27c..92a22c3 100644
--- a/hieradata/hosts/restbase2001.yaml
+++ b/hieradata/hosts/restbase2001.yaml
@@ -1,2 +1,7 @@
 cassandra::rack: 'b'
-cassandra::auto_bootstrap: false
+cassandra::instances:
+  a:
+jmx_port: 7189
+listen_address: 10.192.16.162
+rpc_address: 10.192.16.162
+rpc_interface: eth0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3613b2a997f98437327ca16d5333cb9156bc409
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] add X-Client-IP to as clientip= in X-Analytics - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: add X-Client-IP to as clientip= in X-Analytics
..

add X-Client-IP to as clientip= in X-Analytics

Change-Id: I0984fbd27c1fca6cb8ff0d030d11f2ab2e1f312a
---
M templates/varnish/analytics.inc.vcl.erb
1 file changed, 6 insertions(+), 12 deletions(-)


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

diff --git a/templates/varnish/analytics.inc.vcl.erb 
b/templates/varnish/analytics.inc.vcl.erb
index aedf729..5cc6dd0 100644
--- a/templates/varnish/analytics.inc.vcl.erb
+++ b/templates/varnish/analytics.inc.vcl.erb
@@ -143,12 +143,13 @@
 }
 
 sub analytics_deliver {
-// Create empty header if none, to avoid tons of if/else clauses; will
-// clean up at the end.  Note that if we defined one of the k=v pairs as
-// required (having a real value for the false/negative case), we could
-// set that one first and this would get a bit cleaner...
+// On frontend instances where analytics_deliver runs, XCIP is always set,
+// and from this point forward we can assume resp.http.X-Analytics is too.
 if (!resp.http.X-Analytics) {
-set resp.http.X-Analytics = "";
+set resp.http.X-Analytics = "clientip=" + req.http.X-Client-IP;
+}
+else {
+set resp.http.X-Analytics = resp.http.X-Analytics + ";clientip=" + 
req.http.X-Client-IP;
 }
 
 call analytics_last_access_deliver_;
@@ -187,12 +188,5 @@
 
 if (req.http.X-WMF-NOCOOKIES) {
 set resp.http.X-Analytics = resp.http.X-Analytics + ";nocookies=1";
-}
-
-// Clean up header from setting to empty at the start...
-if (resp.http.X-Analytics == "") {
-unset resp.http.X-Analytics;
-} else {
-set resp.http.X-Analytics = regsub(resp.http.X-Analytics, "^;", "");
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] build: Upgrade to mediawiki-codesniffer 0.5.0 - change (mediawiki...PronunciationRecording)

[jenkins-bot (Code Review)]

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

Change subject: build: Upgrade to mediawiki-codesniffer 0.5.0
..


build: Upgrade to mediawiki-codesniffer 0.5.0

Change-Id: I1049a02ad0afaa17a5473497dc509e995247148a
---
M PronunciationRecording.i18n.php
M PronunciationRecording.php
M composer.json
3 files changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/PronunciationRecording.i18n.php b/PronunciationRecording.i18n.php
index 1a41dd5..9f1bd74 100644
--- a/PronunciationRecording.i18n.php
+++ b/PronunciationRecording.i18n.php
@@ -15,7 +15,7 @@
function wfJsonI18nShimff4e87ecb165bd77( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
+   $fileName = __DIR__ . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents( 
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
diff --git a/PronunciationRecording.php b/PronunciationRecording.php
index cce6134..6ed4f77 100644
--- a/PronunciationRecording.php
+++ b/PronunciationRecording.php
@@ -1,6 +1,8 @@
  __FILE__,
@@ -29,9 +31,9 @@
'remoteExtPath' => 'PronunciationRecording/resources',
 );
 
-//Modules
+// Modules
 
-//"mediawiki.libs.recorderjs" is loaded as WebWorker.
+// "mediawiki.libs.recorderjs" is loaded as WebWorker.
 $wgResourceModules['mediawiki.libs.recorderjs'] = array(
'scripts' => '/mediawiki.libs.recorderjs/recorder.js',
 ) + $pronunciationRecordingModuleInfo;
diff --git a/composer.json b/composer.json
index 48e2014..99741dd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
-   "mediawiki/mediawiki-codesniffer": "0.3.0"
+   "mediawiki/mediawiki-codesniffer": "0.5.0"
},
"scripts": {
"test": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1049a02ad0afaa17a5473497dc509e995247148a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PronunciationRecording
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Purodha 
Gerrit-Reviewer: Siebrand 
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] Update OOjs to v1.1.10 - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update OOjs to v1.1.10
..

Update OOjs to v1.1.10

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fcore.git/v1.1.10/History.md

Change-Id: Id19682f59690aafc70fa05c6febf32b1206090c2
---
M resources/lib/oojs/oojs.jquery.js
1 file changed, 573 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/252452/1

diff --git a/resources/lib/oojs/oojs.jquery.js 
b/resources/lib/oojs/oojs.jquery.js
index 9395ecf..3857f99 100644
--- a/resources/lib/oojs/oojs.jquery.js
+++ b/resources/lib/oojs/oojs.jquery.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs v1.1.9 optimised for jQuery
+ * OOjs v1.1.10 optimised for jQuery
  * https://www.mediawiki.org/wiki/OOjs
  *
  * Copyright 2011-2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-08-25T21:35:29Z
+ * Date: 2015-11-11T16:49:11Z
  */
 ( function ( global ) {
 
@@ -90,17 +90,19 @@
  * @throws {Error} If target already inherits from origin
  */
 oo.inheritClass = function ( targetFn, originFn ) {
+   var targetConstructor;
+
if ( targetFn.prototype instanceof originFn ) {
throw new Error( 'Target already inherits from origin' );
}
 
-   var targetConstructor = targetFn.prototype.constructor;
+   targetConstructor = targetFn.prototype.constructor;
 
// Using ['super'] instead of .super because 'super' is not supported
// by IE 8 and below (bug 63303).
// Provide .parent as alias for code supporting older browsers which
// allows people to comply with their style guide.
-   targetFn['super'] = targetFn.parent = originFn;
+   targetFn[ 'super' ] = targetFn.parent = originFn;
 
targetFn.prototype = createObject( originFn.prototype, {
// Restore constructor property of targetFn
@@ -154,7 +156,7 @@
// Copy prototype properties
for ( key in originFn.prototype ) {
if ( key !== 'constructor' && hasOwn.call( originFn.prototype, 
key ) ) {
-   targetFn.prototype[key] = originFn.prototype[key];
+   targetFn.prototype[ key ] = originFn.prototype[ key ];
}
}
 
@@ -163,7 +165,7 @@
if ( originFn.static ) {
for ( key in originFn.static ) {
if ( hasOwn.call( originFn.static, key ) ) {
-   targetFn.static[key] = originFn.static[key];
+   targetFn.static[ key ] = originFn.static[ key ];
}
}
} else {
@@ -183,8 +185,8 @@
  * that case.
  *
  * @param {Object} obj
- * @param {Mixed...} [keys]
- * @return obj[arguments[1]][arguments[2]] or undefined
+ * @param {...Mixed} [keys]
+ * @return {Object|undefined} obj[arguments[1]][arguments[2]] or undefined
  */
 oo.getProp = function ( obj ) {
var i,
@@ -194,7 +196,7 @@
// Trying to access a property of undefined or null 
causes an error
return undefined;
}
-   retval = retval[arguments[i]];
+   retval = retval[ arguments[ i ] ];
}
return retval;
 };
@@ -210,7 +212,7 @@
  * is not an object, this function will silently abort.
  *
  * @param {Object} obj
- * @param {Mixed...} [keys]
+ * @param {...Mixed} [keys]
  * @param {Mixed} [value]
  */
 oo.setProp = function ( obj ) {
@@ -220,15 +222,15 @@
return;
}
for ( i = 1; i < arguments.length - 2; i++ ) {
-   if ( prop[arguments[i]] === undefined ) {
-   prop[arguments[i]] = {};
+   if ( prop[ arguments[ i ] ] === undefined ) {
+   prop[ arguments[ i ] ] = {};
}
-   if ( Object( prop[arguments[i]] ) !== prop[arguments[i]] ) {
+   if ( Object( prop[ arguments[ i ] ] ) !== prop[ arguments[ i ] 
] ) {
return;
}
-   prop = prop[arguments[i]];
+   prop = prop[ arguments[ i ] ];
}
-   prop[arguments[arguments.length - 2]] = arguments[arguments.length - 1];
+   prop[ arguments[ arguments.length - 2 ] ] = arguments[ arguments.length 
- 1 ];
 };
 
 /**
@@ -260,7 +262,7 @@
 
for ( key in origin ) {
if ( hasOwn.call( origin, key ) ) {
-   r[key] = origin[key];
+   r[ key ] = origin[ key ];
}
}
 
@@ -270,7 +272,7 @@
 /**
  * Get an array of all property values in an object.
  *
- * @param {Object} Object to get values from
+ * @param {Object} obj Object to get values from
  * @return {Array} List of object values
  */
 oo.getObjectValues = function ( obj ) {
@@ 

[MediaWiki-commits] [Gerrit] Fix out of date "Time" data type documentation - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix out of date "Time" data type documentation
..

Fix out of date "Time" data type documentation

I think the discussion reached a state where we can finally state that
the timestamp in a TimeValue is *not* always Gregorian.

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


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

diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index a83b3c1..cea37cd 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -357,7 +357,7 @@
"wikibase-listdatatypes-string-head": "String",
"wikibase-listdatatypes-string-body": "Literal data field for a string 
of glyphs. Typical use are identifiers that have written forms which do not 
depend on the language of the reader.\n* value – explicit value for the 
language specific variant string",
"wikibase-listdatatypes-time-head": "Time",
-   "wikibase-listdatatypes-time-body": "Literal data field for a time 
value. Given as a time with some precision and boundaries. The time is always 
saved internally in the Proleptic Gregorian format, but can use other formats 
during parsing and formatting.\n* time – explicit value for point in time, 
represented as a timestamp resembling ISO 8601, e.g. +2013-01-01T00:00:00Z. The 
year is always signed and padded to have between 1 and 16 digits.\n* timezone – 
explicit value as a signed integer. Timezone information as an offset from UTC 
in minutes.\n* before – explicit integer value for how many units after the 
given time it could be. The unit is given by the precision.\n* after – explicit 
integer value for how many units before the given time it could be. The unit is 
given by the precision.\n* precision – explicit value encoded in a shortint. 
The numbers have the following meaning: 0 - billion years, 1 - hundred million 
years, ..., 6 - millennium, 7 - century, 8 - decade, 9 - year, 10 - month, 11 - 
day, 12 - hour, 13 - minute, 14 - second.\n* calendarmodel – explicit value 
given as a URI. It will identify the calendar model that should be used to 
display this time value.",
+   "wikibase-listdatatypes-time-body": "Literal data field for a point in 
time. Given as a date and time with some precision and boundaries. The time is 
saved internally in the specified calendar model.\n* time – explicit value for 
point in time, represented as a timestamp resembling ISO 8601, e.g. 
+2013-01-01T00:00:00Z. The year is always signed and padded to have between 4 
and 16 digits.\n* timezone – explicit value as a signed integer. Timezone 
information as an offset from UTC in minutes.\n* before – explicit integer 
value for how many units after the given time it could be. The unit is given by 
the precision.\n* after – explicit integer value for how many units before the 
given time it could be. The unit is given by the precision.\n* precision – 
explicit value encoded in a shortint. The numbers have the following meaning: 0 
- billion years, 1 - hundred million years, ..., 6 - millennium, 7 - century, 8 
- decade, 9 - year, 10 - month, 11 - day, 12 - hour, 13 - minute, 14 - 
second.\n* calendarmodel – explicit value given as a URI. It identifies the 
calendar model of the timestamp.",
"wikibase-listdatatypes-url-head": "URL",
"wikibase-listdatatypes-url-body": "Literal data field for a URL. URLs 
are restricted to the protocols also supported for external links in wikitext.",
"wikibase-concept-uri": "Concept URI",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12c7e5514dbf0f74fb799c074d1e7045e7d6aee6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] dataset: remove system::role from the dataset module - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: dataset: remove system::role from the dataset module
..


dataset: remove system::role from the dataset module

Add system::role to the dataset roles and remove it from classes of the
dataset module. They don't belong there and under no definition of a
role is a cronjob a role.

Change-Id: Ibb7027f280b8c6253691e8ed581af569cd143fb1
---
M manifests/role/dataset.pp
M modules/dataset/manifests/cron/kiwix.pp
M modules/dataset/manifests/cron/pagecountsraw.pp
M modules/dataset/manifests/cron/rsync/labs.pp
M modules/dataset/manifests/nfs.pp
M modules/dataset/manifests/rsync/pagecounts.pp
M modules/dataset/manifests/rsync/peers.pp
M modules/dataset/manifests/rsync/phab_dump.pp
M modules/dataset/manifests/rsync/public.pp
9 files changed, 8 insertions(+), 40 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved
  Dzahn: Looks good to me, but someone else must approve



diff --git a/manifests/role/dataset.pp b/manifests/role/dataset.pp
index 079965b..ce598d0 100644
--- a/manifests/role/dataset.pp
+++ b/manifests/role/dataset.pp
@@ -74,6 +74,10 @@
 # of content may or may not be generated here (but should all be eventually)
 # mirrors to the public should not be provided from here via rsync
 class role::dataset::primary {
+system::role { 'role::dataset::primary':
+description => 'dataset primary host',
+}
+
 $rsync = {
 'public' => true,
 'peers'  => true,
@@ -108,6 +112,10 @@
 # number of directories (but best is not at all)
 # mirrors to the public should be provided from here via rsync
 class role::dataset::secondary {
+system::role { 'role::dataset::secondary':
+description => 'dataset secondary host',
+}
+
 $rsync = {
 'public' => true,
 'peers'  => true,
diff --git a/modules/dataset/manifests/cron/kiwix.pp 
b/modules/dataset/manifests/cron/kiwix.pp
index b00c309..64b0b0a 100644
--- a/modules/dataset/manifests/cron/kiwix.pp
+++ b/modules/dataset/manifests/cron/kiwix.pp
@@ -7,11 +7,6 @@
 $ensure = 'absent'
 }
 
-system::role { 'dataset::cron::kiwix':
-ensure  => $ensure,
-description => 'mirror of Kiwix files'
-}
-
 include dataset::common
 
 group { 'mirror':
diff --git a/modules/dataset/manifests/cron/pagecountsraw.pp 
b/modules/dataset/manifests/cron/pagecountsraw.pp
index d04f0a0..d9802cc 100644
--- a/modules/dataset/manifests/cron/pagecountsraw.pp
+++ b/modules/dataset/manifests/cron/pagecountsraw.pp
@@ -10,11 +10,6 @@
 else {
 $ensure = 'absent'
 }
-system::role { 'dataset::cron::pagecountsraw':
-ensure  => $ensure,
-description => 'server of raw page view stats'
-}
-
 file { '/usr/local/bin/daily-pagestats-copy.sh':
 mode   => '0755',
 owner  => 'root',
diff --git a/modules/dataset/manifests/cron/rsync/labs.pp 
b/modules/dataset/manifests/cron/rsync/labs.pp
index def74b4..4eb6989 100644
--- a/modules/dataset/manifests/cron/rsync/labs.pp
+++ b/modules/dataset/manifests/cron/rsync/labs.pp
@@ -8,11 +8,6 @@
 $ensure = 'absent'
 }
 
-system::role { 'dataset::cron::rsync::labs':
-ensure  => $ensure,
-description => 'rsyncer of dumps to labs fs'
-}
-
 file { '/mnt/dumps':
 ensure => directory,
 owner  => 'root',
diff --git a/modules/dataset/manifests/nfs.pp b/modules/dataset/manifests/nfs.pp
index 2f5adb9..bb28134 100644
--- a/modules/dataset/manifests/nfs.pp
+++ b/modules/dataset/manifests/nfs.pp
@@ -9,11 +9,6 @@
 $role_ensure = 'absent'
 }
 
-system::role { 'dataset::nfs':
-ensure  => $role_ensure,
-description => 'nfs server of dumps and other datasets'
-}
-
 file { '/etc/exports':
 mode=> '0444',
 owner   => 'root',
diff --git a/modules/dataset/manifests/rsync/pagecounts.pp 
b/modules/dataset/manifests/rsync/pagecounts.pp
index f780c74..70fba08 100644
--- a/modules/dataset/manifests/rsync/pagecounts.pp
+++ b/modules/dataset/manifests/rsync/pagecounts.pp
@@ -6,11 +6,6 @@
 $ensure = 'absent'
 }
 
-system::role { 'dataset::rsync::pagecounts':
-ensure  => $ensure,
-description => 'mirror of pagecount stats'
-}
-
 include dataset::common
 include dataset::rsync::common
 
diff --git a/modules/dataset/manifests/rsync/peers.pp 
b/modules/dataset/manifests/rsync/peers.pp
index 984729e..957bebd 100644
--- a/modules/dataset/manifests/rsync/peers.pp
+++ b/modules/dataset/manifests/rsync/peers.pp
@@ -6,11 +6,6 @@
 $ensure = 'absent'
 }
 
-system::role { 'dataset::rsync::peers':
-ensure  => $ensure,
-description => 'rsyncer to internal peers of dumps'
-}
-
 include dataset::common
 
 include dataset::rsync::common
diff --git 

[MediaWiki-commits] [Gerrit] Purger for thumbor - change (thumbor/purger)

[jenkins-bot (Code Review)]

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

Change subject: Purger for thumbor
..


Purger for thumbor

Purges only originals for now, through a dedicated URL

Bug: T111005
Change-Id: I253a96525d988f835ec2b1df432fd225a6883420
---
A LICENSE
A Makefile
A README.md
A requirements.txt
A setup.cfg
A setup.py
A tc_purger/__init__.py
A tc_purger/handlers/__init__.py
A tc_purger/handlers/purger.py
A tox.ini
10 files changed, 151 insertions(+), 0 deletions(-)

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



diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..133846d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Gilles Dubuc, Wikimedia Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..8cbd424
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+.PHONY: setup_docs build_docs docs
+
+install:
+   pip install .
+
+reinstall:
+   pip uninstall tc-purger -y
+   pip install .
+
+setup:
+   @pip install -e .[tests]
+
+setup_docs:
+   pip install -r docs/requirements.txt
+
+build_docs:
+   cd docs && make html
+
+docs: setup_docs build_docs
+   python -mwebbrowser file:///`pwd`/docs/_build/html/index.html
+
+pyvows_run:
+   @pyvows -vvv --profile --cover --cover-package=tc_purger vows/
diff --git a/README.md b/README.md
new file mode 100644
index 000..40e5a1e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# purger
+Purger for thumbor
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..ce1d4f8
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+tc_core
+thumbor
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000..b88034e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md
diff --git a/setup.py b/setup.py
new file mode 100644
index 000..1fcd277
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from setuptools import setup, find_packages
+
+
+setup(
+name='tc_purger',
+version='0.1.1',
+url='https://github.com/wikimedia/thumbor-purger',
+license='MIT',
+author='Gilles Dubuc, Wikimedia Foundation',
+description='Purger',
+packages=find_packages(),
+include_package_data=True,
+zip_safe=False,
+platforms='any',
+install_requires=[
+'thumbor',
+'tc_core',
+],
+extras_require={
+'tests': [
+'pyvows',
+'coverage',
+],
+},
+classifiers=[
+'Development Status :: 4 - Beta',
+'Intended Audience :: Developers',
+'License :: OSI Approved :: MIT License',
+'Operating System :: OS Independent',
+'Programming Language :: Python',
+'Topic :: Software Development :: Libraries :: Python Modules'
+]
+)
diff --git a/tc_purger/__init__.py b/tc_purger/__init__.py
new file mode 100644
index 000..c314492
--- /dev/null
+++ b/tc_purger/__init__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2015, thumbor-community, Wikimedia Foundation
+# Use of this source code is governed by the MIT license that can be
+# found in the LICENSE file.
+
+from tc_core import Extension, Extensions
+from tc_purger.handlers.purger import UrlPurgerHandler
+
+extension = Extension('tc_purger')
+
+# Register the route
+extension.add_handler(UrlPurgerHandler.regex(), UrlPurgerHandler)
+
+Extensions.register(extension)
diff --git a/tc_purger/handlers/__init__.py b/tc_purger/handlers/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/tc_purger/handlers/__init__.py
diff --git a/tc_purger/handlers/purger.py b/tc_purger/handlers/purger.py
new file mode 100644
index 000..726b160
--- /dev/null
+++ b/tc_purger/handlers/purger.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2015, 

[MediaWiki-commits] [Gerrit] Restore satisfaction schema and fix the performance issue th... - change (mediawiki...WikimediaEvents)

[jenkins-bot (Code Review)]

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

Change subject: Restore satisfaction schema and fix the performance issue that 
it had
..


Restore satisfaction schema and fix the performance issue that it had

Bug: T116319
Change-Id: Ibeaaf8f43b1d67678e81653c0429875dec4fdb0b
---
M .jshintrc
M WikimediaEvents.php
M modules/ext.wikimediaEvents.searchSatisfaction.js
3 files changed, 311 insertions(+), 77 deletions(-)

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



diff --git a/.jshintrc b/.jshintrc
index 8717bd4..ff367dc 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -19,5 +19,8 @@
"predef": [
"mediaWiki",
"jQuery"
-   ]
+   ],
+   "globals": {
+   "JSON": true
+   }
 }
diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index 4091add..785f226 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -83,7 +83,7 @@
'schema.TestSearchSatisfaction2' => array(
'class'=> 'ResourceLoaderSchemaModule',
'schema'   => 'TestSearchSatisfaction2',
-   'revision' => 14318467,
+   'revision' => 14098806,
),
'schema.GeoFeatures' => array(
'class'=> 'ResourceLoaderSchemaModule',
@@ -109,6 +109,7 @@
'dependencies' => array(
'mediawiki.user', // needed by search.js, 
searchSuggest.js
'mediawiki.Uri', // needed by searchSatisfaction.js
+   'mediawiki.storage', // needed by searchSatisfaction.js
'schema.GeoFeatures', // needed by geoFeatures.js
),
'localBasePath' => __DIR__ . '/modules',
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index ac173f9..a4b1b9f 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -1,111 +1,341 @@
 /*!
  * Javacsript module for measuring internal search bounce rate and dwell time.
+ * Utilizes two wprov query string formats:
+ * - serp:N - This indicates the link was visited directly from a SERP. N is
+ *   a positive integer indicating the position of this page within the 
results.
+ * - cirrus - This indicates the link was visited as part of a search session
+ *   but not directly from the search page.
+ *
+ * Example:
+ * - User performs search, is shown Special:Search. This has no wprov query 
string parameter
+ * - User clicks the 2nd result in the page which is `Jimmy Wales`, the user 
is sent to
+ *   /wiki/Jimmy_Wales?wprov=serp:2
+ * - User clicks a link in the content area of `Jimmy Wales` to `Wikipedia`, 
the user is sent to
+ *   /wiki/Wikipedia?wprov=cirrus.
+ * - Visiting any page without having a direct click stream through article 
pages back
+ *   to a SERP does not log events.
  *
  * @license GNU GPL v2 or later
  * @author Erik Bernhardson 
  */
 ( function ( mw, $, undefined ) {
-   var isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
-   uri = new mw.Uri( location.href ),
-   cameFromSearchResult = uri.query.wprov === 'cirrus';
 
-   function oneIn( populationSize ) {
-   return Math.floor( Math.random() * populationSize ) === 0;
-   }
-
-   if ( cameFromSearchResult ) {
-   // cleanup the location bar in supported browsers
-   if ( window.history.replaceState ) {
-   delete uri.query.wprov;
-   window.history.replaceState( {}, '', uri.toString() );
-   }
-   } else if ( !isSearchResultPage ) {
+   // reject mobile users
+   if ( mw.config.get( 'wgMFMode' ) !== null ) {
return;
}
 
-   mw.loader.using( [
-   'jquery.jStorage',
-   'mediawiki.user',
-   'ext.eventLogging',
-   'schema.TestSearchSatisfaction2'
-   ] ).then( function () {
-   var searchSessionId = $.jStorage.get( 'searchSessionId' ),
-   sessionLifetimeMs = 10 * 60 * 1000,
-   checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 
180, 210, 240, 300, 360, 420 ],
-   pageId = mw.user.generateRandomSessionId(),
+   var isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
+   uri = new mw.Uri( location.href ),
+   // wprov attached to all search result links. If available
+   // indicates user got here directly from Special:Search
+   wprovPrefix = 'srpw1_',
+   // srpw1 has the position (including offset) of the search
+   // result appended.
+   searchResultPosition = parseInt( uri.query.wprov &&
+   uri.query.wprov.substr( 0, wprovPrefix.length ) === 

[MediaWiki-commits] [Gerrit] mw.loader: Use requestIdleCallback to update module store - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: mw.loader: Use requestIdleCallback to update module store
..


mw.loader: Use requestIdleCallback to update module store

.. instead of setTimeout.

Also adapt the code accordingly since it is no longer needed to
cancel and re-schedule an update every time update() is called.
This is already handled by requestIdleCallback.

We can let the already-scheduled callback survive. The data
that will be saved is serialised during the flush anyway,
not when scheduling.

Change-Id: Iea48919b4baba7647040b6ed9ff4b6d0d387b962
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 18 insertions(+), 16 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 3ffe55f..db07ec9 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2277,15 +2277,13 @@
},
 
/**
-* Sync modules to localStorage.
+* Sync in-memory store back to 
localStorage.
 *
-* This function debounces localStorage 
updates. When called multiple times in
-* quick succession, the calls are 
coalesced into a single update operation.
-* This allows us to call #update 
without having to consider the module load
-* queue; the call to 
localStorage.setItem will be naturally deferred until the
-* page is quiescent.
+* This function debounces updates. 
When called with a flush already pending,
+* the call is coalesced into the 
pending update. The call to
+* localStorage.setItem will be 
naturally deferred until the page is quiescent.
 *
-* Because localStorage is shared by 
all pages with the same origin, if multiple
+* Because localStorage is shared by 
all pages from the same origin, if multiple
 * pages are loaded with different 
module sets, the possibility exists that
 * modules saved by one page will be 
clobbered by another. But the impact would
 * be minor and the problem would be 
corrected by subsequent page views.
@@ -2293,16 +2291,16 @@
 * @method
 */
update: ( function () {
-   var timer;
+   var hasPendingWrite = false;
 
-   function flush() {
-   var data,
-   key = 
mw.loader.store.getStoreKey();
-
-   if ( 
!mw.loader.store.enabled ) {
-   return false;
+   function flushWrites() {
+   var data, key;
+   if ( !hasPendingWrite 
|| !mw.loader.store.enabled ) {
+   return;
}
+
mw.loader.store.prune();
+   key = 
mw.loader.store.getStoreKey();
try {
// Replacing 
the content of the module store might fail if the new
// contents 
would exceed the browser's localStorage size limit. To
@@ -2314,11 +2312,15 @@
} catch ( e ) {
mw.track( 
'resourceloader.exception', { exception: e, source: 'store-localstorage-update' 
} );
}
+
+   hasPendingWrite = false;
}
 
return 

[MediaWiki-commits] [Gerrit] Remove support for Wikidata build from build script. - change (mediawiki...Wikibase)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Remove support for Wikidata build from build script.
..

Remove support for Wikidata build from build script.

It is not used for that purpose anymore. Testing of the Wikidata build works on
the Wikimedia Jenkins without a special setup script.

Change-Id: Ic4602b2962d2368aae9fd970a9480cc82cf8d0e0
---
M build/jenkins/mw-apply-wb-settings.sh
1 file changed, 7 insertions(+), 15 deletions(-)


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

diff --git a/build/jenkins/mw-apply-wb-settings.sh 
b/build/jenkins/mw-apply-wb-settings.sh
index d01ba59..d3dfed0 100755
--- a/build/jenkins/mw-apply-wb-settings.sh
+++ b/build/jenkins/mw-apply-wb-settings.sh
@@ -15,6 +15,11 @@
esac
 done
 
+if [ $BUILD = true ] then
+  echo "-b true is not supported by this script anymore."
+  exit 1
+fi
+
 function apply_client_settings {
   echo "client"
   echo '$wgEnableWikibaseRepo = false;' >> LocalSettings.php
@@ -23,13 +28,7 @@
   echo '$wgWikimediaJenkinsCI = true;' >> LocalSettings.php
   echo '$wmgUseWikibaseRepo = false;' >> LocalSettings.php
   echo '$wmgUseWikibaseClient = true;' >> LocalSettings.php
-  if [ $BUILD = true ]
-  then
-echo 'require_once __DIR__ . "/extensions/Wikidata/Wikidata.php";' >> 
LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/client/ExampleSettings.php";' >> 
LocalSettings.php
-  else
-echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
-  fi
+  echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
 }
 
 function apply_repo_settings {
@@ -39,14 +38,7 @@
   echo '$wgWikimediaJenkinsCI = true;' >> LocalSettings.php
   echo '$wmgUseWikibaseRepo = true;' >> LocalSettings.php
   echo '$wmgUseWikibaseClient = true;' >> LocalSettings.php
-  if [ $BUILD = true ]
-  then
-echo 'require_once __DIR__ . "/extensions/Wikidata/Wikidata.php";' >> 
LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/repo/ExampleSettings.php";' >> 
LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/client/ExampleSettings.php";' >> 
LocalSettings.php
-  else
-echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
-  fi
+  echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
 }
 
 cd $WORKSPACE/src

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4602b2962d2368aae9fd970a9480cc82cf8d0e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 

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

[MediaWiki-commits] [Gerrit] Tag v1.1.10 - change (oojs/core)

[jenkins-bot (Code Review)]

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

Change subject: Tag v1.1.10
..


Tag v1.1.10

Change-Id: Ieae8fd3720074f4d2cefe04ee8a940d6d1964250
---
M History.md
M package.json
2 files changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index 6c4348d..8e48467 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,14 @@
 # OOjs Release History
 
+## v1.1.10 / 2015-11-11
+* EventEmitter: Allow disconnecting event handlers given by array (Moriel 
Schottlender)
+* Add EmitterList class (Moriel Schottlender)
+* Add SortedEmitterList class (Moriel Schottlender)
+* core: Add binarySearch() utility from VisualEditor (Ed Sanders)
+* build: Bump various devDependencies to latest (James D. Forrester)
+* tests: Add QUnit web interface (Moriel Schottlender)
+* AUTHORS: Update for the past few months (James D. Forrester)
+
 ## v1.1.9 / 2015-08-25
 * build: Fix the build by downgrading Karma and removing testing of Safari 5 
(Timo Tijhof)
 * core: Remove dependency on Object.create (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index d777c5b..a47a3c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "Power for object oriented JavaScript libraries.",
   "keywords": [
 "oo",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieae8fd3720074f4d2cefe04ee8a940d6d1964250
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
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 pronunciation file URL instead of page URL - change (mediawiki...mobileapps)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Use pronunciation file URL instead of page URL
..

Use pronunciation file URL instead of page URL

Bug: T117944
Change-Id: Ie8bcd2fbd1d649d5f2c402662398244b42dde061
---
M lib/parseProperty.js
M routes/mobile-html-sections.js
M test/features/mobile-html-sections-lead/pagecontent.js
A test/features/mobile-html-sections-lead/parse-pronunciation-test.js
4 files changed, 57 insertions(+), 11 deletions(-)


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

diff --git a/lib/parseProperty.js b/lib/parseProperty.js
index 170baa1..7df6b94 100644
--- a/lib/parseProperty.js
+++ b/lib/parseProperty.js
@@ -21,16 +21,35 @@
 return mUtil.defaultVal(mUtil.filterEmpty(table));
 }
 
-function ensureUrlWithDomain(url, domain) {
-if (url.indexOf("//") === -1) {
-url = "//" + domain + url;
-}
-return url;
+function parsePronunciationFilePageUrls(doc) {
+var ipaFileWithExtensionPageUrlSelector = 'span.IPA a[href*=.]';
+return doc.querySelectorAll(ipaFileWithExtensionPageUrlSelector)
+.map(function(anchor) {
+return anchor.getAttribute('href');
+});
 }
 
-function parsePronunciation(doc, domain) {
-var anchor = doc.querySelector('span.IPA a[href]');
-return anchor && { 'url': ensureUrlWithDomain(anchor.getAttribute('href'), 
domain) };
+function filePageUrlToFilename(url) {
+return url && url.replace(/^.*wiki\/File:/, '');
+}
+
+function filePageUrlToFileUrlSelector(filePageUrl) {
+return filePageUrl && 'a[href^=//][href$=/' + 
filePageUrlToFilename(filePageUrl) + ']';
+}
+
+function pickPronuciationFilePageUrl(urls, title) {
+  var titleRegExp = new RegExp(title.replace(/[\s_-]/g, '.?'), 'i');
+  return urls.find(function(url) {
+  return titleRegExp.test(url);
+  }) || urls[0];
+}
+
+function parsePronunciation(doc, title) {
+  var pageUrls = parsePronunciationFilePageUrls(doc);
+  var pageUrl = pickPronuciationFilePageUrl(pageUrls, title);
+  var selector = filePageUrlToFileUrlSelector(pageUrl);
+  var url = pageUrl && doc.querySelector(selector).getAttribute('href');
+  return url && { url: 'https:' + url };
 }
 
 /**
@@ -90,5 +109,6 @@
 parseInfobox: parseInfobox,
 parsePronunciation: parsePronunciation,
 parseSpokenWikipedia: parseSpokenWikipedia,
-parseGeo: parseGeo
+parseGeo: parseGeo,
+testPickPronuciationFilePageUrl: pickPronuciationFilePageUrl
 };
diff --git a/routes/mobile-html-sections.js b/routes/mobile-html-sections.js
index ca2c9fc..a2a0e67 100644
--- a/routes/mobile-html-sections.js
+++ b/routes/mobile-html-sections.js
@@ -132,7 +132,7 @@
 })),
 extract: input.extract && parseExtract(input.extract.body),
 infobox: parse.parseInfobox(lead),
-pronunciation: parse.parsePronunciation(lead, domain),
+pronunciation: parse.parsePronunciation(lead, input.meta.displaytitle),
 spoken: input.page.spoken,
 geo: input.page.geo,
 sections: buildLeadSections(input.page.sections),
diff --git a/test/features/mobile-html-sections-lead/pagecontent.js 
b/test/features/mobile-html-sections-lead/pagecontent.js
index 1d1aa86..fea632f 100644
--- a/test/features/mobile-html-sections-lead/pagecontent.js
+++ b/test/features/mobile-html-sections-lead/pagecontent.js
@@ -102,7 +102,7 @@
 .then(function(res) {
 var lead = res.body;
 assert.deepEqual(res.status, 200);
-assert.deepEqual(lead.pronunciation.url, 
'//en.wikipedia.org/wiki/File:En-us-Barack-Hussein-Obama.ogg');
+assert.deepEqual(lead.pronunciation.url, 
'https://upload.wikimedia.org/wikipedia/commons/8/82/En-us-Barack-Hussein-Obama.ogg');
 });
 });
 it('en Main page should have at least one image', function() {
diff --git 
a/test/features/mobile-html-sections-lead/parse-pronunciation-test.js 
b/test/features/mobile-html-sections-lead/parse-pronunciation-test.js
new file mode 100644
index 000..cb645cb
--- /dev/null
+++ b/test/features/mobile-html-sections-lead/parse-pronunciation-test.js
@@ -0,0 +1,26 @@
+'use strict';
+var assert = require('../../utils/assert.js');
+var pickPronunciatonFilePageUrl = 
require('../../../lib/parseProperty.js').testPickPronuciationFilePageUrl;
+
+//update android code
+describe('pickPronuciationFilePageUrl', function() {
+function padExpectedUrl(expected) {
+return ['/wiki/File:dummy0.ogg', expected, '/wiki/File:dummy1.ogg'];
+}
+
+it('spaces in title should not effect choice', function() {
+var expected = '/wiki/File:en-us-United-Arab-Emirates.ogg';
+var urls = padExpectedUrl(expected);
+var title = 'United Arab Emirates';
+var result = pickPronunciatonFilePageUrl(urls, title)
+assert.deepEqual(result, 

[MediaWiki-commits] [Gerrit] dataset: inline the non-role role classes - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: dataset: inline the non-role role classes
..


dataset: inline the non-role role classes

Inline the classes
 - role::dataset::pagecountsraw
 - role::dataset::pagecounts_all_sites
 - role::dataset::mediacounts
to role::dataset::primary, as:
 * they are not really role classes in the first place
 * they are only being used by role::dataset::primary
 * it makes for simpler and cleaner code

Change-Id: I1e7e00549efff853eca3bd2ffc4c4da5f7cd22d2
---
M manifests/role/dataset.pp
1 file changed, 40 insertions(+), 82 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/manifests/role/dataset.pp b/manifests/role/dataset.pp
index ce598d0..9b713df 100644
--- a/manifests/role/dataset.pp
+++ b/manifests/role/dataset.pp
@@ -1,75 +1,5 @@
 # role classes for dataset servers
 
-class role::dataset::pagecountsraw($enable = true) {
-class { '::dataset::cron::pagecountsraw':
-enable  => $enable,
-source  => 'stat1002.eqiad.wmnet::hdfs-archive/pagecounts-raw/*/*/',
-}
-}
-
-# == Class role::dataset::pagecounts_all_sites
-#
-# NOTE: this requires that an rsync server
-# module named 'hdfs-archive' is configured on stat1002.
-#
-# This will make these files available at
-# http://dumps.wikimedia.org/other/pagecounts-all-sites/
-#
-class role::dataset::pagecounts_all_sites($enable = true) {
-# TODO: Make this class use dataset::cron::job define instead.
-class { '::dataset::cron::pagecounts_all_sites':
-source =>  'stat1002.eqiad.wmnet::hdfs-archive/pagecounts-all-sites',
-enable => $enable,
-}
-}
-
-# == Class role::dataset::pageviews
-#
-# NOTE: this requires that an rsync server
-# module named 'hdfs-archive' is configured on stat1002.
-#
-# This will make these files available at
-# http://dumps.wikimedia.org/other/pageviews/
-#
-# Copies over files with pageview statistics per page and project,
-# using the current definition of pageviews, from an rsyncable location.
-#
-# These statistics are computed from the raw webrequest logs by the
-# pageview definition: https://meta.wikimedia.org/wiki/Research:Page_view
-#
-# See: 
https://github.com/wikimedia/analytics-refinery/tree/master/oozie/pageview
-#   (docs on the jobs that create the table and archive the files)
-#  https://wikitech.wikimedia.org/wiki/Analytics/Data/Pageview_hourly
-#   (docs on the table from which these statistics are computed)
-#
-class role::dataset::pageviews($ensure = 'present') {
-# Note:  pageview and projectvew files are expected to be in the same
-# directory on dumps.wikimedia.org.  Here the destination for these
-# is the same.
-dataset::cron::job { 'pageview':
-ensure  => $ensure,
-source  => 
'stat1002.eqiad.wmnet::hdfs-archive/{pageview,projectview}/legacy/hourly',
-destination => '/data/xmldatadumps/public/other/pageviews',
-minute  => '51',
-}
-}
-
-# == Class role::dataset::mediacounts
-#
-# NOTE: this requires that an rsync server
-# module named 'hdfs-archive' is configured on stat1002.
-#
-# This will make these files available at
-# http://dumps.wikimedia.org/other/mediacounts/
-#
-class role::dataset::mediacounts($enable = true) {
-class { '::dataset::cron::mediacounts':
-source =>  'stat1002.eqiad.wmnet::hdfs-archive/mediacounts',
-enable => $enable,
-}
-}
-
-
 # a dumps primary server has dumps generated on this host; other directories
 # of content may or may not be generated here (but should all be eventually)
 # mirrors to the public should not be provided from here via rsync
@@ -95,16 +25,47 @@
 grabs   => $grabs,
 uploads => $uploads,
 }
-class { 'role::dataset::pagecountsraw': enable => true }
 
-class { 'role::dataset::pagecounts_all_sites':
-enable => true,
+# NOTE: these requires that an rsync server module named 'hdfs-archive' is
+# configured on stat1002.
+class { '::dataset::cron::pagecountsraw':
+enable  => true,
+source  => 'stat1002.eqiad.wmnet::hdfs-archive/pagecounts-raw/*/*/',
 }
 
-class { 'role::dataset::pageviews': }
-
-class { 'role::dataset::mediacounts':
+class { '::dataset::cron::mediacounts':
 enable => true,
+source => 'stat1002.eqiad.wmnet::hdfs-archive/mediacounts',
+}
+
+# TODO: Make this class use dataset::cron::job define instead.
+class { '::dataset::cron::pagecounts_all_sites':
+enable => true,
+source => 'stat1002.eqiad.wmnet::hdfs-archive/pagecounts-all-sites',
+}
+
+# This will make these files available at
+# http://dumps.wikimedia.org/other/pageviews/
+#
+# Copies over files with pageview statistics per page and project,
+# using the current definition of pageviews, from an rsyncable location.
+#
+   

[MediaWiki-commits] [Gerrit] add all the composer based jobs to ext:ArticlePlaceholder - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: add all the composer based jobs to ext:ArticlePlaceholder
..


add all the composer based jobs to ext:ArticlePlaceholder

Bug: T113049
Change-Id: I61b76563e9340a291f3d1542e0b9842a6a1dfa0d
---
M zuul/ext_dependencies.py
M zuul/layout.yaml
2 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/zuul/ext_dependencies.py b/zuul/ext_dependencies.py
index 9571430..0730446 100755
--- a/zuul/ext_dependencies.py
+++ b/zuul/ext_dependencies.py
@@ -3,6 +3,7 @@
 dependencies = {
 'AbuseFilter': ['AntiSpoof'],
 'ApiFeatureUsage': ['Elastica'],
+'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
 'Capiunto': ['Scribunto'],
 'Citoid': ['VisualEditor'],
 'CodeEditor': ['WikiEditor'],
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d3f6995..07e94b3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3000,11 +3000,18 @@
 
   - name: mediawiki/extensions/ArticlePlaceholder
 template:
-  - name: extension-unittests-generic
+  - name: composer-test
+  - name: extension-unittests-composer
   - name: npm
 check:
   - jsonlint
   - jshint
+test:
+  - mwext-qunit-composer
+gate-and-submit:
+  - mwext-qunit-composer
+experimental:
+  - mwext-mw-selenium-composer
 
   - name: mediawiki/extensions/ApiSandbox
 template:

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

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

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

[MediaWiki-commits] [Gerrit] sentry: use $::mail_smarthost for SMTP_HOST - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: sentry: use $::mail_smarthost for SMTP_HOST
..


sentry: use $::mail_smarthost for SMTP_HOST

Hardcoding the setting into the module is ugly but it's available
as a puppet variable and I couldn't figure out a way to reconcile
that with a hiera-based approach since hiera cannot interpolate
array elements.

Bug: T116709
Change-Id: If4b5e28d1c9cb270aa4d1aa866ead84f39c71cfc
---
M hieradata/labs/sentry/common.yaml
M hieradata/role/common/sentry.yaml
M modules/sentry/manifests/init.pp
M modules/sentry/templates/sentry.conf.py.erb
4 files changed, 1 insertion(+), 17 deletions(-)

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



diff --git a/hieradata/labs/sentry/common.yaml 
b/hieradata/labs/sentry/common.yaml
index da4100d..1476ddc 100644
--- a/hieradata/labs/sentry/common.yaml
+++ b/hieradata/labs/sentry/common.yaml
@@ -1,3 +1,2 @@
 sentry::server_name: "%{::sentry_server_name}"
-sentry::smtp_host: 'mx1001.wikimedia.org'
 sentry::admin_email: 'gti...@wikimedia.org'
diff --git a/hieradata/role/common/sentry.yaml 
b/hieradata/role/common/sentry.yaml
index a021f82..c07e1ed 100644
--- a/hieradata/role/common/sentry.yaml
+++ b/hieradata/role/common/sentry.yaml
@@ -1,3 +1,2 @@
 sentry::server_name: 'sentry.wikimedia.org'
-sentry::smtp_host: 'mx1001.wikimedia.org'
 sentry::admin_email: 'gti...@wikimedia.org'
diff --git a/modules/sentry/manifests/init.pp b/modules/sentry/manifests/init.pp
index 5f3b1e3..51ae189 100644
--- a/modules/sentry/manifests/init.pp
+++ b/modules/sentry/manifests/init.pp
@@ -11,15 +11,6 @@
 # [*server_name*]
 #   Domain name under which Sentry will be available.
 #
-# [*smtp_host*]
-#   SMTP server host name; used to send email alerts on new errors.
-#
-# [*smtp_user*]
-#   SMTP username.
-#
-# [*smtp_pass*]
-#   SMTP password.
-#
 # [*git_branch*]
 #   Which branch to check out.
 #
@@ -38,9 +29,6 @@
 $secret_key,
 $admin_pass,
 $admin_email = 'n...@wikimedia.org',
-$smtp_host   = '',
-$smtp_user   = '',
-$smtp_pass   = '',
 $git_branch  = 'master',
 ) {
 include ::nginx
diff --git a/modules/sentry/templates/sentry.conf.py.erb 
b/modules/sentry/templates/sentry.conf.py.erb
index e17d8ab..5baa9e4 100644
--- a/modules/sentry/templates/sentry.conf.py.erb
+++ b/modules/sentry/templates/sentry.conf.py.erb
@@ -92,9 +92,7 @@
 #
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = '<%= @smtp_host %>'
-EMAIL_HOST_USER = '<%= @smtp_user %>'
-EMAIL_HOST_PASSWORD = '<%= @smtp_pass %>'
+EMAIL_HOST = '<%= @mail_smarthost[0] %>'
 SERVER_EMAIL = 'sentry@<%= @server_name %>'
 
 # see http://sentry.readthedocs.org/en/latest/beacon.html

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4b5e28d1c9cb270aa4d1aa866ead84f39c71cfc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Faidon Liambotis 
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] regex() must be a classmethod - change (thumbor/purger)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: regex() must be a classmethod
..

regex() must be a classmethod

Because the instance isn't created directly in __init.py__, so only
the class is available then.

Change-Id: I46e16091c760da052e0948ba4953831604da2461
---
M tc_purger/handlers/purger.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/thumbor/purger 
refs/changes/60/252460/1

diff --git a/tc_purger/handlers/purger.py b/tc_purger/handlers/purger.py
index 726b160..106215e 100644
--- a/tc_purger/handlers/purger.py
+++ b/tc_purger/handlers/purger.py
@@ -12,7 +12,8 @@
 
 
 class UrlPurgerHandler(ImagingHandler):
-def regex(self):
+@classmethod
+def regex(cls):
 '''
 :return: The regex used for routing.
 :rtype: string

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46e16091c760da052e0948ba4953831604da2461
Gerrit-PatchSet: 1
Gerrit-Project: thumbor/purger
Gerrit-Branch: master
Gerrit-Owner: Gilles 

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

[MediaWiki-commits] [Gerrit] Update OOjs to v1.1.10 - change (VisualEditor/VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update OOjs to v1.1.10
..

Update OOjs to v1.1.10

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fcore.git/v1.1.10/History.md

Change-Id: Id19682f59690aafc70fa05c6febf32b1206090c2
---
M lib/oojs/oojs.jquery.js
1 file changed, 573 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/51/252451/1

diff --git a/lib/oojs/oojs.jquery.js b/lib/oojs/oojs.jquery.js
index 9395ecf..3857f99 100644
--- a/lib/oojs/oojs.jquery.js
+++ b/lib/oojs/oojs.jquery.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs v1.1.9 optimised for jQuery
+ * OOjs v1.1.10 optimised for jQuery
  * https://www.mediawiki.org/wiki/OOjs
  *
  * Copyright 2011-2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-08-25T21:35:29Z
+ * Date: 2015-11-11T16:49:11Z
  */
 ( function ( global ) {
 
@@ -90,17 +90,19 @@
  * @throws {Error} If target already inherits from origin
  */
 oo.inheritClass = function ( targetFn, originFn ) {
+   var targetConstructor;
+
if ( targetFn.prototype instanceof originFn ) {
throw new Error( 'Target already inherits from origin' );
}
 
-   var targetConstructor = targetFn.prototype.constructor;
+   targetConstructor = targetFn.prototype.constructor;
 
// Using ['super'] instead of .super because 'super' is not supported
// by IE 8 and below (bug 63303).
// Provide .parent as alias for code supporting older browsers which
// allows people to comply with their style guide.
-   targetFn['super'] = targetFn.parent = originFn;
+   targetFn[ 'super' ] = targetFn.parent = originFn;
 
targetFn.prototype = createObject( originFn.prototype, {
// Restore constructor property of targetFn
@@ -154,7 +156,7 @@
// Copy prototype properties
for ( key in originFn.prototype ) {
if ( key !== 'constructor' && hasOwn.call( originFn.prototype, 
key ) ) {
-   targetFn.prototype[key] = originFn.prototype[key];
+   targetFn.prototype[ key ] = originFn.prototype[ key ];
}
}
 
@@ -163,7 +165,7 @@
if ( originFn.static ) {
for ( key in originFn.static ) {
if ( hasOwn.call( originFn.static, key ) ) {
-   targetFn.static[key] = originFn.static[key];
+   targetFn.static[ key ] = originFn.static[ key ];
}
}
} else {
@@ -183,8 +185,8 @@
  * that case.
  *
  * @param {Object} obj
- * @param {Mixed...} [keys]
- * @return obj[arguments[1]][arguments[2]] or undefined
+ * @param {...Mixed} [keys]
+ * @return {Object|undefined} obj[arguments[1]][arguments[2]] or undefined
  */
 oo.getProp = function ( obj ) {
var i,
@@ -194,7 +196,7 @@
// Trying to access a property of undefined or null 
causes an error
return undefined;
}
-   retval = retval[arguments[i]];
+   retval = retval[ arguments[ i ] ];
}
return retval;
 };
@@ -210,7 +212,7 @@
  * is not an object, this function will silently abort.
  *
  * @param {Object} obj
- * @param {Mixed...} [keys]
+ * @param {...Mixed} [keys]
  * @param {Mixed} [value]
  */
 oo.setProp = function ( obj ) {
@@ -220,15 +222,15 @@
return;
}
for ( i = 1; i < arguments.length - 2; i++ ) {
-   if ( prop[arguments[i]] === undefined ) {
-   prop[arguments[i]] = {};
+   if ( prop[ arguments[ i ] ] === undefined ) {
+   prop[ arguments[ i ] ] = {};
}
-   if ( Object( prop[arguments[i]] ) !== prop[arguments[i]] ) {
+   if ( Object( prop[ arguments[ i ] ] ) !== prop[ arguments[ i ] 
] ) {
return;
}
-   prop = prop[arguments[i]];
+   prop = prop[ arguments[ i ] ];
}
-   prop[arguments[arguments.length - 2]] = arguments[arguments.length - 1];
+   prop[ arguments[ arguments.length - 2 ] ] = arguments[ arguments.length 
- 1 ];
 };
 
 /**
@@ -260,7 +262,7 @@
 
for ( key in origin ) {
if ( hasOwn.call( origin, key ) ) {
-   r[key] = origin[key];
+   r[ key ] = origin[ key ];
}
}
 
@@ -270,7 +272,7 @@
 /**
  * Get an array of all property values in an object.
  *
- * @param {Object} Object to get values from
+ * @param {Object} obj Object to get values from
  * @return {Array} List of object values
  */
 oo.getObjectValues = function ( obj ) {
@@ -283,11 +285,47 @@
values = [];
  

[MediaWiki-commits] [Gerrit] Make TitleInputWidget configurable, if term should be highli... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Make TitleInputWidget configurable, if term should be 
highlighted or not
..


Make TitleInputWidget configurable, if term should be highlighted or not

Depends on: I36502da43c383373

Bug: T106273
Change-Id: I393eef9cd20bdf80e4db72891f23de08bcdfd376
---
M includes/widget/TitleInputWidget.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/includes/widget/TitleInputWidget.php 
b/includes/widget/TitleInputWidget.php
index 5550a21..25030b1 100644
--- a/includes/widget/TitleInputWidget.php
+++ b/includes/widget/TitleInputWidget.php
@@ -39,6 +39,9 @@
if ( isset( $config['suggestions'] ) ) {
$this->suggestions = $config['suggestions'];
}
+   if ( isset( $config['highlightFirst'] ) ) {
+   $this->highlightFirst = $config['highlightFirst'];
+   }
 
// Initialization
$this->addClasses( array( 'mw-widget-titleInputWidget' ) );
@@ -58,6 +61,9 @@
if ( $this->suggestions !== null ) {
$config['suggestions'] = $this->suggestions;
}
+   if ( $this->highlightFirst !== null ) {
+   $config['highlightFirst'] = $this->highlightFirst;
+   }
return parent::getConfig( $config );
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I393eef9cd20bdf80e4db72891f23de08bcdfd376
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove classes snapshot::common, snapshot::packages - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: Remove classes snapshot::common, snapshot::packages
..


Remove classes snapshot::common, snapshot::packages

Having a class snapshot whose sole contents is an "include
snapshot::common" (and snapshot:common not being used anywhere else) is
silly; merge those two into just the snapshot class.

Moreover, snapshot::packages was also being used only by
snapshot::common; inline that as well.

Finally, don't include "standard" from the snapshot module, but move it
into site.pp instead.

Change-Id: Ie4e7999ce368364993cc3426b7c743c61e284bee
---
M manifests/site.pp
D modules/snapshot/manifests/common.pp
M modules/snapshot/manifests/init.pp
D modules/snapshot/manifests/packages.pp
4 files changed, 32 insertions(+), 40 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index f0b356b..3e2e7fe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2385,12 +2385,14 @@
 role snapshot::common
 include snapshot
 include snapshot::dumps
+include standard
 }
 
 node /^snapshot1003\.eqiad\.wmnet/ {
 role snapshot::common, snapshot::cron::primary
 include snapshot
 include snapshot::dumps
+include standard
 }
 
 # codfw poolcounters
diff --git a/modules/snapshot/manifests/common.pp 
b/modules/snapshot/manifests/common.pp
deleted file mode 100644
index 4879f67..000
--- a/modules/snapshot/manifests/common.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-class snapshot::common {
-include standard
-include snapshot::packages
-include mediawiki::scap
-
-require_package('nfs-common')
-
-file { [ '/mnt/data' ]:
-ensure => 'directory',
-}
-
-$datasetserver = $::site ? {
-'eqiad' => 'dataset1001.wikimedia.org',
-default => 'dataset1001.wikimedia.org',
-}
-
-mount { '/mnt/data':
-ensure   => 'mounted',
-device   => "${datasetserver}:/data",
-fstype   => 'nfs',
-name => '/mnt/data',
-options  => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
-require  => File['/mnt/data'],
-remounts => false,
-}
-}
diff --git a/modules/snapshot/manifests/init.pp 
b/modules/snapshot/manifests/init.pp
index 9a75f86..d45b570 100644
--- a/modules/snapshot/manifests/init.pp
+++ b/modules/snapshot/manifests/init.pp
@@ -1,3 +1,32 @@
 class snapshot {
-include snapshot::common
+include ::mediawiki
+include mediawiki::nutcracker
+include mediawiki::scap
+
+require_package('mwbzutils')
+require_package('mysql-client')
+require_package('p7zip-full')
+require_package('subversion')
+require_package('utfnormal')
+
+require_package('nfs-common')
+
+file { [ '/mnt/data' ]:
+ensure => 'directory',
+}
+
+$datasetserver = $::site ? {
+'eqiad' => 'dataset1001.wikimedia.org',
+default => 'dataset1001.wikimedia.org',
+}
+
+mount { '/mnt/data':
+ensure   => 'mounted',
+device   => "${datasetserver}:/data",
+fstype   => 'nfs',
+name => '/mnt/data',
+options  => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+require  => File['/mnt/data'],
+remounts => false,
+}
 }
diff --git a/modules/snapshot/manifests/packages.pp 
b/modules/snapshot/manifests/packages.pp
deleted file mode 100644
index e4879fd..000
--- a/modules/snapshot/manifests/packages.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class snapshot::packages {
-
-# pick up various users, twemproxy
-include ::mediawiki
-include mediawiki::nutcracker
-
-require_package('mwbzutils')
-require_package('mysql-client')
-require_package('p7zip-full')
-require_package('subversion')
-require_package('utfnormal')
-require_package('pbzip2')
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4e7999ce368364993cc3426b7c743c61e284bee
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Provide inSample() method - change (mediawiki...EventLogging)

[jenkins-bot (Code Review)]

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

Change subject: Provide inSample() method
..


Provide inSample() method

Currently this is hardcoded in all WikimediaEvents consumers and elsewhere.

This is implemented as part of the subscriber module instead of the core module
so that consumers can use this in the boostrapping code (which is always loaded)
instead of loading the core module first.

Based on implementation from I0cb6fe37e.

Tested in Chrome, Safari and Firefox. Both with Crypto API and with 
Math.random()
in mediawiki.user.

Also phase out the ext.eventLogging.init and ext.eventLogging.Schema modules
introduced in 306f4c1.

Bug: T112603
Change-Id: I4a4f06ae195fb331762eadacd16c42322ea22882
---
M EventLogging.php
M modules/ext.eventLogging.Schema.js
M modules/ext.eventLogging.core.js
D modules/ext.eventLogging.init.js
M modules/ext.eventLogging.subscriber.js
M tests/ext.eventLogging.tests.js
6 files changed, 104 insertions(+), 88 deletions(-)

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



diff --git a/EventLogging.php b/EventLogging.php
index 76b46bb..3f88e18 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -180,12 +180,6 @@
 );
 
 // Modules
-$wgResourceModules[ 'ext.eventLogging.init' ] = array(
-   'scripts'   => 'modules/ext.eventLogging.init.js',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'EventLogging',
-   'targets'   => array( 'desktop', 'mobile' ),
-);
 
 $wgResourceModules[ 'ext.eventLogging' ] = array(
'scripts'   => 'modules/ext.eventLogging.core.js',
@@ -193,15 +187,27 @@
'remoteExtPath' => 'EventLogging',
'dependencies'  => array(
'json',
-   'ext.eventLogging.init'
+   'ext.eventLogging.subscriber',
),
'targets'   => array( 'desktop', 'mobile' ),
 );
 
 $wgResourceModules[ 'ext.eventLogging.subscriber' ] = array(
-   'scripts'   => 'modules/ext.eventLogging.subscriber.js',
+   'scripts'   => array(
+   'modules/ext.eventLogging.subscriber.js',
+   'modules/ext.eventLogging.Schema.js',
+   ),
'localBasePath' => __DIR__,
'remoteExtPath' => 'EventLogging',
+   'dependencies'  => array( 'mediawiki.user' ),
+   'targets'   => array( 'desktop', 'mobile' ),
+);
+
+// Back-compatibility alias for subscriber
+$wgResourceModules[ 'ext.eventLogging.Schema' ] = array(
+   'dependencies'  => array(
+   'ext.eventLogging.subscriber'
+   ),
'targets'   => array( 'desktop', 'mobile' ),
 );
 
@@ -217,17 +223,6 @@
'localBasePath' => __DIR__,
'remoteExtPath' => 'EventLogging',
'position'  => 'top',
-);
-
-$wgResourceModules[ 'ext.eventLogging.Schema' ] = array(
-   'scripts'   => 'modules/ext.eventLogging.Schema.js',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'EventLogging',
-   'dependencies'  => array(
-   'mediawiki.user',
-   'ext.eventLogging.init'
-   ),
-   'targets'   => array( 'desktop', 'mobile' ),
 );
 
 // Hooks
diff --git a/modules/ext.eventLogging.Schema.js 
b/modules/ext.eventLogging.Schema.js
index de045b1..337f7d4 100644
--- a/modules/ext.eventLogging.Schema.js
+++ b/modules/ext.eventLogging.Schema.js
@@ -1,92 +1,56 @@
 ( function ( mw, $ ) {
'use strict';
 
-   // 2^32 - 1
-   var MAX_INT32_UNSIGNED = 4294967295;
-
/**
 * The class allows inheriting classes to log events based on a sampling
 * rate if sampling is enabled.
+*
+* If the schema uses different sampling rates for different events, 
`samplingRate`
+* can also be passed to individual events.
 *
 * How to use:
 *
 * var mySchema = new mw.eventLog.Schema( 'Name', 0.01, { skin: 
'minerva' } );
 * // Log the following event at the default sampling rate of 0.01.
-* mySchema.log( { 'action': 'viewed' } );
+* mySchema.log( { action: 'viewed' } );
 * // Log the following event at the sampling rate of 0.2.
-* mySchema.log( { 'action': 'clicked' }, 0.2 );
+* mySchema.log( { action: 'clicked' }, 0.2 );
 *
 * @class mw.eventLog.Schema
 * @constructor
 * @param {string} name Schema name to log to.
-* @param {number} samplingRate The rate at which sampling is performed.
+* @param {number} [samplingRate=1] The rate at which sampling is 
performed.
 *  The values are between 0 and 1 inclusive.
 * @param {Object} [defaults] A set of defaults to log to the schema. 
Once
 *  these defaults are set the values will be logged along with any 
additional
 *  fields that are passed to the log method.
 */
function Schema( name, samplingRate, defaults 

[MediaWiki-commits] [Gerrit] Bump src to 7ca999c1 for deploy - change (mediawiki...deploy)

[jenkins-bot (Code Review)]

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

Change subject: Bump src to 7ca999c1 for deploy
..


Bump src to 7ca999c1 for deploy

Change-Id: I121093713c96a8e7c4c2cd1aa5869a03ffb21962
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/src b/src
index 04893a1..7ca999c 16
--- a/src
+++ b/src
-Subproject commit 04893a183c759629754d4b0a1484d5a87b6447f4
+Subproject commit 7ca999c1aaebab1729d223e14625d989f2eb7982

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I121093713c96a8e7c4c2cd1aa5869a03ffb21962
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] regex() must be a classmethod - change (thumbor/purger)

[jenkins-bot (Code Review)]

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

Change subject: regex() must be a classmethod
..


regex() must be a classmethod

Because the instance isn't created directly in __init.py__, so only
the class is available then.

Change-Id: I46e16091c760da052e0948ba4953831604da2461
---
M tc_purger/handlers/purger.py
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/tc_purger/handlers/purger.py b/tc_purger/handlers/purger.py
index 726b160..106215e 100644
--- a/tc_purger/handlers/purger.py
+++ b/tc_purger/handlers/purger.py
@@ -12,7 +12,8 @@
 
 
 class UrlPurgerHandler(ImagingHandler):
-def regex(self):
+@classmethod
+def regex(cls):
 '''
 :return: The regex used for routing.
 :rtype: string

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46e16091c760da052e0948ba4953831604da2461
Gerrit-PatchSet: 1
Gerrit-Project: thumbor/purger
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix slow search on transaction ID (remove wildcard) - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Fix slow search on transaction ID (remove wildcard)
..

Fix slow search on transaction ID (remove wildcard)

Bug: T117492
Change-Id: Ie4ea1295205e8dd57ffb8aca1cfc9cfbb7160869
---
M CRM/Contact/Form/Search/Advanced.php
M CRM/Contribute/Form/Search.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/63/252463/1

diff --git a/CRM/Contact/Form/Search/Advanced.php 
b/CRM/Contact/Form/Search/Advanced.php
index e5ee97d..b9ec1fa 100644
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -372,7 +372,7 @@
   'contribution_source',
   'membership_status_id',
   'participant_status_id',
-  'contribution_trxn_id',
+  // 'contribution_trxn_id',
   'activity_type_id',
   'status_id',
   'activity_subject',
diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index d1ca3d5..829d1ba 100644
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -269,7 +269,7 @@
 'contribution_soft_credit_type_id',
 'contribution_status_id',
 'contribution_source',
-'contribution_trxn_id',
+//'contribution_trxn_id',
 'invoice_id',
   );
   foreach ($specialParams as $element) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4ea1295205e8dd57ffb8aca1cfc9cfbb7160869
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Don't create SQL function at runtime - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Don't create SQL function at runtime
..

Don't create SQL function at runtime

This breaks the upgrade.

Bug: T117044
Change-Id: I438be42bf24724b757c5ab76cbb8c89ae6686935
---
M CRM/Contact/BAO/Contact.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/69/252469/1

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 12b8a60..7c92761 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -3274,8 +3274,11 @@
 // Update phone table to populate phone_numeric field
 if (!$tableName || $tableName == 'civicrm_phone') {
   // Define stored sql function needed for phones
-  CRM_Core_DAO::executeQuery(self::DROP_STRIP_FUNCTION_43);
-  CRM_Core_DAO::executeQuery(self::CREATE_STRIP_FUNCTION_43);
+  //
+  // FIXME: WMF bug T117044, we can't create this function at runtime 
(unknown why not).
+  // CRM_Core_DAO::executeQuery(self::DROP_STRIP_FUNCTION_43);
+  // CRM_Core_DAO::executeQuery(self::CREATE_STRIP_FUNCTION_43);
+
   $info[] = array(
 'table' => array('civicrm_phone'),
 'when' => 'BEFORE',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I438be42bf24724b757c5ab76cbb8c89ae6686935
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 

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

[MediaWiki-commits] [Gerrit] Enable SSL configuration on db1067 - change (operations/puppet)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Enable SSL configuration on db1067
..

Enable SSL configuration on db1067

This supposes the relevant files are already available on
/etc/mysql/ssl/, but does not check or enforce that fact.
This should be added on a new commit, once the appropiate
keys are in the private repository.

Change-Id: I6581fb85faa5728b2a177b559c40e0c41d9d38db
References: T111654
---
M manifests/role/mariadb.pp
M manifests/site.pp
M modules/mariadb
M templates/mariadb/production.my.cnf.erb
4 files changed, 26 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/252447/1

diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 05e7f9b..3abb082 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -447,6 +447,7 @@
 class role::mariadb::core(
 $shard,
 $p_s = 'off',
+$ssl = 'off',
 ) {
 
 system::role { 'role::mariadb::core':
@@ -471,6 +472,7 @@
 datadir  => '/srv/sqldata',
 tmpdir   => '/srv/tmp',
 p_s  => $p_s,
+ssl  => $ssl,
 }
 
 mariadb::monitor_replication { [ $shard ]:
diff --git a/manifests/site.pp b/manifests/site.pp
index a85a785..64ee166 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -642,6 +642,17 @@
 include base::firewall
 }
 
+node /^db2067\.codfw\.wmnet/ {
+
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 's6',
+p_s   => 'on',
+ssl   => 'on',
+}
+include base::firewall
+}
+
 node /^db10(28|34|39|41|62)\.eqiad\.wmnet/ {
 class { 'role::mariadb::core':
 shard => 's7',
diff --git a/modules/mariadb b/modules/mariadb
index 197be6a..6014a23 16
--- a/modules/mariadb
+++ b/modules/mariadb
-Subproject commit 197be6ad6a0f34b75a4279c8a656f2813ba8712b
+Subproject commit 6014a235e35a8ac0ab2deadaf0de4690a4e63791
diff --git a/templates/mariadb/production.my.cnf.erb 
b/templates/mariadb/production.my.cnf.erb
index 298c739..b57af97 100644
--- a/templates/mariadb/production.my.cnf.erb
+++ b/templates/mariadb/production.my.cnf.erb
@@ -4,6 +4,12 @@
 [client]
 port   = 3306
 socket = /tmp/mysql.sock
+<% if @ssl == 'on' %>
+# ssl
+ssl-ca=/etc/mysql/ssl/cacert.pem
+ssl-cert=/etc/mysql/ssl/server-cert.pem
+ssl-key=/etc/mysql/ssl/server-key.pem
+<% end %>
 
 [mysqld]
 
@@ -86,7 +92,13 @@
 innodb_read_io_threads = 16
 innodb_write_io_threads= 8
 <% end %>
-
+<% if @ssl == 'on' %>
+# ssl
+ssl-ca=/etc/mysql/ssl/cacert.pem
+ssl-cert=/etc/mysql/ssl/server-cert.pem
+ssl-key=/etc/mysql/ssl/server-key.pem
+ssl-cipher=TLSv1.2
+<% end %>
 <% if @p_s == 'on' %>
 # Enabling performance_schema (disabled by default in MariaDB10)
 performance_schema = 1

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

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

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

[MediaWiki-commits] [Gerrit] pybal: allow turning on using etcd for configuration - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: pybal: allow turning on using etcd for configuration
..


pybal: allow turning on using etcd for configuration

Change-Id: Ic537431285ab674a9ad85d13fbef2d124d5380d5
---
M modules/pybal/templates/pybal.conf.erb
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/pybal/templates/pybal.conf.erb 
b/modules/pybal/templates/pybal.conf.erb
index 1dec296..8902c1c 100644
--- a/modules/pybal/templates/pybal.conf.erb
+++ b/modules/pybal/templates/pybal.conf.erb
@@ -35,7 +35,12 @@
 port = <%= service.fetch('port', 80) %>
 scheduler = <%= service.fetch('scheduler', "wrr") %>
 
+<% if scope.lookupvar('::pybal_use_etcd') -%>
+<%- conftool = service['conftool'] -%>
+config = etcd://conf1003.eqiad.wmnet/conftool/v1/pools/<%= @site %>/<%= 
conftool['cluster'] %>/<%= conftool['service'] %>/
+<%- else -%>
 config = http://config-master.<%= @site %>.wmnet/pybal/<%= @site %>/<%= 
servicename %>
+<% end -%>
 
 bgp = <%= service.fetch('bgp', "no") %>
 depool-threshold = <%= service.fetch('depool-threshold', ".5") %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic537431285ab674a9ad85d13fbef2d124d5380d5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable SSL configuration on db1067 - change (operations/puppet)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Enable SSL configuration on db1067
..


Enable SSL configuration on db1067

This supposes the relevant files are already available on
/etc/mysql/ssl/, but does not check or enforce that fact.
This should be added on a new commit, once the appropiate
keys are in the private repository.

Change-Id: I6581fb85faa5728b2a177b559c40e0c41d9d38db
References: T111654
---
M manifests/role/mariadb.pp
M manifests/site.pp
M modules/mariadb
M templates/mariadb/production.my.cnf.erb
4 files changed, 27 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 05e7f9b..3abb082 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -447,6 +447,7 @@
 class role::mariadb::core(
 $shard,
 $p_s = 'off',
+$ssl = 'off',
 ) {
 
 system::role { 'role::mariadb::core':
@@ -471,6 +472,7 @@
 datadir  => '/srv/sqldata',
 tmpdir   => '/srv/tmp',
 p_s  => $p_s,
+ssl  => $ssl,
 }
 
 mariadb::monitor_replication { [ $shard ]:
diff --git a/manifests/site.pp b/manifests/site.pp
index a85a785..f0b356b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -633,7 +633,7 @@
 }
 }
 
-node /^db20(28|39|46|53|60|67)\.codfw\.wmnet/ {
+node /^db20(28|39|46|53|60)\.codfw\.wmnet/ {
 
 $cluster = 'mysql'
 class { 'role::mariadb::core':
@@ -642,6 +642,17 @@
 include base::firewall
 }
 
+node /^db2067\.codfw\.wmnet/ {
+
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 's6',
+p_s   => 'on',
+ssl   => 'on',
+}
+include base::firewall
+}
+
 node /^db10(28|34|39|41|62)\.eqiad\.wmnet/ {
 class { 'role::mariadb::core':
 shard => 's7',
diff --git a/modules/mariadb b/modules/mariadb
index 197be6a..6014a23 16
--- a/modules/mariadb
+++ b/modules/mariadb
-Subproject commit 197be6ad6a0f34b75a4279c8a656f2813ba8712b
+Subproject commit 6014a235e35a8ac0ab2deadaf0de4690a4e63791
diff --git a/templates/mariadb/production.my.cnf.erb 
b/templates/mariadb/production.my.cnf.erb
index 298c739..b57af97 100644
--- a/templates/mariadb/production.my.cnf.erb
+++ b/templates/mariadb/production.my.cnf.erb
@@ -4,6 +4,12 @@
 [client]
 port   = 3306
 socket = /tmp/mysql.sock
+<% if @ssl == 'on' %>
+# ssl
+ssl-ca=/etc/mysql/ssl/cacert.pem
+ssl-cert=/etc/mysql/ssl/server-cert.pem
+ssl-key=/etc/mysql/ssl/server-key.pem
+<% end %>
 
 [mysqld]
 
@@ -86,7 +92,13 @@
 innodb_read_io_threads = 16
 innodb_write_io_threads= 8
 <% end %>
-
+<% if @ssl == 'on' %>
+# ssl
+ssl-ca=/etc/mysql/ssl/cacert.pem
+ssl-cert=/etc/mysql/ssl/server-cert.pem
+ssl-key=/etc/mysql/ssl/server-key.pem
+ssl-cipher=TLSv1.2
+<% end %>
 <% if @p_s == 'on' %>
 # Enabling performance_schema (disabled by default in MariaDB10)
 performance_schema = 1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6581fb85faa5728b2a177b559c40e0c41d9d38db
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] snapshot: create a proper role::snapshot - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: snapshot: create a proper role::snapshot
..


snapshot: create a proper role::snapshot

Rather than including the "role" snapshot::common from site.pp and then
including directly the classes snapshot and snapshot::dumps, create a
proper role class "role::snapshot" which is included from the snapshot*
hosts.

While at it, remove all system::role references from the snapshot
module.

Change-Id: Idc907a518ff21db6ba0f7714191c3643d85c6998
---
R hieradata/role/common/snapshot.yaml
M manifests/role/snapshot.pp
M manifests/site.pp
M modules/snapshot/manifests/addschanges.pp
M modules/snapshot/manifests/centralauthdump.pp
M modules/snapshot/manifests/dumps.pp
M modules/snapshot/manifests/dumps/dumplists.pp
M modules/snapshot/manifests/dumps/mediadirlists.pp
M modules/snapshot/manifests/dumps/pagetitles.pp
M modules/snapshot/manifests/mediaperprojectlists.pp
M modules/snapshot/manifests/wikidatadumps.pp
11 files changed, 14 insertions(+), 54 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/snapshot/common.yaml 
b/hieradata/role/common/snapshot.yaml
similarity index 100%
rename from hieradata/role/common/snapshot/common.yaml
rename to hieradata/role/common/snapshot.yaml
diff --git a/manifests/role/snapshot.pp b/manifests/role/snapshot.pp
index 50f2386..241f1c3 100644
--- a/manifests/role/snapshot.pp
+++ b/manifests/role/snapshot.pp
@@ -8,6 +8,17 @@
 }
 }
 
+class role::snapshot {
+include role::snapshot::common
+
+include ::snapshot
+include ::snapshot::dumps
+
+system::role { 'role::snapshot':
+description => 'producer of XML dumps',
+}
+}
+
 class role::snapshot::cron::primary {
 include role::snapshot::common
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 3e2e7fe..d89a7cd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2382,16 +2382,13 @@
 # NOTE: New snapshot hosts must also be manually added
 # to modules/dataset/files/exports. One must also manually
 # run `exportfs -r` on dataset1001. (T111586)
-role snapshot::common
-include snapshot
-include snapshot::dumps
+role snapshot
 include standard
 }
 
 node /^snapshot1003\.eqiad\.wmnet/ {
-role snapshot::common, snapshot::cron::primary
-include snapshot
-include snapshot::dumps
+role snapshot
+include snapshot::cron::primary
 include standard
 }
 
diff --git a/modules/snapshot/manifests/addschanges.pp 
b/modules/snapshot/manifests/addschanges.pp
index a9c1d26..9ba2100 100644
--- a/modules/snapshot/manifests/addschanges.pp
+++ b/modules/snapshot/manifests/addschanges.pp
@@ -18,11 +18,6 @@
 enable => $enable,
 }
 
-system::role { 'snapshot::addschanges':
-ensure  => $ensure,
-description => 'producer of adds-changes dumps'
-}
-
 cron { 'adds-changes':
 ensure  => $ensure,
 environment => 'MAILTO=ops-du...@wikimedia.org',
diff --git a/modules/snapshot/manifests/centralauthdump.pp 
b/modules/snapshot/manifests/centralauthdump.pp
index b930a67..364f3ca 100644
--- a/modules/snapshot/manifests/centralauthdump.pp
+++ b/modules/snapshot/manifests/centralauthdump.pp
@@ -11,11 +11,6 @@
 $ensure = 'absent'
 }
 
-system::role { 'snapshot::centralauthdump':
-ensure  => $ensure,
-description => 'mysql dumper of centralauth',
-}
-
 file { '/usr/local/bin/dumpcentralauth.sh':
 mode   => '0755',
 owner  => 'root',
diff --git a/modules/snapshot/manifests/dumps.pp 
b/modules/snapshot/manifests/dumps.pp
index b8aa64e..fb099af 100644
--- a/modules/snapshot/manifests/dumps.pp
+++ b/modules/snapshot/manifests/dumps.pp
@@ -10,19 +10,6 @@
 $ensure = 'absent'
 }
 
-if ($hugewikis) {
-system::role { 'snapshot::dumps':
-ensure  => $ensure,
-description => 'producer of xml dumps for enwiki'
-}
-}
-else {
-system::role { 'snapshot::dumps':
-ensure  => $ensure,
-description => 'producer of xml dumps for all wikis but enwiki'
-}
-}
-
 class { 'snapshot::dumps::configs':
 enable   => $enable,
 hugewikis_enable => $hugewikis,
diff --git a/modules/snapshot/manifests/dumps/dumplists.pp 
b/modules/snapshot/manifests/dumps/dumplists.pp
index 6ff342d..f47a542 100644
--- a/modules/snapshot/manifests/dumps/dumplists.pp
+++ b/modules/snapshot/manifests/dumps/dumplists.pp
@@ -11,11 +11,6 @@
 $ensure = 'absent'
 }
 
-system::role { 'snapshot::dumps::dumplists':
-ensure  => $ensure,
-description => 'producer of daily lists of good dumps for mirrors'
-}
-
 file { '/usr/local/bin/list-last-good-dumps.sh':
 ensure  => 'present',
 path=> 

[MediaWiki-commits] [Gerrit] add all the composer based jobs to ext:ArticlePlaceholder - change (integration/config)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: add all the composer based jobs to ext:ArticlePlaceholder
..

add all the composer based jobs to ext:ArticlePlaceholder

Bug: T113049
Change-Id: I61b76563e9340a291f3d1542e0b9842a6a1dfa0d
---
M zuul/ext_dependencies.py
M zuul/layout.yaml
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/57/252457/1

diff --git a/zuul/ext_dependencies.py b/zuul/ext_dependencies.py
index 9571430..0730446 100755
--- a/zuul/ext_dependencies.py
+++ b/zuul/ext_dependencies.py
@@ -3,6 +3,7 @@
 dependencies = {
 'AbuseFilter': ['AntiSpoof'],
 'ApiFeatureUsage': ['Elastica'],
+'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
 'Capiunto': ['Scribunto'],
 'Citoid': ['VisualEditor'],
 'CodeEditor': ['WikiEditor'],
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d3f6995..07e94b3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3000,11 +3000,18 @@
 
   - name: mediawiki/extensions/ArticlePlaceholder
 template:
-  - name: extension-unittests-generic
+  - name: composer-test
+  - name: extension-unittests-composer
   - name: npm
 check:
   - jsonlint
   - jshint
+test:
+  - mwext-qunit-composer
+gate-and-submit:
+  - mwext-qunit-composer
+experimental:
+  - mwext-mw-selenium-composer
 
   - name: mediawiki/extensions/ApiSandbox
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Add composer.json from BoilerPlate - change (mediawiki...ArticlePlaceholder)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Add composer.json from BoilerPlate
..

Add composer.json from BoilerPlate

Change-Id: If36bda8897fdd3753ba56bad07efdf962c4865f3
---
A composer.json
A phpcs.xml
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder 
refs/changes/58/252458/1

diff --git a/composer.json b/composer.json
new file mode 100644
index 000..99741dd
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9",
+   "mediawiki/mediawiki-codesniffer": "0.5.0"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
+   ]
+   }
+}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..d81a292
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+
+
+   
+   .
+   
+   
+   vendor
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If36bda8897fdd3753ba56bad07efdf962c4865f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 

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

[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...GoogleGeocode)

[tosfos (Code Review)]

tosfos has uploaded a new change for review.

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

Change subject: Initial commit
..

Initial commit

Change-Id: Iae02cc3181ebc090e4d5883b096fc8ec8aab9772
---
A GoogleGeocode.hooks.php
A GoogleGeocode.i18n.magic.php
A GoogleGeocodeCache.php
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
7 files changed, 312 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleGeocode 
refs/changes/61/252461/1

diff --git a/GoogleGeocode.hooks.php b/GoogleGeocode.hooks.php
new file mode 100644
index 000..ae8eece
--- /dev/null
+++ b/GoogleGeocode.hooks.php
@@ -0,0 +1,160 @@
+
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+class GoogleGeocodeHooks {
+
+   /**
+* Sets up the googlegeocode parser hook
+*
+* @param Parser $parser
+*/
+   public static function onParserFirstCallInit( Parser &$parser ) {
+   $parser->setFunctionHook( 'googlegeocode', 
'GoogleGeocodeHooks::geocode' );
+   }
+
+   /**
+* Defines the geocode parser function
+*
+* @global string $wgGoogleGeocodeAPIKey
+* @global string $wgGoogleGeocodeDelimiter
+* @global int $wgGoogleGeocodeExpiry
+* @param Parser $parser
+* @param string $addressSent The address requested. Can also be a 
place name, etc.
+* @param string $resultComponentSent The component requested
+* @param string $resultPath The path type to use for the result. Can 
be set to: long_name, short_name or types.
+* @return string
+*/
+   public static function geocode( Parser &$parser, $addressSent = null, 
$resultComponentSent = null,
+   $resultPath = 'long_name' ) {
+   global $wgGoogleGeocodeAPIKey, $wgGoogleGeocodeDelimiter, 
$wgGoogleGeocodeExpiry;
+
+   static $address = '';
+   if ( $addressSent ) {
+   // Allow users to omit the first parameter. Use the 
address sent by last call.
+   $address = $addressSent;
+   }
+   static $resultComponent = '';
+   if ( $resultComponentSent ) {
+   // Allow users to omit the second parameter. Use the 
result component sent by last call.
+   $resultComponent = $resultComponentSent;
+   }
+
+   $result = GoogleGeocodeCache::getCache( $address );
+   if ( !$result ) {
+   $result = self::getFromGoogleAPI( $address, 
$wgGoogleGeocodeAPIKey );
+   if ( empty( $result ) ) {
+   wfDebugLog( 'GoogleGeocode', __METHOD__ . ": 
Unable to locate a place with address $address" );
+   return '';
+   }
+   GoogleGeocodeCache::setCache( $address, $result, 
$wgGoogleGeocodeExpiry );
+   }
+
+   $finalResult = self::getFinalResult( $result, $resultPath );
+
+   if ( !isset( $finalResult[$resultComponent] ) ) {
+   wfDebugLog( 'GoogleGeocode',
+   __METHOD__ . ": Place found with address 
'$address', but unable to locate requested "
+   . "component: $resultComponent" );
+   return '';
+   }
+
+   if ( is_array( $finalResult[$resultComponent] ) ) {
+   // Probably only here for the "types" component
+   return str_replace( "_", " ",
+   implode( $wgGoogleGeocodeDelimiter, 
$finalResult[$resultComponent] ) );
+   }
+
+   return $finalResult[$resultComponent];
+   }
+
+   /**
+* Get the first result set from Google that matches the address
+*
+* @param string $address
+* @param string $apiKey
+* @return string|null Returns null if the address is not found
+*/
+   public static function getFromGoogleAPI( $address, $apiKey = null ) {
+   $geocoder = new GoogleMapsGeocoder( $address );
+
+   /** @todo add lanaguage and 

[MediaWiki-commits] [Gerrit] Repool db2067 after maintenance - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Repool db2067 after maintenance
..


Repool db2067 after maintenance

Change-Id: I1bd429c623bdc76fcb3d9adccac8855198a12a31
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 7677a34..2bff7f3 100755
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -142,7 +142,7 @@
'db2046' => 100,
'db2053' => 100,
'db2060' => 100,
-#  'db2067' => 100,
+   'db2067' => 100,
),
's7' => array(
'db1033' => 0,   # 1.4TB  64GB,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bd429c623bdc76fcb3d9adccac8855198a12a31
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] openldap: Allow configurable ACLs - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: openldap: Allow configurable ACLs
..


openldap: Allow configurable ACLs

LDAP ACLs are highly dependant on the order of the rules being processed,
so for practical purposes it might also be necessary to prepend some rules
to the base ACL set. But the currently version should be a sufficient base
to build upon. If needed, we can add the feature to add an ERB template
for ACLs preceding the base set.

Some of the current corp ACLs could be moved into an extra_acls option
in a later commit.

Bug: T101299
Change-Id: I21adea32ef824e3d18992083b1ca42ae63611690
---
M modules/openldap/manifests/init.pp
A modules/openldap/templates/base-acls.erb
M modules/openldap/templates/slapd.erb
3 files changed, 64 insertions(+), 39 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/openldap/manifests/init.pp 
b/modules/openldap/manifests/init.pp
index 2953271..40a8e1a 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -26,6 +26,9 @@
 #   Optional. TLS enable the server. The path to the CA certificate file
 #$extra_schemas
 #   Optional. A list of schema files relative to the /etc/ldap/schema 
directory
+#$extra_acls
+#   Optional. Specify an ERB template file with additional ACL access rules
+#   (in addition to the base rules)
 #
 # Actions:
 #   Install/configure slapd
@@ -49,6 +52,7 @@
 $key=undef,
 $ca=undef,
 $extra_schemas=undef,
+$extra_acls=undef,
 ) {
 
 require_package('slapd', 'ldap-utils', 'python-ldap')
@@ -92,6 +96,24 @@
 openldap::ldap_schema { $extra_schemas: }
 }
 
+if $extra_acls {
+file { '/etc/ldap/acls.conf' :
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('openldap/base-acls.erb', $extra_acls),
+}
+} else {
+file { '/etc/ldap/acls.conf' :
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('openldap/base-acls.erb'),
+}
+}
+
 # We do this cause we want to rely on using slapd.conf for now
 exec { 'rm_slapd.d':
 onlyif  => '/usr/bin/test -d /etc/ldap/slapd.d',
@@ -108,6 +130,7 @@
 }
 
 # Relationships
+File['/etc/ldap/acls.conf'] -> File['/etc/ldap/slapd.conf']
 Package['slapd'] -> File['/etc/ldap/slapd.conf']
 Package['slapd'] -> File['/etc/default/slapd']
 Package['slapd'] -> File[$datadir]
diff --git a/modules/openldap/templates/base-acls.erb 
b/modules/openldap/templates/base-acls.erb
new file mode 100644
index 000..c8da0f1
--- /dev/null
+++ b/modules/openldap/templates/base-acls.erb
@@ -0,0 +1,39 @@
+###
+## Access lists
+
+# Allow radiusagent to check sambaNTPassword for 802.1x Enterprise WPA2
+access to attrs=sambaNTPassword
+   by dn="cn=admin,<%= @suffix %>" write
+   by dn="cn=radiusagent,ou=other,<%= @suffix %>" read
+   by anonymous auth
+   by self write
+   by * none
+
+# The userPassword by default can be changed
+# by the entry owning it if they are authenticated.
+# Others should not be able to see it, except the
+# admin entry below
+# These access lines apply to database #1 only
+access to attrs=userPassword,shadowLastChange
+   by dn="cn=admin,<%= @suffix %>" write
+   by anonymous auth
+   by self write
+   by * none
+
+# Ensure read access to the base for things like
+# supportedSASLMechanisms.  Without this you may
+# have problems with SASL not knowing what
+# mechanisms are available and the like.
+# Note that this is covered by the 'access to *'
+# ACL below too but if you change that as people
+# are wont to do you'll still need this if you
+# want SASL (and possible other things) to work
+# happily.
+access to dn.base="" by * read
+
+# The admin dn has full write access, everyone else
+# can read everything.
+access to *
+   by dn="cn=admin,<%= @suffix %>" write
+   by self write
+   by * read
diff --git a/modules/openldap/templates/slapd.erb 
b/modules/openldap/templates/slapd.erb
index 189c7ee..d10fa5f 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -163,42 +163,5 @@
 lastmod on
 checkpoint  512 30
 
-###
-## Access lists
-
-# Allow radiusagent to check sambaNTPassword for 802.1x Enterprise WPA2
-access to attrs=sambaNTPassword
-   by dn="cn=admin,<%= @suffix %>" write
-   by dn="cn=radiusagent,ou=other,<%= @suffix %>" read
-   by 

[MediaWiki-commits] [Gerrit] startup.test.js: Add IE11 and Edge-like strings to Grade A t... - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: startup.test.js: Add IE11 and Edge-like strings to Grade A tests
..

startup.test.js: Add IE11 and Edge-like strings to Grade A tests

Change-Id: Ia4fa69c1abfb8381913885aada0784a04c22aa7c
---
M tests/qunit/suites/resources/startup.test.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/252450/1

diff --git a/tests/qunit/suites/resources/startup.test.js 
b/tests/qunit/suites/resources/startup.test.js
index 71dfb9e..d3f528c 100644
--- a/tests/qunit/suites/resources/startup.test.js
+++ b/tests/qunit/suites/resources/startup.test.js
@@ -24,8 +24,13 @@
// Internet Explorer 9+
'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; 
Trident/5.0)',
'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; 
WOW64; Trident/6.0)',
+   'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) 
like Gecko',
// IE Mobile
'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 
7.5; Trident/5.0; IEMobile/9.0; NOKIA; Lumia 800)',
+   // Edge
+   'Mozilla/5.0 (Windows NT 10.0; Win64; x64) 
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 
Edge/12.246',
+   // Edge Mobile
+   'Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; 
Microsoft; Lumia 640 XL LTE) AppleWebKit/537.36 (KHTML, like Gecko) 
Chrome/42.0.2311.135 Mobile Safari/537.36 Edge/12.10166',
// BlackBerry 6+
'Mozilla/5.0 (BlackBerry; U; BlackBerry 9300; en) 
AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.570 Mobile Safari/534.8+',
'Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en) 
AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.346 Mobile 
Safari/534.11+',

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

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

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

[MediaWiki-commits] [Gerrit] Organize code in includes/maintenance directories - change (mediawiki...PageImages)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Organize code in includes/maintenance directories
..

Organize code in includes/maintenance directories

Change-Id: I3a243074049a5b8b212de5bcd1e341c36e4a13e0
---
M PageImages.php
R includes/ApiQueryPageImages.php
R includes/PageImages.php
R maintenance/initImageData.php
4 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/54/252454/1

diff --git a/PageImages.php b/PageImages.php
index 0f52ccb..3d6fb74 100644
--- a/PageImages.php
+++ b/PageImages.php
@@ -14,8 +14,8 @@
'url'=> 
'https://www.mediawiki.org/wiki/Extension:PageImages'
 );
 
-$wgAutoloadClasses['ApiQueryPageImages'] = __DIR__ . "/ApiQueryPageImages.php";
-$wgAutoloadClasses['PageImages'] = __DIR__ . "/PageImages.body.php";
+$wgAutoloadClasses['ApiQueryPageImages'] = __DIR__ . 
'/includes/ApiQueryPageImages.php';
+$wgAutoloadClasses['PageImages'] = __DIR__ . '/includes/PageImages.php';
 
 $wgMessagesDirs['PageImages'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['PageImages'] = __DIR__ . "/PageImages.i18n.php";
diff --git a/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
similarity index 100%
rename from ApiQueryPageImages.php
rename to includes/ApiQueryPageImages.php
diff --git a/PageImages.body.php b/includes/PageImages.php
similarity index 100%
rename from PageImages.body.php
rename to includes/PageImages.php
diff --git a/initImageData.php b/maintenance/initImageData.php
similarity index 96%
rename from initImageData.php
rename to maintenance/initImageData.php
index 40daaee..67e078f 100644
--- a/initImageData.php
+++ b/maintenance/initImageData.php
@@ -4,7 +4,7 @@
 if ( $IP === false ) {
$IP = dirname( dirname( dirname( __FILE__ ) ) );
 }
-require_once( "$IP/maintenance/Maintenance.php" );
+require_once( "$IP/../maintenance/Maintenance.php" );
 
 class InitImageData extends Maintenance {
const BATCH_SIZE = 100;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a243074049a5b8b212de5bcd1e341c36e4a13e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Copy wmgQuickSurveysConfig to wgQuickSurveysConfig - change (operations/mediawiki-config)

[Jhobs (Code Review)]

Jhobs has uploaded a new change for review.

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

Change subject: Copy wmgQuickSurveysConfig to wgQuickSurveysConfig
..

Copy wmgQuickSurveysConfig to wgQuickSurveysConfig

QuickSurveys should be loading a survey on testwiki but isn't.
This should fix that.

Bug: T113443
Change-Id: I6120771e67323acb3464a19962dac3a8d286
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3655a6f..eda4ffd 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2998,6 +2998,7 @@
 
 if ( $wmgUseQuickSurveys ) {
wfLoadExtension( 'QuickSurveys' );
+   $wgQuickSurveysConfig = $wmgQuickSurveysConfig;
 }
 
 # THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED

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

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

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

[MediaWiki-commits] [Gerrit] Redis scan functions require iterator passed by reference. - change (mediawiki/core)

[Alexia (Code Review)]

Alexia has uploaded a new change for review.

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

Change subject: Redis scan functions require iterator passed by reference.
..

Redis scan functions require iterator passed by reference.

Change-Id: I158647ab8bc656f6f0afb1ef1f6d2f19b2fb7cb5
---
M includes/clientpool/RedisConnectionPool.php
1 file changed, 16 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/252455/1

diff --git a/includes/clientpool/RedisConnectionPool.php 
b/includes/clientpool/RedisConnectionPool.php
index 64db0d6..4da59de 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -471,24 +471,34 @@
 
public function __call( $name, $arguments ) {
$conn = $this->conn; // convenience
+   $_arguments = $arguments; //Necessary for the iterator 
reference fix below to work.
 
// Work around https://github.com/nicolasff/phpredis/issues/70
$lname = strtolower( $name );
if ( ( $lname === 'blpop' || $lname == 'brpop' )
-   && is_array( $arguments[0] ) && isset( $arguments[1] )
+   && is_array( $_arguments[0] ) && isset( $_arguments[1] )
) {
-   $this->pool->resetTimeout( $conn, $arguments[1] + 1 );
-   } elseif ( $lname === 'brpoplpush' && isset( $arguments[2] ) ) {
-   $this->pool->resetTimeout( $conn, $arguments[2] + 1 );
+   $this->pool->resetTimeout( $conn, $_arguments[1] + 1 );
+   } elseif ( $lname === 'brpoplpush' && isset( $_arguments[2] ) ) 
{
+   $this->pool->resetTimeout( $conn, $_arguments[2] + 1 );
+   }
+
+   if ( $lname === 'scan' || $lname === 'hscan' || $lname === 
'sscan' || $lname === 'zscan' ) {
+   //Work around for iterator reference in scan functions.
+   
//http://stackoverflow.com/questions/8101071/call-user-func-array-with-references
+   $_arguments = array();
+   foreach ( $arguments as $key => $value ) {
+   $_arguments[$key] = &$arguments[$key];
+   }
}
 
$conn->clearLastError();
try {
-   $res = call_user_func_array( array( $conn, $name ), 
$arguments );
+   $res = call_user_func_array( array( $conn, $name ), 
$_arguments );
if ( preg_match( '/^ERR operation not permitted\b/', 
$conn->getLastError() ) ) {
$this->pool->reauthenticateConnection( 
$this->server, $conn );
$conn->clearLastError();
-   $res = call_user_func_array( array( $conn, 
$name ), $arguments );
+   $res = call_user_func_array( array( $conn, 
$name ), $_arguments );
$this->logger->info(
"Used automatic re-authentication for 
method '$name'.",
array( 'redis_server' => $this->server )

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

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

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

[MediaWiki-commits] [Gerrit] Repool db2067 after maintenance - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Repool db2067 after maintenance
..

Repool db2067 after maintenance

Change-Id: I1bd429c623bdc76fcb3d9adccac8855198a12a31
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 7677a34..2bff7f3 100755
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -142,7 +142,7 @@
'db2046' => 100,
'db2053' => 100,
'db2060' => 100,
-#  'db2067' => 100,
+   'db2067' => 100,
),
's7' => array(
'db1033' => 0,   # 1.4TB  64GB,

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

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

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

[MediaWiki-commits] [Gerrit] CRM-17422 remove prefixing of wildcard to search. - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: CRM-17422 remove prefixing of wildcard to search.
..

CRM-17422 remove prefixing of wildcard to search.

This is a regression in 4.6 compared to 4.2.

Bug: T99836
Change-Id: I582c6e2396a676380df8b858481016ce9f7e73fd
---
M CRM/Core/BAO/CustomValue.php
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/77/252477/1

diff --git a/CRM/Core/BAO/CustomValue.php b/CRM/Core/BAO/CustomValue.php
index bf23c74..953d417 100644
--- a/CRM/Core/BAO/CustomValue.php
+++ b/CRM/Core/BAO/CustomValue.php
@@ -189,14 +189,11 @@
   $formValues[$key] = array('IN' => $formValues[$key]);
 }
   }
-  elseif (($htmlType == 'TextArea' ||
+  elseif (stristr($formValues[$key], '%') && ($htmlType == 'TextArea' ||
   ($htmlType == 'Text' && $dataType == 'String')
-) &&
-!((substr($formValues[$key], 0, 1) == '%') ||
-  (substr($formValues[$key], -1, 1) == '%')
 )
   ) {
-$formValues[$key] = array('LIKE' => '%' . $formValues[$key] . '%');
+$formValues[$key] = array('LIKE' => $formValues[$key]);
   }
 }
   }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I582c6e2396a676380df8b858481016ce9f7e73fd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] CRM-17466 - Refine error message - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: CRM-17466 - Refine error message
..

CRM-17466 - Refine error message

This is an upstream XSS security fix (one of 2 that are in 4.6.10 which just 
came out)

Change-Id: Iefb1b1e13597fead5df645eee8001d0a2d425b5b
---
M CRM/Utils/Signer.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/74/252474/1

diff --git a/CRM/Utils/Signer.php b/CRM/Utils/Signer.php
index 881c710..c1c36a2 100644
--- a/CRM/Utils/Signer.php
+++ b/CRM/Utils/Signer.php
@@ -122,7 +122,7 @@
   public function validate($token, $params) {
 list ($salt, $signature) = explode($this->signDelim, $token);
 if (strlen($salt) != self::SALT_LEN) {
-  throw new Exception("Invalid salt [$token]=[$salt][$signature]");
+  throw new Exception("Token contains invalid salt [" . urlencode($token) 
. "]");
 }
 $newToken = $this->sign($params, $salt);
 return ($token == $newToken);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefb1b1e13597fead5df645eee8001d0a2d425b5b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Totten 

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

[MediaWiki-commits] [Gerrit] Change label from 'Save' to 'Update' on report options. - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Change label from 'Save' to 'Update' on report options.
..

Change label from 'Save' to 'Update' on report options.

The label Update is used in core - it wasn't used in the Giant Rabbits work but 
core has changed since then.

Confirmed this change with Anne.

Bug: T99837
Change-Id: Ib27b5d3374f22aad3b970cbf93894e680f58aa93
---
M CRM/Report/Form.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/76/252476/1

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 9b615f5..2e89f90 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -1400,7 +1400,7 @@
 ts('Save a Copy') . '...');
 }
 $this->addElement('submit', $this->_instanceButtonName,
-  ts('Save') . '...');
+  ts('Update Report'));
 
 $this->assign('instanceForm', $this->_instanceForm);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib27b5d3374f22aad3b970cbf93894e680f58aa93
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Add a setting to disable the dedupe on edit - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Add a setting to disable the dedupe on edit
..

Add a setting to disable the dedupe on edit

Bug: T117172
Change-Id: Icd97abd744ae44efaf8ed43ce1e14b609be5d2cb
---
M CRM/Admin/Form/Preferences/Display.php
M CRM/Contact/Form/Contact.php
M templates/CRM/Admin/Form/Preferences/Display.tpl
3 files changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/66/252466/1

diff --git a/CRM/Admin/Form/Preferences/Display.php 
b/CRM/Admin/Form/Preferences/Display.php
index 5fde514..bada956 100644
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -101,6 +101,11 @@
   'title' => ts('Enable Popup Forms'),
   'weight' => 12,
 ),
+'isDedupeOnSave' => array(
+  'html_type' => 'checkbox',
+  'title' => ts('Dedupe contacts during save'),
+  'weight' => 13,
+),
   ),
 );
 
diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php
index 3902f0f..085ffa8 100644
--- a/CRM/Contact/Form/Contact.php
+++ b/CRM/Contact/Form/Contact.php
@@ -1129,6 +1129,14 @@
*   Contact type.
*/
   public static function checkDuplicateContacts(&$fields, &$errors, 
$contactID, $contactType) {
+// If this site is not configured to check for duplicates during save, 
return without doing anything.
+$isDedupeOnSave = (bool) CRM_Core_BAO_Setting::getItem(
+  CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'isDedupeOnSave', NULL, 
TRUE
+);
+if (!$isDedupeOnSave) {
+  return;
+}
+
 // if this is a forced save, ignore find duplicate rule
 if (empty($fields['_qf_Contact_upload_duplicate'])) {
 
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl 
b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 28131fb..16db5de 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -103,6 +103,10 @@
 {ts}Select the sections that should be included when adding or editing 
a contact record. EXAMPLE: If your organization does not record Gender and 
Birth Date for individuals, then simplify the form by un-checking this option. 
Drag interface allows you to change the order of the panes displayed on contact 
add/edit screen.{/ts}
   
 
+
+  
+  {$form.isDedupeOnSave.html} {$form.isDedupeOnSave.label}
+
 
   {$form.advanced_search_options.label}
   {$form.advanced_search_options.html}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd97abd744ae44efaf8ed43ce1e14b609be5d2cb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 

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

[MediaWiki-commits] [Gerrit] CRM-17310 further fix to my reports - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: CRM-17310 further fix to my reports
..

CRM-17310 further fix to my reports

BUG: T99837

Change-Id: I80e52ec6f206b483ad39e955ddc9460b04b013dd
---
M CRM/Report/Form.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/80/252480/1

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index f146d06..24bfaac 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -1269,7 +1269,7 @@
   }
 }
 if (!empty($this->_options) &&
-(!$this->_id || $this->_id && 
CRM_Report_BAO_ReportInstance::contactCanAdministerReport($this->_id)
+(!$this->_id || ($this->_id && 
CRM_Report_BAO_ReportInstance::contactCanAdministerReport($this->_id))
   )) {
   $this->tabs['ReportOptions'] = array(
 'title' => ts('Display Options'),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80e52ec6f206b483ad39e955ddc9460b04b013dd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] CRM-17310 my reports - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: CRM-17310 my reports
..

CRM-17310 my reports

BUG: T99837

Change-Id: I894b532871a6fc9f061474b615bba957928b7fde

CRM-17310 Add My Reports report listing page and nav item. Issue #20223.

Anne requested that we have a link to a separate page that lists the My
Reports for a contact. This commit takes care of that.

Change-Id: I844e2fed967c2c3e5ee3800095b7ed2675c44a53
---
M CRM/Core/BAO/Navigation.php
M CRM/Report/BAO/ReportInstance.php
M CRM/Report/Form.php
M CRM/Report/Form/Instance.php
M CRM/Report/Info.php
M CRM/Report/Page/InstanceList.php
M templates/CRM/Report/Form/Tabs/Instance.tpl
M templates/CRM/Report/Form/Tabs/Settings.hlp
M templates/CRM/Report/Page/InstanceList.tpl
9 files changed, 157 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/79/252479/1

diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index 2ab0671..5c6be30 100644
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@ -557,6 +557,13 @@
 return $showItem;
   }
 }
+// CRM-17310 my reports allow people with access own reports to see 
the report if it is theirs.
+elseif ($key == 'access own private reports') {
+  // Special permission processing for private reports.
+  $report_url = parse_url(ltrim($url, '/'));
+  $instance_id = 
CRM_Report_Utils_Report::getInstanceID($report_url['path']);
+  $hasPermission = $showItem = 
CRM_Report_BAO_ReportInstance::contactIsOwner($instance_id);
+}
 else {
   $hasPermission = TRUE;
 }
@@ -895,6 +902,8 @@
 
 // Create or update the All Reports link.
 self::createOrUpdateReportNavItem('All Reports', 'civicrm/report/list', 
'reset=1', $reports_nav->id, 'access CiviReport', $domain_id);
+// Create or update the My Reports link.
+self::createOrUpdateReportNavItem('My Reports', 'civicrm/report/list', 
'myreports=1=1', $reports_nav->id, 'access CiviReport');
   }
 
   /**
diff --git a/CRM/Report/BAO/ReportInstance.php 
b/CRM/Report/BAO/ReportInstance.php
index d1b8da7..80d15e7 100644
--- a/CRM/Report/BAO/ReportInstance.php
+++ b/CRM/Report/BAO/ReportInstance.php
@@ -261,4 +261,56 @@
 return NULL;
   }
 
+  /**
+   * Check if report is private.
+   *
+   * @param int $instance_id
+   *
+   * @return bool
+   */
+  static function reportIsPrivate($instance_id) {
+$owner_id = CRM_Core_DAO::getFieldValue('CRM_Report_DAO_ReportInstance', 
$instance_id, 'owner_id', 'id');
+if ($owner_id) {
+  return TRUE;
+}
+return FALSE;
+  }
+
+  /**
+   * Check if the logged in user is the owner.
+   *
+   * @param int $instance_id
+   *
+   * @return TRUE if contact owns the report, FALSE if not
+   */
+  static function contactIsOwner($instance_id) {
+$session = CRM_Core_Session::singleton();
+$contact_id = $session->get('userID');
+$owner_id = CRM_Core_DAO::getFieldValue('CRM_Report_DAO_ReportInstance', 
$instance_id, 'owner_id', 'id');
+if ($contact_id === $owner_id) {
+  return TRUE;
+}
+return FALSE;
+  }
+
+  /**
+   * Check if the logged in contact can administer the report.
+   *
+   * @param int $instance_id
+   *
+   * @return bool
+   *   True if contact can edit the private report, FALSE if not.
+   */
+  static function contactCanAdministerReport($instance_id) {
+if (self::reportIsPrivate($instance_id)) {
+  if (self::contactIsOwner($instance_id) || 
CRM_Core_Permission::check('access all private reports')) {
+return TRUE;
+  }
+}
+elseif (CRM_Core_Permission::check('administer Reports')) {
+  return TRUE;
+}
+return FALSE;
+  }
+
 }
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 2e89f90..f146d06 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -1268,7 +1268,9 @@
 }
   }
 }
-if (!empty($this->_options)) {
+if (!empty($this->_options) &&
+(!$this->_id || $this->_id && 
CRM_Report_BAO_ReportInstance::contactCanAdministerReport($this->_id)
+  )) {
   $this->tabs['ReportOptions'] = array(
 'title' => ts('Display Options'),
 'tpl' => 'ReportOptions',
@@ -1457,6 +1459,9 @@
 if (empty($instanceId)) {
   $actions['save'] = ts('Create Report');
 }
+elseif 
(!CRM_Report_BAO_ReportInstance::contactCanAdministerReport($instanceId)) {
+  unset($actions['save']);
+}
 
 if ($this->_outputMode || $this->_id) {
   $actions['html'] = 'Refresh Results';
@@ -1479,7 +1484,7 @@
   }
 }
 
-if (CRM_Core_Permission::check('administer Reports')) {
+if ($instanceId && 
CRM_Report_BAO_ReportInstance::contactCanAdministerReport($instanceId)) {
   $actions['delete'] = 'Delete report';
 }
 
diff --git 

[MediaWiki-commits] [Gerrit] add test for contact.merge action - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: add test for contact.merge action
..

add test for contact.merge action

Backport upstream e-notice fix to allow tests to pass

Bug: T115426
Change-Id: If1e614bbb3a11922f32453a2fb40b47c98bab234
---
M CRM/Dedupe/Merger.php
M api/v3/Contact.php
2 files changed, 33 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/81/252481/1

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index a49f15c..4ae5018 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -43,6 +43,12 @@
   public static function relTables() {
 static $relTables;
 
+// Setting these merely prevents enotices - but it may be more appropriate 
not to add the user table below
+// if the url can't be retrieved. A more standardised way to retrieve them 
is.
+// CRM_Core_Config::singleton()->userSystem->getUserRecordUrl() - however 
that function takes a contact_id &
+// we may need a different function when it is not known.
+$title = $userRecordUrl = '';
+
 $config = CRM_Core_Config::singleton();
 if ($config->userSystem->is_drupal) {
   $userRecordUrl = CRM_Utils_System::url('user/%ufid');
diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index 24867cc..cf683b6 100644
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -991,23 +991,40 @@
  *
  * @return array
  *   API Result Array
+ * @throws CiviCRM_API3_Exception
  */
 function civicrm_api3_contact_merge($params) {
   $mode = CRM_Utils_Array::value('mode', $params, 'safe');
   $autoFlip = CRM_Utils_Array::value('auto_flip', $params, TRUE);
 
   $dupePairs = array(array(
-  'srcID' => CRM_Utils_Array::value('main_id', $params),
-  'dstID' => CRM_Utils_Array::value('other_id', $params),
-));
-  $result = CRM_Dedupe_Merger::merge($dupePairs, array(), $mode, $autoFlip);
+'srcID' => CRM_Utils_Array::value('main_id', $params),
+'dstID' => CRM_Utils_Array::value('other_id', $params),
+  ));
+  if (($result = CRM_Dedupe_Merger::merge($dupePairs, array(), $mode, 
$autoFlip)) != FALSE) {
+return civicrm_api3_create_success($result, $params);
+  }
+  throw new CiviCRM_API3_Exception('Merge failed');
+}
 
-  if ($result['is_error'] == 0) {
-return civicrm_api3_create_success();
-  }
-  else {
-return civicrm_api3_create_error($result['messages']);
-  }
+/**
+ * Adjust metadata for contact_proximity api function.
+ *
+ * @param array $params
+ */
+function _civicrm_api3_contact_merge_spec(&$params) {
+  $params['main_id'] = array(
+'title' => 'ID of the contact to merge & remove',
+'description' => ts('Wow - these 2 params are the logical reverse of what 
I expect - but what to do?'),
+'api.required' => 1,
+'type' => CRM_Utils_Type::T_INT,
+  );
+  $params['other_id'] = array(
+'title' => 'ID of the contact to keep',
+'description' => ts('Wow - these 2 params are the logical reverse of what 
I expect - but what to do?'),
+'api.required' => 1,
+'type' => CRM_Utils_Type::T_INT,
+  );
 }
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1e614bbb3a11922f32453a2fb40b47c98bab234
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Fix report criteria not showing in output mode - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Fix report criteria not showing in output mode
..

Fix report criteria not showing in output mode

Bug: TT117168

This is part of the Giant Rabbit report-port and I am adjusting in the upstream 
patch too - still in QA
although the part to do with viewing reports without rendering has been merged

Change-Id: Id800f218d88606f8beeeb342acace6fc3f8e22da
---
M templates/CRM/Report/Form/Statistics.tpl
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/65/252465/1

diff --git a/templates/CRM/Report/Form/Statistics.tpl 
b/templates/CRM/Report/Form/Statistics.tpl
index 169a563..44f9323 100644
--- a/templates/CRM/Report/Form/Statistics.tpl
+++ b/templates/CRM/Report/Form/Statistics.tpl
@@ -28,7 +28,7 @@
 {$reportTitle}
 {$reportDate}
   {/if}
-  {if $statistics and $outputMode}
+  {if $statistics}
 
   {foreach from=$statistics.groups item=row}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id800f218d88606f8beeeb342acace6fc3f8e22da
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] CRM-17000 bypass separatevalues for getfields for performance - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: CRM-17000 bypass separatevalues for getfields for performance
..

CRM-17000 bypass separatevalues for getfields for performance

BUG: T99836 Replace 4.2 patch with this
Change-Id: I917acc89acc5bb19b8c4f3b8df7ca6cc15bda238
---
M api/v3/utils.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/82/252482/1

diff --git a/api/v3/utils.php b/api/v3/utils.php
index c31069e..9114194 100644
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -231,7 +231,9 @@
 $result['count'] = (int) count($values);
 
 // Convert value-separated strings to array
-_civicrm_api3_separate_values($values);
+if ($action != 'getfields') {
+  _civicrm_api3_separate_values($values);
+}
 
 if ($result['count'] == 1) {
   list($result['id']) = array_keys($values);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I917acc89acc5bb19b8c4f3b8df7ca6cc15bda238
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Give contribution date range a tighter layout - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Give contribution date range a tighter layout
..

Give contribution date range a tighter layout

The horizontal thing was really disconcerting to me.

Bug: T116420
Change-Id: I0841132475c0c6ddf3ad1d6307027620168f0d0b
---
M templates/CRM/Core/DateRange.tpl
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/67/252467/1

diff --git a/templates/CRM/Core/DateRange.tpl b/templates/CRM/Core/DateRange.tpl
index b8219b7..63a73b0 100644
--- a/templates/CRM/Core/DateRange.tpl
+++ b/templates/CRM/Core/DateRange.tpl
@@ -25,8 +25,8 @@
 *}
 {*this is included inside a table row*}
 {assign var=relativeName   value=$fieldName|cat:"_relative"}
-{$form.$relativeName.html}
-
+
+  {$form.$relativeName.html}
   
 
   {assign var=fromName   value=$fieldName|cat:$from}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0841132475c0c6ddf3ad1d6307027620168f0d0b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 

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

[MediaWiki-commits] [Gerrit] Footer tpl cleanup - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Footer tpl cleanup
..

Footer tpl cleanup

This is one of 2 security fixes in the newly released 4.6.10.

I have pushed the 2 fixes up for review - we can review at more leisure the 
process for changing version.

(note this fix is not exploitable in the context of WMF but it's good practice 
to have it).

Change-Id: If1b7563ecbce86a8899e42f3bd79d86fa28a67fd
---
M templates/CRM/common/footer.tpl
1 file changed, 23 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/73/252473/1

diff --git a/templates/CRM/common/footer.tpl b/templates/CRM/common/footer.tpl
index 229c9ef..01e4bf9 100644
--- a/templates/CRM/common/footer.tpl
+++ b/templates/CRM/common/footer.tpl
@@ -23,24 +23,27 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing|
  ++
 *}
-{include file="CRM/common/accesskeys.tpl"}
-{if !empty($contactId)}
-  {include file="CRM/common/contactFooter.tpl"}
-{/if}
-
-
-  {crmVersion assign=version}
-  {ts 1=$version}Powered by CiviCRM %1.{/ts}
-  {if !empty($security_update)}
-
-  https://civicrm.org/advisory;>{ts}Security update 
required.{/ts}
-  {elseif !empty($newer_civicrm_version)}
-{ts 1=$newer_civicrm_version}A newer version (%1){/ts}
-https://civicrm.org/download;>{ts}is available for 
download{/ts}.
+{if call_user_func(array('CRM_Core_Permission','check'), 'access CiviCRM')}
+  {include file="CRM/common/accesskeys.tpl"}
+  {if !empty($contactId)}
+{include file="CRM/common/contactFooter.tpl"}
   {/if}
-  {ts 1='http://www.gnu.org/licenses/agpl-3.0.html'}CiviCRM is openly 
available under the GNU AGPL License.{/ts}
-  https://civicrm.org/download;>{ts}Download CiviCRM.{/ts}  

-  http://issues.civicrm.org/jira/browse/CRM?report=com.atlassian.jira.plugin.system.project:roadmap-panel;>{ts}View
 issues and report bugs.{/ts}  
-  {docURL page="" text="Online documentation."}
-
-{include file="CRM/common/notifications.tpl"}
+
+  
+{crmVersion assign=version}
+{ts 1=$version}Powered by CiviCRM %1.{/ts}
+{if !empty($security_update)}
+  
+  https://civicrm.org/advisory;>{ts}Security update 
required.{/ts}
+{elseif !empty($newer_civicrm_version)}
+  {ts 1=$newer_civicrm_version}A newer version 
(%1){/ts}
+https://civicrm.org/download;>{ts}is available for 
download{/ts}.
+  
+{/if}
+{ts 1='http://www.gnu.org/licenses/agpl-3.0.html'}CiviCRM is openly 
available under the GNU AGPL License.{/ts}
+https://civicrm.org/download;>{ts}Download CiviCRM.{/ts} 
 
+http://issues.civicrm.org/jira/browse/CRM?report=com.atlassian.jira.plugin.system.project:roadmap-panel;>{ts}View
 issues and report bugs.{/ts}  
+{docURL page="" text="Online documentation."}
+  
+  {include file="CRM/common/notifications.tpl"}
+{/if}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1b7563ecbce86a8899e42f3bd79d86fa28a67fd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Revert "CRM-17075 further fix to handling entity reference i... - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Revert "CRM-17075 further fix to handling entity reference in 
search form"
..

Revert "CRM-17075 further fix to handling entity reference in search form"

This reverts commit 979dfac5c7d6de84b7e6641776e44f3e20e7585b.

This is a reversal of a change that is in the Fuzion repo but not 4.6 core & is 
now rejected
from the fuzion repo (& ammended in 4.7)

Change-Id: Ic4d02abfed76f6484a17a11a46a4cdbf28f6387b
---
M CRM/Contact/Form/Task/SaveSearch.php
1 file changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/78/252478/1

diff --git a/CRM/Contact/Form/Task/SaveSearch.php 
b/CRM/Contact/Form/Task/SaveSearch.php
index a02371e..fc95203 100644
--- a/CRM/Contact/Form/Task/SaveSearch.php
+++ b/CRM/Contact/Form/Task/SaveSearch.php
@@ -187,13 +187,7 @@
 //save the search
 $savedSearch = new CRM_Contact_BAO_SavedSearch();
 $savedSearch->id = $this->_id;
-// Use the query parameters rather than the form values - these have 
already been assessed / converted
-// with the extra knowledge that the form has.
-// Note that we want to move towards a standardised way of saving the 
query that is not
-// an exact match for the form requirements & task the form layer with 
converting backwards and forwards.
-// Ideally per CRM-17075 we will use entity reference fields heavily in 
the form layer & convert to the
-// sql operator syntax at the query layer.
-$savedSearch->form_values = serialize($this->get('queryParams'));
+$savedSearch->form_values = serialize($this->get('formValues'));
 $savedSearch->mapping_id = $mappingId;
 $savedSearch->search_custom_id = $this->get('customSearchID');
 $savedSearch->save();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4d02abfed76f6484a17a11a46a4cdbf28f6387b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] CRM-17422 fix - Change in custom field search behaviour impa... - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: CRM-17422 fix - Change in custom field search behaviour 
impacting on performance
..

CRM-17422 fix - Change in custom field search behaviour impacting on performance

Follow up fix (in 4.7 now) for LIKE '% being added where it's not needed.

https://issues.civicrm.org/jira/browse/CRM-17422

Bug: T99842
Change-Id: I8a5c10bea5020b36fd4ae29f40c7ec91e22cda7e
---
M CRM/Contact/Form/Search/Advanced.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/75/252475/1

diff --git a/CRM/Contact/Form/Search/Advanced.php 
b/CRM/Contact/Form/Search/Advanced.php
index b9ec1fa..ce207e2 100644
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -387,8 +387,8 @@
   }
   $this->_formValues[$element] = array('IN' => $value);
 }
-else {
-  $this->_formValues[$element] = array('LIKE' => "%$value%");
+elseif (strstr($value, '%')) {
+  $this->_formValues[$element] = array('LIKE' => $value);
 }
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a5c10bea5020b36fd4ae29f40c7ec91e22cda7e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] CRM-14232 default not filling for contact preferred language - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: CRM-14232 default not filling for contact preferred language
..

CRM-14232 default not filling for contact preferred language

BUG: T99838
Change-Id: I1053c0b7f5f14660af8fc967d03ad6801f8fa51f
---
M CRM/Admin/Form/Setting/Localization.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/68/252468/1

diff --git a/CRM/Admin/Form/Setting/Localization.php 
b/CRM/Admin/Form/Setting/Localization.php
index a1ad900..9518cd2 100644
--- a/CRM/Admin/Form/Setting/Localization.php
+++ b/CRM/Admin/Form/Setting/Localization.php
@@ -39,6 +39,10 @@
   // use in postProcess (CRM-1496)
   protected $_currencySymbols;
 
+  protected $_settings = array(
+'contact_default_language' => 
CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
+  );
+
   /**
* Build the form object.
*/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1053c0b7f5f14660af8fc967d03ad6801f8fa51f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Fix slow search on email - remove wildcard - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Fix slow search on email - remove wildcard
..

Fix slow search on email - remove wildcard

Note that this and the trxn_id commit are only intended as temporary 'wmf-only' 
fixes and
I intend to work with core on a more stable approach (which is probably about 
honouring an
existing search setting or adding a new one

Change-Id: Ib2867d16e133d71ceff39e5ee1901c09d605f35f
But: T114792
---
M CRM/Contact/BAO/Query.php
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/71/252471/1

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 6f1798a..e96a9a5 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1634,12 +1634,6 @@
   $likeNames = array('sort_name', 'email', 'note', 'display_name');
 }
 
-// email comes in via advanced search
-// so use wildcard always
-if ($id == 'email') {
-  $wildcard = 1;
-}
-
 if (!$useEquals && in_array($id, $likeNames)) {
   $result = array($id, 'LIKE', $values, 0, 1);
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2867d16e133d71ceff39e5ee1901c09d605f35f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Add deprecation comments to 4.2 custom api - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Add deprecation comments to  4.2 custom api
..

Add deprecation comments to  4.2 custom api

T117143

Change-Id: Ib2bc898bc4f2b9579d0cb3156b1c68d4edfe9de1
---
M CRM/Core/BAO/EntityTag.php
M api/v3/EntityTag.php
2 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/72/252472/1

diff --git a/CRM/Core/BAO/EntityTag.php b/CRM/Core/BAO/EntityTag.php
index e69f2c9..4fb4f0f 100644
--- a/CRM/Core/BAO/EntityTag.php
+++ b/CRM/Core/BAO/EntityTag.php
@@ -64,7 +64,11 @@
   }
 
 /**
- * Get array of tag details the contact belongs to.
+ * @deprecated
+ *
+ * This is ported from wmf 4.2 but (hopefully) no longer used
+ * and should be removed after another a few more checks to ensure it
+ * is not called.
  *
  * @param int $entityID id of the entity usually the contactID.
  * @param string $entityTable name of the entity table usually 
'civicrm_contact'
diff --git a/api/v3/EntityTag.php b/api/v3/EntityTag.php
index b6e2bdf..2992e29 100644
--- a/api/v3/EntityTag.php
+++ b/api/v3/EntityTag.php
@@ -70,10 +70,21 @@
   $params['entity_table']['api.default'] = 'civicrm_contact';
 }
 
+/**
+ * @deprecated
+ *
+ * This is ported from wmf 4.2 but (hopefully) no longer used
+ * and should be removed after another a few more checks to ensure it
+ * is not called.
+ *
+ * @param $params
+ * @return array
+ */
 function civicrm_api3_entity_tag_getdetails($params) {
 $values = CRM_Core_BAO_EntityTag::getTagDetails($params['entity_id'], 
$params['entity_table']);
 return civicrm_api3_create_success($values, $params);
 }
+
 function _civicrm_api3_entity_tag_getdetails_spec(&$params) {
 $params['entity_id']['api.required'] = 1;
 $params['entity_id']['api.aliases'] = array('contact_id');

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2bc898bc4f2b9579d0cb3156b1c68d4edfe9de1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Fix save a copy behaviour on report - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Fix save a copy behaviour on report
..

Fix save a copy behaviour on report

(Also working on upstreaming this to core)

Bug: TT117166
Change-Id: Iace202d9abf82c2b89054afbd32c21ebe6ee010d
---
M CRM/Report/Form.php
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/64/252464/1

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 888b352..9b615f5 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -4582,8 +4582,6 @@
 
   /**
* Determine the output mode from the url or input.
-   *
-   * @return string
*/
   protected function setOutputMode() {
 $buttonName = $this->controller->getButtonName();
@@ -4595,8 +4593,13 @@
   CRM_Utils_Array::value('task', $this->_params)
 );
 
-if ($buttonName && $buttonName == $this->_instanceButtonName) {
-  $this->_outputMode = 'save';
+if ($buttonName) {
+  if ($buttonName == $this->_instanceButtonName) {
+$this->_outputMode = 'save';
+  }
+  if ($buttonName == $this->_createNewButtonName) {
+$this->_outputMode = 'copy';
+  }
 }
   }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iace202d9abf82c2b89054afbd32c21ebe6ee010d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Comment out trigger creation - change (wikimedia...civicrm-core)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Comment out trigger creation
..

Comment out trigger creation

Looks like awight's patch got incompletely applied, commenting out
the DROP TRIGGER but not the CREATE TRIGGER

Change-Id: Ida0b6e3b72edc96b13a397b8603e4bd7393d0bc3
---
M CRM/Core/DAO.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-core 
refs/changes/70/252470/1

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 7df1d5a..d6e3b6d 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -1815,7 +1815,8 @@
   }
 }
 
-if ($trigger) {
+// WMF: disabled triggers to limit database permissions
+if (false && $trigger) {
   $result = $dao->query('CREATE TRIGGER civicrm_domain_trigger BEFORE 
INSERT ON civicrm_domain FOR EACH ROW BEGIN END');
   if (PEAR::getStaticProperty('DB_DataObject', 'lastError') || 
is_a($result, 'DB_Error')) {
 if ($view) {
@@ -1824,7 +1825,7 @@
 return FALSE;
   }
 
-  //$dao->query('DROP TRIGGER IF EXISTS civicrm_domain_trigger');
+  $dao->query('DROP TRIGGER IF EXISTS civicrm_domain_trigger');
   if (PEAR::getStaticProperty('DB_DataObject', 'lastError')) {
 if ($view) {
   $dao->query('DROP VIEW IF EXISTS civicrm_domain_view');

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida0b6e3b72edc96b13a397b8603e4bd7393d0bc3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-core
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] Add icons to text in toolbars - change (mediawiki...Wikibase)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Add icons to text in toolbars
..

Add icons to text in toolbars

Bug: T87757
Change-Id: Ifd00e0ec966a359e60e16bb813ec17e470d36077
---
M view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
A view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg
A view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg
A 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
A 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
A 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
A 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
A view/resources/jquery/wikibase/toolbar/themes/default/images/icons/remove.svg
M 
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbar.css
M 
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
M 
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
11 files changed, 98 insertions(+), 2 deletions(-)


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

diff --git a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js 
b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
old mode 100644
new mode 100755
index 7f7664c..d3a294d
--- a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
+++ b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
@@ -133,7 +133,7 @@
} );
 
if ( this.options.renderItemSeparators && 
this.options.$content.length ) {
-   $container.append( mw.wbTemplate( 
'wikibase-toolbar-bracketed', $children ) );
+   $container.append( $children  );
} else {
$container.append( $children );
}
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg
new file mode 100755
index 000..62e5496
--- /dev/null
+++ b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg
new file mode 100755
index 000..cf7858b
--- /dev/null
+++ 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
new file mode 100755
index 000..1427670
--- /dev/null
+++ 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
new file mode 100644
index 000..6e0ca93
--- /dev/null
+++ 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
new file mode 100755
index 000..4cd6cda
--- /dev/null
+++ 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
new file mode 100755
index 000..932997b
--- /dev/null
+++ 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/remove.svg 
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/remove.svg
new file mode 100755
index 000..ef5f97b
--- /dev/null
+++ 

[MediaWiki-commits] [Gerrit] admin: remove mholloway's ssh key - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: admin: remove mholloway's ssh key
..

admin: remove mholloway's ssh key

The laptop is going in for repair, so deactivating
this key by request.

Bug:T118392
Change-Id: Ic5bd2c4404704d4b07f2edb16e275486bac2414e
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/252431/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 3d22701..ccf08d8 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1498,7 +1498,7 @@
 gid: 500
 name: mholloway-shell
 realname: Michael Holloway
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQClpNu2ypDdiuw6Lh0xB6/niNGkBgI3U7YEKycd2QaD/mNeaIj+s3BgOYT86FkvZlK9L6VcCp6rPTW9ExQULJMr8VRZkYItSSrnx6hrNIfXnf7oB1UIkC5qtMWbg6Y6KvvvzJxMmcNymuLBMstcxvKUn+CN3+aCnpVHv5b4YGOJZmpHKEM1/OywXvp+DRfq93qkfvelOHG/dcUfwPj4tfrP10nLkAMyJWKkfLXvkoW1TfqOqYDk3hjJNyuFnYOyw46l+lX7SEoiooFQfJPq7kMafPfG+uJHwbtO8v5E0TIyCmjS7eJkpF/braBMxZwUIgBqjh+6jgCGD99H2RVPFKrh
 mhollo...@wikimedia.org]
+ssh_keys: []
 uid: 11963
   madhuvishy:
 ensure: present

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5bd2c4404704d4b07f2edb16e275486bac2414e
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] Rename timestamp to ts for CirrusSearchRequestSet - change (operations/puppet)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Rename timestamp to ts for CirrusSearchRequestSet
..

Rename timestamp to ts for CirrusSearchRequestSet

Ie575f471 is needed in refinery-camus

Bug: T117873
Change-Id: I540712dc548005853f3095c48996a023897493a0
---
M modules/camus/templates/mediawiki.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/camus/templates/mediawiki.erb 
b/modules/camus/templates/mediawiki.erb
index 33640ce..6c55acf 100644
--- a/modules/camus/templates/mediawiki.erb
+++ b/modules/camus/templates/mediawiki.erb
@@ -24,7 +24,7 @@
 camus.message.timestamp.format=unix_seconds
 
 # use the dt field
-camus.message.timestamp.field=timestamp
+camus.message.timestamp.field=ts
 
 etl.default.timezone=UTC
 

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

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

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

[MediaWiki-commits] [Gerrit] elastic: timeout on wmfelastic collector - change (operations/puppet)

[Rush (Code Review)]

Rush has uploaded a new change for review.

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

Change subject: elastic: timeout on wmfelastic collector
..

elastic: timeout on wmfelastic collector

Bug: T117461
Change-Id: I2d04a60e2e1a9762cdd5af84afd3f16e25d3486b
---
M modules/elasticsearch/files/monitor/wmfelastic.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/elasticsearch/files/monitor/wmfelastic.py 
b/modules/elasticsearch/files/monitor/wmfelastic.py
index 1c691d6..15aa081 100644
--- a/modules/elasticsearch/files/monitor/wmfelastic.py
+++ b/modules/elasticsearch/files/monitor/wmfelastic.py
@@ -154,7 +154,7 @@
 url = 'http://%s:%i/%s' % (self.config['host'],
self.config['port'],
path)
-response = urllib2.urlopen(url)
+response = urllib2.urlopen(url, timeout=3)
 return json.load(response)
 
 def is_master(self):

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

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

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

[MediaWiki-commits] [Gerrit] Language: Convert names cache from MapCacheLRU to HashBagOStuff - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Language: Convert names cache from MapCacheLRU to HashBagOStuff
..


Language: Convert names cache from MapCacheLRU to HashBagOStuff

Change-Id: I3237c8ed97d23e82caa171d936ecb5745a2fe3d5
---
M languages/Language.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/languages/Language.php b/languages/Language.php
index c7871c1..7747198 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -147,7 +147,7 @@
 
/**
 * Cache for language names
-* @var MapCacheLRU|null
+* @var HashBagOStuff|null
 */
static private $languageNameCache;
 
@@ -851,11 +851,11 @@
$cacheKey = $inLanguage === null ? 'null' : $inLanguage;
$cacheKey .= ":$include";
if ( self::$languageNameCache === null ) {
-   self::$languageNameCache = new MapCacheLRU( 20 );
+   self::$languageNameCache = new HashBagOStuff( array( 
'maxKeys' => 20 ) );
}
-   if ( self::$languageNameCache->has( $cacheKey ) ) {
-   $ret = self::$languageNameCache->get( $cacheKey );
-   } else {
+
+   $ret = self::$languageNameCache->get( $cacheKey );
+   if ( !$ret ) {
$ret = self::fetchLanguageNamesUncached( $inLanguage, 
$include );
self::$languageNameCache->set( $cacheKey, $ret );
}

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

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

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

[MediaWiki-commits] [Gerrit] pybal: don't write pool files using confd - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: pybal: don't write pool files using confd
..


pybal: don't write pool files using confd

Change-Id: Id6439e6362be80699624b580fd98ce15180ab109
---
M modules/confd/manifests/file.pp
M modules/pybal/manifests/conf_file.pp
M modules/pybal/manifests/configuration.pp
M modules/pybal/manifests/pool.pp
4 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/modules/confd/manifests/file.pp b/modules/confd/manifests/file.pp
index 1d4576f..953f181 100644
--- a/modules/confd/manifests/file.pp
+++ b/modules/confd/manifests/file.pp
@@ -14,7 +14,10 @@
 $content= undef,
 ) {
 
-include ::confd
+if $ensure == 'present' {
+include ::confd
+}
+
 $safe_name = regsubst($name, '/', '_', 'G')
 
 file { "/etc/confd/templates/${safe_name}.tmpl":
diff --git a/modules/pybal/manifests/conf_file.pp 
b/modules/pybal/manifests/conf_file.pp
index 4748eeb..814841a 100644
--- a/modules/pybal/manifests/conf_file.pp
+++ b/modules/pybal/manifests/conf_file.pp
@@ -14,11 +14,13 @@
 define pybal::conf_file (
 $cluster,
 $service,
-$dc=$::site
+$dc=$::site,
+$ensure=present
 ){
 $watch_keys = ["/conftool/v1/pools/${dc}/${cluster}/${service}/"]
 
 confd::file { $name:
+ensure => $ensure,
 watch_keys => $watch_keys,
 content=> template('pybal/host-pool.tmpl.erb'),
 check  => '/usr/local/bin/pybal-eval-check',
diff --git a/modules/pybal/manifests/configuration.pp 
b/modules/pybal/manifests/configuration.pp
index 622b8de..86086dc 100644
--- a/modules/pybal/manifests/configuration.pp
+++ b/modules/pybal/manifests/configuration.pp
@@ -14,7 +14,8 @@
 
 $service_keys = keys($lvs_services)
 pybal::pool { $service_keys:
-lvs_services => $lvs_services,
+ensure  => absent,
+lvs_services=> $lvs_services,
 lvs_class_hosts => $lvs_class_hosts
 }
 }
diff --git a/modules/pybal/manifests/pool.pp b/modules/pybal/manifests/pool.pp
index d5f7557..8e150ae 100644
--- a/modules/pybal/manifests/pool.pp
+++ b/modules/pybal/manifests/pool.pp
@@ -9,6 +9,7 @@
 #   lvs_class_hosts hash from lvs/configuration.pp
 #
 define pybal::pool(
+$ensure='present',
 $lvs_services={},
 $lvs_class_hosts={},
 ) {
@@ -20,6 +21,7 @@
 if member($lvs_class_hosts[$service_config['class']], $::hostname) {
 
 pybal::conf_file { "/etc/pybal/pools/${name}":
+ensure  => $ensure,
 cluster => $service_config['conftool']['cluster'],
 service => $service_config['conftool']['service'],
 require => File['/etc/pybal/pools'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6439e6362be80699624b580fd98ce15180ab109
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Exclude WMF Office from ratelimiter - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Exclude WMF Office from ratelimiter
..

Exclude WMF Office from ratelimiter

Change-Id: I5a19ee9aba6155009b3130e439b581762ed57530
---
M manifests/network.pp
M modules/varnish/templates/vcl/wikimedia.vcl.erb
2 files changed, 16 insertions(+), 1 deletion(-)


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

diff --git a/manifests/network.pp b/manifests/network.pp
index 6b00066..ec0b3bd 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -14,8 +14,15 @@
 '2a02:ec80::/32',
 ]
 
+# Address space for WMF offices
+$oit_networks = [
+'198.73.209.0/24',
+'2620:62:c000::/48',
+]
+
 $all_networks = flatten([$external_networks, '10.0.0.0/8'])
 $all_networks_lo = flatten([$all_networks, '127.0.0.0/8', '::1/128'])
+$all_networks_oit_lo = flatten([$all_networks_lo, $oit_networks])
 
 $special_hosts = {
 'production' => {
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index a9cf7dc..b19bc49 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -71,6 +71,14 @@
 <% end -%>
 }
 
+acl wikimedia_nets_plus_oit {
+<% scope.lookupvar('::network::constants::all_networks_oit_lo').each do |entry|
+   subnet, mask = entry.split("/", 2)
+-%>
+   "<%= subnet %>"/<%= mask %>;
+<% end -%>
+}
+
 # Backend probes
 
 # frontends in front of other varnish instances should send
@@ -175,7 +183,7 @@
 <% if @vcl_config.fetch("layer", "") == "frontend" -%>
 
 sub misspass_limiter {
-   if (ipcast.ip(req.http.X-Client-IP, "127.0.0.1") !~ wikimedia_nets) {
+   if (ipcast.ip(req.http.X-Client-IP, "127.0.0.1") !~ 
wikimedia_nets_plus_oit) {
// TBF: "1, 0.02s, 250" == "50/s, burst of 250"
if (!tbf.rate(req.http.X-Client-IP, 1, 0.02s, 250)) {
error 429 "Request Rate Exceeded";

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: PHP fix ups - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: PHP fix ups
..


Hygiene: PHP fix ups

Don't do variable assignments in if statements
Don't do shorthand single line if statements
These are not allowed in the latest version of mediawiki
code sniffer

Change-Id: I51ef78a5095fac3df16267295288b53b969b375f
---
M includes/MobileContext.php
M includes/MobileFrontend.hooks.php
M includes/specials/SpecialMobileEditor.php
3 files changed, 16 insertions(+), 5 deletions(-)

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



diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 0235789..2ea9019 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -691,7 +691,9 @@
}
 
// use $startTime if it's valid
-   if ( intval( $startTime ) === 0 ) $startTime = time();
+   if ( intval( $startTime ) === 0 ) {
+   $startTime = time();
+   }
 
$expiry = $startTime + $cookieDuration;
return $expiry;
@@ -766,8 +768,10 @@
// if parsing failed, maybe it's a local Url, try to expand and 
reparse it - task T107505
if ( !$parsedUrl ) {
$expandedUrl = wfExpandUrl( $url );
-   // if Url could not be expanded or parsed, return 
false, instead of an empty string
-   if ( !$expandedUrl || !$parsedUrl = wfParseUrl( 
$expandedUrl ) ) {
+   if ( $expandedUrl ) {
+   $parsedUrl = wfParseUrl( $expandedUrl );
+   }
+   if ( !$expandedUrl || !$parsedUrl ) {
return false;
}
}
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index b778f55..65bc45f 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -88,7 +88,8 @@
// Handle any X-Analytics header values in the request by 
adding them
// as log items. X-Analytics header values are serialized 
key=value
// pairs, separated by ';', used for analytics purposes.
-   if ( $xanalytics = $mobileContext->getRequest()->getHeader( 
'X-Analytics' ) ) {
+   $xanalytics = $mobileContext->getRequest()->getHeader( 
'X-Analytics' );
+   if ( $xanalytics ) {
$xanalytics_arr = explode( ';', $xanalytics );
if ( count( $xanalytics_arr ) > 1 ) {
foreach ( $xanalytics_arr as $xanalytics_item ) 
{
diff --git a/includes/specials/SpecialMobileEditor.php 
b/includes/specials/SpecialMobileEditor.php
index feb519e..523de86 100644
--- a/includes/specials/SpecialMobileEditor.php
+++ b/includes/specials/SpecialMobileEditor.php
@@ -20,9 +20,15 @@
 * @param string $subpage The name of the page to edit
 */
public function executeWhenAvailable( $subpage ) {
-   if ( !is_string( $subpage ) || is_null( $title = 
Title::newFromText( $subpage ) ) ) {
+   if ( !is_string( $subpage ) ) {
$this->showPageNotFound();
return;
+   } else {
+   $title = Title::newFromText( $subpage );
+   if ( is_null( $title ) ) {
+   $this->showPageNotFound();
+   return;
+   }
}
 
$data = $this->getRequest()->getValues();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51ef78a5095fac3df16267295288b53b969b375f
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
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] build: Updating development dependencies - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: build: Updating development dependencies
..


build: Updating development dependencies

* mediawiki/mediawiki-codesniffer: 0.4.0 → 0.5.0

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

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



diff --git a/composer.json b/composer.json
index 4365e8a..99741dd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
-   "mediawiki/mediawiki-codesniffer": "0.4.0"
+   "mediawiki/mediawiki-codesniffer": "0.5.0"
},
"scripts": {
"test": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17c1fca49bdc647e7cd1a8022dfe06d4712092d8
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] First QuickSurvey for reader segmentation research - externa... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: First QuickSurvey for reader segmentation research - external 
survey
..


First QuickSurvey for reader segmentation research - external survey

* Include first survey
* Enable QuickSurveys on testwiki

Bug: T113443
Change-Id: Ibc612b26cd1d9629b593e8f8213738749b8b0034
---
M wmf-config/InitialiseSettings.php
1 file changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 130bdf9..f253760 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15807,6 +15807,29 @@
 // https://phabricator.wikimedia.org/T110661
 'wmgUseQuickSurveys' => array(
'default' => false,
+   'testwiki' => true,
+),
+
+'wmgQuickSurveysConfig' => array(
+   'default' => array(),
+   'testwiki' => array(
+   array(
+   // T113443
+   "name" => "reader-segmentation-1",
+   "type" => "external",
+   "schema" => "QuickSurveysResponses",
+   "enabled" => true,
+   "description" => "reader-segmentation-1-description",
+   "link" => 
"https://docs.google.com/forms/d/17vKKxhVF4A3iO71JNQ4xbvc42Md3U87WgnYwmXISqoM/viewform;,
+   "question" => "reader-segmentation-1-message",
+   "privacyPolicy" => "reader-segmentation-1-privacy",
+   "coverage" => 0.005,
+   "platform" => array(
+   "desktop" => array( "stable" ),
+   "mobile" => array(),
+   ),
+   )
+   ),
 ),
 
 // WikidataPageBanner extension (T98029)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc612b26cd1d9629b593e8f8213738749b8b0034
Gerrit-PatchSet: 7
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Load example config when under WM CI. - change (mediawiki...Wikibase)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Load example config when under WM CI.
..

Load example config when under WM CI.

Bug: T112572
Change-Id: I5766cd9092df5b62b7908790fda66a95168bd46b
---
M Wikibase.php
M build/jenkins/mw-apply-wb-settings.sh
M build/travis/mw-apply-wb-settings.sh
3 files changed, 21 insertions(+), 14 deletions(-)


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

diff --git a/Wikibase.php b/Wikibase.php
index c0bcf18..41281e4 100644
--- a/Wikibase.php
+++ b/Wikibase.php
@@ -32,8 +32,14 @@
 
 if ( !array_key_exists( 'wgEnableWikibaseRepo', $GLOBALS ) || 
$GLOBALS['wgEnableWikibaseRepo'] ) {
require_once __DIR__ . '/repo/Wikibase.php';
+   if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
+   require_once __DIR__ . '/repo/ExampleSettings.php';
+   }
 }
 
 if ( !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) || 
$GLOBALS['wgEnableWikibaseClient'] ) {
require_once __DIR__ . '/client/WikibaseClient.php';
+   if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
+   require_once __DIR__ . '/client/ExampleSettings.php';
+   }
 }
diff --git a/build/jenkins/mw-apply-wb-settings.sh 
b/build/jenkins/mw-apply-wb-settings.sh
index acee8f7..5184d58 100755
--- a/build/jenkins/mw-apply-wb-settings.sh
+++ b/build/jenkins/mw-apply-wb-settings.sh
@@ -26,14 +26,14 @@
 echo 'require_once __DIR__ . "/extensions/Wikidata/Wikidata.php";' >> 
LocalSettings.php
 echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/client/ExampleSettings.php";' >> 
LocalSettings.php
   else
-echo 'require_once __DIR__ . 
"/extensions/Wikibase/client/WikibaseClient.php";' >> LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikibase/client/ExampleSettings.php";' >> LocalSettings.php
+echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
   fi
 }
 
 function apply_repo_settings {
   echo '$wgEnableWikibaseRepo = true;' >> LocalSettings.php
   echo '$wgEnableWikibaseClient = true;' >> LocalSettings.php
+  # done by jenkins job: $wgWikimediaJenkinsCI = true
   echo '$wmgUseWikibaseRepo = true;' >> LocalSettings.php
   echo '$wmgUseWikibaseClient = true;' >> LocalSettings.php
   if [ $BUILD = true ]
@@ -42,10 +42,7 @@
 echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/repo/ExampleSettings.php";' >> 
LocalSettings.php
 echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/client/ExampleSettings.php";' >> 
LocalSettings.php
   else
-echo 'require_once __DIR__ . "/extensions/Wikibase/repo/Wikibase.php";' >> 
LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikibase/repo/ExampleSettings.php";' >> LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikibase/client/WikibaseClient.php";' >> LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikibase/client/ExampleSettings.php";' >> LocalSettings.php
+echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
   fi
 }
 
diff --git a/build/travis/mw-apply-wb-settings.sh 
b/build/travis/mw-apply-wb-settings.sh
index b59aee4..63f7e97 100755
--- a/build/travis/mw-apply-wb-settings.sh
+++ b/build/travis/mw-apply-wb-settings.sh
@@ -5,32 +5,34 @@
 cd ../phase3
 
 function apply_client_settings {
-  echo '$wgEnableWikibaseRepo = false;' >> LocalSettings.php
   echo '$wgEnableWikibaseClient = true;' >> LocalSettings.php
-  echo 'require_once __DIR__ . 
"/extensions/Wikibase/client/WikibaseClient.php";' >> LocalSettings.php
-  echo 'require_once __DIR__ . 
"/extensions/Wikibase/client/ExampleSettings.php";' >> LocalSettings.php
   echo '$wgWBClientSettings["siteGlobalID"] = "enwiki";' >> LocalSettings.php
   echo 'require_once __DIR__ . "/extensions/Scribunto/Scribunto.php";' >> 
LocalSettings.php
 }
 
 function apply_repo_settings {
   echo '$wgEnableWikibaseRepo = true;' >> LocalSettings.php
-  echo '$wgEnableWikibaseClient = false;' >> LocalSettings.php
-  echo 'require_once __DIR__ . "/extensions/Wikibase/repo/Wikibase.php";' >> 
LocalSettings.php
-  echo 'require_once __DIR__ . 
"/extensions/Wikibase/repo/ExampleSettings.php";' >> LocalSettings.php
 }
 
-function apply_common_settings {
+function apply_common_before_settings {
   echo 'error_reporting(E_ALL| E_STRICT);' >> LocalSettings.php
   echo 'ini_set("display_errors", 1);' >> LocalSettings.php
+  echo '$wgWikimediaJenkinsCI = true;' >> LocalSettings.php
   echo '$wgShowExceptionDetails = true;' >> LocalSettings.php
   echo '$wgDevelopmentWarnings = true;' >> LocalSettings.php
   echo '$wgLanguageCode = "'$LANG'";' >> LocalSettings.php
   echo '$wgDebugLogFile = "mw-debug.log";' >> LocalSettings.php
   echo 'require_once __DIR__ .