[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Temporary disable remex html"

[Subramanya Sastry (Code Review)]

Hello Urbanecm, Paladox, Hoo man, jenkins-bot, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "Temporary disable remex html"
..

Revert "Temporary disable remex html"

This reverts commit b1da6a77d9edae0786381972b41af663666eed7b.

Change-Id: I97c47cdb0bb72b5ce805ce1eb8143ceb5268ff24
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a263862..1d476fb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19116,16 +19116,15 @@
 'wgTidyConfig' => [
'default' => null,
 
-   // TEMP disable: T178632
-   // 'mediawikiwiki' => [ 'driver' => 'RemexHtml' ],
-   // 'testwiki' => [ 'driver' => 'RemexHtml' ],
+   'mediawikiwiki' => [ 'driver' => 'RemexHtml' ],
+   'testwiki' => [ 'driver' => 'RemexHtml' ],
 
-   // 'fawiki' => [ 'driver' => 'RemexHtml' ], // T176150
-   // 'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989
+   'fawiki' => [ 'driver' => 'RemexHtml' ], // T176150
+   'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989
 
-   // 'eswikiversity' => [ 'driver' => 'RemexHtml' ],
+   'eswikiversity' => [ 'driver' => 'RemexHtml' ],
 
-   // 'wikitech' => [ 'driver' => 'RemexHtml' ],
+   'wikitech' => [ 'driver' => 'RemexHtml' ],
 ],
 
 // Cache ResourceLoader modules in localStorage

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97c47cdb0bb72b5ce805ce1eb8143ceb5268ff24
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix RemexCompatMunger infinite recursion

[jenkins-bot (Code Review)]

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

Change subject: Fix RemexCompatMunger infinite recursion
..


Fix RemexCompatMunger infinite recursion

When TreeBuilder requests reparenting of all child nodes of a given
element, we do this by removing the existing child nodes, and then
inserting the proposed new parent under the old parent. However, when a
p-wrap diversion is in place, the insertion of the new parent is
diverted into the p-wrap, and the p-wrap then becomes a child of the new
parent, causing a reference loop, and ultimately infinite recursion in
Serializer.

Instead, divert the entire reparent request to the p-wrap, so that the
new parent is a child of the p-wrap. This makes sense since the new
parent is always a formatting element. The only caller of
reparentChildren(), apart from proxies, is AAA step 17, which reparents
children under the formatting element cloned from the AFE list.

Left in some debug code for next time.

Bug: T178632
Change-Id: Id77d21d99748e94c064ef24c43ee0033de627b8e
---
M includes/tidy/RemexCompatMunger.php
M includes/tidy/RemexMungerData.php
M tests/phpunit/includes/tidy/RemexDriverTest.php
3 files changed, 70 insertions(+), 1 deletion(-)

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



diff --git a/includes/tidy/RemexCompatMunger.php 
b/includes/tidy/RemexCompatMunger.php
index 73bc5f8..c06eea0 100644
--- a/includes/tidy/RemexCompatMunger.php
+++ b/includes/tidy/RemexCompatMunger.php
@@ -174,6 +174,10 @@
$length, $sourceStart, $sourceLength );
}
 
+   private function trace( $msg ) {
+   // echo "[RCM] $msg\n";
+   }
+
/**
 * Insert or reparent an element. Create p-wrappers or split the tag 
stack
 * as necessary.
@@ -242,6 +246,7 @@
if ( $under && $parentData->isPWrapper && !$inline ) {
// [B/b] The element is non-inline and the parent is a 
p-wrapper,
// close the parent and insert into its parent instead
+   $this->trace( 'insert B/b' );
$newParent = $this->serializer->getParentNode( $parent 
);
$parent = $newParent;
$parentData = $parent->snData;
@@ -255,12 +260,14 @@
// [CS/b, DS/i] The parent is splittable and the 
current element is
// inline in block context, or if the current element 
is a block
// under a p-wrapper, split the tag stack.
+   $this->trace( $inline ? 'insert DS/i' : 'insert CS/b' );
$newRef = $this->splitTagStack( $newRef, $inline, 
$sourceStart );
$parent = $newRef;
$parentData = $parent->snData;
} elseif ( $under && $parentData->needsPWrapping && $inline ) {
// [A/i] If the element is inline and we are in 
body/blockquote,
// we need to create a p-wrapper
+   $this->trace( 'insert A/i' );
$newRef = $this->insertPWrapper( $newRef, $sourceStart 
);
$parent = $newRef;
$parentData = $parent->snData;
@@ -268,9 +275,12 @@
// [CU/b] If the element is non-inline and (despite 
attempting to
// split above) there is still an ancestor p-wrap, 
disable that
// p-wrap
+   $this->trace( 'insert CU/b' );
$this->disablePWrapper( $parent, $sourceStart );
+   } else {
+   // [A/b, B/i, C/i, D/b, DU/i] insert as normal
+   $this->trace( 'insert normal' );
}
-   // else [A/b, B/i, C/i, D/b, DU/i] insert as normal
 
// An element with element children is a non-blank element
$parentData->nonblankNodeCount++;
@@ -457,6 +467,20 @@
 
public function reparentChildren( Element $element, Element $newParent, 
$sourceStart ) {
$self = $element->userData;
+   if ( $self->snData->childPElement ) {
+   // Reparent under the p-wrapper instead, so that e.g.
+   //   ...
+   // becomes
+   //   
...
+
+   // The formatting element should not be the parent of 
the p-wrap.
+   // Without this special case, the insertElement() of 
the  below
+   // would be diverted into the p-wrapper, causing 
infinite recursion
+   // (T178632)
+   $this->reparentChildren( $self->snData->childPElement, 
$newParent, $sourceStart );
+   

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: $wmf* -> $wmg*

[TerraCodes (Code Review)]

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

Change subject: $wmf* -> $wmg*
..

$wmf* -> $wmg*

Bug: T45956
Change-Id: I88a69cf4cbe0570ba48ea242f152df477e2e1b96
---
M multiversion/MWMultiVersion.php
M multiversion/MWRealm.php
M refresh-dblist
M tests/TestServices.php
M tests/WgConfTestCase.php
M tests/cirrusTest.php
M tests/dbconfigTest.php
M tests/loggingTest.php
M tests/multiversion/MWRealmTest.php
M tests/noc-conf/highlightTest.php
M w/robots.php
M wmf-config/CirrusSearch-common.php
M wmf-config/CirrusSearch-production.php
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/PoolCounterSettings.php
M wmf-config/Wikibase.php
M wmf-config/abusefilter.php
M wmf-config/db-labs.php
M wmf-config/etcd.php
M wmf-config/filebackend.php
M wmf-config/flaggedrevs.php
M wmf-config/jobqueue-labs.php
M wmf-config/logging.php
M wmf-config/mc-labs.php
M wmf-config/mobile.php
M wmf-config/redis.php
M wmf-config/wgConf.php
30 files changed, 216 insertions(+), 216 deletions(-)


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

diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 2b59447..0267f05 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -290,14 +290,14 @@
 * The first item is the MW version
 */
private function loadVersionInfo() {
-   global $wmfRealm;
+   global $wmgRealm;
 
if ( $this->versionLoaded ) {
return;
}
$this->versionLoaded = true;
 
-   if ( $wmfRealm === 'labs' ) {
+   if ( $wmgRealm === 'labs' ) {
$phpFilename = MEDIAWIKI_DEPLOYMENT_DIR . 
'/wikiversions-labs.php';
} else {
$phpFilename = MEDIAWIKI_DEPLOYMENT_DIR . 
'/wikiversions.php';
diff --git a/multiversion/MWRealm.php b/multiversion/MWRealm.php
index e7f421c..84befbd 100644
--- a/multiversion/MWRealm.php
+++ b/multiversion/MWRealm.php
@@ -1,15 +1,15 @@
 loadWgConf( 'production' 
)->settings['wgLogoHD'];
 *
-* @param string $wmfRealm Realm to use for example: 'labs' or 
'production'
+* @param string $wmgRealm Realm to use for example: 'labs' or 
'production'
 * @return SiteConfiguration
 */
-   final protected function loadWgConf( $wmfRealm ) {
+   final protected function loadWgConf( $wmgRealm ) {
// Variables required for wgConf.php
-   $wmfConfigDir = __DIR__ . "/../wmf-config";
+   $wmgConfigDir = __DIR__ . "/../wmf-config";
 
-   require "{$wmfConfigDir}/wgConf.php";
+   require "{$wmgConfigDir}/wgConf.php";
 
// InitialiseSettings.php explicitly declares these as global, 
so we must too
$this->setGlobals( [
'wmfUdp2logDest' => 'localhost',
'wmfDatacenter' => 'unittest',
'wmfMasterDatacenter' => 'unittest',
-   'wmfRealm' => $wmfRealm,
-   'wmfConfigDir' => $wmfConfigDir,
+   'wmfRealm' => $wmgRealm,
+   'wmfConfigDir' => $wmgConfigDir,
'wgConf' => $wgConf,
] );
 
@@ -113,7 +113,7 @@
] );
require __DIR__ . '/TestServices.php';
 
-   require "{$wmfConfigDir}/InitialiseSettings.php";
+   require "{$wmgConfigDir}/InitialiseSettings.php";
 
$ret = $wgConf;
// Make sure globals are restored, else they will be serialized 
on each
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 5bccd87..f53d48b 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -5,7 +5,7 @@
 
 class cirrusTests extends WgConfTestCase {
public function testClusterConfigurationForProdTestwiki() {
-   $wmfDatacenter = 'unittest';
+   $wmgDatacenter = 'unittest';
$config = $this->loadCirrusConfig( 'production', 'testwiki', 
'wiki' );
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
@@ -74,11 +74,11 @@
$this->assertArrayNotHasKey( 'wgCirrusSearchWikiToNameMap', 
$config );
}
 
-   private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) {
-   $wmfConfigDir = __DIR__ . "/../wmf-config";
+   private function loadCirrusConfig( $wmgRealm, $wgDBname, $dbSuffix ) {
+   $wmgConfigDir = __DIR__ . "/../wmf-config";
require __DIR__ . '/../private/PrivateSettings.php.example';

[MediaWiki-commits] [Gerrit] operations/puppet[production]: DHCP: update MAC address for webperf1001

[Dzahn (Code Review)]

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

Change subject: DHCP: update MAC address for webperf1001
..


DHCP: update MAC address for webperf1001

Change-Id: I9f3531261cfbb2a43500d0ff89d42e8e9828e56a
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 71306d0..d40c1bd 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6420,7 +6420,7 @@
 }
 
 host webperf1001 {
-hardware ethernet aa:00:00:c1:8b:b8;
+hardware ethernet aa:00:00:5e:f4:43;
 fixed-address webperf1001.eqiad.wmnet;
 option pxelinux.pathprefix "stretch-installer/";
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: DHCP: update MAC address for webperf1001

[Dzahn (Code Review)]

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

Change subject: DHCP: update MAC address for webperf1001
..

DHCP: update MAC address for webperf1001

Change-Id: I9f3531261cfbb2a43500d0ff89d42e8e9828e56a
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/392183/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 71306d0..d40c1bd 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6420,7 +6420,7 @@
 }
 
 host webperf1001 {
-hardware ethernet aa:00:00:c1:8b:b8;
+hardware ethernet aa:00:00:5e:f4:43;
 fixed-address webperf1001.eqiad.wmnet;
 option pxelinux.pathprefix "stretch-installer/";
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add seperate ensure for testwiki in wikidata crons

[Dzahn (Code Review)]

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

Change subject: Add seperate ensure for testwiki in wikidata crons
..


Add seperate ensure for testwiki in wikidata crons

Bug: T173357
Change-Id: I1a77cd79c912bf093250e13e435dda10ba104b22
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
M modules/profile/manifests/mediawiki/maintenance.pp
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp 
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index 0c991cd..365e985 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -1,4 +1,4 @@
-class mediawiki::maintenance::wikidata( $ensure = present ) {
+class mediawiki::maintenance::wikidata( $ensure = present, $ensure_testwiki = 
present ) {
 require ::mediawiki::users
 
 # Starts a dispatcher instance every 3 minutes
@@ -14,7 +14,7 @@
 }
 
 cron { 'wikibase-dispatch-changes-test':
-ensure  => $ensure,
+ensure  => $ensure_testwiki,
 command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dispatchChanges.php 
--wiki testwikidatawiki --max-time 900 --batch-size 200 --dispatch-interval 30 
>/dev/null 2>&1',
 user=> $::mediawiki::users::web,
 minute  => '*/15',
@@ -30,7 +30,7 @@
 }
 
 cron { 'wikibase-repo-prune-test':
-ensure  => $ensure,
+ensure  => $ensure_testwiki,
 command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/pruneChanges.php 
--wiki testwikidatawiki --number-of-days=3 >> 
/var/log/wikidata/prune-testwikidata.log 2>&1',
 user=> $::mediawiki::users::web,
 minute  => [0,15,30,45],
diff --git a/modules/profile/manifests/mediawiki/maintenance.pp 
b/modules/profile/manifests/mediawiki/maintenance.pp
index cd81ef3..bd067d6 100644
--- a/modules/profile/manifests/mediawiki/maintenance.pp
+++ b/modules/profile/manifests/mediawiki/maintenance.pp
@@ -19,7 +19,7 @@
 class { 'mediawiki::maintenance::pagetriage': ensure => $ensure }
 class { 'mediawiki::maintenance::translationnotifications': ensure => 
$ensure }
 class { 'mediawiki::maintenance::updatetranslationstats': ensure => 
$ensure }
-class { 'mediawiki::maintenance::wikidata': ensure => $ensure }
+class { 'mediawiki::maintenance::wikidata': ensure => $ensure, 
ensure_testwiki => $ensure }
 class { 'mediawiki::maintenance::echo_mail_batch': ensure => $ensure }
 class { 'mediawiki::maintenance::parsercachepurging': ensure => $ensure }
 class { 'mediawiki::maintenance::cleanup_upload_stash': ensure => $ensure }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a77cd79c912bf093250e13e435dda10ba104b22
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SwiftFileBackend::resolveContainerPath() check the proper le...

[jenkins-bot (Code Review)]

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

Change subject: SwiftFileBackend::resolveContainerPath() check the proper length
..


SwiftFileBackend::resolveContainerPath() check the proper length

The length sanity check should use this instead of urlencode()
see it is rawurlencode() that is actually used.

Change-Id: I5632e30c14c8ab27c8324c3e31311ca8bff7c162
---
M includes/libs/filebackend/SwiftFileBackend.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/libs/filebackend/SwiftFileBackend.php 
b/includes/libs/filebackend/SwiftFileBackend.php
index f50d26b..373ad93 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -158,7 +158,7 @@
protected function resolveContainerPath( $container, $relStoragePath ) {
if ( !mb_check_encoding( $relStoragePath, 'UTF-8' ) ) {
return null; // not UTF-8, makes it hard to use CF and 
the swift HTTP API
-   } elseif ( strlen( urlencode( $relStoragePath ) ) > 1024 ) {
+   } elseif ( strlen( rawurlencode( $relStoragePath ) ) > 1024 ) {
return null; // too long for Swift
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Ignore 'invert' model if there are no namespaces ...

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Ignore 'invert' model if there are no namespaces in 
saved queries
..

RCFilters: Ignore 'invert' model if there are no namespaces in saved queries

When comparing and when saving the query, normalize the 'invert'
state so that it represents the **effective** state of the filters.
If there are no namespaces, then 'invert' is irrelevant.

Make sure we ignore that state when it is irrelevant when we save
saved queries and when we compare the current state to a saved query.

Change-Id: If80b50c3d2b90b5116b6b0018a8d56bce2deb7c4
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
2 files changed, 32 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/392182/1

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index d959540..99558bd 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -1036,6 +1036,23 @@
};
 
/**
+* Check whether the invert state is a valid one. A valid invert state 
is one where
+* there are actual namespaces selcted.
+*
+* This is done to compare states to previous ones that may have had 
the invert model
+* selected but effectively had no namespaces, so are not effectively 
different than
+* ones where invert is not selected.
+*
+* @return {boolean} Invert is effectively selected
+*/
+   
mw.rcfilters.dm.FiltersViewModel.prototype.areNamespacesEffectivelyInverted = 
function () {
+   return this.getInvertModel().isSelected() &&
+   this.getSelectedItems().some( function ( itemModel ) {
+   return itemModel.getGroupModel().getView() === 
'namespace';
+   } );
+   };
+
+   /**
 * Get the item that matches the given name
 *
 * @param {string} name Filter name
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 1d7934f..1caacf4 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -123,6 +123,11 @@
// the given data, if they exist
normalizedData.params = 
model.filtersModel.removeExcludedParams( normalizedData.params );
 
+   // Correct the invert state for effective 
selection
+   if ( normalizedData.params.invert && 
!normalizedData.params.namespaces ) {
+   delete normalizedData.params.invert;
+   }
+
model.cleanupHighlights( normalizedData );
 
id = String( id );
@@ -226,6 +231,11 @@
}
} );
 
+   // Correct the invert state for effective selection
+   if ( normalizedData.params.invert && 
!this.filtersModel.areNamespacesEffectivelyInverted() ) {
+   delete normalizedData.params.invert;
+   }
+
// Add item
this.addItems( [
new mw.rcfilters.dm.SavedQueryItemModel(
@@ -272,6 +282,11 @@
// Minimize before comparison
fullQueryComparison = 
this.filtersModel.getMinimizedParamRepresentation( fullQueryComparison );
 
+   // Correct the invert state for effective selection
+   if ( fullQueryComparison.invert ) {
+   delete fullQueryComparison.invert;
+   }
+
return this.getItems().filter( function ( item ) {
return OO.compare(
item.getCombinedData(),

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: annualreport: replace favicon with high-res version

[Dzahn (Code Review)]

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

Change subject: annualreport: replace favicon with high-res version
..


annualreport: replace favicon with high-res version

Replace the favicon.ico with a version that is not limited to
16x16 pixels.

Used https://www.wikimedia.org/static/favicon/wmf.ico as suggested
on ticket.

Bug: T180859
Change-Id: Ib96289d027ae52c0d02df2f1fc6e02e644f8edea
---
M 2016/img/favicon.ico
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/2016/img/favicon.ico b/2016/img/favicon.ico
index fed930b..eb0c14c 100644
--- a/2016/img/favicon.ico
+++ b/2016/img/favicon.ico
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib96289d027ae52c0d02df2f1fc6e02e644f8edea
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/annualreport
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: git community logo

[Thcipriani (Code Review)]

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

Change subject: Gerrit: git community logo
..

Gerrit: git community logo

Change-Id: I3dbd253b8d88ddeee10b216ad9ef3a141f22dad3
---
M modules/gerrit/files/etc/GerritSite.css
M modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
M modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
3 files changed, 5 insertions(+), 10,541 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/392181/1


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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: annualreport: replace favicon with high-res version

[Dzahn (Code Review)]

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

Change subject: annualreport: replace favicon with high-res version
..

annualreport: replace favicon with high-res version

Replace the favicon.ico with a version that is not limited to
16x16 pixels.

Used https://www.wikimedia.org/static/favicon/wmf.ico as suggested
on ticket.

Bug: T180859
Change-Id: Ib96289d027ae52c0d02df2f1fc6e02e644f8edea
---
M 2016/img/favicon.ico
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/annualreport 
refs/changes/80/392180/1

diff --git a/2016/img/favicon.ico b/2016/img/favicon.ico
index fed930b..eb0c14c 100644
--- a/2016/img/favicon.ico
+++ b/2016/img/favicon.ico
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib96289d027ae52c0d02df2f1fc6e02e644f8edea
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/annualreport
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Add "Link to this message" to translation editor tools

[jenkins-bot (Code Review)]

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

Change subject: Add "Link to this message" to translation editor tools
..


Add "Link to this message" to translation editor tools

Change-Id: I46e32a2c7b4a5a1ba83da3da7ee1806367106a55
---
M Resources.php
M api/ApiQueryMessageCollection.php
M i18n/core/en.json
M i18n/core/qqq.json
M resources/js/ext.translate.editor.js
5 files changed, 16 insertions(+), 2 deletions(-)

Approvals:
  Petar.petkovic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Resources.php b/Resources.php
index cb80344..27578e0 100644
--- a/Resources.php
+++ b/Resources.php
@@ -91,6 +91,7 @@
'tux-editor-message-tools-delete',
'tux-editor-message-tools-history',
'tux-editor-message-tools-translations',
+   'tux-editor-message-tools-linktothis',
'tux-editor-n-uses',
'tux-editor-need-more-help',
'tux-editor-outdated-warning',
diff --git a/api/ApiQueryMessageCollection.php 
b/api/ApiQueryMessageCollection.php
index a0415b1..0bfe461 100644
--- a/api/ApiQueryMessageCollection.php
+++ b/api/ApiQueryMessageCollection.php
@@ -140,6 +140,7 @@
if ( is_null( $resultPageSet ) ) {
$data = $this->extractMessageData( $result, 
$props, $messages[$mkey] );
$data['title'] = $title->getPrefixedText();
+   $data['primaryGroup'] = ( new MessageHandle( 
$title ) )->getGroup()->getId();
 
$result->addValue( [ 'query', 
$this->getModuleName() ], null, $data );
} else {
diff --git a/i18n/core/en.json b/i18n/core/en.json
index c7fcaaf..894d8f2 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -383,6 +383,7 @@
"tux-editor-message-tools-history": "History",
"tux-editor-message-tools-delete": "Delete",
"tux-editor-message-tools-translations": "All translations",
+   "tux-editor-message-tools-linktothis": "Link to this message",
"tux-editor-loading": "Loading...",
"translate-search-more-languages-info": "$1 more 
{{PLURAL:$1|language|languages}}",
"translate-statsbar-tooltip": "$1% translated, $2% reviewed",
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index 9358dbf..408a043 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -415,6 +415,7 @@
"tux-editor-message-tools-history": "A link to the message history. An 
item in a menu that appears when clicking on the message 
title.\n{{Identical|History}}",
"tux-editor-message-tools-delete": "A link to delete the message. An 
item in a menu that appears when clicking on the message 
title.\n{{Identical|Delete}}",
"tux-editor-message-tools-translations": "A link to translations of a 
message to all languages. An item in a menu that appears when clicking on 
message title.\n{{Identical|All translations}}",
+   "tux-editor-message-tools-linktothis": "A direct link to the 
translation editor showing this translation. An item in a menu that appears 
when clicking on message title",
"tux-editor-loading": "Loading message while translation editor is 
being prepared with helper information.\n{{Identical|Loading}}",
"translate-search-more-languages-info": "Information shown as number of 
languages matching the query using\n[[Special:SearchTranslations]]\n* $1 - 
number of languages\nSee also:\n* {{msg-mw|Translate-search-more-groups-info}}",
"translate-statsbar-tooltip": "Descriptive text to show for the stats 
bar for message groups on mouse over.\n* $1 percentage of messages 
translated\n* $2 percentage of messages reviewed",
diff --git a/resources/js/ext.translate.editor.js 
b/resources/js/ext.translate.editor.js
index b2adaa5..0268a26 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -368,7 +368,7 @@
 * @return {jQuery} The new message tools menu element
 */
createMessageTools: function () {
-   var $editItem, $historyItem, $deleteItem, 
$translationsItem;
+   var $editItem, $historyItem, $deleteItem, 
$translationsItem, $linkToThisItem;
 
$editItem = this.createMessageToolsItem(
'message-tools-edit',
@@ -421,9 +421,19 @@
'tux-editor-message-tools-translations'
);
 
+   $linkToThisItem = this.createMessageToolsItem(
+   'message-tools-linktothis',
+   {
+   title: 'Special:Translate',
+   showMessage: this.message.key,
+  

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: add $active_server parameter and use it

[Dzahn (Code Review)]

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

Change subject: smokeping: add $active_server parameter and use it
..


smokeping: add $active_server parameter and use it

Add a new parameter $active_server, like we already do for
similar setups, to role class and actual smokeping class.

Use the existing "netmon_server" Hiera value that is also
used by other monitoring tools to determine the active server.
 (Alternative would be to have a separate smokeping_server setting).

Use it to control whether the smokeping service is running or stopped.

Also use it to determine which server should be the source of the rsync
of RRD files. The passive server(s) pull from the active server.

Replace includes in role class with class instances. Reorder for style.

Bug: T180812
Change-Id: Id1a5ec6d7a2dcf755eb9d82deb2e0e4b248c77be
---
M hieradata/common.yaml
M modules/role/manifests/smokeping.pp
M modules/smokeping/manifests/init.pp
3 files changed, 35 insertions(+), 11 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 370db71..dc9a88a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -555,6 +555,8 @@
 install_server_failover: install2002.wikimedia.org
 
 netmon_server: netmon1002.wikimedia.org
+netmon_server_failover: netmon2001.wikimedia.org
+
 profile::netbox::netbox_server: netmon1002.wikimedia.org
 
 releases_server: releases1001.eqiad.wmnet
diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index c5c4726..f1f12ed 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -3,8 +3,16 @@
 
 system::role { 'smokeping': description => 'smokeping server' }
 
-include ::smokeping
-include ::smokeping::web
+$active_server = hiera('netmon_server')
+$passive_server = hiera('netmon_server_failover')
+
+rsync::quickdatacopy { 'var-lib-smokeping':
+ensure  => present,
+auto_sync   => true,
+source_host => $active_server,
+dest_host   => $passive_server,
+module_path => '/var/lib/smokeping',
+}
 
 ferm::service { 'smokeping-http':
 proto  => 'tcp',
@@ -12,13 +20,11 @@
 srange => '$CACHE_MISC',
 }
 
-backup::set {'smokeping': }
+backup::set { 'smokeping': }
 
-rsync::quickdatacopy { 'var-lib-smokeping':
-ensure  => present,
-auto_sync   => true,
-source_host => 'netmon1002.wikimedia.org',
-dest_host   => 'netmon2001.wikimedia.org',
-module_path => '/var/lib/smokeping',
+class{ '::smokeping':
+active_server => $active_server,
 }
+
+class{ '::smokeping::web': }
 }
diff --git a/modules/smokeping/manifests/init.pp 
b/modules/smokeping/manifests/init.pp
index 9cffdca..42d875f 100644
--- a/modules/smokeping/manifests/init.pp
+++ b/modules/smokeping/manifests/init.pp
@@ -1,4 +1,14 @@
-class smokeping {
+# SmokePing - monitor network latency
+# https://oss.oetiker.ch/smokeping
+# https://github.com/oetiker/SmokePing
+#
+# parameters: $active_server
+# In a multi-server setup, set $active_server to the FQDN
+# of the server that should run the smokeping service
+# and be the rsync source of RRD files.
+class smokeping(
+$active_server,
+) {
 
 require_package('smokeping', 'curl', 'dnsutils')
 
@@ -12,8 +22,14 @@
 require => Package['smokeping'],
 }
 
+if $active_server == $::fqdn {
+$service_ensure = 'running'
+} else {
+$service_ensure = 'stopped'
+}
+
 service { 'smokeping':
-ensure=> running,
+ensure=> $service_ensure,
 require   => [
 Package['smokeping'],
 File['/etc/smokeping/config.d'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1a5ec6d7a2dcf755eb9d82deb2e0e4b248c77be
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Only apply excluded label to namespace items

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Only apply excluded label to namespace items
..

RCFilters: Only apply excluded label to namespace items

Bug: T180863
Change-Id: I08db859c571b82ed4e4793d97b99100875ff1e23
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/392179/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
index db43a53..97000d4 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
@@ -65,7 +65,11 @@
this.excludeLabel = new OO.ui.LabelWidget( {
label: mw.msg( 'rcfilters-filter-excluded' )
} );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
 
layout = new OO.ui.FieldLayout( this.checkboxWidget, {
label: $label,
@@ -133,7 +137,11 @@
this.checkboxWidget.setSelected( this.itemModel.isSelected() );
 
this.highlightButton.toggle( 
this.filtersViewModel.isHighlightEnabled() );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
};
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: normalize_path_encoding: decode tilde for upload

[BBlack (Code Review)]

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

Change subject: normalize_path_encoding: decode tilde for upload
..


normalize_path_encoding: decode tilde for upload

Bug: T171881
Change-Id: Ifccc52c8f8b04e65987cba939e093594b5d7ad4b
---
M modules/varnish/templates/normalize_path.inc.vcl.erb
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/modules/varnish/templates/normalize_path.inc.vcl.erb 
b/modules/varnish/templates/normalize_path.inc.vcl.erb
index 9bea315..a3fb89f 100644
--- a/modules/varnish/templates/normalize_path.inc.vcl.erb
+++ b/modules/varnish/templates/normalize_path.inc.vcl.erb
@@ -32,13 +32,13 @@
  *   its own functional path-delimiting slashes unencoded.
  *
  * upload.wikimedia.org:-
- *   MW seems to use PHP's urlencode() directly when translating from MediaWiki
- *   File titles to storage URLs.  Note the filenames never contain spaces
- *   (would be underscores), and cannot have forward slashes (which will still
- *   exist in the rest of the path un-encoded).  .  The rules we should obey to
- *   be consistent with it would be:
+ *   MW seems to use PHP's rawurlencode() directly when translating from
+ *   MediaWiki File titles to storage URLs.  Note the filenames never contain
+ *   spaces (would be underscores), and cannot have forward slashes (which will
+ *   still exist in the rest of the path un-encoded).  The rules we should obey
+ *   to be consistent with it would be:
  *
- * Always-Decode: 0-9 A-Z a-z - . _ /
+ * Always-Decode: 0-9 A-Z a-z - . _ ~ /
  * Always-Encode: Everything Else
  
**/
 
@@ -55,7 +55,7 @@
   //@ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _
 0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
   //` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ 
-0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,0,
   // 0x80-0xFF (all unprintable)
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: normalize_path_encoding: decode tilde for upload

[BBlack (Code Review)]

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

Change subject: normalize_path_encoding: decode tilde for upload
..

normalize_path_encoding: decode tilde for upload

Bug: T171881
Change-Id: Ifccc52c8f8b04e65987cba939e093594b5d7ad4b
---
M modules/varnish/templates/normalize_path.inc.vcl.erb
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/392178/1

diff --git a/modules/varnish/templates/normalize_path.inc.vcl.erb 
b/modules/varnish/templates/normalize_path.inc.vcl.erb
index 9bea315..a3fb89f 100644
--- a/modules/varnish/templates/normalize_path.inc.vcl.erb
+++ b/modules/varnish/templates/normalize_path.inc.vcl.erb
@@ -32,13 +32,13 @@
  *   its own functional path-delimiting slashes unencoded.
  *
  * upload.wikimedia.org:-
- *   MW seems to use PHP's urlencode() directly when translating from MediaWiki
- *   File titles to storage URLs.  Note the filenames never contain spaces
- *   (would be underscores), and cannot have forward slashes (which will still
- *   exist in the rest of the path un-encoded).  .  The rules we should obey to
- *   be consistent with it would be:
+ *   MW seems to use PHP's rawurlencode() directly when translating from
+ *   MediaWiki File titles to storage URLs.  Note the filenames never contain
+ *   spaces (would be underscores), and cannot have forward slashes (which will
+ *   still exist in the rest of the path un-encoded).  The rules we should obey
+ *   to be consistent with it would be:
  *
- * Always-Decode: 0-9 A-Z a-z - . _ /
+ * Always-Decode: 0-9 A-Z a-z - . _ ~ /
  * Always-Encode: Everything Else
  
**/
 
@@ -55,7 +55,7 @@
   //@ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _
 0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
   //` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ 
-0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,0,
   // 0x80-0xFF (all unprintable)
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifccc52c8f8b04e65987cba939e093594b5d7ad4b
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] operations/puppet[production]: planet-rawdog: rm "You have reached the beginning" heading

[Dzahn (Code Review)]

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

Change subject: planet-rawdog: rm "You have reached the beginning" heading
..


planet-rawdog: rm "You have reached the beginning" heading

Change-Id: I32922ae51d099dd55f91d58e10b85148a6c94267
---
M modules/planet/templates/html/rd_page.html.tmpl.erb
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/modules/planet/templates/html/rd_page.html.tmpl.erb 
b/modules/planet/templates/html/rd_page.html.tmpl.erb
index 5905ef0..f627af3 100644
--- a/modules/planet/templates/html/rd_page.html.tmpl.erb
+++ b/modules/planet/templates/html/rd_page.html.tmpl.erb
@@ -129,9 +129,6 @@
 (rawdog __version__: __num_items__ items from 
__num_feeds__ feeds)
 Open all Close all Mark All 
Read
 
-
-You've reached the beginning
-
 
 __paged_output_pages__
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet-rawdog: rm "You have reached the beginning" heading

[Dzahn (Code Review)]

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

Change subject: planet-rawdog: rm "You have reached the beginning" heading
..

planet-rawdog: rm "You have reached the beginning" heading

Change-Id: I32922ae51d099dd55f91d58e10b85148a6c94267
---
M modules/planet/templates/html/rd_page.html.tmpl.erb
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/392177/1

diff --git a/modules/planet/templates/html/rd_page.html.tmpl.erb 
b/modules/planet/templates/html/rd_page.html.tmpl.erb
index 5905ef0..f627af3 100644
--- a/modules/planet/templates/html/rd_page.html.tmpl.erb
+++ b/modules/planet/templates/html/rd_page.html.tmpl.erb
@@ -129,9 +129,6 @@
 (rawdog __version__: __num_items__ items from 
__num_feeds__ feeds)
 Open all Close all Mark All 
Read
 
-
-You've reached the beginning
-
 
 __paged_output_pages__
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Turn lowercase initial letter in usernames to uppercase befo...

[Niharika29 (Code Review)]

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

Change subject: Turn lowercase initial letter in usernames to uppercase before 
querying
..

Turn lowercase initial letter in usernames to uppercase before querying

Lowercase usernames and no longer in use.

Bug: T180858
Change-Id: Ia6898dba0dc31345c97da65fe217e9048702bc6b
---
M includes/api/ApiQueryGlobalAllUsers.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/includes/api/ApiQueryGlobalAllUsers.php 
b/includes/api/ApiQueryGlobalAllUsers.php
index 38c4e3d..136e0da 100644
--- a/includes/api/ApiQueryGlobalAllUsers.php
+++ b/includes/api/ApiQueryGlobalAllUsers.php
@@ -51,6 +51,7 @@
 * @return string
 */
private function getCanonicalUserName( $name ) {
+   $name = ucfirst( $name );
return str_replace( '_', ' ', $name );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6898dba0dc31345c97da65fe217e9048702bc6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Fix colour for title to be green

[Dzahn (Code Review)]

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

Change subject: planet: Fix colour for title to be green
..


planet: Fix colour for title to be green

Change-Id: I8a9a5ab938e2b17838eab1f69fc15218cf4f053c
---
M modules/planet/files/theme/rawdog_style.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/planet/files/theme/rawdog_style.css 
b/modules/planet/files/theme/rawdog_style.css
index bd2a84f..d931fa1 100644
--- a/modules/planet/files/theme/rawdog_style.css
+++ b/modules/planet/files/theme/rawdog_style.css
@@ -106,7 +106,7 @@
 color: #14866d;
 }
 .unread {
-color: #36c;
+color: #00af89;
 }
 
 .xmlbutton {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a9a5ab938e2b17838eab1f69fc15218cf4f053c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Port categories dump header fix

[Smalyshev (Code Review)]

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

Change subject: Port categories dump header fix
..

Port categories dump header fix

This fix is ported from https://gerrit.wikimedia.org/r/#/c/372905
since it does not belong to SPARQL updates really.

It changes main node for category dump to

thus allowing to support multiple wikis living on the same domain.w

Change-Id: Ie1ac5ddf6b3b73f3966274f90abc1db50061b494
---
M includes/CategoriesRdf.php
M maintenance/dumpCategoriesAsRdf.php
M tests/phpunit/data/categoriesrdf/categoriesRdf-out.nt
M tests/phpunit/maintenance/categoriesRdfTest.php
4 files changed, 36 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/392175/1

diff --git a/includes/CategoriesRdf.php b/includes/CategoriesRdf.php
index e19dc2a..7e6089b 100644
--- a/includes/CategoriesRdf.php
+++ b/includes/CategoriesRdf.php
@@ -37,7 +37,13 @@
/**
 * Current version of the dump format.
 */
-   const FORMAT_VERSION = "1.0";
+   const FORMAT_VERSION = "1.1";
+   /**
+* Special page for Dump identification.
+* Used as head URI for each wiki's category dump, e.g.:
+* https://en.wikipedia.org/wiki/Special:CategoryDump
+*/
+   const SPECIAL_DUMP = 'CategoryDump';
/**
 * @var RdfWriter
 */
@@ -85,11 +91,29 @@
}
 
/**
+* Make URL from title label
+* @param string $titleLabel Short label (without namespace) of the 
category
+* @return string URL for the category
+*/
+   public function labelToUrl( $titleLabel ) {
+   return $this->titleToUrl( Title::makeTitle( NS_CATEGORY, 
$titleLabel ) );
+   }
+
+   /**
 * Convert Title to link to target page.
 * @param Title $title
-* @return string
+* @return string URL for the category
 */
private function titleToUrl( Title $title ) {
return $title->getFullURL( '', false, PROTO_CANONICAL );
}
+
+   /**
+* Get URI of the dump for this particular wiki.
+* @return false|string
+*/
+   public function getDumpURI() {
+   return $this->titleToUrl( Title::makeTitle( NS_SPECIAL, 
self::SPECIAL_DUMP ) );
+   }
+
 }
diff --git a/maintenance/dumpCategoriesAsRdf.php 
b/maintenance/dumpCategoriesAsRdf.php
index 282a04b..c1835d0 100644
--- a/maintenance/dumpCategoriesAsRdf.php
+++ b/maintenance/dumpCategoriesAsRdf.php
@@ -96,7 +96,7 @@
if ( substr( $licenseUrl, 0, 2 ) == '//' ) {
$licenseUrl = 'https:' . $licenseUrl;
}
-   $this->rdfWriter->about( wfExpandUrl( '/categoriesDump', 
PROTO_CANONICAL ) )
+   $this->rdfWriter->about( $this->categoriesRdf->getDumpURI() )
->a( 'schema', 'Dataset' )
->a( 'owl', 'Ontology' )
->say( 'cc', 'license' )->is( $licenseUrl )
diff --git a/tests/phpunit/data/categoriesrdf/categoriesRdf-out.nt 
b/tests/phpunit/data/categoriesrdf/categoriesRdf-out.nt
index d2d7ea8..b8bd8e0 100644
--- a/tests/phpunit/data/categoriesrdf/categoriesRdf-out.nt
+++ b/tests/phpunit/data/categoriesrdf/categoriesRdf-out.nt
@@ -1,10 +1,10 @@
- 
  .
- 
 
 .
-  
 .
-  "1.0" .
-  
"{DATE}"^^ .
-  
 .
-  
 .
+ 
  .
+ 
 
 .
+ 
 
 .
+ 
 "1.1" .
+  
"{DATE}"^^ .
+  
 .

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Fix colour for title to be green

[Paladox (Code Review)]

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

Change subject: planet: Fix colour for title to be green
..

planet: Fix colour for title to be green

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a9a5ab938e2b17838eab1f69fc15218cf4f053c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Switch colour's around for title, and authored by in...

[Dzahn (Code Review)]

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

Change subject: planet: Switch colour's around for title, and authored by in 
rawdog
..


planet: Switch colour's around for title, and authored by in rawdog

Use the identical red, green and blue from the SVG community logo file
for better design, per Mutante.

Change-Id: Icf7bb94bf1ce2e050c058fc12823d7d1f11e3c5d
---
M modules/planet/files/theme/rawdog_style.css
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/modules/planet/files/theme/rawdog_style.css 
b/modules/planet/files/theme/rawdog_style.css
index 0d30911..bd2a84f 100644
--- a/modules/planet/files/theme/rawdog_style.css
+++ b/modules/planet/files/theme/rawdog_style.css
@@ -50,17 +50,17 @@
 
 .itemheader {
 font-size: 120%;
-/*text-align: center;*/
-color: #a03;
+/*text-align: center;*/
+color: #2a4b8d;
 }
 
 .itemheader a, .itemheader a:visited {
 text-decoration: none;
-color: #a03;
+color: #b32424;
 }
 
 .itemheader a:hover {
-color: #08b;
+color: #b32424;
 }
 
 .itemtitle{
@@ -103,10 +103,10 @@
 }
 
 .read {
-color: #08b;
+color: #14866d;
 }
 .unread {
-color: #a03;
+color: #36c;
 }
 
 .xmlbutton {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Switch colour from red to #36c (blue) in rawdog

[Paladox (Code Review)]

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

Change subject: planet: Switch colour from red to #36c (blue) in rawdog
..

planet: Switch colour from red to #36c (blue) in rawdog

Per feedback

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/392169/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf7bb94bf1ce2e050c058fc12823d7d1f11e3c5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] mediawiki/core[master]: Add more data to categories dump

[Smalyshev (Code Review)]

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

Change subject: Add more data to categories dump
..

Add more data to categories dump

Hidden category:  a mediawiki:HiddenCategory .
Pages count:  mediawiki:pageCount 10 .
Subcats count:  mediawiki:subcatCount 5 .

Note that pages count includes only actual articles, unlike mediawiki
table.

Bug: T173980
Change-Id: I6d34c58f844411f891195776406e11acd2aef7b1
---
M docs/ontology.owl
M includes/CategoriesRdf.php
M maintenance/dumpCategoriesAsRdf.php
M tests/phpunit/data/categoriesrdf/categoriesRdf-out.nt
M tests/phpunit/maintenance/categoriesRdfTest.php
5 files changed, 90 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/392173/1

diff --git a/docs/ontology.owl b/docs/ontology.owl
index 6b2e0b7..76ee321 100644
--- a/docs/ontology.owl
+++ b/docs/ontology.owl
@@ -38,6 +38,11 @@
 MediaWiki category.
   
 
+  
+HiddenCategory
+MediaWiki hidden category.
+  
+
   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: Move cloud VMs to the puppet 'future' environment

[Andrew Bogott (Code Review)]

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

Change subject: puppet:  Move cloud VMs to the puppet 'future' environment
..

puppet:  Move cloud VMs to the puppet 'future' environment

Bug: T178508
Change-Id: I807fe0297038c978e50dcd80843c3f0d2cc2e507
---
M hieradata/labs.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index d24b949..b837f52 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -91,7 +91,7 @@
 hosts:
   "%{::fqdn}": 1
 
-profile::base::environment: ''
+profile::base::environment: "future"
 profile::base::nrpe_allowed_hosts: '10.68.16.210'
 profile::base::ssh_server_settings:
   disable_agent_forwarding: false

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

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

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

[MediaWiki-commits] [Gerrit] integration/commit-message-validator[master]: Release 0.5.2

[jenkins-bot (Code Review)]

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

Change subject: Release 0.5.2
..


Release 0.5.2

Change-Id: I68f418439fd2ed406cac7565927bddfada78e614
---
M commit_message_validator/__init__.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/commit_message_validator/__init__.py 
b/commit_message_validator/__init__.py
index 8455baf..cf15256 100644
--- a/commit_message_validator/__init__.py
+++ b/commit_message_validator/__init__.py
@@ -28,7 +28,7 @@
 import subprocess
 import sys
 
-__version__ = '0.5.1'
+__version__ = '0.5.2'
 
 RE_BUGID = re.compile('^T[0-9]+$')
 RE_CHANGEID = re.compile('^I[a-f0-9]{40}$')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68f418439fd2ed406cac7565927bddfada78e614
Gerrit-PatchSet: 1
Gerrit-Project: integration/commit-message-validator
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/commit-message-validator[master]: Release 0.5.2

[Legoktm (Code Review)]

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

Change subject: Release 0.5.2
..

Release 0.5.2

Change-Id: I68f418439fd2ed406cac7565927bddfada78e614
---
M commit_message_validator/__init__.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/commit-message-validator 
refs/changes/71/392171/1

diff --git a/commit_message_validator/__init__.py 
b/commit_message_validator/__init__.py
index 8455baf..cf15256 100644
--- a/commit_message_validator/__init__.py
+++ b/commit_message_validator/__init__.py
@@ -28,7 +28,7 @@
 import subprocess
 import sys
 
-__version__ = '0.5.1'
+__version__ = '0.5.2'
 
 RE_BUGID = re.compile('^T[0-9]+$')
 RE_CHANGEID = re.compile('^I[a-f0-9]{40}$')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68f418439fd2ed406cac7565927bddfada78e614
Gerrit-PatchSet: 1
Gerrit-Project: integration/commit-message-validator
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] operations/puppet[production]: smokeping: enable cron to auto-rsync data

[Dzahn (Code Review)]

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

Change subject: smokeping: enable cron to auto-rsync data
..


smokeping: enable cron to auto-rsync data

With $auto_sync set to false, the rsync::quickdatacopy class
sets up rsyncd config and ferm rules to allow a human to copy data
but does not enable the additional cronjob to automatically run
the actual rsync command.

Enabling this (after we switched smokeping back to eqiad and changed
rsync direction accordingly).

But maybe it doesn't make much sense if we have the service running on both?

Do we want to have the service running on both or we want to declare
the current web frontend the "active server" and stop the service on the
other one?

Bug: T180812
Change-Id: I16fbeecbd672893e1b2f43940f1b482dcaed8486
---
M modules/role/manifests/smokeping.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index 3b222fb..c5c4726 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -16,7 +16,7 @@
 
 rsync::quickdatacopy { 'var-lib-smokeping':
 ensure  => present,
-auto_sync   => false,
+auto_sync   => true,
 source_host => 'netmon1002.wikimedia.org',
 dest_host   => 'netmon2001.wikimedia.org',
 module_path => '/var/lib/smokeping',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make SwiftFileBackend::resolveContainerPath use rawurlencode

[Aaron Schulz (Code Review)]

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

Change subject: Make SwiftFileBackend::resolveContainerPath use rawurlencode
..

Make SwiftFileBackend::resolveContainerPath use rawurlencode

The length sanity check should use this instead of urlencode()
see it is rawurlencode() that is actually used.

Change-Id: I5632e30c14c8ab27c8324c3e31311ca8bff7c162
---
M includes/libs/filebackend/SwiftFileBackend.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/392170/1

diff --git a/includes/libs/filebackend/SwiftFileBackend.php 
b/includes/libs/filebackend/SwiftFileBackend.php
index f50d26b..373ad93 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -158,7 +158,7 @@
protected function resolveContainerPath( $container, $relStoragePath ) {
if ( !mb_check_encoding( $relStoragePath, 'UTF-8' ) ) {
return null; // not UTF-8, makes it hard to use CF and 
the swift HTTP API
-   } elseif ( strlen( urlencode( $relStoragePath ) ) > 1024 ) {
+   } elseif ( strlen( rawurlencode( $relStoragePath ) ) > 1024 ) {
return null; // too long for Swift
}
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "smokeping: switch data rsync direction"

[Dzahn (Code Review)]

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

Change subject: Revert "smokeping: switch data rsync direction"
..


Revert "smokeping: switch data rsync direction"

This reverts commit 43dcf15fbb7869e78b9c6c5d614726fd62fd16ba.

Change-Id: I980f5df96bce6d2c5ef87f22326e655ed4c0ad0e
---
M modules/role/manifests/smokeping.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index f4ad708..3b222fb 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -17,8 +17,8 @@
 rsync::quickdatacopy { 'var-lib-smokeping':
 ensure  => present,
 auto_sync   => false,
-source_host => 'netmon2001.wikimedia.org',
-dest_host   => 'netmon1002.wikimedia.org',
+source_host => 'netmon1002.wikimedia.org',
+dest_host   => 'netmon2001.wikimedia.org',
 module_path => '/var/lib/smokeping',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAuthors[master]: BlueSpiceAuthors: Change gpl licence version to v3

[Mglaser (Code Review)]

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

Change subject: BlueSpiceAuthors: Change gpl licence version to v3
..


BlueSpiceAuthors: Change gpl licence version to v3

Changed GPL version to 3.0 and raised extension
version number to 3.0.0-alpha.

Changed GPL version to 3.0.

Removed mentionings about licensing any later version and removed "+"
behind GPL-Versionnumber

Corrected Licence-Disclaimer.

Added COPYING-file.

Removed @version-comments

Added code-header to main classes

Removed code-header from main classes except Authors.class.php

Corrected Licence-disclaimer.

Change-Id: I6f904e0f98e3fc0cd53bd96ded8fa638912743ab
---
M Authors.class.php
A COPYING
M extension.json
M resources/bluespice.authors.css
M views/view.Authors.php
M views/view.AuthorsUserPageProfileImageSetting.php
6 files changed, 682 insertions(+), 9 deletions(-)

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



diff --git a/Authors.class.php b/Authors.class.php
index 22bc111..76acfeb 100644
--- a/Authors.class.php
+++ b/Authors.class.php
@@ -6,11 +6,10 @@
  *
  * 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.
+ * the Free Software Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
  *
@@ -23,11 +22,10 @@
  *
  * @author Markus Glaser 
  * @author Robert Vogel 
- * @version2.23.1
  * @packageBlueSpice_Extensions
  * @subpackage Authors
  * @copyright  Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
+ * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v3
  * @filesource
  */
 
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..e72bfdd
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the 

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Add Javanese translations for Scribunto

[jenkins-bot (Code Review)]

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

Change subject: Add Javanese translations for Scribunto
..


Add Javanese translations for Scribunto

Provided by  in the
linked Phabricator Task.

Bug: T180578
Change-Id: I1dc82427c6ebb95044b0456c8513cbec19e2ab52
---
M Scribunto.namespaces.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php
index 4dc78ed..57dd935 100644
--- a/Scribunto.namespaces.php
+++ b/Scribunto.namespaces.php
@@ -248,6 +248,11 @@
829 => 'モジュール・トーク',
 ];
 
+$namespaceNames['jv'] = [
+   828 => 'Modhul',
+   829 => 'Parembugan_Modhul',
+];
+
 $namespaceNames['ka'] = [
828 => 'მოდული',
829 => 'მოდულის_განხილვა',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dc82427c6ebb95044b0456c8513cbec19e2ab52
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: add $active_server parameter and use it

[Dzahn (Code Review)]

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

Change subject: smokeping: add $active_server parameter and use it
..

smokeping: add $active_server parameter and use it

Add a new parameter $active_server, like we already do for
similar setups, to role class and actual smokeping class.

Use the existing "netmon_server" Hiera value that is also
used by other monitoring tools to determine the active server.
 (Alternative would be to have a separate smokeping_server setting).

Use it to control whether the smokeping service is running or stopped.

Also use it to determine which server should be the source of the rsync
of RRD files. If the current FQDN equals active_server, do _not_ have
an rsync-cron, otherwise (on one or multiple "passive" servers) do have
an rsync cronjob and use $fqdn as destination and $active server as
source. The passive server(s) pull from the active server.

Bug: T180812
Change-Id: Id1a5ec6d7a2dcf755eb9d82deb2e0e4b248c77be
---
M modules/role/manifests/smokeping.pp
M modules/smokeping/manifests/init.pp
2 files changed, 38 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/392167/1

diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index 8413d1b..3eace50 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -3,8 +3,21 @@
 
 system::role { 'smokeping': description => 'smokeping server' }
 
-include ::smokeping
-include ::smokeping::web
+$active_server = hiera('netmon_server')
+
+if $active_server == $::fqdn {
+$rsync_ensure = 'absent'
+} else {
+$rsync_ensure = 'present'
+}
+
+rsync::quickdatacopy { 'var-lib-smokeping':
+ensure  => $rsync_ensure,
+auto_sync   => true,
+source_host => $active_server,
+dest_host   => $::fqdn,
+module_path => '/var/lib/smokeping',
+}
 
 ferm::service { 'smokeping-http':
 proto  => 'tcp',
@@ -12,13 +25,11 @@
 srange => '$CACHE_MISC',
 }
 
-backup::set {'smokeping': }
+backup::set { 'smokeping': }
 
-rsync::quickdatacopy { 'var-lib-smokeping':
-ensure  => present,
-auto_sync   => true,
-source_host => 'netmon2001.wikimedia.org',
-dest_host   => 'netmon1002.wikimedia.org',
-module_path => '/var/lib/smokeping',
+class{ '::smokeping':
+active_server => $active_server,
 }
+
+class{ '::smokeping::web' }
 }
diff --git a/modules/smokeping/manifests/init.pp 
b/modules/smokeping/manifests/init.pp
index 9cffdca..1a082c2 100644
--- a/modules/smokeping/manifests/init.pp
+++ b/modules/smokeping/manifests/init.pp
@@ -1,4 +1,14 @@
-class smokeping {
+# SmokePing - monitor network latency
+# https://oss.oetiker.ch/smokeping
+# https://github.com/oetiker/SmokePing
+#
+# parameters: $active_server
+# In a multi-server setup, set $active_server to the FQDN
+# of the server that should run the smokeping service
+# and be the rsync source of RRD files.
+class smokeping(
+$active_server,
+) {
 
 require_package('smokeping', 'curl', 'dnsutils')
 
@@ -12,8 +22,14 @@
 require => Package['smokeping'],
 }
 
+if $active_server == $::fqdn {
+$service_ensure = 'running',
+} else {
+$service_ensure = 'stopped',
+}
+
 service { 'smokeping':
-ensure=> running,
+ensure=> $service_ensure,
 require   => [
 Package['smokeping'],
 File['/etc/smokeping/config.d'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1a5ec6d7a2dcf755eb9d82deb2e0e4b248c77be
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] wikidata...rdf[master]: Update GUI

[jenkins-bot (Code Review)]

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

Change subject: Update GUI
..


Update GUI

Change-Id: I9fc3fe48227ef46bc9578bfd2d5f12856584bd26
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/gui b/gui
index 4999f59..6078d78 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 4999f5955040352debf77aeae93bed518bb300e0
+Subproject commit 6078d78a415037616200301faf077c9294956370

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fc3fe48227ef46bc9578bfd2d5f12856584bd26
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Allow admins to remove users from MP3 uploaders user group

[Kaldari (Code Review)]

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

Change subject: Allow admins to remove users from MP3 uploaders user group
..

Allow admins to remove users from MP3 uploaders user group

Bug: T180002
Change-Id: I3c18a5a6e11ec7aa7c1d6b8040c87df7df05e976
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dd734f2..cc16114 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10655,7 +10655,16 @@
'accountcreator', // T144689
],
'checkuser' => [ 'ipblock-exempt' ],
-   'sysop' => [ 'rollbacker', 'confirmed', 'patroller', 
'autopatrolled', 'filemover', 'Image-reviewer', 'upwizcampeditors' ],
+   'sysop' => [
+   'rollbacker',
+   'confirmed',
+   'patroller',
+   'autopatrolled',
+   'filemover',
+   'Image-reviewer',
+   'mp3-uploader', // T180002
+   'upwizcampeditors'
+   ],
],
'+cswiki' => [
'bureaucrat' => [ 'arbcom', 'autopatrolled' ], // T63418

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Add some extensions

[Umherirrender (Code Review)]

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

Change subject: Add some extensions
..


Add some extensions

- BlueSpiceArticleInfo
- BlueSpiceAuthors
- BlueSpiceAvatars
- BlueSpiceBlog
- BlueSpiceChecklist
- BlueSpiceConfigManager
- BlueSpiceContextMenu
- BlueSpiceCountThings
- BlueSpiceDashboards
- BlueSpiceEmoticons
- BlueSpiceExtendedStatistics
- BlueSpiceGroupManager
- BlueSpiceInterWikiLinks
- BlueSpiceNamespaceManager
- BlueSpicePageTemplates
- BlueSpicePagesVisited
- BlueSpicePermissionManager
- BlueSpiceReaders
- BlueSpiceSmartlist
- BlueSpiceUserManager
- BlueSpiceUserPreferences
- HAWelcome
- MetaMaster
- PhabTaskGraph
- Widgets - T180849

Change-Id: If144663d4ae646a6cae9f4c9445270a3769d6a79
---
M .gitmodules
A BlueSpiceArticleInfo
A BlueSpiceAuthors
A BlueSpiceAvatars
A BlueSpiceBlog
A BlueSpiceChecklist
A BlueSpiceConfigManager
A BlueSpiceContextMenu
A BlueSpiceCountThings
A BlueSpiceDashboards
A BlueSpiceEmoticons
A BlueSpiceExtendedStatistics
A BlueSpiceGroupManager
A BlueSpiceInterWikiLinks
A BlueSpiceNamespaceManager
A BlueSpicePageTemplates
A BlueSpicePagesVisited
A BlueSpicePermissionManager
A BlueSpiceReaders
A BlueSpiceSmartlist
A BlueSpiceUserManager
A BlueSpiceUserPreferences
A HAWelcome
A MetaMaster
A PhabTaskGraph
A Widgets
26 files changed, 125 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index b180df7..1162471 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -186,13 +186,53 @@
path = BlogPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlogPage
branch = .
+[submodule "BlueSpiceArticleInfo"]
+   path = BlueSpiceArticleInfo
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceArticleInfo
+   branch = .
+[submodule "BlueSpiceAuthors"]
+   path = BlueSpiceAuthors
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceAuthors
+   branch = .
+[submodule "BlueSpiceAvatars"]
+   path = BlueSpiceAvatars
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceAvatars
+   branch = .
+[submodule "BlueSpiceBlog"]
+   path = BlueSpiceBlog
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceBlog
+   branch = .
 [submodule "BlueSpiceCategoryManager"]
path = BlueSpiceCategoryManager
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceCategoryManager
branch = .
+[submodule "BlueSpiceChecklist"]
+   path = BlueSpiceChecklist
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceChecklist
+   branch = .
+[submodule "BlueSpiceConfigManager"]
+   path = BlueSpiceConfigManager
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceConfigManager
+   branch = .
+[submodule "BlueSpiceContextMenu"]
+   path = BlueSpiceContextMenu
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceContextMenu
+   branch = .
+[submodule "BlueSpiceCountThings"]
+   path = BlueSpiceCountThings
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceCountThings
+   branch = .
+[submodule "BlueSpiceDashboards"]
+   path = BlueSpiceDashboards
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceDashboards
+   branch = .
 [submodule "BlueSpiceEditNotifyConnector"]
path = BlueSpiceEditNotifyConnector
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceEditNotifyConnector
+   branch = .
+[submodule "BlueSpiceEmoticons"]
+   path = BlueSpiceEmoticons
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceEmoticons
branch = .
 [submodule "BlueSpiceExtendedFilelist"]
path = BlueSpiceExtendedFilelist
@@ -202,6 +242,10 @@
path = BlueSpiceExtendedSearch
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtendedSearch
branch = .
+[submodule "BlueSpiceExtendedStatistics"]
+   path = BlueSpiceExtendedStatistics
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtendedStatistics
+   branch = .
 [submodule "BlueSpiceExtensions"]
path = BlueSpiceExtensions
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtensions
@@ -210,21 +254,57 @@
path = BlueSpiceFoundation
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceFoundation
branch = .
+[submodule "BlueSpiceGroupManager"]
+   path = BlueSpiceGroupManager
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceGroupManager
+   branch = .
 [submodule "BlueSpiceInsertTemplate"]
path = BlueSpiceInsertTemplate
url = 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-Up Iae63b6994: Add missing editfont dependency

[jenkins-bot (Code Review)]

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

Change subject: Follow-Up Iae63b6994: Add missing editfont dependency
..


Follow-Up Iae63b6994: Add missing editfont dependency

Change-Id: I606a81576baf312891f3bb12f575892b00bca823
---
M resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index dcf2f9b..715f339 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2103,6 +2103,7 @@
'mediawiki.notification.convertmessagebox',
'oojs-ui-widgets',
'mediawiki.widgets.SelectWithInputWidget',
+   'mediawiki.editfont.styles',
],
],
'mediawiki.special.preferences.styles.ooui' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Add some extensions

[Umherirrender (Code Review)]

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

Change subject: Add some extensions
..

Add some extensions

- BlueSpiceArticleInfo
- BlueSpiceAuthors
- BlueSpiceAvatars
- BlueSpiceBlog
- BlueSpiceChecklist
- BlueSpiceConfigManager
- BlueSpiceContextMenu
- BlueSpiceCountThings
- BlueSpiceDashboards
- BlueSpiceEmoticons
- BlueSpiceExtendedStatistics
- BlueSpiceGroupManager
- BlueSpiceInterWikiLinks
- BlueSpiceNamespaceManager
- BlueSpicePageTemplates
- BlueSpicePagesVisited
- BlueSpicePermissionManager
- BlueSpiceReaders
- BlueSpiceSmartlist
- BlueSpiceUserManager
- BlueSpiceUserPreferences
- HAWelcome
- MetaMaster
- PhabTaskGraph
- Widgets - T180849

Change-Id: If144663d4ae646a6cae9f4c9445270a3769d6a79
---
M .gitmodules
A BlueSpiceArticleInfo
A BlueSpiceAuthors
A BlueSpiceAvatars
A BlueSpiceBlog
A BlueSpiceChecklist
A BlueSpiceConfigManager
A BlueSpiceContextMenu
A BlueSpiceCountThings
A BlueSpiceDashboards
A BlueSpiceEmoticons
A BlueSpiceExtendedStatistics
A BlueSpiceGroupManager
A BlueSpiceInterWikiLinks
A BlueSpiceNamespaceManager
A BlueSpicePageTemplates
A BlueSpicePagesVisited
A BlueSpicePermissionManager
A BlueSpiceReaders
A BlueSpiceSmartlist
A BlueSpiceUserManager
A BlueSpiceUserPreferences
A HAWelcome
A MetaMaster
A PhabTaskGraph
A Widgets
26 files changed, 125 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/65/392165/1

diff --git a/.gitmodules b/.gitmodules
index b180df7..1162471 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -186,13 +186,53 @@
path = BlogPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlogPage
branch = .
+[submodule "BlueSpiceArticleInfo"]
+   path = BlueSpiceArticleInfo
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceArticleInfo
+   branch = .
+[submodule "BlueSpiceAuthors"]
+   path = BlueSpiceAuthors
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceAuthors
+   branch = .
+[submodule "BlueSpiceAvatars"]
+   path = BlueSpiceAvatars
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceAvatars
+   branch = .
+[submodule "BlueSpiceBlog"]
+   path = BlueSpiceBlog
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceBlog
+   branch = .
 [submodule "BlueSpiceCategoryManager"]
path = BlueSpiceCategoryManager
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceCategoryManager
branch = .
+[submodule "BlueSpiceChecklist"]
+   path = BlueSpiceChecklist
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceChecklist
+   branch = .
+[submodule "BlueSpiceConfigManager"]
+   path = BlueSpiceConfigManager
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceConfigManager
+   branch = .
+[submodule "BlueSpiceContextMenu"]
+   path = BlueSpiceContextMenu
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceContextMenu
+   branch = .
+[submodule "BlueSpiceCountThings"]
+   path = BlueSpiceCountThings
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceCountThings
+   branch = .
+[submodule "BlueSpiceDashboards"]
+   path = BlueSpiceDashboards
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceDashboards
+   branch = .
 [submodule "BlueSpiceEditNotifyConnector"]
path = BlueSpiceEditNotifyConnector
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceEditNotifyConnector
+   branch = .
+[submodule "BlueSpiceEmoticons"]
+   path = BlueSpiceEmoticons
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceEmoticons
branch = .
 [submodule "BlueSpiceExtendedFilelist"]
path = BlueSpiceExtendedFilelist
@@ -202,6 +242,10 @@
path = BlueSpiceExtendedSearch
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtendedSearch
branch = .
+[submodule "BlueSpiceExtendedStatistics"]
+   path = BlueSpiceExtendedStatistics
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtendedStatistics
+   branch = .
 [submodule "BlueSpiceExtensions"]
path = BlueSpiceExtensions
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtensions
@@ -210,21 +254,57 @@
path = BlueSpiceFoundation
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceFoundation
branch = .
+[submodule "BlueSpiceGroupManager"]
+   path = BlueSpiceGroupManager
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceGroupManager
+   branch = .
 [submodule "BlueSpiceInsertTemplate"]
path = BlueSpiceInsertTemplate
url = 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-Up Iae63b6994: Add missing editfont dependency

[Esanders (Code Review)]

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

Change subject: Follow-Up Iae63b6994: Add missing editfont dependency
..

Follow-Up Iae63b6994: Add missing editfont dependency

Change-Id: I606a81576baf312891f3bb12f575892b00bca823
---
M resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/Resources.php b/resources/Resources.php
index dcf2f9b..715f339 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2103,6 +2103,7 @@
'mediawiki.notification.convertmessagebox',
'oojs-ui-widgets',
'mediawiki.widgets.SelectWithInputWidget',
+   'mediawiki.editfont.styles',
],
],
'mediawiki.special.preferences.styles.ooui' => [

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Revert "Don't widen images on metered connections"

[Mholloway (Code Review)]

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

Change subject: Revert "Don't widen images on metered connections"
..

Revert "Don't widen images on metered connections"

This is probably no longer needed, as images are now lazy-loaded, and
data-sensitive users can turn off images completely.

This reverts commit 7ae21ce4dea5d39066d80c9f44e995d4228cf7b5.

Change-Id: Ie9f8a894fd05a44dc95255ebc22eab27543df123
---
M app/src/main/assets/bundle.js
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/util/DeviceUtil.java
M www/js/sections.js
4 files changed, 2 insertions(+), 18 deletions(-)


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

diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index 108fc69..d8b8db5 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -323,7 +323,6 @@
 window.fromRestBase = payload.fromRestBase;
 window.isBeta = payload.isBeta;
 window.siteLanguage = payload.siteLanguage;
-window.isNetworkMetered = payload.isNetworkMetered;
 window.showImages = payload.showImages;
 }
 
@@ -432,10 +431,7 @@
 }
 if (!window.isMainPage) {
 transformer.transform( "hideTables", content );
-
-if (!window.isNetworkMetered) {
-transformer.transform( "widenImages", content );
-}
+transformer.transform( "widenImages", content );
 
 if (!window.isFilePage) {
 lazyLoadTransformer.convertImagesToPlaceholders( content );
diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java 
b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
index 3354d3e..d55bda7 100644
--- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
@@ -42,7 +42,6 @@
 import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.DateUtil;
-import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.L10nUtil;
 import org.wikipedia.util.ReleaseUtil;
@@ -577,7 +576,6 @@
 .put("isMainPage", page.isMainPage())
 .put("isFilePage", page.isFilePage())
 .put("fromRestBase", page.isFromRestBase())
-.put("isNetworkMetered", DeviceUtil.isNetworkMetered(app))
 .put("apiLevel", Build.VERSION.SDK_INT)
 .put("showImages", Prefs.isImageDownloadEnabled());
 }
diff --git a/app/src/main/java/org/wikipedia/util/DeviceUtil.java 
b/app/src/main/java/org/wikipedia/util/DeviceUtil.java
index be77724..a6d3569 100644
--- a/app/src/main/java/org/wikipedia/util/DeviceUtil.java
+++ b/app/src/main/java/org/wikipedia/util/DeviceUtil.java
@@ -9,7 +9,6 @@
 import android.net.Uri;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
-import android.support.v4.net.ConnectivityManagerCompat;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
@@ -64,11 +63,6 @@
 InputMethodManager keyboard = 
(InputMethodManager)view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
 // Not using getCurrentFocus as that sometimes is null, but the 
keyboard is still up.
 keyboard.hideSoftInputFromWindow(view.getWindowToken(), 0);
-}
-
-public static boolean isNetworkMetered(Context context) {
-return ConnectivityManagerCompat.isActiveNetworkMetered(
-(ConnectivityManager) 
context.getSystemService(Context.CONNECTIVITY_SERVICE));
 }
 
 public static boolean isLocationServiceEnabled(@NonNull Context context) {
diff --git a/www/js/sections.js b/www/js/sections.js
index 4c20356..46ddadb 100644
--- a/www/js/sections.js
+++ b/www/js/sections.js
@@ -80,7 +80,6 @@
 window.fromRestBase = payload.fromRestBase;
 window.isBeta = payload.isBeta;
 window.siteLanguage = payload.siteLanguage;
-window.isNetworkMetered = payload.isNetworkMetered;
 window.showImages = payload.showImages;
 }
 
@@ -189,10 +188,7 @@
 }
 if (!window.isMainPage) {
 transformer.transform( "hideTables", content );
-
-if (!window.isNetworkMetered) {
-transformer.transform( "widenImages", content );
-}
+transformer.transform( "widenImages", content );
 
 if (!window.isFilePage) {
 lazyLoadTransformer.convertImagesToPlaceholders( content );

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: wikimedia-page-library -> 4.7.4

[Mholloway (Code Review)]

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

Change subject: wikimedia-page-library -> 4.7.4
..

wikimedia-page-library -> 4.7.4

Change-Id: I7e438d889dac343042b2ab374ebcdbc05146b336
---
M app/src/main/assets/bundle.js
M app/src/main/assets/preview.js
M app/src/main/assets/wikimedia-page-library.css
M www/package-lock.json
M www/package.json
5 files changed, 22 insertions(+), 16 deletions(-)


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

diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index bab059e..108fc69 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -1280,8 +1280,11 @@
   /* en > Away colours > 793128975 */
   /* en > Manchester United F.C. > 793244653 */
   /* en > Pantone > 792312384 */
-  Polyfill.querySelectorAll(element, 'div.color_swatch div, 
div[style*="position: absolute"]').forEach(function (div) {
-div.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
+  /* en > Wikipedia:Graphs_and_charts > 801754530 */
+  /* en > PepsiCo > 807406166 */
+  var selector = ['div.color_swatch div', 'div[style*="position: absolute"]', 
'div.barbox table div[style*="background:"]', 'div.chart 
div[style*="background-color"]', 'div.chart ul li 
span[style*="background-color"]', 'span.legend-color'].join();
+  Polyfill.querySelectorAll(element, selector).forEach(function (element) {
+return element.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
   });
 };
 
diff --git a/app/src/main/assets/preview.js b/app/src/main/assets/preview.js
index 73a1a24..51da04e 100644
--- a/app/src/main/assets/preview.js
+++ b/app/src/main/assets/preview.js
@@ -432,8 +432,11 @@
   /* en > Away colours > 793128975 */
   /* en > Manchester United F.C. > 793244653 */
   /* en > Pantone > 792312384 */
-  Polyfill.querySelectorAll(element, 'div.color_swatch div, 
div[style*="position: absolute"]').forEach(function (div) {
-div.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
+  /* en > Wikipedia:Graphs_and_charts > 801754530 */
+  /* en > PepsiCo > 807406166 */
+  var selector = ['div.color_swatch div', 'div[style*="position: absolute"]', 
'div.barbox table div[style*="background:"]', 'div.chart 
div[style*="background-color"]', 'div.chart ul li 
span[style*="background-color"]', 'span.legend-color'].join();
+  Polyfill.querySelectorAll(element, selector).forEach(function (element) {
+return element.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
   });
 };
 
diff --git a/app/src/main/assets/wikimedia-page-library.css 
b/app/src/main/assets/wikimedia-page-library.css
index 64b2424..e34821f 100644
--- a/app/src/main/assets/wikimedia-page-library.css
+++ b/app/src/main/assets/wikimedia-page-library.css
@@ -3,7 +3,7 @@
 
 /* --- CSS from '/src/transform/ThemeTransform.css' --- */ 
 
- /* 
+ /*
 The styles referred to as 'baseline' in the comments below are critical 
because they ensure
 a theme colors are more universally applied even by elements colored via 
inline styles. These are
 particularly difficult to theme otherwise. We can build on top of, so to 
speak, these baseline
@@ -29,7 +29,7 @@
 }
 
 /* external anchor */
-.pagelib_theme_dark a.external, 
+.pagelib_theme_dark a.external,
 .pagelib_theme_sepia a.external {
   background-image: 
url(data:image/png;base64,iVBORw0KGgoNSUhEUgoKCAYAAACNMs+9AXNSR0IArs4c6QRnQU1BAACxjwv8YQUJcEhZcwAADsMAAA7DAcdvqGQadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAGJJREFUKFN1jdENgCAMBYmJn47Bak7DZrhTpc/XIm34OAjXA4qIgHI/dSBbLGTcOKjBryFlinGmjDQGiOF0MQkxI3v5wq6L38qR7SnsAx8ul37igPjAd+o5Oz2MRA+xY4ZSXuaW6wYouOLpAElFTkSuQmCC);
 }
@@ -47,12 +47,12 @@
 .pagelib_theme_sepia .content tr,
 .pagelib_theme_sepia .content th {
   background: #f0e6d6 !important;
-  color: #222 !important; 
+  color: #222 !important;
 }
 
 /* baseline div, span, ul, li */
 .pagelib_theme_dark .content div:not(.pagelib_theme_div_do_not_apply_baseline),
-.pagelib_theme_dark .content span,
+.pagelib_theme_dark .content 
span:not(.pagelib_theme_div_do_not_apply_baseline),
 .pagelib_theme_dark .content ul,
 .pagelib_theme_dark .content ol,
 .pagelib_theme_dark .content li {
@@ -60,12 +60,12 @@
   color: #f8f9fa !important;
 }
 .pagelib_theme_sepia .content 
div:not(.pagelib_theme_div_do_not_apply_baseline),
-.pagelib_theme_sepia .content span,
+.pagelib_theme_sepia .content 
span:not(.pagelib_theme_div_do_not_apply_baseline),
 .pagelib_theme_sepia .content ul,
 .pagelib_theme_sepia .content ol,
 .pagelib_theme_sepia .content li {
   background-color: inherit !important;
-  color: #222 !important; 
+  color: #222 !important;
 }
 
 /* baseline border color */
@@ -83,7 +83,7 @@
 .pagelib_theme_dark .content div.quotebox {
   background: #27292d !important;
 }
-.pagelib_theme_sepia .content blockquote, 
+.pagelib_theme_sepia .content blockquote,
 

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Do not error out on invalid coordinate when calculating dist...

[jenkins-bot (Code Review)]

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

Change subject: Do not error out on invalid coordinate when calculating 
distance.
..


Do not error out on invalid coordinate when calculating distance.

Bug: T180314
Change-Id: Ie7757129b034c8093a6dbf1f4f216c1d4e6a8edc
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
1 file changed, 9 insertions(+), 1 deletion(-)

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



diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
index 47ceca5..b9c5827 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
@@ -7,6 +7,7 @@
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IValueExpression;
+import com.bigdata.rdf.error.SparqlTypeErrorException;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.constraints.INeedsMaterialization;
 import com.bigdata.rdf.internal.constraints.IVValueExpression;
@@ -14,6 +15,8 @@
 import com.bigdata.rdf.internal.gis.ICoordinate.UNITS;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.sparql.ast.GlobalAnnotations;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Implementation of geof:distance function.
@@ -103,10 +106,15 @@
  * @param iv
  * @return Coordinate
  */
+@SuppressFBWarnings(value = "LEST_LOST_EXCEPTION_STACK_TRACE", 
justification = "Converting to SPARQL exception")
 protected CoordinateDD getCoordinateFromIV(IV iv) {
 final WikibasePoint point = new 
WikibasePoint(asLiteral(iv).stringValue());
-return new CoordinateDD(Double.parseDouble(point.getLatitude()),
+try {
+return new CoordinateDD(Double.parseDouble(point.getLatitude()),
 Double.parseDouble(point.getLongitude()));
+} catch (IllegalArgumentException e) {
+throw new SparqlTypeErrorException();
+}
 }
 
 @Override

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7757129b034c8093a6dbf1f4f216c1d4e6a8edc
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

[Smalyshev (Code Review)]

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

Change subject: Update GUI
..

Update GUI

Change-Id: I9fc3fe48227ef46bc9578bfd2d5f12856584bd26
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/gui b/gui
index 4999f59..6078d78 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 4999f5955040352debf77aeae93bed518bb300e0
+Subproject commit 6078d78a415037616200301faf077c9294956370

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fc3fe48227ef46bc9578bfd2d5f12856584bd26
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 6078d78a415037616200301faf077c9294956370:

[Smalyshev (Code Review)]

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

Change subject: Merging from 6078d78a415037616200301faf077c9294956370:
..

Merging from 6078d78a415037616200301faf077c9294956370:

Merge "Use leaflet.markercluster for single-layer maps"

Change-Id: I28dd7e72a188967ab35c658605a78abcf51e9342
---
M copyright.html
R css/embed.style.min.d88a30b9edeac4d806b9.css
R css/style.min.7c925abdfa0f437c6bd1.css
M embed.html
M i18n/ar.json
M i18n/bn.json
M i18n/br.json
M i18n/diq.json
M i18n/el.json
M i18n/eu.json
M i18n/lfn.json
M i18n/lv.json
M i18n/nl.json
M i18n/sah.json
M i18n/su.json
M index.html
D js/embed.vendor.min.83c07f3aeb6783df16e8.js
A js/embed.vendor.min.ff5a48b35cb60bfe12e8.js
A js/embed.wdqs.min.689c71c6adeae2164dc4.js
D js/embed.wdqs.min.ac5ab224e9adc9034fdb.js
D js/vendor.min.476d4fc06106baf3acce.js
A js/vendor.min.8ae8a3459f4ec9a2231d.js
D js/wdqs.min.836bd66e6755867ee39b.js
A js/wdqs.min.e90ac2a045501f627bdd.js
24 files changed, 22 insertions(+), 22 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28dd7e72a188967ab35c658605a78abcf51e9342
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 6078d78a415037616200301faf077c9294956370:

[Smalyshev (Code Review)]

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

Change subject: Merging from 6078d78a415037616200301faf077c9294956370:
..


Merging from 6078d78a415037616200301faf077c9294956370:

Merge "Use leaflet.markercluster for single-layer maps"

Change-Id: I28dd7e72a188967ab35c658605a78abcf51e9342
---
M copyright.html
R css/embed.style.min.d88a30b9edeac4d806b9.css
R css/style.min.7c925abdfa0f437c6bd1.css
M embed.html
M i18n/ar.json
M i18n/bn.json
M i18n/br.json
M i18n/diq.json
M i18n/el.json
M i18n/eu.json
M i18n/lfn.json
M i18n/lv.json
M i18n/nl.json
M i18n/sah.json
M i18n/su.json
M index.html
D js/embed.vendor.min.83c07f3aeb6783df16e8.js
A js/embed.vendor.min.ff5a48b35cb60bfe12e8.js
A js/embed.wdqs.min.689c71c6adeae2164dc4.js
D js/embed.wdqs.min.ac5ab224e9adc9034fdb.js
D js/vendor.min.476d4fc06106baf3acce.js
A js/vendor.min.8ae8a3459f4ec9a2231d.js
D js/wdqs.min.836bd66e6755867ee39b.js
A js/wdqs.min.e90ac2a045501f627bdd.js
24 files changed, 22 insertions(+), 22 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28dd7e72a188967ab35c658605a78abcf51e9342
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove livingstyleguide manifest

[jenkins-bot (Code Review)]

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

Change subject: Remove livingstyleguide manifest
..


Remove livingstyleguide manifest

OOUIPlayground (T166057) and Blueprint (T173653) are archived

Change-Id: I6316cc59668acf242b94bdcf029a108fa66d3081
---
D puppet/modules/role/manifests/livingstyleguide.pp
1 file changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/puppet/modules/role/manifests/livingstyleguide.pp 
b/puppet/modules/role/manifests/livingstyleguide.pp
deleted file mode 100644
index 0ab892f..000
--- a/puppet/modules/role/manifests/livingstyleguide.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# == Class: role::livingstyleguide
-# Sets up a 'living style guide' wiki, with the custom Blueprint skin.
-# This wiki will be available, by default, at livingstyleguide.
-class role::livingstyleguide {
-  mediawiki::wiki {'livingstyleguide': }
-
-  mediawiki::extension { 'OOUIPlayground':
-  composer => true,
-  wiki => 'livingstyleguide',
-  }
-
-  mediawiki::skin { 'Blueprint':
-  default  => true,
-  composer => true,
-  wiki => 'livingstyleguide',
-  }
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6316cc59668acf242b94bdcf029a108fa66d3081
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove wikigrok.pp manifest

[jenkins-bot (Code Review)]

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

Change subject: Remove wikigrok.pp manifest
..


Remove wikigrok.pp manifest

Bug: T180847
Change-Id: I2860278e963fbb36675a5e7c62865d2b4406b2df
---
D puppet/modules/role/manifests/wikigrok.pp
1 file changed, 0 insertions(+), 12 deletions(-)

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



diff --git a/puppet/modules/role/manifests/wikigrok.pp 
b/puppet/modules/role/manifests/wikigrok.pp
deleted file mode 100644
index 90318b3..000
--- a/puppet/modules/role/manifests/wikigrok.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# == Class: role::wikigrok
-# Creates an easy way to fill in missing Wikidata information
-class role::wikigrok {
-include ::role::wikidata
-include ::role::mobilefrontend
-
-mediawiki::extension { 'WikiGrok':
-settings => [
-'$wgWikiGrokRepoMode = $wmgUseWikibaseRepo;',
-],
-}
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2860278e963fbb36675a5e7c62865d2b4406b2df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: BryanDavis 
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] apps...wikipedia[master]: Follow-up to reading list sync notification.

[jenkins-bot (Code Review)]

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

Change subject: Follow-up to reading list sync notification.
..


Follow-up to reading list sync notification.

Sorry, it started with a few tweaks, but then got a little more extensive...
This simplifies the logic and the code. Just a little bit.
Please take note of the changes for future tasks.

Change-Id: I2272e629d8248620b03f98404ca7afbc8a7d47b0
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/Constants.java
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
M 
app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
D app/src/main/java/org/wikipedia/savedpages/SavedPageSyncBroadcastReceiver.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncNotification.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/res/values/strings.xml
12 files changed, 160 insertions(+), 315 deletions(-)

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



diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e01cd5d..b8b4e95 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -346,9 +346,7 @@
 android:name=".savedpages.SavedPageSyncService"
 android:permission="android.permission.BIND_JOB_SERVICE" />
 
-
-
-
+
 
 
 
diff --git a/app/src/main/java/org/wikipedia/Constants.java 
b/app/src/main/java/org/wikipedia/Constants.java
index 8f26db9..96846f2 100644
--- a/app/src/main/java/org/wikipedia/Constants.java
+++ b/app/src/main/java/org/wikipedia/Constants.java
@@ -36,7 +36,7 @@
 public static final String INTENT_EXTRA_REVERT_QNUMBER = "revertQNumber";
 public static final String INTENT_EXTRA_DELETE_READING_LIST = 
"deleteReadingList";
 
-public static final String INTENT_EXTRA_NOTIFICATION_SYNC_PAUSE = 
"syncPause";
+public static final String INTENT_EXTRA_NOTIFICATION_SYNC_PAUSE_RESUME = 
"syncPauseResume";
 public static final String INTENT_EXTRA_NOTIFICATION_SYNC_CANCEL = 
"syncCancel";
 
 public static final int PROGRESS_BAR_MAX_VALUE = 10_000;
diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 1b0a2e9..0e805cf 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -198,7 +198,7 @@
 public void onReceive(Context context, Intent intent) {
 if (DeviceUtil.isOnline()) {
 onGoOnline();
-ReadingListSynchronizer.instance().syncSavedPages(true);
+ReadingListSynchronizer.instance().syncSavedPages();
 } else {
 onGoOffline();
 }
@@ -220,7 +220,7 @@
 }
 
 @Subscribe public void on(NetworkConnectEvent event) {
-ReadingListSynchronizer.instance().syncSavedPages(false);
+ReadingListSynchronizer.instance().syncSavedPages();
 }
 
 @Subscribe public void on(ThemeChangeEvent event) {
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index e4ba419..afacfa9 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -154,7 +154,7 @@
 getCallback().updateToolbarElevation(shouldElevateToolbar());
 }
 
-ReadingListSynchronizer.instance().sync(true);
+ReadingListSynchronizer.instance().sync();
 
 return view;
 }
diff --git a/app/src/main/java/org/wikipedia/login/LoginActivity.java 
b/app/src/main/java/org/wikipedia/login/LoginActivity.java
index dc0c012..5960daa 100644
--- a/app/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/app/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -242,7 +242,7 @@
 hideSoftKeyboard(LoginActivity.this);
 setResult(RESULT_LOGIN_SUCCESS);
 
-ReadingListSynchronizer.instance().sync(true);
+ReadingListSynchronizer.instance().sync();
 finish();
 } else if (result.fail()) {
 String message = result.getMessage();
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java 
b/app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
index dda7fbd..0dd886b 100644
--- 

[MediaWiki-commits] [Gerrit] performance[refs/meta/dashboards/custom]: Try again with using 'ownerin:' instead of hardcoded ...

[Krinkle (Code Review)]

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

Change subject: Try again with using 'ownerin:' instead of hardcoded list
..


Try again with using 'ownerin:' instead of hardcoded list

Follows-up 6268aed4700edde881, bbb26c4ef4b. Last time we tried
this caused Gerrit to take over 10 seconds to query the dashboard.
Not sure why, but doing a manual query now seems to show that
that bug has been fixed.

Change-Id: I349dac9983ee317d979372f92f3fcfc23d7ee51a
---
M custom
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/custom b/custom
index 961a069..cc549da 100644
--- a/custom
+++ b/custom
@@ -1,7 +1,7 @@
 [dashboard]
   title = Performance Team
   description = Custom dashboard for the Performance Team
-  foreach = (owner:Ori.livneh OR owner:asch...@wikimedia.org OR owner:Gilles 
OR owner:Krinkle OR owner:Phedenskog)
+  foreach = ownerin:performance
 [section "Pending patches by team"]
   query = is:open -owner:self -message:WIP -message:DNM -label:Verified<=-1 
-label:Code-Review<=-1 limit:40
 [section "My patches for review"]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I349dac9983ee317d979372f92f3fcfc23d7ee51a
Gerrit-PatchSet: 1
Gerrit-Project: performance
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 

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

[MediaWiki-commits] [Gerrit] performance[refs/meta/dashboards/custom]: Try again with using 'ownerin:' instead of hardcoded ...

[Krinkle (Code Review)]

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

Change subject: Try again with using 'ownerin:' instead of hardcoded list
..

Try again with using 'ownerin:' instead of hardcoded list

Follows-up 6268aed4700edde881, bbb26c4ef4b. Last time we tried
this caused Gerrit to take over 10 seconds to query the dashboard.
Not sure why, but doing a manual query now seems to show that
that bug has been fixed.

Change-Id: I349dac9983ee317d979372f92f3fcfc23d7ee51a
---
M custom
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance refs/changes/12/392112/1

diff --git a/custom b/custom
index 961a069..cc549da 100644
--- a/custom
+++ b/custom
@@ -1,7 +1,7 @@
 [dashboard]
   title = Performance Team
   description = Custom dashboard for the Performance Team
-  foreach = (owner:Ori.livneh OR owner:asch...@wikimedia.org OR owner:Gilles 
OR owner:Krinkle OR owner:Phedenskog)
+  foreach = ownerin:performance
 [section "Pending patches by team"]
   query = is:open -owner:self -message:WIP -message:DNM -label:Verified<=-1 
-label:Code-Review<=-1 limit:40
 [section "My patches for review"]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I349dac9983ee317d979372f92f3fcfc23d7ee51a
Gerrit-PatchSet: 1
Gerrit-Project: performance
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Prevent loading or saving of zeros in the database.

[jenkins-bot (Code Review)]

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

Change subject: Prevent loading or saving of zeros in the database.
..


Prevent loading or saving of zeros in the database.

When intval() fails, the function returns a zero. We should remove
the failures from the blacklist.

Bug: T178512
Change-Id: I89ad680a287da16c2fbd6aa4d53a725142429144
---
M Hooks.php
M includes/ContainmentSet.php
A tests/phpunit/HooksTest.php
3 files changed, 67 insertions(+), 5 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index cdf0255..ea9efbe 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1252,7 +1252,7 @@
}
 
if ( isset( $options['echo-notifications-blacklist'] ) ) {
-   $options['echo-notifications-blacklist'] = array_map( 
'intval', explode( "\n", $options['echo-notifications-blacklist'] ) );
+   $options['echo-notifications-blacklist'] = 
self::mapToInt( explode( "\n", $options['echo-notifications-blacklist'] ) );
}
 
return true;
@@ -1287,8 +1287,16 @@
$ids = $lookup->centralIdsFromNames( 
$names, $user );
}
 
-   $user->setOption( 
'echo-notifications-blacklist', $ids );
-   $options['echo-notifications-blacklist'] = 
implode( "\n", $user->getOption( 'echo-notifications-blacklist' ) );
+   $ids = self::mapToInt( $ids );
+
+   if ( count( $ids ) > 0 ) {
+   $user->setOption( 
'echo-notifications-blacklist', $ids );
+   
$options['echo-notifications-blacklist'] = implode( "\n", $user->getOption( 
'echo-notifications-blacklist' ) );
+   } else {
+   // If the blacklist is empty, set it to 
null rather than an empty
+   // string.
+   
$options['echo-notifications-blacklist'] = null;
+   }
} else {
// If the blacklist is empty, set it to null 
rather than an empty string.
$options['echo-notifications-blacklist'] = null;
@@ -1299,6 +1307,27 @@
}
 
/**
+* Convert all values in an array to integers and filter out zeroes.
+*
+* @param array $numbers
+*
+* @return int[]
+*/
+   protected static function mapToInt( array $numbers ) {
+   $data = [];
+
+   foreach ( $numbers as $value ) {
+   $int = intval( $value );
+   if ( $int === 0 ) {
+   continue;
+   }
+   $data[] = $int;
+   }
+
+   return $data;
+   }
+
+   /**
 * Handler for UserClearNewTalkNotification hook.
 * @see 
http://www.mediawiki.org/wiki/Manual:Hooks/UserClearNewTalkNotification
 * @param User $user User whose talk page notification should be marked 
as read
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index 0803da0..5b779d0 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -75,8 +75,8 @@
 
if ( $preference ) {
$lookup = CentralIdLookup::factory();
-   $names = $lookup->lookupCentralIds( array_flip( 
$preference ), $this->recipient );
-   $this->addArray( array_values( $names ) );
+   $names = $lookup->namesFromCentralIds( $preference, 
$this->recipient );
+   $this->addArray( $names );
}
}
 
diff --git a/tests/phpunit/HooksTest.php b/tests/phpunit/HooksTest.php
new file mode 100644
index 000..78bdc72
--- /dev/null
+++ b/tests/phpunit/HooksTest.php
@@ -0,0 +1,33 @@
+assertSame( "12345\n54321", 
$options['echo-notifications-blacklist'] );
+   }
+
+   /**
+* Test the UserLoadOptions hook implementation.
+*/
+   public function testOnUserLoadOptions() {
+   $options['echo-notifications-blacklist'] = "12345\n54321";
+
+   EchoHooks::onUserLoadOptions( new User(), $options );
+
+   $this->assertSame( [ 12345, 54321 ], 
$options['echo-notifications-blacklist'] );
+   }
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89ad680a287da16c2fbd6aa4d53a725142429144
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove box-shadow from preference panels for ooui-apex

[Esanders (Code Review)]

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

Change subject: Remove box-shadow from preference panels for ooui-apex
..

Remove box-shadow from preference panels for ooui-apex

Change-Id: I7d42c75053b29cb634b18bae9e06e6b28ae1e967
---
M resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git 
a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css 
b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
index f87036f..7be6ce1 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
@@ -50,6 +50,7 @@
border-radius: 0;
padding-left: 0;
padding-right: 0;
+   box-shadow: none;
 }
 
 /* Tweak the margins to reduce the shifting of form contents

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "DNS: Only send eqsin countries to ulsfo"

[Ayounsi (Code Review)]

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

Change subject: Revert "DNS: Only send eqsin countries to ulsfo"
..


Revert "DNS: Only send eqsin countries to ulsfo"

This reverts commit 56e7131ffd1e24b35eb7977437cd2ad69c0f3315.

Change-Id: Ifc7a9b15ddf6ef4f1e533ea61f9647b7d07ec7b3
---
M geo-maps
1 file changed, 27 insertions(+), 27 deletions(-)

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



diff --git a/geo-maps b/geo-maps
index b07bdeb..d256477 100644
--- a/geo-maps
+++ b/geo-maps
@@ -23,8 +23,8 @@
 HK => [ulsfo, codfw, eqiad, esams, eqsin], # Hong Kong
 ID => [ulsfo, codfw, eqiad, esams, eqsin], # Indonesia
 IL => [esams, eqiad, codfw, ulsfo, eqsin], # Israel
-IN => [ulsfo, esams, eqiad, codfw, eqsin], # India
-IO => [ulsfo, esams, eqiad, codfw, eqsin], # British Indian Ocean 
Territory
+IN => [esams, eqiad, codfw, ulsfo, eqsin], # India
+IO => [esams, eqiad, codfw, ulsfo, eqsin], # British Indian Ocean 
Territory
 IQ => [esams, eqiad, codfw, ulsfo, eqsin], # Iraq
 IR => [esams, eqiad, codfw, ulsfo, eqsin], # Iran (Islamic 
Republic of)
 JO => [esams, eqiad, codfw, ulsfo, eqsin], # Jordan
@@ -37,7 +37,7 @@
 KZ => [esams, eqiad, codfw, ulsfo, eqsin], # Kazakhstan
 LA => [ulsfo, codfw, eqiad, esams, eqsin], # Lao People's 
Democratic Republic
 LB => [esams, eqiad, codfw, ulsfo, eqsin], # Lebanon
-LK => [ulsfo, esams, eqiad, codfw, eqsin], # Sri Lanka
+LK => [esams, eqiad, codfw, ulsfo, eqsin], # Sri Lanka
 MM => [ulsfo, codfw, eqiad, esams, eqsin], # Myanmar
 MN => [ulsfo, codfw, eqiad, esams, eqsin], # Mongolia
 MO => [ulsfo, codfw, eqiad, esams, eqsin], # Macao
@@ -46,7 +46,7 @@
 NP => [ulsfo, codfw, eqiad, esams, eqsin], # Nepal
 OM => [esams, eqiad, codfw, ulsfo, eqsin], # Oman
 PH => [ulsfo, codfw, eqiad, esams, eqsin], # Philippines
-PK => [ulsfo, esams, eqiad, codfw, eqsin], # Pakistan
+PK => [esams, eqiad, codfw, ulsfo, eqsin], # Pakistan
 PS => [esams, eqiad, codfw, ulsfo, eqsin], # Palestine, State of
 QA => [esams, eqiad, codfw, ulsfo, eqsin], # Qatar
 SA => [esams, eqiad, codfw, ulsfo, eqsin], # Saudi Arabia
@@ -119,20 +119,20 @@
 },
 NA => {
 US => { # United States of America
-AK => [codfw, ulsfo, eqiad, esams, eqsin], # Alaska
+AK => [ulsfo, codfw, eqiad, esams, eqsin], # Alaska
 AL => [codfw, eqiad, ulsfo, esams, eqsin], # Alabama
 AR => [codfw, eqiad, ulsfo, esams, eqsin], # Arkansas
-AZ => [codfw, ulsfo, eqiad, esams, eqsin], # Arizona
-CA => [codfw, ulsfo, eqiad, esams, eqsin], # California
+AZ => [ulsfo, codfw, eqiad, esams, eqsin], # Arizona
+CA => [ulsfo, codfw, eqiad, esams, eqsin], # California
 CO => [codfw, eqiad, ulsfo, esams, eqsin], # Colorado
 CT => [eqiad, codfw, ulsfo, esams, eqsin], # Connecticut
 DC => [eqiad, codfw, ulsfo, esams, eqsin], # District of 
Columbia
 DE => [eqiad, codfw, ulsfo, esams, eqsin], # Delaware
 FL => [eqiad, codfw, ulsfo, esams, eqsin], # Florida
 GA => [eqiad, codfw, ulsfo, esams, eqsin], # Georgia
-HI => [codfw, ulsfo, eqiad, esams, eqsin], # Hawaii
+HI => [ulsfo, codfw, eqiad, esams, eqsin], # Hawaii
 IA => [codfw, eqiad, ulsfo, esams, eqsin], # Iowa
-ID => [codfw, ulsfo, eqiad, esams, eqsin], # Idaho
+ID => [ulsfo, codfw, eqiad, esams, eqsin], # Idaho
 IL => [eqiad, codfw, ulsfo, esams, eqsin], # Illinois
 IN => [eqiad, codfw, ulsfo, esams, eqsin], # Indiana
 KS => [codfw, eqiad, ulsfo, esams, eqsin], # Kansas
@@ -145,46 +145,46 @@
 MN => [codfw, eqiad, ulsfo, esams, eqsin], # Minnesota
 MO => [codfw, eqiad, ulsfo, esams, eqsin], # Missouri
 MS => [codfw, eqiad, ulsfo, esams, eqsin], # Mississippi
-MT => [codfw, ulsfo, eqiad, esams, eqsin], # Montana
+MT => [ulsfo, codfw, eqiad, esams, eqsin], # Montana
 NC => [eqiad, codfw, ulsfo, esams, eqsin], # North Carolina
 ND => [codfw, eqiad, ulsfo, esams, eqsin], # North Dakota
 NE => [codfw, eqiad, ulsfo, esams, eqsin], # Nebraska
 NH => [eqiad, codfw, ulsfo, esams, eqsin], # New Hampshire
 NJ => [eqiad, codfw, ulsfo, esams, eqsin], # New Jersey
 

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: New VectorAfterToolbox and VectorBeforeFooter hooks

[jenkins-bot (Code Review)]

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

Change subject: New VectorAfterToolbox and VectorBeforeFooter hooks
..


New VectorAfterToolbox and VectorBeforeFooter hooks

Example use case: the ShoutWiki Ads extension

Change-Id: I0eadf18b9a20147a097729f5f8053cfc65594553
---
M VectorTemplate.php
M hooks.txt
2 files changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/VectorTemplate.php b/VectorTemplate.php
index 5b27141..6e3495d 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -195,6 +195,7 @@
renderPortals( 
$this->data['sidebar'] ); ?>


+   
html( 
'userlangattributes' ) ?>>
getFooterLinks() as $category => 
$links ) {
@@ -271,6 +272,7 @@
break;
case 'TOOLBOX':
$this->renderPortal( 'tb', 
$this->getToolbox(), 'toolbox', 'SkinTemplateToolboxEnd' );
+   Hooks::run( 'VectorAfterToolbox' );
break;
case 'LANGUAGES':
if ( $this->data['language_urls'] !== 
false ) {
diff --git a/hooks.txt b/hooks.txt
index 6ba9de6..84ca7fe 100644
--- a/hooks.txt
+++ b/hooks.txt
@@ -4,3 +4,14 @@
 loaded by the Vector skin.
 $skin: SkinVector object
 &$styles: Array of module names whose style will be loaded for the skin
+
+'VectorAfterToolbox': Called after rendering the toolbox portlet (div#p-tb).
+You can use this to inject items (such as ads or a hit counter, for example)
+from an extension.
+This is the Vector couterpart to the MonoBookAfterToolbox hook in the MonoBook
+skin.
+
+'VectorBeforeFooter': Called before the footer (div#footer) is output, but 
after
+div#mw-navigation has been closed.
+You can use this to inject items (such as ads or a hit counter, for example)
+from an extension.
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0eadf18b9a20147a097729f5f8053cfc65594553
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "DNS: Only send eqsin countries to ulsfo"

[Ayounsi (Code Review)]

Hello BBlack, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "DNS: Only send eqsin countries to ulsfo"
..

Revert "DNS: Only send eqsin countries to ulsfo"

This reverts commit 56e7131ffd1e24b35eb7977437cd2ad69c0f3315.

Change-Id: Ifc7a9b15ddf6ef4f1e533ea61f9647b7d07ec7b3
---
M geo-maps
1 file changed, 27 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/05/392105/1

diff --git a/geo-maps b/geo-maps
index b07bdeb..d256477 100644
--- a/geo-maps
+++ b/geo-maps
@@ -23,8 +23,8 @@
 HK => [ulsfo, codfw, eqiad, esams, eqsin], # Hong Kong
 ID => [ulsfo, codfw, eqiad, esams, eqsin], # Indonesia
 IL => [esams, eqiad, codfw, ulsfo, eqsin], # Israel
-IN => [ulsfo, esams, eqiad, codfw, eqsin], # India
-IO => [ulsfo, esams, eqiad, codfw, eqsin], # British Indian Ocean 
Territory
+IN => [esams, eqiad, codfw, ulsfo, eqsin], # India
+IO => [esams, eqiad, codfw, ulsfo, eqsin], # British Indian Ocean 
Territory
 IQ => [esams, eqiad, codfw, ulsfo, eqsin], # Iraq
 IR => [esams, eqiad, codfw, ulsfo, eqsin], # Iran (Islamic 
Republic of)
 JO => [esams, eqiad, codfw, ulsfo, eqsin], # Jordan
@@ -37,7 +37,7 @@
 KZ => [esams, eqiad, codfw, ulsfo, eqsin], # Kazakhstan
 LA => [ulsfo, codfw, eqiad, esams, eqsin], # Lao People's 
Democratic Republic
 LB => [esams, eqiad, codfw, ulsfo, eqsin], # Lebanon
-LK => [ulsfo, esams, eqiad, codfw, eqsin], # Sri Lanka
+LK => [esams, eqiad, codfw, ulsfo, eqsin], # Sri Lanka
 MM => [ulsfo, codfw, eqiad, esams, eqsin], # Myanmar
 MN => [ulsfo, codfw, eqiad, esams, eqsin], # Mongolia
 MO => [ulsfo, codfw, eqiad, esams, eqsin], # Macao
@@ -46,7 +46,7 @@
 NP => [ulsfo, codfw, eqiad, esams, eqsin], # Nepal
 OM => [esams, eqiad, codfw, ulsfo, eqsin], # Oman
 PH => [ulsfo, codfw, eqiad, esams, eqsin], # Philippines
-PK => [ulsfo, esams, eqiad, codfw, eqsin], # Pakistan
+PK => [esams, eqiad, codfw, ulsfo, eqsin], # Pakistan
 PS => [esams, eqiad, codfw, ulsfo, eqsin], # Palestine, State of
 QA => [esams, eqiad, codfw, ulsfo, eqsin], # Qatar
 SA => [esams, eqiad, codfw, ulsfo, eqsin], # Saudi Arabia
@@ -119,20 +119,20 @@
 },
 NA => {
 US => { # United States of America
-AK => [codfw, ulsfo, eqiad, esams, eqsin], # Alaska
+AK => [ulsfo, codfw, eqiad, esams, eqsin], # Alaska
 AL => [codfw, eqiad, ulsfo, esams, eqsin], # Alabama
 AR => [codfw, eqiad, ulsfo, esams, eqsin], # Arkansas
-AZ => [codfw, ulsfo, eqiad, esams, eqsin], # Arizona
-CA => [codfw, ulsfo, eqiad, esams, eqsin], # California
+AZ => [ulsfo, codfw, eqiad, esams, eqsin], # Arizona
+CA => [ulsfo, codfw, eqiad, esams, eqsin], # California
 CO => [codfw, eqiad, ulsfo, esams, eqsin], # Colorado
 CT => [eqiad, codfw, ulsfo, esams, eqsin], # Connecticut
 DC => [eqiad, codfw, ulsfo, esams, eqsin], # District of 
Columbia
 DE => [eqiad, codfw, ulsfo, esams, eqsin], # Delaware
 FL => [eqiad, codfw, ulsfo, esams, eqsin], # Florida
 GA => [eqiad, codfw, ulsfo, esams, eqsin], # Georgia
-HI => [codfw, ulsfo, eqiad, esams, eqsin], # Hawaii
+HI => [ulsfo, codfw, eqiad, esams, eqsin], # Hawaii
 IA => [codfw, eqiad, ulsfo, esams, eqsin], # Iowa
-ID => [codfw, ulsfo, eqiad, esams, eqsin], # Idaho
+ID => [ulsfo, codfw, eqiad, esams, eqsin], # Idaho
 IL => [eqiad, codfw, ulsfo, esams, eqsin], # Illinois
 IN => [eqiad, codfw, ulsfo, esams, eqsin], # Indiana
 KS => [codfw, eqiad, ulsfo, esams, eqsin], # Kansas
@@ -145,46 +145,46 @@
 MN => [codfw, eqiad, ulsfo, esams, eqsin], # Minnesota
 MO => [codfw, eqiad, ulsfo, esams, eqsin], # Missouri
 MS => [codfw, eqiad, ulsfo, esams, eqsin], # Mississippi
-MT => [codfw, ulsfo, eqiad, esams, eqsin], # Montana
+MT => [ulsfo, codfw, eqiad, esams, eqsin], # Montana
 NC => [eqiad, codfw, ulsfo, esams, eqsin], # North Carolina
 ND => [codfw, eqiad, ulsfo, esams, eqsin], # North Dakota
 NE => [codfw, eqiad, ulsfo, esams, eqsin], # Nebraska
 NH => [eqiad, codfw, ulsfo, esams, eqsin], # New Hampshire
 NJ => [eqiad, codfw, ulsfo, esams, eqsin], # New Jersey
 

[MediaWiki-commits] [Gerrit] mediawiki...AccessibilitySimulation[refs/meta/config]: Mark AccessibilitySimulation repository read only

[Umherirrender (Code Review)]

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

Change subject: Mark AccessibilitySimulation repository read only
..


Mark AccessibilitySimulation repository read only

Bug: T180810
Change-Id: I904133854bcb1a930f6fe0143236528ab0e9a02e
---
M project.config
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/project.config b/project.config
index 779eb58..6814917 100644
--- a/project.config
+++ b/project.config
@@ -1,5 +1,6 @@
 [project]
-   description = [INACTIVE] MediaWiki extension AccessibilitySimulation
+   state = Read Only
+   description = [ARCHIVED] MediaWiki extension AccessibilitySimulation
 [access]
inheritFrom = mediawiki/extensions
 [receive]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I904133854bcb1a930f6fe0143236528ab0e9a02e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AccessibilitySimulation
Gerrit-Branch: refs/meta/config
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...AccessibilitySimulation[master]: Archive the AccesibilitySimulation extension

[Umherirrender (Code Review)]

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

Change subject: Archive the AccesibilitySimulation extension
..


Archive the AccesibilitySimulation extension

Bug: T180810
Change-Id: Ie2ef3a34ca75ab826ffca7ff8c46c6034441afd7
---
A ARCHIVED
D AccessibilitySimulation.php
D accessibility-switch.js
D downTriangle.svg
D dropdown.css
D filters.css
D filters.svg
D i18n/en.json
D i18n/qqq.json
D visionSimulator.svg
10 files changed, 2 insertions(+), 328 deletions(-)

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

Objections:
  jenkins-bot: Fails



diff --git a/ARCHIVED b/ARCHIVED
new file mode 100644
index 000..d85bde7
--- /dev/null
+++ b/ARCHIVED
@@ -0,0 +1,2 @@
+This extension was not maintained for some time and has been archived.
+Please see https://phabricator.wikimedia.org/T180810
\ No newline at end of file
diff --git a/AccessibilitySimulation.php b/AccessibilitySimulation.php
deleted file mode 100644
index 2e7b5fb..000
--- a/AccessibilitySimulation.php
+++ /dev/null
@@ -1,70 +0,0 @@
- __FILE__,
-   'name' => 'AccessibilitySimulation',
-   'url' => 
'https://www.mediawiki.org/wiki/Extension:AccessibilitySimulation',
-   'author' => array(
-   'Andrew Garrett',
-   ),
-   'descriptionmsg' => 'accessibilitysimulation-desc',
-);
-
-$dir = dirname( __FILE__ ) . '/';
-
-$wgMessagesDirs['AccessibilitySimulation'] = $dir . 'i18n';
-
-$wgResourceModules['ext.accessibility-simulation'] = array(
-   'remoteExtPath' => 'AccessibilitySimulation',
-   'localBasePath' => __DIR__,
-   'group' => 'ext.accessibility-simulation',
-   'styles' => array(
-   'filters.css',
-   'dropdown.css',
-   ),
-   'scripts' => 'accessibility-switch.js',
-   'dependencies' => 'oojs-ui',
-   'messages' => array(
-   'accessibility-simulation-none',
-   'accessibility-simulation-protanopia',
-   'accessibility-simulation-deuteranopia',
-   'accessibility-simulation-tritanopia',
-   'accessibility-simulation-monochromacy',
-   ),
-);
-
-$wgHooks['BeforePageDisplay'][] = function( $out ) {
-   $out->addModules( 'ext.accessibility-simulation' );
-};
diff --git a/accessibility-switch.js b/accessibility-switch.js
deleted file mode 100644
index e205cea..000
--- a/accessibility-switch.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/* global OO */
-( function( $, mw ) {
-function selectSimulation( type ) {
-   $.each(
-   ['protanopia', 'deuteranopia', 'tritanopia', 'monochromacy'],
-   function( i, type ) {
-   $( '.container' ).removeClass( 'as-' + type );
-   }
-   );
-
-   if ( type ) {
-   $( '.container' ).addClass( 'as-' + type );
-   }
-}
-
-/* Lifted from http://stackoverflow.com/a/2880929 */
-function decodeQueryString( query ) {
-   var match,
-   search = /([^&=]+)=?([^&]*)/g,
-   decode = function (s) { return decodeURIComponent(s.replace('+', " 
")); },
-   urlParams;
-
-   query = query.substring(1);
-   urlParams = {};
-   while ( ( match = search.exec( query ) ) !== null )
-  urlParams[decode(match[1])] = decode(match[2]);
-
-   return urlParams;
-}
-
-window.onpopstate = function( event ) {
-   if ( event && event.state && event.state.simulation ) {
-   selectSimulation( event.state.simulation );
-   }
-};
-
-$( function() {
-   var $extraSpace = $( '#extra-space' ),
-   $dropdown = $( '' )
-   .attr( {
-   'role': 'menu',
-   'aria-labelledby': 'Accessibility Simulation',
-   'class': 'dropdown-menu 
accessibility-simulation-dropdown'
-   } )
-   .append(
-   $( '' ).append(
-   $( '' )
-   .text( mw.msg( 
'accessibility-simulation-none' ) )
-   .data( 'name', '' )
-   ),
-   $( '' ).append(
-   $( '' )
-   .text( mw.msg( 
'accessibility-simulation-protanopia' ) )
-   .data( 'name', 'protanopia' )
-   ),
-   $( '' ).append(
-   $( '' )
-   .text( mw.msg( 
'accessibility-simulation-deuteranopia' ) )
-   .data( 'name', 'deuteranopia' )
-   ),
-   $( '' ).append(
-  

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove wikigrok.pp manifest

[Umherirrender (Code Review)]

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

Change subject: Remove wikigrok.pp manifest
..

Remove wikigrok.pp manifest

T180847
Change-Id: I2860278e963fbb36675a5e7c62865d2b4406b2df
---
D puppet/modules/role/manifests/wikigrok.pp
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/04/392104/1

diff --git a/puppet/modules/role/manifests/wikigrok.pp 
b/puppet/modules/role/manifests/wikigrok.pp
deleted file mode 100644
index 90318b3..000
--- a/puppet/modules/role/manifests/wikigrok.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# == Class: role::wikigrok
-# Creates an easy way to fill in missing Wikidata information
-class role::wikigrok {
-include ::role::wikidata
-include ::role::mobilefrontend
-
-mediawiki::extension { 'WikiGrok':
-settings => [
-'$wgWikiGrokRepoMode = $wmgUseWikibaseRepo;',
-],
-}
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2860278e963fbb36675a5e7c62865d2b4406b2df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...webplatform[master]: Turn the topics navigation (bottom footer) into an editable ...

[jenkins-bot (Code Review)]

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

Change subject: Turn the topics navigation (bottom footer) into an editable 
MediaWiki: message
..


Turn the topics navigation (bottom footer) into an editable MediaWiki: message

The syntax of [[MediaWiki:Webplatform-bottom-footer]] is similar to that
of [[MediaWiki:Sidebar]]:
* Page name|Displayed text
* Another page|some-interface-message-name

The skin class parseItem(), getMessageAsArray() and getBottomFooterLinks()
methods originate from Wikia codebase and thus are licensed under GPLv2+.
See
https://github.com/Wikia/app/blob/dev/includes/wikia/GlobalFunctions.php
for the current Wikia versions of these methods (well, the first two,
anyway) as well as a full history of authors.
These particular methods are copied from ShoutWiki's version of the Monaco
skin and changed to non-static methods (to make use of RequestContext
where appropriate) and old (long) array syntax converted to short array
syntax.

Change-Id: Iad79bd61f679d38ce9eb2b20023f3fd86835bff4
---
M SkinWebPlatform.class.php
M WebPlatformTemplate.class.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 119 insertions(+), 8 deletions(-)

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



diff --git a/SkinWebPlatform.class.php b/SkinWebPlatform.class.php
index 887052e..bf17b57 100644
--- a/SkinWebPlatform.class.php
+++ b/SkinWebPlatform.class.php
@@ -70,4 +70,108 @@
parent::setupSkinUserCss( $out );
$out->addModuleStyles( 'skins.webplatform.css' );
}
+
+   /**
+* Parses MediaWiki:Webplatform-bottom-footer
+* @return array
+*/
+   public function getBottomFooterLinks() {
+   $nodes = [];
+   $lines = $this->getMessageAsArray( 'Webplatform-bottom-footer' 
);
+   if ( !$lines ) {
+   return $nodes;
+   }
+
+   foreach ( $lines as $line ) {
+   $depth = strrpos( $line, '*' );
+   if ( $depth === 0 ) {
+   $nodes[] = $this->parseItem( $line );
+   }
+   }
+
+   return $nodes;
+   }
+
+   /**
+* Parse one line from MediaWiki message to array with indexes 'text', 
'href',
+* 'org' and 'desc'
+*
+* @param string $line Name of a MediaWiki: message
+* @return array
+*/
+   public function parseItem( $line ) {
+   $href = false;
+
+   // trim spaces and asterisks from line and then split it to 
maximum three chunks
+   $line_temp = explode( '|', trim( $line, '* ' ), 3 );
+
+   // trim [ and ] from line to have just http://en.wikipedia.org 
instead
+   // of [http://en.wikipedia.org] for external links
+   $line_temp[0] = trim( $line_temp[0], '[]' );
+
+   // $line_temp now contains page name or URL as the 0th array 
element
+   // and the link description as the 1st array element
+   if ( count( $line_temp ) >= 2 && $line_temp[1] != '' ) {
+   $msgObj = $this->msg( $line_temp[0] );
+   $link = ( $msgObj->isDisabled() ? $line_temp[0] : trim( 
$msgObj->inContentLanguage()->text() ) );
+   $textObj = $this->msg( trim( $line_temp[1] ) );
+   $line = ( !$textObj->isDisabled() ? $textObj->text() : 
trim( $line_temp[1] ) );
+   } else {
+   $line = $link = trim( $line_temp[0] );
+   }
+
+   $descText = null;
+   if ( count( $line_temp ) > 2 && $line_temp[2] != '' ) {
+   $desc = $line_temp[2];
+   $descObj = $this->msg( $desc );
+   if ( $descObj->isDisabled() ) {
+   $descText = $desc;
+   } else {
+   $descText = $descObj->text();
+   }
+   }
+
+   $lineObj = $this->msg( $line );
+   if ( $lineObj->isDisabled() ) {
+   $text = $line;
+   } else {
+   $text = $lineObj->text();
+   }
+
+   if ( $link != null ) {
+   if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', 
$link ) ) {
+   $href = $link;
+   } else {
+   $title = Title::newFromText( $link );
+   if ( $title ) {
+   $title = $title->fixSpecialName();
+   $href = $title->getLocalURL();
+   } else {
+   $href = '#';
+  

[MediaWiki-commits] [Gerrit] wikimedia...autoreporter[master]: Add interleaved test analysis

[Chelsyx (Code Review)]

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

Change subject: Add interleaved test analysis
..

Add interleaved test analysis

Bug: T176493
Change-Id: I795023856963030e67e85e1cde7352842aa3a7a8
---
M functions.R
M modules/data/data_aggregation.R
M modules/data/data_cleansing.R
M modules/data/fetch_data.R
A modules/interleaved_test/data_processing.R
A modules/interleaved_test/interleaved_preference.R
A modules/interleaved_test/page_dwelltime.R
M modules/setup.R
M modules/sister_search/sidebar_results.R
M modules/stat_test/engagement.R
A modules/stat_test/remove_interleaved_data.R
M modules/stat_test/return_rate.R
M modules/stat_test/serp_from_autocomplete.R
M modules/stat_test/serp_offset.R
M modules/stat_test/visited_page.R
M modules/test_summary/browser_os.R
M modules/test_summary/events.R
M modules/test_summary/searches.R
M report.Rmd
M run.R
20 files changed, 388 insertions(+), 65 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/autoreporter 
refs/changes/02/392102/1

diff --git a/functions.R b/functions.R
index a4c6367..a7dff7e 100644
--- a/functions.R
+++ b/functions.R
@@ -79,3 +79,59 @@
 ggplot2::scale_color_brewer(palette = "Set1") +
 ggplot2::labs(x = NULL, color = "Group", y = y_lab, title = title, 
subtitle = subtitle)
 }
+
+cppFunction('CharacterVector fill_in(CharacterVector ids) {
+  CharacterVector new_ids(ids.size());
+  String current_id = ids[0];
+  new_ids[0] = current_id;
+  for (int i = 1; i < ids.size(); i++) {
+if (ids[i] != NA_STRING) {
+  current_id = ids[i];
+}
+new_ids[i] = current_id;
+  }
+  return new_ids;
+}')
+
+cppFunction('NumericVector cumunique(CharacterVector ids) {
+  NumericVector count(ids.size());
+  String current_id = ids[0];
+  count[0] = 1;
+  for (int i = 1; i < ids.size(); i++) {
+if (ids[i] == current_id) {
+  count[i] = count[i-1];
+} else {
+  count[i] = count[i-1] + 1;
+  current_id = ids[i];
+}
+  }
+  return count;
+}')
+
+# Process interleaved team draft
+process_session <- function(df) {
+  processed_session <- unsplit(lapply(split(df, df$serp_id), function(df) {
+if (is.na(df$event_extraParams[1]) || df$event_extraParams[1] == "") {
+  visited_pages <- rep(as.character(NA), times = nrow(df))
+} else {
+  from_json <- jsonlite::fromJSON(df$event_extraParams[1], simplifyVector 
= FALSE)
+  if (!("teamDraft" %in% names(from_json)) || all(is.na(df$article_id))) {
+visited_pages <- rep(as.character(NA), times = nrow(df))
+  } else {
+team_a <- unlist(from_json$teamDraft$a)
+team_b <- unlist(from_json$teamDraft$b)
+visited_pages <- vapply(df$article_id, function(article_id) {
+  if (article_id %in% team_a) {
+return("A")
+  } else if (article_id %in% team_b) {
+return("B")
+  } else {
+return(as.character(NA))
+  }
+}, "")
+  }
+}
+return(visited_pages)
+  }), df$serp_id)
+  return(processed_session)
+}
diff --git a/modules/data/data_aggregation.R b/modules/data/data_aggregation.R
index db5a178..6115703 100644
--- a/modules/data/data_aggregation.R
+++ b/modules/data/data_aggregation.R
@@ -8,9 +8,9 @@
 
 message("Aggregating by search...")
 searches <- events %>%
-  keep_where(!(is.na(serp_id))) %>% # remove visitPage and checkin events
-  arrange(date, session_id, serp_id, timestamp) %>%
-  group_by(group, wiki, session_id, serp_id) %>%
+  keep_where(!(is.na(search_id))) %>% # remove visitPage and checkin events
+  arrange(date, session_id, search_id, timestamp) %>%
+  group_by(group, wiki, session_id, search_id) %>%
   summarize(
 date = date[1],
 timestamp = timestamp[1],
@@ -56,19 +56,19 @@
 keep_where(event == "searchResultPage", `some same-wiki results` == 
"TRUE") %>%
 # SERPs with 0 results will not have an offset in extraParams ^
 mutate(offset = purrr::map_int(event_extraParams, ~ parse_extraParams(.x, 
action = "searchResultPage")$offset)) %>%
-select(session_id, event_id, serp_id, offset)
+select(session_id, event_id, search_id, offset)
 
   message("Processing SERP interwiki data...")
-  extract_iw <- function(session_id, event_id, serp_id, event_extraParams) {
+  extract_iw <- function(session_id, event_id, search_id, event_extraParams) {
 return(data.frame(
-  session_id, event_id, serp_id,
+  session_id, event_id, search_id,
   parse_extraParams(event_extraParams, action = "searchResultPage")$iw,
   stringsAsFactors = FALSE
 ))
   }
   serp_iw <- events %>%
 keep_where(event == "searchResultPage") %>%
-select(session_id, event_id, serp_id, event_extraParams) %>%
+select(session_id, event_id, search_id, event_extraParams) %>%
 purrr::pmap_df(extract_iw) %>%
 mutate(source = case_when(
   source == "wikt" ~ "Wiktionary",
@@ -104,12 +104,12 @@
 

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Making list entries the same height for visual consistency, ...

[jenkins-bot (Code Review)]

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

Change subject: Making list entries the same height for visual consistency, 
with hover-over to expand longer entries and manipulation icons only showing up 
on hover.
..


Making list entries the same height for visual consistency, with
hover-over to expand longer entries and manipulation icons only
showing up on hover.

Change-Id: Ic76884146471f9df4c214feca2922750dcb943a4
---
M includes/content/CollaborationListContent.php
M modules/ext.CollaborationKit.list.styles.less
M modules/ext.CollaborationKit.list.ui.js
3 files changed, 52 insertions(+), 16 deletions(-)

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



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index e194b96..2bb07a0 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -372,8 +372,9 @@
} elseif ( $item->link !== false ) {
$titleForItem = 
Title::newFromText( $item->link );
}
+   $adjustedIconWidth = $iconWidth * 1.3;
$text .= Html::openElement( 'div', [
-   'style' => 
"min-height:{$iconWidth}px",
+   'style' => 
"height:{$adjustedIconWidth}px; min-height:{$adjustedIconWidth}px",
'class' => 'mw-ck-list-item',
'data-collabkit-item-title' => 
$item->title,
'data-collabkit-item-id' => 
$colId . '-' . $itemCounter,
diff --git a/modules/ext.CollaborationKit.list.styles.less 
b/modules/ext.CollaborationKit.list.styles.less
index 01345b8..9729fa0 100644
--- a/modules/ext.CollaborationKit.list.styles.less
+++ b/modules/ext.CollaborationKit.list.styles.less
@@ -3,7 +3,46 @@
 /* Styles needed when transcluding list content */
 
 .mw-ck-list-item {
-   margin-bottom: 0.5em;
+   overflow: hidden;
+   margin-bottom: 0.5625em;
+   position: relative;
+
+   .mw-ck-list-buttonrow {
+   display: none;
+   }
+
+   .mw-ck-list-container .mw-ck-list-notes p {
+   margin: 0.35em 0;
+   }
+}
+
+.mw-ck-list-item:after {
+   content: '';
+   background: linear-gradient( to bottom, transparent, #fff );
+   height: 50%;
+   width: 100%;
+   margin-left: 68px;
+   position: absolute;
+   bottom: 0;
+   left: 0;
+}
+
+.mw-ck-hub-members .mw-ck-list-item:after {
+   background: linear-gradient( to bottom, transparent, #f9f9f9 );
+}
+
+.mw-ck-list-item:hover {
+   height: auto !important;
+   overflow: visible;
+
+   .mw-ck-list-buttonrow {
+   display: block;
+   }
+}
+
+/* Removes the fadeout effect */
+.mw-ck-list-item:hover:after {
+   display: none;
 }
 
 .mw-ck-list-image {
@@ -20,10 +59,8 @@
background: #eee 50% 50%;
 }
 .mw-ck-list-container {
-   height: 64px;
padding-left: 10px;
display: table-cell;
-   vertical-align: middle;
line-height: 1.2;
 }
 .mw-ck-list-title {
@@ -33,7 +70,6 @@
 
 .mw-ck-list-notes {
font-size: 90%;
-   margin: 1em 0 2em;
 }
 
 /* Multilist stuff */
@@ -77,11 +113,6 @@
 /* Stuff below here could potentially be in a separate module since
  * its only used on direct page and not when transcluding */
 
-/* Separate so spinner can replace properly */
-.mw-ck-list-deletebutton {
-   margin-left: 2em;
-}
-
 .mw-ck-list:not(.mw-ck-dragging) .mw-ck-list-movebutton {
cursor: ns-resize;
cursor: -moz-grab;
@@ -102,8 +133,7 @@
 
 /* Unclear if this is a really bad idea, but 24px makes the icon too big */
 .mw-ck-list-button .oo-ui-iconElement-icon.oo-ui-iconElement-icon {
-   min-height: 22px;
-   height: 1em;
+   height: 22px;
 }
 
 .mw-ck-list-additem {
diff --git a/modules/ext.CollaborationKit.list.ui.js 
b/modules/ext.CollaborationKit.list.ui.js
index 6630652..7744fa0 100644
--- a/modules/ext.CollaborationKit.list.ui.js
+++ b/modules/ext.CollaborationKit.list.ui.js
@@ -274,7 +274,8 @@
$list = $( '.mw-ck-list' );
 
$list.find( '.mw-ck-list-item' ).each( function () {
-   var deleteButton,
+   var buttonRow,
+   deleteButton,
moveButton,
editButton,
delWrapper,
@@ -336,10 +337,14 @@
.addClass( 'mw-ck-list-button' )
   

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Custom styling for and elements

[jenkins-bot (Code Review)]

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

Change subject: Custom styling for  and  elements
..


Custom styling for  and  elements

Copypasted from core /resources/src/mediawiki.skinning/elements.css with
colors adjusted for Timeless.

Bug: T177142
Change-Id: Ic6d18911df4f1ea504ed547292676eac1ff54995
---
M resources/screen-common.less
1 file changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/resources/screen-common.less b/resources/screen-common.less
index 7d90c76..62030a7 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -300,6 +300,29 @@
display: block;
}
 }
+
+/* pre and code styles copypasted from core
+ * /resources/src/mediawiki.skinning/elements.css and modified a bit
+ * @see https://phabricator.wikimedia.org/T177142
+ */
+code {
+   color: #000;
+   background-color: @grey-bright;
+   border: 1px solid @grey-dark;
+   border-radius: 2px;
+   padding: 1px 4px;
+}
+
+pre,
+.mw-code {
+   color: #000;
+   background-color: @grey-bright;
+   border: 1px solid @grey-dark;
+   padding: 1em;
+   /* Wrap lines in overflow. T2260, T103780 */
+   white-space: pre-wrap;
+}
+
 #mw-content {
h1,
h2,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6d18911df4f1ea504ed547292676eac1ff54995
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Do not error out on invalid coordinate when calculating dist...

[Smalyshev (Code Review)]

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

Change subject: Do not error out on invalid coordinate when calculating 
distance.
..

Do not error out on invalid coordinate when calculating distance.

Bug: T180314
Change-Id: Ie7757129b034c8093a6dbf1f4f216c1d4e6a8edc
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
1 file changed, 9 insertions(+), 1 deletion(-)


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

diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
index 47ceca5..b9c5827 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDistanceBOp.java
@@ -7,6 +7,7 @@
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IValueExpression;
+import com.bigdata.rdf.error.SparqlTypeErrorException;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.constraints.INeedsMaterialization;
 import com.bigdata.rdf.internal.constraints.IVValueExpression;
@@ -14,6 +15,8 @@
 import com.bigdata.rdf.internal.gis.ICoordinate.UNITS;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.sparql.ast.GlobalAnnotations;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Implementation of geof:distance function.
@@ -103,10 +106,15 @@
  * @param iv
  * @return Coordinate
  */
+@SuppressFBWarnings(value = "LEST_LOST_EXCEPTION_STACK_TRACE", 
justification = "Converting to SPARQL exception")
 protected CoordinateDD getCoordinateFromIV(IV iv) {
 final WikibasePoint point = new 
WikibasePoint(asLiteral(iv).stringValue());
-return new CoordinateDD(Double.parseDouble(point.getLatitude()),
+try {
+return new CoordinateDD(Double.parseDouble(point.getLatitude()),
 Double.parseDouble(point.getLongitude()));
+} catch (IllegalArgumentException e) {
+throw new SparqlTypeErrorException();
+}
 }
 
 @Override

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7757129b034c8093a6dbf1f4f216c1d4e6a8edc
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove livingstyleguide manifest

[Umherirrender (Code Review)]

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

Change subject: Remove livingstyleguide manifest
..

Remove livingstyleguide manifest

OOUIPlayground (T166057) and Blueprint (T173653) are archived

Change-Id: I6316cc59668acf242b94bdcf029a108fa66d3081
---
D puppet/modules/role/manifests/livingstyleguide.pp
1 file changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/00/392100/1

diff --git a/puppet/modules/role/manifests/livingstyleguide.pp 
b/puppet/modules/role/manifests/livingstyleguide.pp
deleted file mode 100644
index 0ab892f..000
--- a/puppet/modules/role/manifests/livingstyleguide.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# == Class: role::livingstyleguide
-# Sets up a 'living style guide' wiki, with the custom Blueprint skin.
-# This wiki will be available, by default, at livingstyleguide.
-class role::livingstyleguide {
-  mediawiki::wiki {'livingstyleguide': }
-
-  mediawiki::extension { 'OOUIPlayground':
-  composer => true,
-  wiki => 'livingstyleguide',
-  }
-
-  mediawiki::skin { 'Blueprint':
-  default  => true,
-  composer => true,
-  wiki => 'livingstyleguide',
-  }
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6316cc59668acf242b94bdcf029a108fa66d3081
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Updated behaviour when queue is populated from dump file to ...

[jenkins-bot (Code Review)]

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

Change subject: Updated behaviour when queue is populated from dump file to 
detect whether additional info source headers are present and if not inject them
..


Updated behaviour when queue is populated from dump file to detect whether 
additional info source headers are present and if not inject them

Change-Id: I7a0cca729fc2bfc772c8aba1ccaff4aed8fb6816
---
M Maintenance/PopulateQueueFromDump.php
1 file changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/Maintenance/PopulateQueueFromDump.php 
b/Maintenance/PopulateQueueFromDump.php
index 73551b0..0aa6ea8 100644
--- a/Maintenance/PopulateQueueFromDump.php
+++ b/Maintenance/PopulateQueueFromDump.php
@@ -53,9 +53,15 @@
continue;
}
 
-   // push message directly to queue, bypassing 
QueueWrapper's adding
-   // source fields.
-   $datastore->push( $message );
+   // if $message SourceFields headers are not set then we 
send it through QueueWrapper::push()
+   if ( !array_key_exists( 'source_enqueued_time', 
$message ) ) {
+   // QueueWrapper::push() injects additional 
useful properties
+   // useful properties declared here 
\SmashPig\CrmLink\Messages\SourceFields::addToMessage()
+   QueueWrapper::push( $this->getOption( 'queue' 
), $message );
+   } else {
+
+   $datastore->push( $message );
+   }
 
$messageCount++;
if ( $messageCount % 1000 == 0 ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a0cca729fc2bfc772c8aba1ccaff4aed8fb6816
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Jgleeson 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cron jobs on the dumpsdatahosts use the new dumpsgen user

[ArielGlenn (Code Review)]

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

Change subject: cron jobs on the dumpsdatahosts use the new dumpsgen user
..


cron jobs on the dumpsdatahosts use the new dumpsgen user

Bug: T179942
Change-Id: Ib20f175665bd4f08875969fdfff5894e236cedb9
---
M modules/snapshot/manifests/cron.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/snapshot/manifests/cron.pp 
b/modules/snapshot/manifests/cron.pp
index b5f0151..6043285 100644
--- a/modules/snapshot/manifests/cron.pp
+++ b/modules/snapshot/manifests/cron.pp
@@ -21,7 +21,7 @@
 class { '::snapshot::cron::cirrussearch': user   => $depr_user }
 class { '::snapshot::cron::categoriesrdf': user   => $depr_user }
 class { '::snapshot::cron::dumplists': user   => $depr_user }
-class { '::snapshot::cron::dump_global_blocks': user   => $depr_user }
+class { '::snapshot::cron::dump_global_blocks': user   => $miscdumpsuser }
 class { '::snapshot::cron::wikidatadumps':
 user  => $depr_user,
 group => $group,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cron jobs on the dumpsdatahosts use the new dumpsgen user

[ArielGlenn (Code Review)]

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

Change subject: cron jobs on the dumpsdatahosts use the new dumpsgen user
..

cron jobs on the dumpsdatahosts use the new dumpsgen user

Bug: T179942
Change-Id: Ib20f175665bd4f08875969fdfff5894e236cedb9
---
M modules/snapshot/manifests/cron.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/snapshot/manifests/cron.pp 
b/modules/snapshot/manifests/cron.pp
index b5f0151..6043285 100644
--- a/modules/snapshot/manifests/cron.pp
+++ b/modules/snapshot/manifests/cron.pp
@@ -21,7 +21,7 @@
 class { '::snapshot::cron::cirrussearch': user   => $depr_user }
 class { '::snapshot::cron::categoriesrdf': user   => $depr_user }
 class { '::snapshot::cron::dumplists': user   => $depr_user }
-class { '::snapshot::cron::dump_global_blocks': user   => $depr_user }
+class { '::snapshot::cron::dump_global_blocks': user   => $miscdumpsuser }
 class { '::snapshot::cron::wikidatadumps':
 user  => $depr_user,
 group => $group,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "smokeping: switch data rsync direction"

[Dzahn (Code Review)]

Hello Giuseppe Lavagetto, BBlack, jenkins-bot, Ayounsi,

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

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

to review the following change.


Change subject: Revert "smokeping: switch data rsync direction"
..

Revert "smokeping: switch data rsync direction"

This reverts commit 43dcf15fbb7869e78b9c6c5d614726fd62fd16ba.

Change-Id: I980f5df96bce6d2c5ef87f22326e655ed4c0ad0e
---
M modules/role/manifests/smokeping.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index f4ad708..3b222fb 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -17,8 +17,8 @@
 rsync::quickdatacopy { 'var-lib-smokeping':
 ensure  => present,
 auto_sync   => false,
-source_host => 'netmon2001.wikimedia.org',
-dest_host   => 'netmon1002.wikimedia.org',
+source_host => 'netmon1002.wikimedia.org',
+dest_host   => 'netmon2001.wikimedia.org',
 module_path => '/var/lib/smokeping',
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I980f5df96bce6d2c5ef87f22326e655ed4c0ad0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Ayounsi 
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] mediawiki...PronunciationRecording[master]: Use tabs in json

[Umherirrender (Code Review)]

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

Change subject: Use tabs in json
..

Use tabs in json

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


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

diff --git a/.stylelintrc.json b/.stylelintrc.json
index 0fc57dc..2c90730 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,3 +1,3 @@
 {
-"extends": "stylelint-config-wikimedia"
+   "extends": "stylelint-config-wikimedia"
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikisource[master]: Use json extension for .stylelintrc

[Umherirrender (Code Review)]

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

Change subject: Use json extension for .stylelintrc
..

Use json extension for .stylelintrc

Bug: T173516
Change-Id: Id8b577c878231947ca061aebd4fdd03cbad735da
---
R .stylelintrc.json
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikisource 
refs/changes/96/392096/1

diff --git a/.stylelintrc b/.stylelintrc.json
similarity index 100%
rename from .stylelintrc
rename to .stylelintrc.json

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move role::gerrit::server to just role::gerrit

[Chad (Code Review)]

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

Change subject: Move role::gerrit::server to just role::gerrit
..

Move role::gerrit::server to just role::gerrit

It's kinda redundant and a legacy function of how this all used to
be named

Change-Id: Ie5658b9ebba629ca4a05a3ddf5ae56ad7c62ac2f
---
R hieradata/role/common/gerrit.yaml
M manifests/site.pp
M modules/profile/templates/cumin/aliases.yaml.erb
R modules/role/manifests/gerrit.pp
4 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/hieradata/role/common/gerrit/server.yaml 
b/hieradata/role/common/gerrit.yaml
similarity index 100%
rename from hieradata/role/common/gerrit/server.yaml
rename to hieradata/role/common/gerrit.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 55531ce..f17b9b5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -191,7 +191,7 @@
 
 # All gerrit servers (swap master status in hiera)
 node 'cobalt.wikimedia.org', 'gerrit2001.wikimedia.org' {
-role(gerrit::server)
+role(gerrit)
 
 interface::add_ip6_mapped { 'main': }
 }
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb 
b/modules/profile/templates/cumin/aliases.yaml.erb
index d89b293..28bc910 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -58,7 +58,7 @@
 ganeti-canary: P{ganeti2001.codfw.wmnet}
 ganeti-codfw: A:ganeti and A:codfw
 ganeti-eqiad: A:ganeti and A:eqiad
-gerrit: P{O:gerrit::server}
+gerrit: P{O:gerrit}
 graphite: P{O:graphite::production or O:labs::graphite}
 hadoop: A:hadoop-worker or A:hadoop-master or A:hadoop-standby
 hadoop-master: P{O:analytics_cluster::hadoop::master}
diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit.pp
similarity index 88%
rename from modules/role/manifests/gerrit/server.pp
rename to modules/role/manifests/gerrit.pp
index 87ef401..e31c828 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit.pp
@@ -1,7 +1,7 @@
 # server running Gerrit code review software
 # https://en.wikipedia.org/wiki/Gerrit_%28software%29
 #
-class role::gerrit::server {
+class role::gerrit {
 include ::standard
 include ::profile::backup::host
 include ::profile::base::firewall

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: EventLogging for Android

[Dbrant (Code Review)]

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

Change subject: EventLogging for Android
..

EventLogging for Android

- Persistent event records
- Post events on exit
- If the device was offline for too long, [5 days] decide not to send them
- Extended app capsule entries
- MobileWikiApp prefix
- No encryption of stored records [For now]

Related tasks :

- Attention to battery and  the type of network connection
https://phabricator.wikimedia.org/T180190
- Can we send data that doesnt change during a session in summary event
instead of included with each event?
https://phabricator.wikimedia.org/T180193

Change-Id: Ice3287b5f58d53e85f51094c6e29cce941639907
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/WikipediaApp.java
A app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java
A app/src/main/java/org/wikipedia/analytics/AnalyticsIntentService.java
M app/src/main/java/org/wikipedia/analytics/DailyStatsFunnel.java
A app/src/main/java/org/wikipedia/analytics/EventLoggingConfig.java
D app/src/main/java/org/wikipedia/analytics/EventLoggingService.java
M app/src/main/java/org/wikipedia/analytics/Funnel.java
A app/src/main/java/org/wikipedia/analytics/SystemInformation.java
A app/src/main/java/org/wikipedia/analytics/db/EventDatabaseHelper.java
A app/src/main/java/org/wikipedia/analytics/db/EventRecord.java
A app/src/main/java/org/wikipedia/analytics/db/EventRecordContract.java
M app/src/main/java/org/wikipedia/util/DeviceUtil.java
13 files changed, 614 insertions(+), 87 deletions(-)


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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a581ae3..53c7e26 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
 should be specific to the update mechanism channel.
 -->
 
+
 
 
 
@@ -358,5 +359,9 @@
 
 
 
+
 
-
+
+
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 974b4a6..6f7cff6 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -247,6 +247,7 @@
 registerConnectivityReceiver();
 
 listenForNotifications();
+registerActivityLifecycleCallbacks(new WikpediaAppLifecycleHandler());
 }
 
 public String getUserAgent() {
diff --git a/app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java 
b/app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java
new file mode 100644
index 000..b592dc6
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java
@@ -0,0 +1,95 @@
+package org.wikipedia;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.Application;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+
+import org.wikipedia.analytics.AnalyticsIntentService;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+public class WikpediaAppLifecycleHandler implements 
Application.ActivityLifecycleCallbacks {
+public static final String APP_IN_BACKGROUND = "app sent to background";
+
+@Override
+public void onActivityCreated(Activity activity, Bundle bundle) {
+
+}
+
+@Override
+public void onActivityStarted(Activity activity) {
+
+}
+
+@Override
+public void onActivityResumed(Activity activity) {
+
+}
+
+@Override
+public void onActivityPaused(Activity activity) {
+
+}
+
+@Override
+public void onActivityStopped(Activity activity) {
+try {
+boolean foreground = new 
ForegroundCheckTask().execute(WikipediaApp.getInstance()).get();
+if (!foreground) {
+//App is in Background
+postQueuedEvents();
+}
+} catch (InterruptedException e) {
+e.printStackTrace();
+} catch (ExecutionException e) {
+e.printStackTrace();
+}
+}
+
+@Override
+public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
+
+}
+
+@Override
+public void onActivityDestroyed(Activity activity) {
+
+}
+
+
+private void postQueuedEvents() {
+AnalyticsIntentService.enqueueService(WikipediaApp.getInstance(), 
APP_IN_BACKGROUND);
+}
+
+
+   static class ForegroundCheckTask extends AsyncTask {
+@Override
+protected Boolean doInBackground(Context... params) {
+final Context context = params[0];
+return isAppOnForeground(context);
+}
+
+private boolean isAppOnForeground(Context context) {
+ActivityManager activityManager = 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: switch backend to eqiad

[Dzahn (Code Review)]

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

Change subject: smokeping: switch backend to eqiad
..


smokeping: switch backend to eqiad

Bug: T180812
Change-Id: Icadbf3979fac61fb6afb97ce01d33fc4bc2e9c84
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 7ae5f47..18d846b 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -262,7 +262,7 @@
   servermon.wikimedia.org:
 director: 'netmon1003'
   smokeping.wikimedia.org:
-director: 'netmon2001'
+director: 'netmon1002'
   static-bugzilla.wikimedia.org:
 director: 'bromine'
   stats.wikimedia.org:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icadbf3979fac61fb6afb97ce01d33fc4bc2e9c84
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: switch data rsync direction

[Dzahn (Code Review)]

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

Change subject: smokeping: switch data rsync direction
..


smokeping: switch data rsync direction

This is to copy smokeping data back from codfw to eqiad
to switch smokeping back to eqiad.

Since "auto_sync" isn't set to true this will not
sync anything automatically, it just sets up the ferm
and rsyncd config snippets accordingly to let a human
run the sync command.

Later we will enable auto-sync.

Bug: T180812
Change-Id: I09ead68e3d7ba81546f6ba41e2ae70a97e363c4e
---
M modules/role/manifests/smokeping.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index 3b222fb..f4ad708 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -17,8 +17,8 @@
 rsync::quickdatacopy { 'var-lib-smokeping':
 ensure  => present,
 auto_sync   => false,
-source_host => 'netmon1002.wikimedia.org',
-dest_host   => 'netmon2001.wikimedia.org',
+source_host => 'netmon2001.wikimedia.org',
+dest_host   => 'netmon1002.wikimedia.org',
 module_path => '/var/lib/smokeping',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I09ead68e3d7ba81546f6ba41e2ae70a97e363c4e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] marvin[master]: Update: show 404 page when content cannot be found

[Niedzielski (Code Review)]

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

Change subject: Update: show 404 page when content cannot be found
..

Update: show 404 page when content cannot be found

• Detect and throw an Error when fetch status indicates failure.
  fetch-with-redirect should probably be renamed as it's now a generic
  HTTP client abstraction.

• Show the not found page for any 4xx HTTP status error. This prevents a
  confusing raw error log from being presented to the user for simple
  page not found scenarios. The logic for determining when to show this
  page lives in the router to prevent duplication in both the server and
  client.

• Statically bundle the not-found page since this will become a generic
  error page. api.ts just defines chunkName as an empty string now and
  the typing may be improved later.

• The vendor chunk changed because it now includes unfetch. It isn't
  clear why this library wasn't already in there since there's no
  minimum on the number of children for it be bundled.

Bug: T177000
Change-Id: Icac4b44a6e6c29af9823fc73e13087463715e248
---
M package.json
M src/common/http/fetch-with-redirect.ts
M src/common/routers/api.ts
M src/common/routers/router.ts
M src/server/index.tsx
5 files changed, 73 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/93/392093/1

diff --git a/package.json b/package.json
index 1d5d82c..2dadc3c 100644
--- a/package.json
+++ b/package.json
@@ -103,15 +103,15 @@
   "bundlesize": [
 {
   "path": "dist/public/index.*.js",
-  "maxSize": "2.8KB"
+  "maxSize": "3.2KB"
 },
 {
   "path": "dist/public/runtime.*.js",
-  "maxSize": "1.1KB"
+  "maxSize": "1KB"
 },
 {
   "path": "dist/public/vendor.*.js",
-  "maxSize": "7.8KB"
+  "maxSize": "8.2KB"
 },
 {
   "path": "dist/public/pages/about.*.js",
@@ -122,16 +122,12 @@
   "maxSize": "0.8KB"
 },
 {
-  "path": "dist/public/pages/not-found.*.js",
-  "maxSize": "0.3KB"
-},
-{
   "path": "dist/public/pages/summary.*.js",
-  "maxSize": "2.9KB"
+  "maxSize": "2.2KB"
 },
 {
   "path": "dist/public/pages/wiki.*.js",
-  "maxSize": "3.3KB"
+  "maxSize": "2.6KB"
 }
   ]
 }
diff --git a/src/common/http/fetch-with-redirect.ts 
b/src/common/http/fetch-with-redirect.ts
index afa4730..b4f3ce4 100644
--- a/src/common/http/fetch-with-redirect.ts
+++ b/src/common/http/fetch-with-redirect.ts
@@ -1,14 +1,12 @@
+// todo: rename this module.
+
 import * as unfetch from "isomorphic-unfetch";
 
 /** true if executing on server, false otherwise. */
 const server = typeof window !== "object";
 
-/** Server-only redirect status code and destination URL. */
-export class RedirectError extends Error {
-  /** Status code in the domain of [300, 399]. */
+export class FetchError extends Error {
   status: number;
-
-  /** Destination URL. */
   url: string;
 
   constructor(status: number, url: string) {
@@ -17,6 +15,15 @@
 this.url = url;
   }
 }
+
+/** Server-only 3xx redirect status code and destination URL. */
+export class RedirectError extends FetchError {}
+
+/** 4xx status code errors. */
+export class ClientError extends FetchError {}
+
+/** 5xx status code errors. */
+export class ServerError extends FetchError {}
 
 /**
  * Isomorphic fetch with transparent throw-on-redirect behavior for requests
@@ -37,6 +44,13 @@
   const url = response.headers.get("location");
   throw new RedirectError(response.status, url as string);
 }
+const url = typeof input === "string" ? input : input.url;
+if (response.status >= 400 && response.status <= 499) {
+  throw new ClientError(response.status, url);
+}
+if (response.status >= 500) {
+  throw new ServerError(response.status, url);
+}
 return response;
   });
 }
diff --git a/src/common/routers/api.ts b/src/common/routers/api.ts
index 5484e5f..7222b4a 100644
--- a/src/common/routers/api.ts
+++ b/src/common/routers/api.ts
@@ -1,4 +1,4 @@
-import { Params as NotFoundParams } from "../pages/not-found";
+import * as notFoundModule from "../pages/not-found";
 import { Props as WikiProps, Params as WikiParams } from "../pages/wiki";
 import {
   Props as SummaryProps,
@@ -60,13 +60,12 @@
   chunkName: "pages/style-guide"
 });
 
-export const notFound: Route = newRoute({
+export const notFound: Route = newRoute({
   // `(.*)` is the new `*`. See
   // https://github.com/pillarjs/path-to-regexp/issues/37.
   path: "(.*)",
-  importModule: () =>
-import(/* webpackChunkName: "pages/not-found" */ "../pages/not-found"),
-  chunkName: "pages/not-found"
+  importModule: () => Promise.resolve(notFoundModule),
+  chunkName: ""
 });
 
 export const routes: AnyRoute[] = [
diff --git a/src/common/routers/router.ts b/src/common/routers/router.ts
index 5f488e4..d216737 100644
--- 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: set up directory for misc cron dumps on dumpsdata, move firs...

[ArielGlenn (Code Review)]

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

Change subject: set up directory for misc cron dumps on dumpsdata, move first 
cron job
..


set up directory for misc cron dumps on dumpsdata, move first cron job

We can use a different layout now since this host is internal.

Xml/sql dumps live under (mntpoint)/xmldatadumps/{public,private}
all the rest go under (mntpoint)/otherdumps

First cron job to be moved is an easy one, dump_global_blocks.

Bug: T179942
Change-Id: Ia30c4abb81beb7ea1bb90965a20d7f31565ba725
---
M modules/dumps/manifests/generation/server/dirs.pp
M modules/snapshot/files/cron/dump-global-blocks.sh
M modules/snapshot/manifests/cron/dump_global_blocks.pp
M modules/snapshot/manifests/dumps/dirs.pp
M modules/snapshot/templates/set_dump_dirs.sh.erb
5 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/modules/dumps/manifests/generation/server/dirs.pp 
b/modules/dumps/manifests/generation/server/dirs.pp
index dfbb315..17d7ae5 100644
--- a/modules/dumps/manifests/generation/server/dirs.pp
+++ b/modules/dumps/manifests/generation/server/dirs.pp
@@ -7,7 +7,7 @@
 # directories with incoming rsyncs of datasets
 $datadir  = '/data/xmldatadumps'
 $publicdir= '/data/xmldatadumps/public'
-$otherdir = '/data/other'
+$otherdir = '/data/otherdumps'
 $cirrussearchdir  = "${otherdir}/cirrussearch"
 $xlationdir   = "${otherdir}/contenttranslation"
 $globalblocksdir  = "${otherdir}/globalblocks"
diff --git a/modules/snapshot/files/cron/dump-global-blocks.sh 
b/modules/snapshot/files/cron/dump-global-blocks.sh
index e7e4825..90f80ea 100644
--- a/modules/snapshot/files/cron/dump-global-blocks.sh
+++ b/modules/snapshot/files/cron/dump-global-blocks.sh
@@ -108,7 +108,7 @@
 checkval "$settingname" "${!settingname}"
 done
 
-outputdir="${otherdir}/globalblocks"
+outputdir="${cronsdir}/globalblocks"
 
 host=`get_db_host "$apachedir"` || exit 1
 db_user=`get_db_user "$apachedir"` || exit 1
diff --git a/modules/snapshot/manifests/cron/dump_global_blocks.pp 
b/modules/snapshot/manifests/cron/dump_global_blocks.pp
index 6c8f2f3..71315af 100644
--- a/modules/snapshot/manifests/cron/dump_global_blocks.pp
+++ b/modules/snapshot/manifests/cron/dump_global_blocks.pp
@@ -2,7 +2,8 @@
 $user   = undef,
 ) {
 $confsdir = $snapshot::dumps::dirs::confsdir
-$otherdir = $snapshot::dumps::dirs::otherdir
+# $otherdir = $snapshot::dumps::dirs::otherdir
+$otherdir = $snapshot::dumps::dirs::cronsdir
 $globalblocksdir = "${otherdir}/globalblocks"
 
 file { '/usr/local/bin/dump-global-blocks.sh':
diff --git a/modules/snapshot/manifests/dumps/dirs.pp 
b/modules/snapshot/manifests/dumps/dirs.pp
index 01736b3..d54bd13 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -14,6 +14,7 @@
 
 $miscdumpsdir = "${miscdumpsmount}/xmldatadumps"
 $xmldumpsdir = "${xmldumpsmount}/xmldatadumps"
+$cronsdir = "${xmldumpsmount}/otherdumps"
 
 $apachedir = '/srv/mediawiki'
 $confsdir = "${dumpsdir}/confs"
diff --git a/modules/snapshot/templates/set_dump_dirs.sh.erb 
b/modules/snapshot/templates/set_dump_dirs.sh.erb
index fbb73e9..6313c23 100644
--- a/modules/snapshot/templates/set_dump_dirs.sh.erb
+++ b/modules/snapshot/templates/set_dump_dirs.sh.erb
@@ -6,5 +6,6 @@
 xmldumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::xmldumpsdir') -%>"
 miscdumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::miscdumpsdir') -%>"
 otherdir="<%= scope.lookupvar('snapshot::dumps::dirs::otherdir') -%>"
+cronsdir="<%= scope.lookupvar('snapshot::dumps::dirs::cronsdir') -%>"
 dumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir') -%>"
 dblistsdir="<%= scope.lookupvar('snapshot::dumps::dirs::dblistsdir') -%>"

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: EventLogging for Android

[Sharvaniharan (Code Review)]

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

Change subject: EventLogging for Android
..

EventLogging for Android

- Persistent event records
- Post events on exit
- If the device was offline for too long, [5 days] decide not to send them
- Extended app capsule entries
- MobileWikiApp prefix
- No encryption of stored records [For now]

Related tasks :

- Attention to battery and  the type of network connection
  https://phabricator.wikimedia.org/T180190
- Can we send data that doesn’t change during a session in summary 
event instead of included with each event?
  https://phabricator.wikimedia.org/T180193

Change-Id: Ie1842a1932dc3776097abe4cfc136a94a8f45180
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
A app/src/main/java/org/wikipedia/WikipediaAppLifecyleHandler.java
D app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java
M app/src/main/java/org/wikipedia/analytics/AnalyticsIntentService.java
M app/src/main/java/org/wikipedia/analytics/EventLoggingConfig.java
5 files changed, 85 insertions(+), 105 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 6f7cff6..2b58a59 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -247,7 +247,7 @@
 registerConnectivityReceiver();
 
 listenForNotifications();
-registerActivityLifecycleCallbacks(new WikpediaAppLifecycleHandler());
+registerActivityLifecycleCallbacks(new WikipediaAppLifecyleHandler());
 }
 
 public String getUserAgent() {
diff --git a/app/src/main/java/org/wikipedia/WikipediaAppLifecyleHandler.java 
b/app/src/main/java/org/wikipedia/WikipediaAppLifecyleHandler.java
new file mode 100644
index 000..425eae5
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/WikipediaAppLifecyleHandler.java
@@ -0,0 +1,77 @@
+package org.wikipedia;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.Application;
+import android.content.Context;
+import android.os.Bundle;
+
+import org.wikipedia.analytics.AnalyticsIntentService;
+
+import java.util.List;
+
+public class WikipediaAppLifecyleHandler implements 
Application.ActivityLifecycleCallbacks {
+public static final String APP_IN_BACKGROUND = "app sent to background";
+
+@Override
+public void onActivityCreated(Activity activity, Bundle bundle) {
+
+}
+
+@Override
+public void onActivityStarted(Activity activity) {
+
+}
+
+@Override
+public void onActivityResumed(Activity activity) {
+
+}
+
+@Override
+public void onActivityPaused(Activity activity) {
+
+}
+
+@Override
+public void onActivityStopped(Activity activity) {
+boolean foreground = isAppForeground(WikipediaApp.getInstance());
+if (!foreground) {
+//App is in Background
+postQueuedEvents();
+}
+}
+
+@Override
+public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
+
+}
+
+@Override
+public void onActivityDestroyed(Activity activity) {
+
+}
+
+
+private void postQueuedEvents() {
+AnalyticsIntentService.enqueueService(WikipediaApp.getInstance(), 
APP_IN_BACKGROUND);
+}
+
+private boolean isAppForeground(Context context) {
+ActivityManager activityManager = (ActivityManager) 
context.getSystemService(Context.ACTIVITY_SERVICE);
+if (activityManager != null) {
+List appProcesses = 
activityManager.getRunningAppProcesses();
+if (appProcesses == null) {
+return false;
+}
+final String packageName = context.getPackageName();
+for (ActivityManager.RunningAppProcessInfo appProcess : 
appProcesses) {
+if (appProcess.importance == 
ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND && 
appProcess.processName.equals(packageName)) {
+return true;
+}
+}
+}
+return false;
+}
+
+}
diff --git a/app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java 
b/app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java
deleted file mode 100644
index b592dc6..000
--- a/app/src/main/java/org/wikipedia/WikpediaAppLifecycleHandler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.wikipedia;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.Application;
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Bundle;
-
-import org.wikipedia.analytics.AnalyticsIntentService;
-
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-public class 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: cleanup hiera tree for cloud/labs things

[Rush (Code Review)]

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

Change subject: openstack: cleanup hiera tree for cloud/labs things
..

openstack: cleanup hiera tree for cloud/labs things

There are stragglers here we don't want but this is
the point in time purge we can do now.

Bug: T171494
Change-Id: I31fbc99700404efa1700f957a3c07da64a7cb1ff
---
M hieradata/codfw.yaml
M hieradata/common.yaml
M hieradata/common/monitoring.yaml
M hieradata/common/profile/openstack/main.yaml
M hieradata/eqiad.yaml
M hieradata/eqiad/profile/openstack/main/nova/network.yaml
D hieradata/hosts/labtestcontrol2001.yaml
D hieradata/hosts/labtestpuppetmaster2001.yaml
D hieradata/hosts/labtestweb2001.yaml
M hieradata/labs.yaml
M hieradata/regex.yaml
M hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
M hieradata/role/codfw/wmcs/openstack/labtest/web.yaml
13 files changed, 34 insertions(+), 292 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/392091/1

diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 70fa14d..c53589e 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -20,14 +20,10 @@
 
 ganglia_aggregators: install2002.wikimedia.org:10649
 
+# Cloud Services <
 #
-# LABS
-#
-labs_nova_controller: "labcontrol1001.wikimedia.org"
-labs_glance_controller: "labcontrol1001.wikimedia.org"
 labs_puppet_master: "labs-puppetmaster.wikimedia.org"
 labs_keystone_host: "labcontrol1001.wikimedia.org"
-labs_certmanager_hostname: "labservices1001.wikimedia.org"
 
 # These are the up-and-coming, better dns servers:
 labsdnsconfig:
@@ -41,6 +37,9 @@
   hostname: ldap-labs.codfw.wikimedia.org
   secondary_hostname: ldap-labs.eqiad.wikimedia.org
 
+# /> Cloud Services
+#
+
 prometheus_nodes:
   - prometheus2003.codfw.wmnet
   - prometheus2004.codfw.wmnet
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 370db71..38c08a7 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -300,7 +300,6 @@
   eqiad: []
 
 puppetmaster: "puppet"
-active_labstore_host: 'labstore1001'
 statistics_servers:
   - stat1004.eqiad.wmnet
   - stat1005.eqiad.wmnet
@@ -364,17 +363,8 @@
 # Used to specify writer handler for eventlogging processor producer.
 eventlogging_kafka_producer_scheme: "kafka-confluent://"
 
-# LABS
-
-labs_tld: "wmflabs"
-labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
-labs_designate_hostname:  "labservices1001.wikimedia.org"
-labs_designate_hostname_secondary: _designate_hostname_secondary 
"labservices1002.wikimedia.org"
-labs_nova_api_host:  "labnet1001.eqiad.wmnet"
-labs_nova_network_host:  "labnet1001"
-labs_nova_network_ip:  "10.64.20.25"
-status_wiki_host_master: 'wikitech.wikimedia.org'
-
+# Cloud Services <
+#
 # Cumin
 profile::openstack::main::cumin::auth_group: cumin_masters
 profile::openstack::main::cumin::project_masters: []
@@ -383,65 +373,12 @@
 profile::openstack::base::keystone::public_port: 5000
 profile::openstack::main::nova::dhcp_domain: 'eqiad.wmflabs'
 
-# By default, don't allow projects to allocate public IPs; this way we can
-# let users have network admin rights, for firewall rules and such, and can
-# give them public ips by increasing their quota
-novaconfig:
-  network_host: *labsnovanetworkip
-  api_host: *labsnovaapihost
-  db_name: 'nova'
-  api_db_name: 'novaapi'
-  db_user: 'nova'
-  ldap_base_dn: 'dc=wikimedia,dc=org'
-  ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
-  ldap_proxyagent: 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
-  puppet_db_name: 'puppet'
-  puppet_db_user: 'puppet'
-  quota_floating_ips: '0'
-  libvirt_type: 'kvm'
-  my_ip: "%{::ipaddress}"
-  network_public_interface: 'eth0'
-  network_flat_interface: 'eth1.1102'
-  network_flat_tagged_base_interface: 'eth1'
-  network_flat_interface_vlan: '1102'
-  flat_network_bridge: 'br1102'
-  fixed_range: '10.68.16.0/21'
-  dhcp_start: '10.68.16.4'
-  network_public_ip: '208.80.155.255'
-  dmz_cidr: '208.80.155.0/22,10.0.0.0/8'
-
-keystoneconfig:
-  db_name: 'keystone'
-  db_user: 'keystone'
-  ldap_base_dn: 'dc=wikimedia,dc=org'
-  ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
-  ldap_user_id_attribute: 'uid'
-  ldap_tenant_id_attribute: 'cn'
-  ldap_user_name_attribute: 'cn'
-  ldap_tenant_name_attribute: 'cn'
-  ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
-  auth_protocol: 'http'
-  auth_port: '35357'
-  public_port: '5000'
-  db_host: 'm5-master.eqiad.wmnet'
-  ldap_hosts:
-- ldap-labs.eqiad.wikimedia.org
-- ldap-labs.codfw.wikimedia.org
-  token_driver: 'normal'
-
-glanceconfig:
-  db_host: 'm5-master.eqiad.wmnet'
-  bind_ip: "%{::ipaddress}"
-
-# IPs assigned here MUST be reserved beforehand so they don't collide with 
labs VMs.
-#  To reserve, on the labs controller run $ sudo nova-manage fixed reserve 
-# (If using Neutron, all bets are off and this comment is wrong.)
-# Note 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: labsaliases extra records move to module/profile/...

[Rush (Code Review)]

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

Change subject: openstack: labsaliases extra records move to module/profile/role
..


openstack: labsaliases extra records move to module/profile/role

Bug: T171494
Change-Id: I702781639d524221038527f47a6606bc9f570a18
---
R hieradata/common/profile/openstack/base/pdns/recursor.yaml
M modules/profile/manifests/openstack/base/pdns/recursor/service.pp
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/common/dnsrecursor/labsaliaser.yaml 
b/hieradata/common/profile/openstack/base/pdns/recursor.yaml
similarity index 85%
rename from hieradata/common/dnsrecursor/labsaliaser.yaml
rename to hieradata/common/profile/openstack/base/pdns/recursor.yaml
index 6fc06be..812f839 100644
--- a/hieradata/common/dnsrecursor/labsaliaser.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/recursor.yaml
@@ -1,7 +1,7 @@
 # Extra records that the Labs DNS resolver should respond to.
 # Used for things that would ideally be in a .svc. DNS zone but
 # we do not have one. REMEMBER THE TRAILING DOT.
-dnsrecursor::labsaliaser::extra_records:
+profile::openstack::base::pdns::recursor::aliaser_extra_records:
   tools-db.tools.eqiad.wmflabs.: 10.64.37.9 # labsdb1005.eqiad.wmnet / tools-db
   tools-redis.tools.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
-  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
\ No newline at end of file
+  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
diff --git a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp 
b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
index d80d55c..7e66951 100644
--- a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
+++ b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
@@ -29,6 +29,7 @@
 $c1_dbs = hiera('profile::openstack::base::pdns::labsdb::c1'),
 $c2_dbs = hiera('profile::openstack::base::pdns::labsdb::c2'),
 $c3_dbs = hiera('profile::openstack::base::pdns::labsdb::c3'),
+$aliaser_extra_records = 
hiera('profile::openstack::base::pdns::recursor::aliaser_extra_records'),
 ) {
 
 include ::network::constants
@@ -79,6 +80,7 @@
 username  => $observer_user,
 password  => $observer_password,
 nova_api_url  => "http://${nova_controller}:35357/v3;,
+extra_records => $aliaser_extra_records,
 alias_file=> $alias_file,
 observer_project_name => $observer_project,
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Fix FlaggedRevision query

[jenkins-bot (Code Review)]

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

Change subject: Fix FlaggedRevision query
..


Fix FlaggedRevision query

It was missing needed join conditions.

Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
---
M backend/FlaggedRevision.php
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 0f86629..a536739 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -175,12 +175,13 @@
$frQuery['fields'],
[
'fp_page_id' => $pageId,
-   'fr_rev_id = fp_stable',
$db->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0', // sanity
],
__METHOD__,
$options,
-   $frQuery['joins']
+   [
+   'flaggedrevs' => [ 'JOIN', 'fr_rev_id = 
fp_stable' ],
+   ] + $frQuery['joins']
);
if ( $row ) {
$frev = new self( $row );
@@ -448,7 +449,7 @@
'rev_id = fr_rev_id',
'rev_page = fr_page_id', // sanity
] ],
-   ],
+   ] + $revQuery['joins'],
];
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jackmcbarn 
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] operations/puppet[production]: smokeping: enable cron to auto-rsync data

[Dzahn (Code Review)]

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

Change subject: smokeping: enable cron to auto-rsync data
..

smokeping: enable cron to auto-rsync data

With $auto_sync set to false, the rsync::quickdatacopy class
sets up rsyncd config and ferm rules to allow a human to copy data
but does not enable the additional cronjob to automatically run
the actual rsync command.

Enabling this (after we switched smokeping back to eqiad and changed
rsync direction accordingly).

Bug: T180812
Change-Id: I16fbeecbd672893e1b2f43940f1b482dcaed8486
---
M modules/role/manifests/smokeping.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/392090/1

diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index f4ad708..8413d1b 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -16,7 +16,7 @@
 
 rsync::quickdatacopy { 'var-lib-smokeping':
 ensure  => present,
-auto_sync   => false,
+auto_sync   => true,
 source_host => 'netmon2001.wikimedia.org',
 dest_host   => 'netmon1002.wikimedia.org',
 module_path => '/var/lib/smokeping',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Fix FlaggedRevision query

[Anomie (Code Review)]

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

Change subject: Fix FlaggedRevision query
..

Fix FlaggedRevision query

It was missing needed join conditions.

Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
---
M backend/FlaggedRevision.php
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 0f86629..a536739 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -175,12 +175,13 @@
$frQuery['fields'],
[
'fp_page_id' => $pageId,
-   'fr_rev_id = fp_stable',
$db->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0', // sanity
],
__METHOD__,
$options,
-   $frQuery['joins']
+   [
+   'flaggedrevs' => [ 'JOIN', 'fr_rev_id = 
fp_stable' ],
+   ] + $frQuery['joins']
);
if ( $row ) {
$frev = new self( $row );
@@ -448,7 +449,7 @@
'rev_id = fr_rev_id',
'rev_page = fr_page_id', // sanity
] ],
-   ],
+   ] + $revQuery['joins'],
];
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: labsaliases extra records move to module/profile/...

[Rush (Code Review)]

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

Change subject: openstack: labsaliases extra records move to module/profile/role
..

openstack: labsaliases extra records move to module/profile/role

Bug: T171494
Change-Id: I702781639d524221038527f47a6606bc9f570a18
---
R hieradata/common/profile/openstack/base/pdns/recursor.yaml
M modules/profile/manifests/openstack/base/pdns/recursor/service.pp
2 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/hieradata/common/dnsrecursor/labsaliaser.yaml 
b/hieradata/common/profile/openstack/base/pdns/recursor.yaml
similarity index 85%
rename from hieradata/common/dnsrecursor/labsaliaser.yaml
rename to hieradata/common/profile/openstack/base/pdns/recursor.yaml
index 6fc06be..812f839 100644
--- a/hieradata/common/dnsrecursor/labsaliaser.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/recursor.yaml
@@ -1,7 +1,7 @@
 # Extra records that the Labs DNS resolver should respond to.
 # Used for things that would ideally be in a .svc. DNS zone but
 # we do not have one. REMEMBER THE TRAILING DOT.
-dnsrecursor::labsaliaser::extra_records:
+profile::openstack::base::pdns::recursor::aliaser_extra_records:
   tools-db.tools.eqiad.wmflabs.: 10.64.37.9 # labsdb1005.eqiad.wmnet / tools-db
   tools-redis.tools.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
-  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
\ No newline at end of file
+  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
diff --git a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp 
b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
index d80d55c..7e66951 100644
--- a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
+++ b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
@@ -29,6 +29,7 @@
 $c1_dbs = hiera('profile::openstack::base::pdns::labsdb::c1'),
 $c2_dbs = hiera('profile::openstack::base::pdns::labsdb::c2'),
 $c3_dbs = hiera('profile::openstack::base::pdns::labsdb::c3'),
+$aliaser_extra_records = 
hiera('profile::openstack::base::pdns::recursor::aliaser_extra_records'),
 ) {
 
 include ::network::constants
@@ -79,6 +80,7 @@
 username  => $observer_user,
 password  => $observer_password,
 nova_api_url  => "http://${nova_controller}:35357/v3;,
+extra_records => $aliaser_extra_records,
 alias_file=> $alias_file,
 observer_project_name => $observer_project,
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I702781639d524221038527f47a6606bc9f570a18
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] mediawiki...BatchUserRights[master]: Change windows newline to unix newline

[jenkins-bot (Code Review)]

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

Change subject: Change windows newline to unix newline
..


Change windows newline to unix newline

\r\n -> \n

Removed unneeded MediaWiki.NamingConventions.ValidGlobalName property

Change-Id: I6be4cff442b5d1ba926a7152f5348b1cec44e62c
---
M .phpcs.xml
1 file changed, 15 insertions(+), 20 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index ab1462a..c33515a 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,20 +1,15 @@
-
-
-  
-
-
-
-
-
-
-
-  
-  
-
-  
-
-  
-  .
-  
-  
-
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   .
+   
+   
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6be4cff442b5d1ba926a7152f5348b1cec44e62c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BatchUserRights
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: switch backend to eqiad

[Dzahn (Code Review)]

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

Change subject: smokeping: switch backend to eqiad
..

smokeping: switch backend to eqiad

Bug: T180812
Change-Id: Icadbf3979fac61fb6afb97ce01d33fc4bc2e9c84
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/392086/1

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 7ae5f47..18d846b 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -262,7 +262,7 @@
   servermon.wikimedia.org:
 director: 'netmon1003'
   smokeping.wikimedia.org:
-director: 'netmon2001'
+director: 'netmon1002'
   static-bugzilla.wikimedia.org:
 director: 'bromine'
   stats.wikimedia.org:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...wikidiff2[master]: Add placeholder for title tags to the moved indicators

[jenkins-bot (Code Review)]

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

Change subject: Add placeholder for title tags to the moved indicators
..


Add placeholder for title tags to the moved indicators

Bug: T180602
Change-Id: I62a85e5456076a86929b14cd6fff2866505e9642
---
M TableDiff.cpp
M Wikidiff2.h
M tests/001.phpt
M tests/007.phpt
4 files changed, 14 insertions(+), 14 deletions(-)

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



diff --git a/TableDiff.cpp b/TableDiff.cpp
index 964f1c8..3914811 100644
--- a/TableDiff.cpp
+++ b/TableDiff.cpp
@@ -39,7 +39,7 @@
if (printLeft) {
result += "  ";
if(dstAnchor != "")
-   result += "";
+   result += "";
else
result += "−";
result += "\n";
@@ -56,7 +56,7 @@
if (printRight) {
result += "  ";
if(dstAnchor != "")
-   result += "";
+   result += "";
else
result += "+";
result += "\n";
diff --git a/Wikidiff2.h b/Wikidiff2.h
index 909e084..5ae1c76 100644
--- a/Wikidiff2.h
+++ b/Wikidiff2.h
@@ -16,7 +16,7 @@
 #include 
 #include 
 
-#define WIKIDIFF2_VERSION_STRING   "1.5.1"
+#define WIKIDIFF2_VERSION_STRING   "1.5.2"
 
 class Wikidiff2 {
public:
diff --git a/tests/001.phpt b/tests/001.phpt
index 716d470..96271bd 100644
--- a/tests/001.phpt
+++ b/tests/001.phpt
@@ -171,7 +171,7 @@
   a
 
 
-  
+  
   ---line---
   
 
@@ -205,7 +205,7 @@
 
 
   
-  
+  
   ---line---
 
 
@@ -237,12 +237,12 @@
   a
 
 
-  
+  
   --line1--
   
 
 
-  
+  
   --line2--
   
 
@@ -276,12 +276,12 @@
 
 
   
-  
+  
   --line1--
 
 
   
-  
+  
   --line2--
 
 
@@ -395,4 +395,4 @@
   
   
   
-
+
\ No newline at end of file
diff --git a/tests/007.phpt b/tests/007.phpt
index f37fe16..ecc8364 100644
--- a/tests/007.phpt
+++ b/tests/007.phpt
@@ -43,7 +43,7 @@
   
 
 
-  
+  
   Substance, 
in the truest and primary and 
most definite sense of the word, is that which is neither predicable of a 
subject nor present in a subject; for instance, the individual man or horse. 
But in a secondary sense those things are called substances within which, as 
species, the primary substances are included; also those which, as genera, 
include the species. For instance, the individual man is included in the 
species 'man', and the genus to which the species belongs is 'animal'; these, 
therefore—that is to say, the species 'man' and the genus 'animal,-are termed 
secondary substances.
   
 
@@ -65,7 +65,7 @@
 
 
   
-  
+  
   Everything 
except primary substances is either predicable of a primary substance or 
present in a primary substance. This becomes evident by reference to particular 
instances which occur. 'Animal' is predicated of the species 'man', therefore 
of the individual man, for if there were no individual man of whom it could be 
predicated, it could not be predicated of the species 'man' at all. Again, 
colour is present in body, therefore in individual bodies, for if there were no 
individual body in which it was present, it could not be present in body at 
all. Thus everything except primary substances is either predicated of primary 
substances, or is present in them, and if these last did not exist, it would be 
impossible for anything else to exist. Never underestimate lawns.
 
 
@@ -86,7 +86,7 @@
   
 
 
-  
+  
   Everything 
except primary substances is either predicable of a primary substance or 
present in a primary substance. This becomes evident by reference to particular 
instances which occur. 'Animal' is predicated of the species 'man', therefore 
of the individual man, for if there were no individual man of whom it could be 
predicated, it could not be predicated of the species 'man' at all. Again, 
colour is present in body, therefore in individual bodies, for if there were no 
individual body in which it was present, it could not be present in body at 
all. Thus everything except primary substances is either predicated of primary 
substances, or is present in them, and if these last did not exist, it would be 
impossible for anything else to exist.
   
 
@@ -109,6 +109,6 @@
 
 
   
-  
+  
   Substance, 
in the truest and most definite sense of the word, is that which is neither 
predicable of a subject nor present in a subject; for instance, the individual 
man or horse. But in a secondary sense those things are called substances 
within which, as species, the primary substances are included; also those 
which, as genera, include the species. For instance, the individual man is 
included in the species 'man', and the genus to which the species belongs is 
'animal'; these, therefore—that is to say, the 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revision::userCanBitfield test fallback to $wgUser

[jenkins-bot (Code Review)]

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

Change subject: Revision::userCanBitfield test fallback to $wgUser
..


Revision::userCanBitfield test fallback to $wgUser

Bug: T180210
Change-Id: Ibda256d6fdd8762e0e90748d71034979e2de106f
---
M tests/phpunit/includes/RevisionDbTestBase.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/RevisionDbTestBase.php 
b/tests/phpunit/includes/RevisionDbTestBase.php
index 2fdf590..20e69ae 100644
--- a/tests/phpunit/includes/RevisionDbTestBase.php
+++ b/tests/phpunit/includes/RevisionDbTestBase.php
@@ -1326,6 +1326,16 @@
$expected,
Revision::userCanBitfield( $bitField, $field, $user, 
$title )
);
+
+   // Fallback to $wgUser
+   $this->setMwGlobals(
+   'wgUser',
+   $user
+   );
+   $this->assertSame(
+   $expected,
+   Revision::userCanBitfield( $bitField, $field, null, 
$title )
+   );
}
 
public function provideUserCan() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibda256d6fdd8762e0e90748d71034979e2de106f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: set up directory for misc cron dumps on dumpsdata, move firs...

[ArielGlenn (Code Review)]

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

Change subject: set up directory for misc cron dumps on dumpsdata, move first 
cron job
..

set up directory for misc cron dumps on dumpsdata, move first cron job

We can use a different layout now since this host is internal.

Xml/sql dumps live under (mntpoint)/xmldatadumps/{public,private}
all the rest go under (mntpoint)/otherdumps/{public,private}

First cron job to be moved is an easy one, dump_global_blocks.

Bug: T179942
Change-Id: Ia30c4abb81beb7ea1bb90965a20d7f31565ba725
---
M modules/dumps/manifests/generation/server/dirs.pp
M modules/snapshot/files/cron/dump-global-blocks.sh
M modules/snapshot/manifests/cron/dump_global_blocks.pp
M modules/snapshot/manifests/dumps/dirs.pp
4 files changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/modules/dumps/manifests/generation/server/dirs.pp 
b/modules/dumps/manifests/generation/server/dirs.pp
index dfbb315..17d7ae5 100644
--- a/modules/dumps/manifests/generation/server/dirs.pp
+++ b/modules/dumps/manifests/generation/server/dirs.pp
@@ -7,7 +7,7 @@
 # directories with incoming rsyncs of datasets
 $datadir  = '/data/xmldatadumps'
 $publicdir= '/data/xmldatadumps/public'
-$otherdir = '/data/other'
+$otherdir = '/data/otherdumps'
 $cirrussearchdir  = "${otherdir}/cirrussearch"
 $xlationdir   = "${otherdir}/contenttranslation"
 $globalblocksdir  = "${otherdir}/globalblocks"
diff --git a/modules/snapshot/files/cron/dump-global-blocks.sh 
b/modules/snapshot/files/cron/dump-global-blocks.sh
index e7e4825..90f80ea 100644
--- a/modules/snapshot/files/cron/dump-global-blocks.sh
+++ b/modules/snapshot/files/cron/dump-global-blocks.sh
@@ -108,7 +108,7 @@
 checkval "$settingname" "${!settingname}"
 done
 
-outputdir="${otherdir}/globalblocks"
+outputdir="${cronsdir}/globalblocks"
 
 host=`get_db_host "$apachedir"` || exit 1
 db_user=`get_db_user "$apachedir"` || exit 1
diff --git a/modules/snapshot/manifests/cron/dump_global_blocks.pp 
b/modules/snapshot/manifests/cron/dump_global_blocks.pp
index 6c8f2f3..71315af 100644
--- a/modules/snapshot/manifests/cron/dump_global_blocks.pp
+++ b/modules/snapshot/manifests/cron/dump_global_blocks.pp
@@ -2,7 +2,8 @@
 $user   = undef,
 ) {
 $confsdir = $snapshot::dumps::dirs::confsdir
-$otherdir = $snapshot::dumps::dirs::otherdir
+# $otherdir = $snapshot::dumps::dirs::otherdir
+$otherdir = $snapshot::dumps::dirs::cronsdir
 $globalblocksdir = "${otherdir}/globalblocks"
 
 file { '/usr/local/bin/dump-global-blocks.sh':
diff --git a/modules/snapshot/manifests/dumps/dirs.pp 
b/modules/snapshot/manifests/dumps/dirs.pp
index 01736b3..d54bd13 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -14,6 +14,7 @@
 
 $miscdumpsdir = "${miscdumpsmount}/xmldatadumps"
 $xmldumpsdir = "${xmldumpsmount}/xmldatadumps"
+$cronsdir = "${xmldumpsmount}/otherdumps"
 
 $apachedir = '/srv/mediawiki'
 $confsdir = "${dumpsdir}/confs"

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOT...

[jenkins-bot (Code Review)]

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

Change subject: Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH 
on Beta Cluster
..


Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH on Beta Cluster

The schema change has long since been automatically deployed there.
Let's start using it to see if stuff breaks.

Bug: T166733
Change-Id: If37b6102c2c455830bea599d090dc54a9bd2d925
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index b22786b..09f7dd0 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -695,5 +695,9 @@
'-wmgCirrusSearchMLRModel' => [
'default' => '20171023_enwiki_v1'
],
+
+   'wgCommentTableSchemaMigrationStage' => [
+   'default' => MIGRATION_WRITE_BOTH,
+   ],
];
 } # wmflLabsSettings()
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7d0486c..dd734f2 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19749,6 +19749,10 @@
'group0' => true,
 ],
 
+'wgCommentTableSchemaMigrationStage' => [
+   'default' => MIGRATION_OLD,
+],
+
 ];
 
 ### WMF Labs override #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If37b6102c2c455830bea599d090dc54a9bd2d925
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: switch data rsync direction

[Dzahn (Code Review)]

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

Change subject: smokeping: switch data rsync direction
..

smokeping: switch data rsync direction

Bug: T180812
Change-Id: I09ead68e3d7ba81546f6ba41e2ae70a97e363c4e
---
M modules/role/manifests/smokeping.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/smokeping.pp 
b/modules/role/manifests/smokeping.pp
index 3b222fb..f4ad708 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -17,8 +17,8 @@
 rsync::quickdatacopy { 'var-lib-smokeping':
 ensure  => present,
 auto_sync   => false,
-source_host => 'netmon1002.wikimedia.org',
-dest_host   => 'netmon2001.wikimedia.org',
+source_host => 'netmon2001.wikimedia.org',
+dest_host   => 'netmon1002.wikimedia.org',
 module_path => '/var/lib/smokeping',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Enable logstash for gerrit

[Paladox (Code Review)]

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

Change subject: Gerrit: Enable logstash for gerrit
..

Gerrit: Enable logstash for gerrit

Bug: T141324
Change-Id: Ia096be493581da18243c28c4dbe14b16d65b4885
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/392083/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia096be493581da18243c28c4dbe14b16d65b4885
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] mediawiki...UserMerge[master]: Standardize with other MediaWiki log messages

[jenkins-bot (Code Review)]

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

Change subject: Standardize with other MediaWiki log messages
..


Standardize with other MediaWiki log messages

Also remove {{GENDER:}} since the account no longer exists, trying to
look up the gender won't work.

Bug: T177013
Change-Id: I99208c1cf3ba724db53430efbb7639d84fd0fb4d
---
M i18n/en.json
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Matěj Suchánek: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 87affa0..f764d74 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,17 +15,17 @@
"usermerge-deleteolduser": "Delete old user",
"usermerge-submit": "Merge user",
"usermerge-badtoken": "Invalid edit token.",
-   "usermerge-userdeleted": "{{GENDER:$1|$1}} ($2) has been deleted.",
-   "usermerge-userdeleted-log": "Deleted user: $2 ($3)",
-   "usermerge-success": "Merge from {{GENDER:$1|$1}} ($2) to 
{{GENDER:$3|$3}} ($4) is complete.",
-   "usermerge-success-log": "User {{GENDER:$2|$2}} ($3) merged to 
{{GENDER:$4|$4}} ($5)",
+   "usermerge-userdeleted": "$1 ($2) has been deleted.",
+   "usermerge-userdeleted-log": "deleted the user account \"$2\" ($3)",
+   "usermerge-success": "Merge from $1 ($2) to $3 ($4) is complete.",
+   "usermerge-success-log": "merged the account \"$2\" ($3) into 
\"[[User:$4|$4]]\" ($5)",
"usermerge-logpage": "User merge log",
"usermerge-logpagetext": "This is a log of user merge actions.",
"usermerge-noselfdelete": "You cannot delete or merge from 
{{GENDER:$1|yourself}}!",
-   "usermerge-protectedgroup": "Unable to merge from {{GENDER:$1|user}}: 
User is in a protected group.",
+   "usermerge-protectedgroup": "Unable to merge from {{GENDER:$1|user}}: 
user is in a protected group.",
"right-usermerge": "Merge users",
"action-usermerge": "merge users",
-   "usermerge-autopagedelete": "Automatically deleted when merging users",
+   "usermerge-autopagedelete": "Automatically deleted page while merging 
users",
"usermerge-page-unmoved": "The page $1 could not be moved to $2.",
-   "usermerge-move-log": "Automatically moved page while merging the user 
\"[[User:$1|$1]]\" to \"[[User:$2|{{GENDER:$2|$2}}]]\""
+   "usermerge-move-log": "Automatically moved page while merging the 
account \"$1\" to \"[[User:$2|$2]]\""
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99208c1cf3ba724db53430efbb7639d84fd0fb4d
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Matěj Suchánek 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOT...

[Anomie (Code Review)]

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

Change subject: Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH 
on Beta Cluster
..

Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH on Beta Cluster

The schema change has long since been automatically deployed there.
Let's start using it to see if stuff breaks.

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


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 633e84d..079eb2e 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -60,6 +60,9 @@
'proxies.dnsbl.sorbs.net.',
 ];
 
+# Test comment table schema before deploying it to production
+$wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH;
+
 if ( $wmgUseFlow ) {
// Override CommonSettings.php, which has:
// $wgFlowExternalStore = $wgDefaultExternalStore;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Add mirandese (mwl) translations

[jenkins-bot (Code Review)]

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

Change subject: Add mirandese (mwl) translations
..


Add mirandese (mwl) translations

Provided by User:Athena in Wonderland.

Bug: T180052
Change-Id: I422926ee1f13621a78c26f20f04fb07cc63c
---
M Gadgets.namespaces.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/Gadgets.namespaces.php b/Gadgets.namespaces.php
index 16148f8..899d736 100644
--- a/Gadgets.namespaces.php
+++ b/Gadgets.namespaces.php
@@ -177,6 +177,13 @@
NS_GADGET_DEFINITION_TALK => 'چأک_چئنە_توضییا_گأجئت',
 ];
 
+$namespaceNames['mwl'] = [
+   NS_GADGET => 'Gadget',
+   NS_GADGET_TALK => 'Cumbersa_gadget',
+   NS_GADGET_DEFINITION => 'Defeniçon_gadget',
+   NS_GADGET_DEFINITION_TALK => 'Cumbersa_defeniçon_gadget',
+];
+
 $namespaceNames['mzn'] = [
NS_GADGET => 'گجت',
NS_GADGET_TALK => 'گجت_گپ',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I422926ee1f13621a78c26f20f04fb07cc63c
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Document Firefox 57 whitespace hack

[jenkins-bot (Code Review)]

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

Change subject: Document Firefox 57 whitespace hack
..


Document Firefox 57 whitespace hack

Change-Id: Ifd0ca3d824f8111cf369438b886f2af4f8ec0adf
---
M src/themes/wikimediaui/widgets.less
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/src/themes/wikimediaui/widgets.less 
b/src/themes/wikimediaui/widgets.less
index 8b66cb7..5a2caea 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -677,6 +677,8 @@
 
// Add custom dropdown arrow
// Support: Everything besides IE 6-8
+   // Support: Firefox 57 - it can't parse `rule[ attr ]` and the 
LESS compiler doesn't
+   // strip whitespace inside the :not() (T180138)
&:not( [no-ie] ) { // stylelint-disable-line 
selector-attribute-brackets-space-inside
background-position: right 1.75em center;
width: e( 'calc( 100% + 1em )' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd0ca3d824f8111cf369438b886f2af4f8ec0adf
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: mw.MediaWikiPlayerSupport: Fix more jQuery 3 deprecation war...

[jenkins-bot (Code Review)]

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

Change subject: mw.MediaWikiPlayerSupport: Fix more jQuery 3 deprecation 
warnings
..


mw.MediaWikiPlayerSupport: Fix more jQuery 3 deprecation warnings

Bug: T169385
Change-Id: I241d1e3e3f400e812d10507b6b6aee7f9c4a1e7c
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
M MwEmbedModules/TimedText/resources/mw.TimedText.js
M resources/mw.MediaWikiPlayerSupport.js
3 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
index ff47568..0b6871a 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
@@ -745,7 +745,7 @@
}
// Set up the new embedObj
mw.log( 'EmbedPlayer::updatePlaybackInterface: 
embedding with ' + this.selectedPlayer.library );
-   this.selectedPlayer.load( function() {
+   this.selectedPlayer.on('load', function() {
_this.updateLoadedPlayerInterface( callback );
});
},
@@ -1651,7 +1651,7 @@
// Poster support is not very consistent in 
browsers use a jpg poster image:
$( this )
.html(
-   $( '' )
+   $( '' )
.css({
'position': 'absolute',
'top': 0,
@@ -1663,7 +1663,7 @@
'src' : posterSrc
})
.addClass( 'playerPoster' )
-   .load(function(){
+   .on('load', function(){
_this.applyIntrinsicAspect();
})
).show();
diff --git a/MwEmbedModules/TimedText/resources/mw.TimedText.js 
b/MwEmbedModules/TimedText/resources/mw.TimedText.js
index 023dfc7..80cd936 100644
--- a/MwEmbedModules/TimedText/resources/mw.TimedText.js
+++ b/MwEmbedModules/TimedText/resources/mw.TimedText.js
@@ -136,7 +136,7 @@
},
destroy: function(){
// remove any old player bindings;
-   $( this.embedPlayer ).unbind( this.bindPostFix );
+   $( this.embedPlayer ).off( this.bindPostFix );
// Clear out enabled sources:
this.enabledSources = [];
// Clear out text sources:
@@ -242,7 +242,7 @@
}
var $textButton = 
embedPlayer.getInterface().find( '.timed-text' );
if ( $textButton.length ) {
-   $textButton.unbind( 'click' );
+   $textButton.off( 'click' );
}
_this.lastLayout = _this.getLayoutMode();
_this.setLayoutMode( 'off' );
diff --git a/resources/mw.MediaWikiPlayerSupport.js 
b/resources/mw.MediaWikiPlayerSupport.js
index a382d62..f57eece 100644
--- a/resources/mw.MediaWikiPlayerSupport.js
+++ b/resources/mw.MediaWikiPlayerSupport.js
@@ -11,7 +11,7 @@
} );
 
// Add mediaWiki player support to target embedPlayer
-   $( mw ).bind( 'EmbedPlayerNewPlayer', function ( event, embedPlayer ) {
+   $( mw ).on( 'EmbedPlayerNewPlayer', function ( event, embedPlayer ) {
mw.addMediaWikiPlayerSupport( embedPlayer );
} );
 
@@ -250,7 +250,7 @@
} );
 
// Show credits on clip complete:
-   $( embedPlayer ).bind( 'onEndedDone', function ( event, id ) {
+   $( embedPlayer ).on( 'onEndedDone', function ( event, id ) {
var cb;
if ( embedPlayer.id !== id ) {
// possible event trigger error. ( skip )
@@ -268,7 +268,7 @@
cb.showMenuItem( 'credits' );
} );
 
-   $( embedPlayer ).bind( 'showInlineDownloadLink', function () {
+   $( embedPlayer ).on( 'showInlineDownloadLink', function () {
// Add recommend HTML5 player if we have non-native 
playback:
if ( embedPlayer.controlBuilder.checkNativeWarning() ) {

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Set blocker in unit tests

[jenkins-bot (Code Review)]

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

Change subject: Set blocker in unit tests
..


Set blocker in unit tests

MediaWiki core is going to start rejecting blocks without a valid
blocker, so make sure one is supplied.

Change-Id: I9293fd6e0f958d87e52965de925046f1bb8f8a50
---
M tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php 
b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
index 2bfb688..84b12d0 100644
--- a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
+++ b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
@@ -89,6 +89,7 @@
$blockedUser = $this->blockedUser();
$this->block = new Block( [
'address' => $blockedUser->getName(),
+   'by' => $this->getTestSysop()->getUser()->getId(),
'user' => $blockedUser->getID()
] );
$this->block->insert();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9293fd6e0f958d87e52965de925046f1bb8f8a50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Anomie 
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] mediawiki...DeleteBatch[master]: Convert DeleteBatch to use extension registration

[MarcoAurelio (Code Review)]

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

Change subject: Convert DeleteBatch to use extension registration
..

Convert DeleteBatch to use extension registration

Bug: T180818
Change-Id: Ibca3f2d3bbb4c9b6128a26ed6c95f50c1ea310f0
---
M DeleteBatch.php
A extension.json
2 files changed, 52 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DeleteBatch 
refs/changes/81/392081/1

diff --git a/DeleteBatch.php b/DeleteBatch.php
index 5c3a84b..e5dae19 100644
--- a/DeleteBatch.php
+++ b/DeleteBatch.php
@@ -9,35 +9,17 @@
  * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  * @link https://www.mediawiki.org/wiki/Extension:DeleteBatch Documentation
  */
-
-// Ensure that the script cannot be executed outside of MediaWiki.
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( 'This is an extension to MediaWiki and cannot be run standalone.' 
);
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'DeleteBatch' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['DeleteBatch'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['DeleteBatchAlias'] = __DIR__ . 
'/DeleteBatch.alias.php';
+   wfWarn(
+   'Deprecated PHP entry point used for the DeleteBatch extension. 
' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the DeleteBatch extension requires MediaWiki 
1.29+' );
 }
-// Extension credits that will show up on Special:version
-$wgExtensionCredits['specialpage'][] = array(
-   'path' => __FILE__,
-   'name' => 'Delete Batch',
-   'version' => '1.6.0',
-   'author' => array(
-   'Bartek Łapiński',
-   '...'
-   ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:DeleteBatch',
-   'descriptionmsg' => 'deletebatch-desc',
-   'license-name' => 'GPL-2.0+'
-);
-
-// New user right, required to use Special:DeleteBatch
-$wgAvailableRights[] = 'deletebatch';
-$wgGroupPermissions['bureaucrat']['deletebatch'] = true;
-
-// Set up the new special page
-$wgMessagesDirs['DeleteBatch'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DeleteBatchAlias'] = __DIR__ . 
'/DeleteBatch.alias.php';
-$wgAutoloadClasses['SpecialDeleteBatch'] = __DIR__ . '/DeleteBatch.body.php';
-$wgAutoloadClasses['DeleteBatchForm'] = __DIR__ . '/DeleteBatch.body.php';
-$wgSpecialPages['DeleteBatch'] = 'SpecialDeleteBatch';
-
-// Hooks
-$wgHooks['AdminLinks'][] = 'SpecialDeleteBatch::addToAdminLinks'; // Admin 
Links extension
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..ef40cc8
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,39 @@
+{
+   "name": "Delete Batch",
+   "version": "1.6.0",
+   "author": [
+   "Bartek Łapiński",
+   "..."
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:DeleteBatch;,
+   "descriptionmsg": "deletebatch-desc",
+   "license-name": "GPL-2.0+",
+   "type": "specialpage",
+   "AvailableRights": [
+   "deletebatch"
+   ],
+   "GroupPermissions": {
+   "bureaucrat": {
+   "deletebatch": true
+   }
+   },
+   "SpecialPages": {
+   "DeleteBatch": "SpecialDeleteBatch"
+   },
+   "MessagesDirs": {
+   "DeleteBatch": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "DeleteBatchAlias": "DeleteBatch.alias.php"
+   },
+   "AutoloadClasses": {
+   "SpecialDeleteBatch": "DeleteBatch.body.php",
+   "DeleteBatchForm": "DeleteBatch.body.php"
+   },
+   "Hooks": {
+   "AdminLinks": "SpecialDeleteBatch::addToAdminLinks"
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibca3f2d3bbb4c9b6128a26ed6c95f50c1ea310f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DeleteBatch
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Work around Firefox 57 attribute parsing regression

[jenkins-bot (Code Review)]

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

Change subject: Work around Firefox 57 attribute parsing regression
..


Work around Firefox 57 attribute parsing regression

Bug: T180138
Change-Id: I554d5adf88c448db64e6f135e19ee76a4ec28493
---
M resources/src/mediawiki.skinning/elements.css
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.skinning/elements.css 
b/resources/src/mediawiki.skinning/elements.css
index 3599f34..58fd500 100644
--- a/resources/src/mediawiki.skinning/elements.css
+++ b/resources/src/mediawiki.skinning/elements.css
@@ -13,7 +13,9 @@
background: none;
 }
 
-a:not( [ href ] ) {
+/* Support: Firefox 57 - it can't parse `rule[ attr ]` and the LESS compiler 
doesn't */
+/* strip whitespace inside the :not() (T180138) */
+a:not( [href] ) { /* stylelint-disable-line 
selector-attribute-brackets-space-inside */
cursor: pointer; /* Always cursor:pointer even without href */
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I554d5adf88c448db64e6f135e19ee76a4ec28493
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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