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

[Marostegui (Code Review)]

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

Change subject: db-codfw.php: Depool db2060
..

db-codfw.php: Depool db2060

db2060 needs its controller replaced on Monday, so depooling it.
Add db2067 to temporary serve API traffic

Bug: T156161
Change-Id: I36f8c62616b362341113d8a6fc1711780c0e05ec
---
M wmf-config/db-codfw.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 2438b76..20ffe16 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -139,8 +139,8 @@
'db2039' => 50,  # C6 2.9TB 160GB, rc, log
'db2046' => 400, # C6 2.9TB 160GB
'db2053' => 100, # D6 2.9TB 160GB, dump (inactive), vslow
-   'db2060' => 100, # D6 3.3TB 160GB, api
-   'db2067' => 400, # D6 3.3TB 160GB
+#  'db2060' => 100, # D6 3.3TB 160GB, api #T156161
+   'db2067' => 200, # D6 3.3TB 160GB, api #Temporary api #T156161
],
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
@@ -381,7 +381,7 @@
'db2053' => 1,
],
'api' => [
-   'db2060' => 1,
+   'db2067' => 1,
],
],
's7' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Removing non-sensical line.

[Harej (Code Review)]

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

Change subject: Removing non-sensical line.
..

Removing non-sensical line.

Change-Id: Id082bdd416bb8f7ec6bfd4f582c7f520528d17a5
---
M includes/content/CollaborationHubTOC.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/includes/content/CollaborationHubTOC.php 
b/includes/content/CollaborationHubTOC.php
index 20dde3a..5bc8606 100644
--- a/includes/content/CollaborationHubTOC.php
+++ b/includes/content/CollaborationHubTOC.php
@@ -16,7 +16,6 @@
$linkCounter = 1;
while ( in_array( $link2, $this->tocLinks ) ) {
$link2 = $link . '_' . $linkCounter;
-   $spPageLinkCounter++;
}
$this->tocLinks[] = $link2;
return $link2;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id082bdd416bb8f7ec6bfd4f582c7f520528d17a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Make some unit tests voting

[Umherirrender (Code Review)]

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

Change subject: Make some unit tests voting
..

Make some unit tests voting

* BlueSpiceEditNotifyConnector:
I4ea31fa87ff08eb5829c02f26e40458133f06f73
* OOUIPlayground: I6e9be1de916e9f732e4dfd8a875c8363b6b7bbad
* WindowsAzureSDK: I78c095a50b9394899b45153f7928f11d639bd7ce

Change-Id: Iff8a86bf201167d6cb5cf34349d70632c62da661
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/78/335978/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a2ad808..976d9f7 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4787,7 +4787,7 @@
 
   - name: mediawiki/extensions/BlueSpiceEditNotifyConnector
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: npm
 check:
   - jsonlint
@@ -7380,7 +7380,7 @@
 
   - name: mediawiki/extensions/WindowsAzureSDK
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: npm
 
   - name: mediawiki/extensions/WindowsAzureStorage
@@ -7584,11 +7584,9 @@
  - name: extension-unittests-generic
  - name: jsonlint
 
-  # File not found
-  # /OOUIPlayground/vendor/autoload.php
   - name: mediawiki/extensions/OOUIPlayground
 template:
- - name: extension-unittests-non-voting
+ - name: extension-unittests-generic
 
   - name: mediawiki/extensions/OOJsUIAjaxLogin
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff8a86bf201167d6cb5cf34349d70632c62da661
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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/TransparencyReport-private[master]: Get images from current repo

[Siddparmar (Code Review)]

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

Change subject: Get images from current repo
..


Get images from current repo

Change-Id: I9b40675930cc37df30bb942980d0af6d490a9ee0
---
M build/content.html
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/index.html
M build/fr/privacy.html
M build/fr/stories.html
M build/index.html
M build/privacy.html
M build/stories.html
M source/layouts/layout.erb
M source/localizable/faq.html.erb
M source/localizable/index.html.erb
M source/localizable/privacy.html.erb
M source/localizable/stories.html.erb
15 files changed, 79 insertions(+), 79 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b40675930cc37df30bb942980d0af6d490a9ee0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Siddparmar 
Gerrit-Reviewer: Siddparmar 

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

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Get images from current repo

[Siddparmar (Code Review)]

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

Change subject: Get images from current repo
..

Get images from current repo

Change-Id: I9b40675930cc37df30bb942980d0af6d490a9ee0
---
M build/content.html
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/index.html
M build/fr/privacy.html
M build/fr/stories.html
M build/index.html
M build/privacy.html
M build/stories.html
M source/layouts/layout.erb
M source/localizable/faq.html.erb
M source/localizable/index.html.erb
M source/localizable/privacy.html.erb
M source/localizable/stories.html.erb
15 files changed, 79 insertions(+), 79 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private 
refs/changes/77/335977/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b40675930cc37df30bb942980d0af6d490a9ee0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Siddparmar 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Fixing special page time-out

[Kaldari (Code Review)]

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

Change subject: Fixing special page time-out
..

Fixing special page time-out

Bug: T156198
Change-Id: I28c3bb5b64ff4a91a3dd998daea7857959c780a3
---
M src/SpecialPage.php
1 file changed, 5 insertions(+), 10 deletions(-)


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

diff --git a/src/SpecialPage.php b/src/SpecialPage.php
index 30c18e5..46207ae 100644
--- a/src/SpecialPage.php
+++ b/src/SpecialPage.php
@@ -261,20 +261,15 @@
protected function getForm() {
$this->getOutput()->addModules( 'ext.pageassessments.special' );
 
-   // Add a list of all currently-used projects to the page's JS.
-   $projects = wfGetDB( DB_SLAVE )->select(
-   [ 'page_assessments_projects', 'page_assessments' ],
+   // Add a list of all projects to the page's JS.
+   $projects = wfGetDB( DB_SLAVE )->selectFieldValues(
+   [ 'page_assessments_projects' ],
'pap_project_title',
'',
__METHOD__,
-   [ 'ORDER BY' => 'pap_project_title' ],
-   [ 'page_assessments_projects' => [ 'JOIN', 
'pa_project_id = pap_project_id' ] ]
+   [ 'ORDER BY' => 'pap_project_title' ]
);
-   $projectOptions = [];
-   foreach ( $projects as $project ) {
-   $projectOptions[] = $project->pap_project_title;
-   }
-   $this->getOutput()->addJsConfigVars( 
'wgPageAssessmentProjects', $projectOptions );
+   $this->getOutput()->addJsConfigVars( 
'wgPageAssessmentProjects', $projects );
 
// Define the form fields.
$formDescriptor = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28c3bb5b64ff4a91a3dd998daea7857959c780a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
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] operations/puppet[production]: tools: Update infrastructure message to match reality

[Yuvipanda (Code Review)]

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

Change subject: tools: Update infrastructure message to match reality
..


tools: Update infrastructure message to match reality

Change-Id: Ia0b7e27b8eb3c71f615dd56c0e9cb605aa3785ca
---
M modules/toollabs/files/40-tools-infrastructure-banner.sh
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/40-tools-infrastructure-banner.sh 
b/modules/toollabs/files/40-tools-infrastructure-banner.sh
index c00e6f8..82c0d78 100644
--- a/modules/toollabs/files/40-tools-infrastructure-banner.sh
+++ b/modules/toollabs/files/40-tools-infrastructure-banner.sh
@@ -10,7 +10,8 @@
 / ! \
/_\ "No user-serviceable parts inside."
 
-   *** This is a stable server ***
+   *** This is supposed to be a stable server ***
+   *** Laugh or cry as appropriate ***
 
 EOF
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Update infrastructure message to match reality

[Yuvipanda (Code Review)]

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

Change subject: tools: Update infrastructure message to match reality
..

tools: Update infrastructure message to match reality

Change-Id: Ia0b7e27b8eb3c71f615dd56c0e9cb605aa3785ca
---
M modules/toollabs/files/40-tools-infrastructure-banner.sh
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/335975/1

diff --git a/modules/toollabs/files/40-tools-infrastructure-banner.sh 
b/modules/toollabs/files/40-tools-infrastructure-banner.sh
index c00e6f8..82c0d78 100644
--- a/modules/toollabs/files/40-tools-infrastructure-banner.sh
+++ b/modules/toollabs/files/40-tools-infrastructure-banner.sh
@@ -10,7 +10,8 @@
 / ! \
/_\ "No user-serviceable parts inside."
 
-   *** This is a stable server ***
+   *** This is supposed to be a stable server ***
+   *** Laugh or cry as appropriate ***
 
 EOF
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Remove unused docker related files

[Yuvipanda (Code Review)]

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

Change subject: tools: Remove unused docker related files
..

tools: Remove unused docker related files

Change-Id: I671443bd950602e73c3e495385eabd6c31bfe2f6
---
D modules/docker/files/docker.gpg
D modules/docker/files/setup-docker
D modules/k8s/manifests/docker.pp
D modules/k8s/templates/initscripts/docker.systemd.erb
4 files changed, 0 insertions(+), 65 deletions(-)


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

diff --git a/modules/docker/files/docker.gpg b/modules/docker/files/docker.gpg
deleted file mode 100644
index a81f586..000
--- a/modules/docker/files/docker.gpg
+++ /dev/null
Binary files differ
diff --git a/modules/docker/files/setup-docker 
b/modules/docker/files/setup-docker
deleted file mode 100644
index caf828b..000
--- a/modules/docker/files/setup-docker
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o nounset
-VERSION="$1"
-
-# If the default vd lvm group that labs_Lvm sets up still exists
-# remove it, since we will set up our own
-if vgdisplay vd; then
-vgremove --force vd
-fi
-
-# Create a docker vg, then create individual volumes in there
-vgcreate docker /dev/vda4
-
-lvcreate --wipesignatures y -n data docker -l 95%VG
-lvcreate --wipesignatures y -n metadata docker -l 5%VG
-
-# Run an apt-get update to make sure we have the docker repo
-apt-get update
-
-# Install a particular version of docker engine, but do not start it!
-RUNLEVEL=1 apt-get install --yes docker-engine=${VERSION}
-
-# Clean out the current /var/lib/docker for good measure, to prevent
-# any remnants of the loopback config from staying on
-rm -rf /var/lib/docker
\ No newline at end of file
diff --git a/modules/k8s/manifests/docker.pp b/modules/k8s/manifests/docker.pp
deleted file mode 100644
index f21bfa8..000
--- a/modules/k8s/manifests/docker.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# = Class: k8s::docker
-#
-# Sets up docker as used by kubernetes
-class k8s::docker {
-class { '::docker::engine':
-declare_service => false,
-}
-
-base::service_unit { 'docker':
-systemd   => true,
-subscribe => Class['::docker::engine'],
-}
-}
diff --git a/modules/k8s/templates/initscripts/docker.systemd.erb 
b/modules/k8s/templates/initscripts/docker.systemd.erb
deleted file mode 100644
index c27972c..000
--- a/modules/k8s/templates/initscripts/docker.systemd.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is managed by puppet
-[Unit]
-Description=Docker Application Container Engine (with flannel support)
-Documentation=http://docs.docker.com
-After=network.target docker.socket flannel.service
-Requires=docker.socket flannel.service
-
-[Service]
-EnvironmentFile=-/etc/default/docker
-EnvironmentFile=/run/flannel/subnet.env
-ExecStart=/usr/bin/docker daemon -H fd:// \
---bip=${FLANNEL_SUBNET} \
---mtu=${FLANNEL_MTU} \
---iptables=false \
---ip-masq=false \
---storage-opt dm.datadev=/dev/docker/data \
---storage-opt dm.metadatadev=/dev/docker/metadata
-MountFlags=slave
-LimitNOFILE=1048576
-LimitNPROC=1048576
-LimitCORE=infinity
-TimeoutStartSec=0
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use EntityIdComposer instead EntityId::newFromNumber in repo

[Ladsgroup (Code Review)]

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

Change subject: Use EntityIdComposer instead EntityId::newFromNumber in repo
..

Use EntityIdComposer instead EntityId::newFromNumber in repo

Bug: T151578
Change-Id: Ibd22680d260a20c567d7ca4f5b0cf5ee9054b6a3
---
M repo/includes/Store/Sql/ChangesSubscriptionTableBuilder.php
M repo/includes/Store/Sql/DatabaseSchemaUpdater.php
M repo/includes/Store/Sql/PropertyInfoTableBuilder.php
M repo/includes/Store/Sql/SqlSiteLinkConflictLookup.php
M repo/maintenance/populateChangesSubscription.php
M repo/maintenance/rebuildPropertyInfo.php
M repo/tests/phpunit/includes/Store/Sql/ChangesSubscriptionTableBuilderTest.php
M repo/tests/phpunit/includes/Store/Sql/PropertyInfoTableBuilderTest.php
8 files changed, 57 insertions(+), 14 deletions(-)


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

diff --git a/repo/includes/Store/Sql/ChangesSubscriptionTableBuilder.php 
b/repo/includes/Store/Sql/ChangesSubscriptionTableBuilder.php
index f7ecd65..68a3edc 100644
--- a/repo/includes/Store/Sql/ChangesSubscriptionTableBuilder.php
+++ b/repo/includes/Store/Sql/ChangesSubscriptionTableBuilder.php
@@ -7,10 +7,12 @@
 use LoadBalancer;
 use ResultWrapper;
 use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\Lib\EntityIdComposer;
 use Wikibase\Lib\Reporting\ExceptionHandler;
 use Wikibase\Lib\Reporting\LogWarningExceptionHandler;
 use Wikibase\Lib\Reporting\MessageReporter;
 use Wikibase\Lib\Reporting\NullMessageReporter;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * Implements initial population (priming) for the wb_changes_subscription 
table,
@@ -48,10 +50,16 @@
private $verbosity;
 
/**
+* @var EntityIdComposer
+*/
+   private $entityIdComposer;
+
+   /**
 * @param LoadBalancer $loadBalancer
 * @param string $tableName
 * @param int $batchSize
 * @param string $verbosity Either 'standard' or 'verbose'
+* @param EntityIdComposer $entityIdComposer
 *
 * @throws InvalidArgumentException
 */
@@ -59,7 +67,8 @@
LoadBalancer $loadBalancer,
$tableName,
$batchSize,
-   $verbosity = 'standard'
+   $verbosity = 'standard',
+   EntityIdComposer $entityIdComposer
) {
if ( !is_string( $tableName ) ) {
throw new InvalidArgumentException( '$tableName must be 
a string' );
@@ -81,6 +90,8 @@
 
$this->exceptionHandler = new LogWarningExceptionHandler();
$this->progressReporter = new NullMessageReporter();
+
+   $this->entityIdComposer = $entityIdComposer;
}
 
/**
@@ -229,7 +240,9 @@
foreach ( $res as $row ) {
if ( $row->ips_item_id != $currentItemId ) {
$currentItemId = $row->ips_item_id;
-   $itemId = ItemId::newFromNumber( $currentItemId 
)->getSerialization();
+   $itemId = $this->entityIdComposer
+   ->composeEntityId( '', 'item', 
$currentItemId )
+   ->getSerialization();
}
 
$subscriptionsPerItem[$itemId][] = $row->ips_site_id;
diff --git a/repo/includes/Store/Sql/DatabaseSchemaUpdater.php 
b/repo/includes/Store/Sql/DatabaseSchemaUpdater.php
index 376ce99..89d6bff 100644
--- a/repo/includes/Store/Sql/DatabaseSchemaUpdater.php
+++ b/repo/includes/Store/Sql/DatabaseSchemaUpdater.php
@@ -203,7 +203,12 @@
$cachingEntityLookup = new CachingEntityRevisionLookup( 
$wikiPageEntityLookup, new HashBagOStuff() );
$entityLookup = new RevisionBasedEntityLookup( 
$cachingEntityLookup );
 
-   $builder = new PropertyInfoTableBuilder( $table, $entityLookup, 
$propertyInfoBuilder );
+   $builder = new PropertyInfoTableBuilder(
+   $table,
+   $entityLookup,
+   $propertyInfoBuilder,
+   $wikibaseRepo->getEntityIdComposer()
+   );
$builder->setReporter( $reporter );
$builder->setUseTransactions( false );
 
diff --git a/repo/includes/Store/Sql/PropertyInfoTableBuilder.php 
b/repo/includes/Store/Sql/PropertyInfoTableBuilder.php
index fb181be..e7665a9 100644
--- a/repo/includes/Store/Sql/PropertyInfoTableBuilder.php
+++ b/repo/includes/Store/Sql/PropertyInfoTableBuilder.php
@@ -7,6 +7,7 @@
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\Lib\EntityIdComposer;
 use Wikibase\Lib\Reporting\MessageReporter;
 use Wikibase\Lib\Store\Sql\PropertyInfoTable;

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Turn on docker live-migrate for docker builder

[Yuvipanda (Code Review)]

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

Change subject: tools: Turn on docker live-migrate for docker builder
..

tools: Turn on docker live-migrate for docker builder

Bug: T157180
Change-Id: Ie0a29a5e086c07365ffd2ff09b79ac65033c58dc
---
M modules/role/manifests/toollabs/docker/builder.pp
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/toollabs/docker/builder.pp 
b/modules/role/manifests/toollabs/docker/builder.pp
index 5def64e..8c3d211 100644
--- a/modules/role/manifests/toollabs/docker/builder.pp
+++ b/modules/role/manifests/toollabs/docker/builder.pp
@@ -9,8 +9,9 @@
 
 class { '::profile::docker::engine':
 settings=> {
-'iptables' => false,
-'ip-masq'  => false,
+'iptables' => false,
+'ip-masq'  => false,
+'live-restore' => true,
 },
 version => '1.12.6-0~debian-jessie',
 declare_service => true,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistats: cron for automatic miraheze table update

[Dzahn (Code Review)]

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

Change subject: wikistats: cron for automatic miraheze table update
..

wikistats: cron for automatic miraheze table update

Change-Id: Ie9d297705159f165a46b9e5be045dfbfe1074ff6
---
A modules/wikistats/manifests/cronjob/import.pp
R modules/wikistats/manifests/cronjob/update.pp
M modules/wikistats/manifests/updates.pp
3 files changed, 23 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/335971/1

diff --git a/modules/wikistats/manifests/cronjob/import.pp 
b/modules/wikistats/manifests/cronjob/import.pp
new file mode 100644
index 000..4b04fe2
--- /dev/null
+++ b/modules/wikistats/manifests/cronjob/import.pp
@@ -0,0 +1,16 @@
+# define a cronjob to import a wikistats table
+define wikistats::cronjob::import() {
+
+$project = regsubst($name, '@.*', '\1')
+$monthday = regsubst($name, '.*@', '\1')
+
+cron { "cron-wikistats-import-${name}":
+ensure   => present,
+command  => "/usr/local/bin/wikistats/import_${project}_combined.sh > 
/var/log/wikistats/import_${project}.log 2>&1",
+user => 'wikistatsuser',
+monthday => $monthday,
+hour => '11',
+minute   => '11',
+}
+}
+
diff --git a/modules/wikistats/manifests/cronjob.pp 
b/modules/wikistats/manifests/cronjob/update.pp
similarity index 91%
rename from modules/wikistats/manifests/cronjob.pp
rename to modules/wikistats/manifests/cronjob/update.pp
index 906eb50..3e10063 100644
--- a/modules/wikistats/manifests/cronjob.pp
+++ b/modules/wikistats/manifests/cronjob/update.pp
@@ -1,6 +1,6 @@
 # define a cronjob to update a wikistats table
 # usage: @
-define wikistats::cronjob() {
+define wikistats::cronjob::update() {
 
 $project = regsubst($name, '@.*', '\1')
 $hour= regsubst($name, '.*@', '\1')
diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index 7764941..7399cf6 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -16,7 +16,7 @@
 }
 
 # update cron jobs: usage: @
-wikistats::cronjob { [
+wikistats::cronjob::update { [
 'wp@0',  # Wikipedias
 'lx@1',  # LXDE
 'si@1',  # Wikisite
@@ -51,4 +51,9 @@
 'w3@23', # W3C
 ]: }
 
+ # imports (fetching lists of wikis itself)
+ wikistats::cronjjobs::import { [
+'miraheze@5', # https://phabricator.wikimedia.org/T153930
+   ]: }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9d297705159f165a46b9e5be045dfbfe1074ff6
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]: tools: Fix puppet on docker builder hosts

[Yuvipanda (Code Review)]

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

Change subject: tools: Fix puppet on docker builder hosts
..

tools: Fix puppet on docker builder hosts

Change-Id: Ifcb5469fd4d70cf6fa958472655a2d83ea0413e4
---
M modules/role/manifests/toollabs/docker/builder.pp
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/335970/1

diff --git a/modules/role/manifests/toollabs/docker/builder.pp 
b/modules/role/manifests/toollabs/docker/builder.pp
index acf7495..0d9e05b 100644
--- a/modules/role/manifests/toollabs/docker/builder.pp
+++ b/modules/role/manifests/toollabs/docker/builder.pp
@@ -8,12 +8,13 @@
 }
 
 class { '::profile::docker::engine':
-settings => {
-'iptables' => false,
-'ip-masq'  => false,
+settings=> {
+'iptables' => false,
+'ip-masq'  => false,
 },
-version  => '1.12.6-0~jessie',
-require  => Class['::profile::docker::storage'],
+version => '1.12.6-0~jessie',
+declare_service => true,
+require => Class['::profile::docker::storage'],
 }
 
 class { '::toollabs::images': }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rcfeed: Ensure formatter (and other params) is passed to RCF...

[Krinkle (Code Review)]

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

Change subject: rcfeed: Ensure formatter (and other params) is passed to 
RCFeedEngine
..

rcfeed: Ensure formatter (and other params) is passed to RCFeedEngine

Follows-up 39a6e3dc4d. Class-based feeds are always given their parameters
by RCFeed::factory. However because the old getEngine() method insists
on creating its own object, the constructor parameters were not given.

Add it as optional parameter and pass it through there.

This is backwards-compatible still because before the 39a6e3dc4d refactor,
an RCFeedEngine also was not given information about any formatter and it
was the callers responsibility to format the line before calling send().
CentralAuth still uses it this way and that works fine. The core-caller
that expected the construction parameters since 39a6e3dc4d is hereby fixed.

The test couldn't catch this because it constructed the class instance there,
since PHPUnit does not support a mock class that is instantiated by foreign
code, and the parameter is passed there.

Bug: T156996
Bug: T157106
Change-Id: I83433cf57b6e040cdb69f3ad8807a999c4f931a5
---
M includes/DefaultSettings.php
M includes/changes/RecentChange.php
M includes/rcfeed/RCFeed.php
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/335969/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 42253ab..a1a4067 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6704,7 +6704,7 @@
  * 'omit_bots' => true,
  * ];
  * @example $wgRCFeeds['example'] = [
- *  'class' => 'ExampleRCFeed',
+ * 'class' => 'ExampleRCFeed',
  * ];
  * @since 1.22
  */
diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index 507e6c3..dcab158 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -429,7 +429,7 @@
 * @return RCFeedEngine The engine object
 * @throws MWException
 */
-   public static function getEngine( $uri ) {
+   public static function getEngine( $uri, $params = [] ) {
// TODO: Merge into RCFeed::factory().
global $wgRCEngines;
$scheme = parse_url( $uri, PHP_URL_SCHEME );
@@ -442,7 +442,7 @@
if ( defined( 'MW_PHPUNIT_TEST' ) && is_object( 
$wgRCEngines[$scheme] ) ) {
return $wgRCEngines[$scheme];
}
-   return new $wgRCEngines[$scheme];
+   return new $wgRCEngines[$scheme]( $params );
}
 
/**
diff --git a/includes/rcfeed/RCFeed.php b/includes/rcfeed/RCFeed.php
index 7e9ce60..284f68a 100644
--- a/includes/rcfeed/RCFeed.php
+++ b/includes/rcfeed/RCFeed.php
@@ -48,7 +48,7 @@
if ( !isset( $params['uri'] ) ) {
throw new Exception( "RCFeeds must have a 
'class' or 'uri' set." );
}
-   return RecentChange::getEngine( $params['uri'] );
+   return RecentChange::getEngine( $params['uri'], $params 
);
}
$class = $params['class'];
if ( !class_exists( $class ) ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiPurge: update description for POST requirement

[Ricordisamoa (Code Review)]

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

Change subject: ApiPurge: update description for POST requirement
..

ApiPurge: update description for POST requirement

Follow-up to eada94090990f9d06a3b512efc1ca7e6eb4bb2f1.

Change-Id: I134e4df9ed478a5989e55a991fb739b9af28ffb9
---
M includes/api/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/335968/1

diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index d92d78b..c32b5e8 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -389,7 +389,7 @@
"apihelp-protect-example-unprotect": "Unprotect a page by setting 
restrictions to all (i.e. everyone is allowed to take the action).",
"apihelp-protect-example-unprotect2": "Unprotect a page by setting no 
restrictions.",
 
-   "apihelp-purge-description": "Purge the cache for the given 
titles.\n\nRequires a POST request if the user is not logged in.",
+   "apihelp-purge-description": "Purge the cache for the given titles.",
"apihelp-purge-param-forcelinkupdate": "Update the links tables.",
"apihelp-purge-param-forcerecursivelinkupdate": "Update the links 
table, and update the links tables for any page that uses this page as a 
template.",
"apihelp-purge-example-simple": "Purge the Main Page and the 
API page.",

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

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

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Add .gitreview

[Ladsgroup (Code Review)]

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

Change subject: Add .gitreview
..

Add .gitreview

Change-Id: Ic9b947adf5b1c7d7c3a1aee80ac97de6d213fb10
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/66/335966/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..7dd5355
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=research/ores/wheels.git
+defaultbranch=master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9b947adf5b1c7d7c3a1aee80ac97de6d213fb10
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix crasher from 85b7a988

[Subramanya Sastry (Code Review)]

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

Change subject: Fix crasher from 85b7a988
..

Fix crasher from 85b7a988

Change-Id: Ia395d11486186d1961f12506ab6517f2f6b05812
---
M lib/wt2html/tt/TemplateHandler.js
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/lib/wt2html/tt/TemplateHandler.js 
b/lib/wt2html/tt/TemplateHandler.js
index f3e3e7c..be5b5c4 100644
--- a/lib/wt2html/tt/TemplateHandler.js
+++ b/lib/wt2html/tt/TemplateHandler.js
@@ -400,7 +400,10 @@
target: 'pf_' + translatedPrefix,
pfArg: target.substr(prefix.length + 1),
// Extract toks that make up pfArg
-   pfArgToks: [targetToks[0].replace(/^[^:]*:?/, 
'')].concat(targetToks.slice(1)),
+   // FIXME: In the scenario where the target itself is
+   // templated / is not a string, protect from crashers.
+   // Ex: {{safesubst:1x|foo}}
+   pfArgToks: (typeof targetToks[0] === 'string' ? 
[targetToks[0].replace(/^[^:]*:?/, '')] : []).concat(targetToks.slice(1)),
};
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia395d11486186d1961f12506ab6517f2f6b05812
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Delete unneeded wheels

[Ladsgroup (Code Review)]

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

Change subject: Delete unneeded wheels
..


Delete unneeded wheels

Change-Id: Id8326c6a7cf75d5c7916dba342ab5527e4d309c8
---
D editquality-0.4.0-py2.py3-none-any.whl
D wb_vandalism-0.1.8-py3-none-any.whl
D wikiclass-0.3.0-py2.py3-none-any.whl
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/editquality-0.4.0-py2.py3-none-any.whl 
b/editquality-0.4.0-py2.py3-none-any.whl
deleted file mode 100644
index eb30777..000
--- a/editquality-0.4.0-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/wb_vandalism-0.1.8-py3-none-any.whl 
b/wb_vandalism-0.1.8-py3-none-any.whl
deleted file mode 100644
index 489d0d5..000
--- a/wb_vandalism-0.1.8-py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/wikiclass-0.3.0-py2.py3-none-any.whl 
b/wikiclass-0.3.0-py2.py3-none-any.whl
deleted file mode 100644
index 87549bb..000
--- a/wikiclass-0.3.0-py2.py3-none-any.whl
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8326c6a7cf75d5c7916dba342ab5527e4d309c8
Gerrit-PatchSet: 2
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Deleted unneeded wheels

[Ladsgroup (Code Review)]

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

Change subject: Deleted unneeded wheels
..

Deleted unneeded wheels

Change-Id: Id8326c6a7cf75d5c7916dba342ab5527e4d309c8
---
D editquality-0.4.0-py2.py3-none-any.whl
D wb_vandalism-0.1.8-py3-none-any.whl
D wikiclass-0.3.0-py2.py3-none-any.whl
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/65/335965/1

diff --git a/editquality-0.4.0-py2.py3-none-any.whl 
b/editquality-0.4.0-py2.py3-none-any.whl
deleted file mode 100644
index eb30777..000
--- a/editquality-0.4.0-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/wb_vandalism-0.1.8-py3-none-any.whl 
b/wb_vandalism-0.1.8-py3-none-any.whl
deleted file mode 100644
index 489d0d5..000
--- a/wb_vandalism-0.1.8-py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/wikiclass-0.3.0-py2.py3-none-any.whl 
b/wikiclass-0.3.0-py2.py3-none-any.whl
deleted file mode 100644
index 87549bb..000
--- a/wikiclass-0.3.0-py2.py3-none-any.whl
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8326c6a7cf75d5c7916dba342ab5527e4d309c8
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: doc: Add quotes around PROJECT_NAME setting

[jenkins-bot (Code Review)]

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

Change subject: doc: Add quotes around PROJECT_NAME setting
..


doc: Add quotes around PROJECT_NAME setting

Otherwise spaces are stripped from the name, previously
rendered as "OOjsUI".

Change-Id: If413c81ec32097fa4483d8939875548263a68f99
---
M Doxyfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Doxyfile b/Doxyfile
index 7969e99..938aa52 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,6 +1,6 @@
 # Configuration file for Doxygen
 
-PROJECT_NAME   = OOjs UI
+PROJECT_NAME   = "OOjs UI"
 PROJECT_BRIEF  = "Object-Oriented JavaScript – User Interface"
 
 OUTPUT_DIRECTORY   = doc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If413c81ec32097fa4483d8939875548263a68f99
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 
Gerrit-Reviewer: Jforrester 
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...wikistats[master]: update miraheze table automatically

[Dzahn (Code Review)]

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

Change subject: update miraheze table automatically
..


update miraheze table automatically

Adjust existing scripts that get regular miraheze
wikis and miraheze wikis with custom domains and
combine them in a third script that can be called via cron
to automatically update the entire table and resolve T153930.

Bug: T153930
Change-Id: I5fcc706cd3a2dc42787bd375afa1566991712119
---
M usr/local/bin/wikistats/import_miraheze.php
A usr/local/bin/wikistats/import_miraheze_combined.sh
M usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
3 files changed, 57 insertions(+), 3 deletions(-)

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



diff --git a/usr/local/bin/wikistats/import_miraheze.php 
b/usr/local/bin/wikistats/import_miraheze.php
index 2cb48fe..a020e6d 100644
--- a/usr/local/bin/wikistats/import_miraheze.php
+++ b/usr/local/bin/wikistats/import_miraheze.php
@@ -1,5 +1,8 @@
 https://meta.miraheze.org/w/api.php?action=sitematrix=php;;
diff --git a/usr/local/bin/wikistats/import_miraheze_combined.sh 
b/usr/local/bin/wikistats/import_miraheze_combined.sh
new file mode 100755
index 000..f5e2d9f
--- /dev/null
+++ b/usr/local/bin/wikistats/import_miraheze_combined.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# import miraheze wikis, both regular and custom domain wikis
+# Dzahn - https://phabricator.wikimedia.org/T153930
+
+WORKDIR="/tmp"
+OUTFILE="${WORKDIR}/miraheze_wikis_combined.sql"
+
+cd $WORKDIR
+
+if [ -f $OUTFILE ]; then
+echo -e "$OUTFILE exists. deleting to cleanup"
+rm $OUTFILE
+fi
+
+echo -e "DELETE from miraheze;" >> $OUTFILE
+
+echo -e "fetching regular miraheze wikis.. \n"
+
+/usr/bin/php /usr/local/bin/wikistats/import_miraheze.php >> $OUTFILE
+
+echo -e "appended to $OUTFILE\n"
+echo -e "fetching miraheze wikis with custom domains.. \n"
+
+/bin/bash /usr/local/bin/wikistats/import_miraheze_custom_wikis.sh >> $OUTFILE
+
+echo -e "appended to $OUTFILE\n"
+
+num_wikis=$(wc -l $OUTFILE | cut -d " " -f1)
+
+echo -e "$num_wikis wikis detected. deleting table contents .. importing new 
data to mysql ..\n"
+
+/usr/bin/mysql -u root wikistats < $OUTFILE
+
+echo -e "cleaning up temp files and starting regular table update script\n"
+
+/bin/rm $OUTFILE
+
+/usr/bin/php /usr/lib/wikistats/update.php mh
+
+exit
+
diff --git a/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh 
b/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
index 31696c8..27bb533 100755
--- a/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
+++ b/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
@@ -9,7 +9,14 @@
 
 
 cd $WORKDIR
-/bin/rm $INFILE
+
+if [ -f $INFILE ]; then
+# echo -e "$INFILE exists. deleting to clean up\n"
+/bin/rm $INFILE
+fi
+
+# echo -e "wget'ting $URL\n"
+
 /usr/bin/wget $URL
 
 while read -r line
@@ -18,14 +25,17 @@
 wiki=$(echo $line|cut -d\| -f1)
 url=$(echo $line| cut -d\| -f2)
 
-echo "DELETE from miraheze where prefix='${wiki}';" | tee $OUTFILE
+# echo "DELETE from miraheze where prefix='${wiki}';" | tee $OUTFILE
 echo "INSERT IGNORE INTO miraheze (prefix,method,statsurl) values 
('${wiki}','8','${url}');" | tee $OUTFILE
 
 done < "${INFILE}"
 
 cat $OUTFILE
 
-/usr/bin/mysql -u root wikistats < $OUTFILE
+# echo -e "importing to mysql ..\n"
+# /usr/bin/mysql -u root wikistats < $OUTFILE
 
+# echo -e "cleaning up. deleting work files. bye\n"
 /bin/rm $WORKDIR/$INFILE $OUTFILE
 
+exit

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fcc706cd3a2dc42787bd375afa1566991712119
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Southparkfan 
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...wikistats[master]: update miraheze table automatically

[Dzahn (Code Review)]

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

Change subject: update miraheze table automatically
..

update miraheze table automatically

Adjust existing scripts that get regular miraheze
wikis and miraheze wikis with custom domains and
combine them in a third script that can be called via cron
to automatically update the entire table and resolve T153930.

Bug: T153930
Change-Id: I5fcc706cd3a2dc42787bd375afa1566991712119
---
M usr/local/bin/wikistats/import_miraheze.php
A usr/local/bin/wikistats/import_miraheze_combined.sh
M usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
3 files changed, 57 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats 
refs/changes/64/335964/1

diff --git a/usr/local/bin/wikistats/import_miraheze.php 
b/usr/local/bin/wikistats/import_miraheze.php
index 2cb48fe..a020e6d 100644
--- a/usr/local/bin/wikistats/import_miraheze.php
+++ b/usr/local/bin/wikistats/import_miraheze.php
@@ -1,5 +1,8 @@
 https://meta.miraheze.org/w/api.php?action=sitematrix=php;;
diff --git a/usr/local/bin/wikistats/import_miraheze_combined.sh 
b/usr/local/bin/wikistats/import_miraheze_combined.sh
new file mode 100755
index 000..6b9c523
--- /dev/null
+++ b/usr/local/bin/wikistats/import_miraheze_combined.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# import miraheze wikis, both regular and custom domain wikis 
+# Dzahn - https://phabricator.wikimedia.org/T153930
+
+WORKDIR="/tmp"
+OUTFILE="${WORKDIR}/miraheze_wikis_combined.sql"
+
+cd $WORKDIR
+
+if [ -f $OUTFILE ]; then
+echo -e "$OUTFILE exists. deleting to cleanup"
+rm $OUTFILE
+fi
+
+echo -e "DELETE from miraheze;" >> $OUTFILE
+
+echo -e "fetching regular miraheze wikis.. \n"
+
+/usr/bin/php /usr/local/bin/wikistats/import_miraheze.php >> $OUTFILE
+
+echo -e "appended to $OUTFILE\n"
+echo -e "fetching miraheze wikis with custom domains.. \n"
+
+/bin/bash /usr/local/bin/wikistats/import_miraheze_custom_wikis.sh >> $OUTFILE
+
+echo -e "appended to $OUTFILE\n"
+
+num_wikis=$(wc -l $OUTFILE | cut -d " " -f1)
+
+echo -e "$num_wikis wikis detected. deleting table contents .. importing new 
data to mysql ..\n"
+
+/usr/bin/mysql -u root wikistats < $OUTFILE
+
+echo -e "cleaning up temp files and starting regular table update script\n"
+
+/bin/rm $OUTFILE
+
+/usr/bin/php /usr/lib/wikistats/update.php mh 
+
+exit
+
diff --git a/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh 
b/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
index 31696c8..27bb533 100755
--- a/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
+++ b/usr/local/bin/wikistats/import_miraheze_custom_wikis.sh
@@ -9,7 +9,14 @@
 
 
 cd $WORKDIR
-/bin/rm $INFILE
+
+if [ -f $INFILE ]; then
+# echo -e "$INFILE exists. deleting to clean up\n"
+/bin/rm $INFILE
+fi
+
+# echo -e "wget'ting $URL\n"
+
 /usr/bin/wget $URL
 
 while read -r line
@@ -18,14 +25,17 @@
 wiki=$(echo $line|cut -d\| -f1)
 url=$(echo $line| cut -d\| -f2)
 
-echo "DELETE from miraheze where prefix='${wiki}';" | tee $OUTFILE
+# echo "DELETE from miraheze where prefix='${wiki}';" | tee $OUTFILE
 echo "INSERT IGNORE INTO miraheze (prefix,method,statsurl) values 
('${wiki}','8','${url}');" | tee $OUTFILE
 
 done < "${INFILE}"
 
 cat $OUTFILE
 
-/usr/bin/mysql -u root wikistats < $OUTFILE
+# echo -e "importing to mysql ..\n"
+# /usr/bin/mysql -u root wikistats < $OUTFILE
 
+# echo -e "cleaning up. deleting work files. bye\n"
 /bin/rm $WORKDIR/$INFILE $OUTFILE
 
+exit

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fcc706cd3a2dc42787bd375afa1566991712119
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
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...parsoid[master]: Remove special-case non-void semantics for

[jenkins-bot (Code Review)]

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

Change subject: Remove special-case non-void semantics for 
..


Remove special-case non-void semantics for 

 * Previously, we weren't considering  tags as void *at all*,
   which wasn't a problem since the extension handler transformed them
   before they made it to the dom.

 * However, in upcoming patches, we're going to start emitting html
tags in the context of  tags, which need the void
   semantics in order to not be stripped as autoinserted.

Change-Id: Ibac0311f56b7986e2eff0740a3e4c5b6861d2626
---
M lib/config/WikitextConstants.js
M lib/wt2html/pegTokenizer.pegjs
M lib/wt2html/tokenizer.utils.js
3 files changed, 11 insertions(+), 10 deletions(-)

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



diff --git a/lib/config/WikitextConstants.js b/lib/config/WikitextConstants.js
index b39a872..bdae1ac 100644
--- a/lib/config/WikitextConstants.js
+++ b/lib/config/WikitextConstants.js
@@ -231,13 +231,9 @@
]),
 
// See 
http://www.whatwg.org/specs/web-apps/current-work/#void-elements
-   //
-   // We are currently treating  as an extension tag since 
this is widely
-   // used on wikipedias.  So, we dont want to treat this as a 
HTML tag => it cannot
-   // be a void element
VoidTags: new Set([
'AREA', 'BASE', 'BR', 'COL', 'COMMAND', 'EMBED', 'HR', 
'IMG',
-   'INPUT', 'KEYGEN', 'LINK', 'META', 'PARAM', /* 
'SOURCE', */
+   'INPUT', 'KEYGEN', 'LINK', 'META', 'PARAM', 'SOURCE',
'TRACK', 'WBR',
]),
},
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 9afa9d6..a0efaea 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1248,7 +1248,11 @@
 stops.pop('extTag');
 
 var lcName = name.toLowerCase();
-var isVoidElt = Util.isVoidElement(lcName) ? true : null;
+
+// Extension tags don't necessarily have the same semantics as html 
tags,
+// so don't treat them as void elements.
+var isVoidElt = Util.isVoidElement(lcName) && 
!env.conf.wiki.extensionTags.has(lcName);
+
 // Support 
 var broken = false;
 if (lcName === 'br' && end) {
@@ -1256,14 +1260,15 @@
 end = null;
 }
 
-var res = tu.buildXMLTag(name, lcName, attribs, end, selfclose || 
isVoidElt, tsrOffsets());
+var res = tu.buildXMLTag(name, lcName, attribs, end, !!selfclose || 
isVoidElt, tsrOffsets());
 
 // change up data-attribs in one scenario
 // void-elts that aren't self-closed ==> useful for accurate RT-ing
-if (selfclose === null && isVoidElt) {
+if (!selfclose && isVoidElt) {
 res.dataAttribs.selfClose = undefined;
 res.dataAttribs.noClose = true;
 }
+
 if (broken || bad_ws.length > 0) {
 res.dataAttribs.brokenHTMLTag = true;
 }
@@ -1298,7 +1303,7 @@
   stops.pop('table');
   stops.pop('tableCellArg');
   stops.pop('extTag');
-  var t = tu.buildXMLTag(name, name.toLowerCase(), attribs, end, 
selfclose, tsrOffsets());
+  var t = tu.buildXMLTag(name, name.toLowerCase(), attribs, end, 
!!selfclose, tsrOffsets());
   return [maybeExtensionTag(t)];
 }
 / "<" "/"? tag_name & { return stops.pop('extTag'); }
diff --git a/lib/wt2html/tokenizer.utils.js b/lib/wt2html/tokenizer.utils.js
index 514ae78..b72a59a 100644
--- a/lib/wt2html/tokenizer.utils.js
+++ b/lib/wt2html/tokenizer.utils.js
@@ -149,7 +149,7 @@
 
if (endTag !== null) {
tok = new EndTagTk(lcName, attribs, da);
-   } else if (selfClose !== null) {
+   } else if (selfClose) {
da.selfClose = true;
tok = new SelfclosingTagTk(lcName, attribs, da);
} else {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add class to diff and history links in Special:Contributions

[Ladsgroup (Code Review)]

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

Change subject: Add class to diff and history links in Special:Contributions
..

Add class to diff and history links in Special:Contributions

Change-Id: I4fb26d55a0b7721e430b497440029c6de254dd8f
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/335963/1

diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index 0c3a211..47a2aed 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -402,7 +402,7 @@
$difftext = $linkRenderer->makeKnownLink(
$page,
new HtmlArmor( $this->messages['diff'] 
),
-   [],
+   [ 'class' => 'mw-changeslist-diff' ],
[
'diff' => 'prev',
'oldid' => $row->rev_id
@@ -414,7 +414,7 @@
$histlink = $linkRenderer->makeKnownLink(
$page,
new HtmlArmor( $this->messages['hist'] ),
-   [],
+   [ 'class' => 'mw-changeslist-history' ],
[ 'action' => 'history' ]
);
 

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Destroy unicorns properly when cursoring to another branch node

[Divec (Code Review)]

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

Change subject: Destroy unicorns properly when cursoring to another branch node
..

Destroy unicorns properly when cursoring to another branch node

Bug: T157019
Change-Id: Idd98c4529b24901ec685f80b870b5cd65480e591
---
M src/ce/ve.ce.Surface.js
1 file changed, 46 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/62/335962/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 020c0a8..6690fc0 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1492,7 +1492,9 @@
  * @return {boolean} Whether unicorns have been destroyed
  */
 ve.ce.Surface.prototype.cleanupUnicorns = function ( fixupCursor ) {
-   var preUnicorn, range, node, fixup, veRange;
+   var preUnicorn, range, node, fixup, veRange,
+   contentBranchNodeBefore, contentBranchNodeAfter;
+
if ( !this.unicorningNode || !this.unicorningNode.unicorns ) {
return false;
}
@@ -1536,11 +1538,13 @@
fixup = 1;
}
 
+   contentBranchNodeBefore = this.getSelectedContentBranchNode();
+
// Apply the DOM selection to the model
-   this.incRenderLock();
-   try {
-   veRange = ve.ce.veRangeFromSelection( this.nativeSelection );
-   if ( veRange ) {
+   veRange = ve.ce.veRangeFromSelection( this.nativeSelection );
+   if ( veRange ) {
+   this.incRenderLock();
+   try {
// The most likely reason for this condition to 
not-pass is if we
// try to cleanup unicorns while the native selection 
is outside
// the model momentarily, as sometimes happens during 
paste.
@@ -1548,14 +1552,22 @@
this.model.getDocument(),
veRange
) );
+   if ( fixupCursor ) {
+   this.moveModelCursor( fixup );
+   }
+   } finally {
+   this.decRenderLock();
}
-   if ( fixupCursor ) {
-   this.moveModelCursor( fixup );
-   }
-   } finally {
-   this.decRenderLock();
}
-   this.renderSelectedContentBranchNode();
+
+   contentBranchNodeAfter = this.getSelectedContentBranchNode();
+   if ( contentBranchNodeAfter ) {
+   contentBranchNodeAfter.renderContents();
+   }
+   if ( contentBranchNodeBefore && contentBranchNodeBefore !== 
contentBranchNodeAfter ) {
+   contentBranchNodeBefore.renderContents();
+   }
+
this.showModelSelection();
return true;
 };
@@ -2645,25 +2657,35 @@
 };
 
 /**
- * Re-render the ContentBranchNode the selection is currently in.
+ * Get the ContentBranchNode containing the selection focus, if any
+ *
+ * @return {ve.ce.ContentBranchNode|null} ContentBranchNode containing 
selection focus, or null
+ */
+ve.ce.Surface.prototype.getSelectedContentBranchNode = function () {
+   var node,
+   selection = this.model.getSelection();
+
+   if ( !( selection instanceof ve.dm.LinearSelection ) ) {
+   return null;
+   }
+   node = this.documentView.getBranchNodeFromOffset( 
selection.getRange().to );
+   if ( !node || !( node instanceof ve.ce.ContentBranchNode ) ) {
+   return null;
+   }
+   return node;
+};
+
+/**
+ * Re-render the ContentBranchNode containing the selection focus, if any
  *
  * @return {boolean} Whether a re-render actually happened
  */
 ve.ce.Surface.prototype.renderSelectedContentBranchNode = function () {
-   var selection, ceNode;
-   selection = this.model.getSelection();
-   if ( !( selection instanceof ve.dm.LinearSelection ) ) {
+   var node = this.getSelectedContentBranchNode();
+   if ( !node ) {
return false;
}
-   ceNode = this.documentView.getBranchNodeFromOffset( 
selection.getRange().start );
-   if ( ceNode === null ) {
-   return false;
-   }
-   if ( !( ceNode instanceof ve.ce.ContentBranchNode ) ) {
-   // not a content branch node
-   return false;
-   }
-   return ceNode.renderContents();
+   return node.renderContents();
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd98c4529b24901ec685f80b870b5cd65480e591
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: doc: Add quotes around PROJECT_NAME setting

[Ricordisamoa (Code Review)]

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

Change subject: doc: Add quotes around PROJECT_NAME setting
..

doc: Add quotes around PROJECT_NAME setting

Otherwise spaces are stripped from the name, previously
rendered as "OOjsUI".

Change-Id: If413c81ec32097fa4483d8939875548263a68f99
---
M Doxyfile
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/61/335961/1

diff --git a/Doxyfile b/Doxyfile
index 7969e99..938aa52 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,6 +1,6 @@
 # Configuration file for Doxygen
 
-PROJECT_NAME   = OOjs UI
+PROJECT_NAME   = "OOjs UI"
 PROJECT_BRIEF  = "Object-Oriented JavaScript – User Interface"
 
 OUTPUT_DIRECTORY   = doc

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me...

[Huji (Code Review)]

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

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter into 
review/huji/T152934
..

Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter into 
review/huji/T152934

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ff071ec79684c6fe71643618fc0017b78132689
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Add twitter meta tag for image

[jenkins-bot (Code Review)]

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

Change subject: Add twitter meta tag for image
..


Add twitter meta tag for image

Bug: T157145
Change-Id: I8605b69b658b99941d63db3707ae6c2c0cf1b2ce
---
M includes/PageImages.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/includes/PageImages.php b/includes/PageImages.php
index 4a8004b..35ef710 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -212,6 +212,8 @@
}
 
$out->addMeta( 'og:image', wfExpandUrl( $thumb->getUrl(), 
PROTO_CANONICAL ) );
+   // Make twitter understand: T157145
+   $out->addMeta( 'twitter:card', 'summary_large_image' );
}
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8605b69b658b99941d63db3707ae6c2c0cf1b2ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Jdlrobson 
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] mediawiki...ORES[master]: Make API not fail when edit is deleted or can't be scored

[Ladsgroup (Code Review)]

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

Change subject: Make API not fail when edit is deleted or can't be scored
..

Make API not fail when edit is deleted or can't be scored

Bug: T157078
Change-Id: I8987d0a65dc16ae0e6786ec38f675d0be9ac639d
---
M includes/ApiHooks.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/includes/ApiHooks.php b/includes/ApiHooks.php
index 43d22f9..04f057f 100644
--- a/includes/ApiHooks.php
+++ b/includes/ApiHooks.php
@@ -13,6 +13,7 @@
 use ApiResult;
 use DeferredUpdates;
 use JobQueueGroup;
+use MediaWiki\Logger\LoggerFactory;
 use Title;
 use ResultWrapper;
 use WatchedItem;
@@ -268,6 +269,10 @@
}
$loadedScores = Scoring::instance()->getScores( $revids 
);
$cache = Cache::instance();
+   $cache->setErrorCallback( function ( $mssg, $revision ) 
{
+   $logger = LoggerFactory::getInstance( 'ORES' );
+   $logger->info( "Scoring errored for $revision: 
$mssg\n" );
+   } );
DeferredUpdates::addCallableUpdate( function() use ( 
$cache, $loadedScores ) {
$cache->storeScores( $loadedScores );
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add class in diff and history links in ChangesList

[Ladsgroup (Code Review)]

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

Change subject: Add class in diff and history links in ChangesList
..

Add class in diff and history links in ChangesList

It would make it easier to select in javascript and CSS

Change-Id: I2d5ef8c180ae4ff6e7f5d0ab443dc7084f8c4c77
---
M includes/changes/ChangesList.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/335958/1

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 1e88e13..ccf2ced 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -379,7 +379,7 @@
$diffLink = $this->linkRenderer->makeKnownLink(
$rc->getTitle(),
new HtmlArmor( $this->message['diff'] ),
-   [],
+   [ 'class' => 'mw-changeslist-diff' ],
$query
);
}
@@ -394,7 +394,8 @@
[],
[
'curid' => $rc->mAttribs['rc_cur_id'],
-   'action' => 'history'
+   'action' => 'history',
+   'class' => 'mw-changeslist-history'
]
);
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Use docker profile for k8s worker nodes

[Yuvipanda (Code Review)]

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

Change subject: tools: Use docker profile for k8s worker nodes
..

tools: Use docker profile for k8s worker nodes

Change-Id: I51a43923ba14837ba1842cb9ddcef9662ea2d322
---
M hieradata/role/common/kubernetes/worker.yaml
M modules/profile/manifests/docker/engine.pp
A modules/profile/manifests/docker/flannel.pp
A 
modules/profile/templates/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
M modules/role/manifests/toollabs/k8s/worker.pp
5 files changed, 52 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/335957/1

diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index eb27f09..f868bba 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -5,6 +5,7 @@
 profile::docker::storage::physical_volumes: "/dev/md2"
 profile::docker::storage::vg_to_remove: ''
 profile::docker::engine::version: "1.12.5-0~debian-jessie"
+profile::docker::engine::declare_service: true
 profile::kubernetes::master_hosts:
 - argon.eqiad.wmnet
 - chlorine.eqiad.wmnet
diff --git a/modules/profile/manifests/docker/engine.pp 
b/modules/profile/manifests/docker/engine.pp
index 7e9d1b5..c6b8d98 100644
--- a/modules/profile/manifests/docker/engine.pp
+++ b/modules/profile/manifests/docker/engine.pp
@@ -9,6 +9,9 @@
 $settings = hiera_hash('profile::docker::engine::settings'),
 # Version to install; the default is not to pick one.
 $version = hiera('profile::docker::engine::version'),
+# Set to false if we don't want to declare the docker service here
+# We want this to be on if we want to use a different docker systemd 
service (with flannel support, for eg.)
+$declare_service = hiera('profile::docker::engine::declare_service')
 ) {
 
 # Install docker
@@ -42,8 +45,10 @@
 value => '1',
 }
 
-# Service declaration
-service { 'docker':
-ensure => 'running',
+if $declare_service {
+# Service declaration
+service { 'docker':
+ensure => 'running',
+}
 }
 }
diff --git a/modules/profile/manifests/docker/flannel.pp 
b/modules/profile/manifests/docker/flannel.pp
new file mode 100644
index 000..277f3db
--- /dev/null
+++ b/modules/profile/manifests/docker/flannel.pp
@@ -0,0 +1,15 @@
+class profile::docker::flannel(
+# Docker version in use. The systemd override is specific
+# to the version in use.
+$docker_version = hiera('profile::flannel::docker_version'),
+) {
+base::service_unit { 'docker':
+ensure   => present,
+systemd  => false,
+systemd_override => true,
+# Restarts must always be manual, since restart
+# destroy all running containers. Fuck you, Docker.
+refresh  => false,
+template_name=> "docker/flannel/docker_${docker_version}",
+}
+}
diff --git 
a/modules/profile/templates/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
 
b/modules/profile/templates/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
new file mode 100644
index 000..3a6569d
--- /dev/null
+++ 
b/modules/profile/templates/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
@@ -0,0 +1,14 @@
+# Docker override systemd for v1.11.2-0~jessie
+[Unit]
+After=network.target docker.socket flannel.service
+Requires=docker.socket flannel.service
+
+[Service]
+EnvironmentFile=/run/flannel/subnet.env
+ExecStart=/usr/bin/docker daemon -H fd:// \
+--bip=${FLANNEL_SUBNET} \
+--mtu=${FLANNEL_MTU} \
+--iptables=false \
+--ip-masq=false \
+--storage-opt dm.datadev=/dev/docker/data \
+--storage-opt dm.metadatadev=/dev/docker/metadata
diff --git a/modules/role/manifests/toollabs/k8s/worker.pp 
b/modules/role/manifests/toollabs/k8s/worker.pp
index e865010..4a4763a 100644
--- a/modules/role/manifests/toollabs/k8s/worker.pp
+++ b/modules/role/manifests/toollabs/k8s/worker.pp
@@ -16,8 +16,20 @@
 etcd_endpoints => $etcd_url,
 }
 
-class { '::k8s::docker':
-require => Class['::k8s::flannel'],
+$docker_version = '1.11.2-0~jessie'
+
+class { '::profile::docker::engine':
+settings=> {
+'iptables' => false,
+'ip-masq'  => false,
+},
+version => $docker_version,
+declare_service => false,
+}
+
+class { '::profile::docker::flannel':
+docker_version => $docker_version,
+require=> Class['::profile::docker::engine'],
 }
 
 class { '::k8s::ssl':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Break img element handling out to its own func

[Arlolra (Code Review)]

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

Change subject: Break img element handling out to its own func
..

Break img element handling out to its own func

 * Paving the way to add other element types.

Change-Id: I9cba11df9bf9fc8384d845ec4656edc950f0229d
---
M lib/wt2html/tt/LinkHandler.js
1 file changed, 114 insertions(+), 105 deletions(-)


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

diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index cbaf697..2ba426d 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -933,6 +933,104 @@
return resultStr;
 }
 
+// Set up the actual image structure, attributes etc
+WikiLinkHandler.prototype.handleImage = function(opts, info, errs) {
+   var img = new SelfclosingTagTk('img', []);
+
+   if ('alt' in opts) {
+   img.addNormalizedAttribute('alt', opts.alt.v, opts.alt.src);
+   }
+
+   img.addNormalizedAttribute('resource', this.env.makeLink(opts.title.v), 
opts.title.src);
+   img.addAttribute('src', getPath(info));
+
+   if (opts.lang) {
+   img.addNormalizedAttribute('lang', opts.lang.v, opts.lang.src);
+   }
+
+   // T110692: The batching API seems to return these as strings.
+   // Till that is fixed, let us make sure these are numbers.
+   info.height = Number(info.height);
+   info.width = Number(info.width);
+
+   if (!errs.length) {
+   // Add (read-only) information about original file size (T64881)
+   img.addAttribute('data-file-width', String(info.width));
+   img.addAttribute('data-file-height', String(info.height));
+   img.addAttribute('data-file-type', info.mediatype && 
info.mediatype.toLowerCase());
+   }
+
+   var mustRender;
+   if (info.mustRender !== undefined) {
+   mustRender = info.mustRender;
+   } else {
+   mustRender = info.mediatype !== 'BITMAP';
+   }
+
+   var size = handleSize(info);
+
+   // Handle client-side upscaling (including 'border')
+   if (info.height && info.width) {
+   // Calculate the scaling ratio from the user-specified width 
and height
+   var ratio = null;
+   if (opts.size.v.height) {
+   ratio = opts.size.v.height / info.height;
+   }
+   if (opts.size.v.width) {
+   var r = opts.size.v.width / info.width;
+   ratio = (ratio === null || r < ratio) ? r : ratio;
+   }
+
+   if (ratio !== null && ratio > 1) {
+   // If the user requested upscaling, then this is denied 
in the thumbnail
+   // and frameless format, except for files with 
mustRender.
+   var format = getFormat(opts);
+   if (!mustRender && (format === 'thumbnail' || format 
=== 'frameless')) {
+   // Upscaling denied
+   size.height = info.height;
+   size.width = info.width;
+   } else {
+   // Upscaling allowed
+   // In the batch API, these will already be 
correct, but the non-batch
+   // API returns the source width and height 
whenever client-side scaling
+   // is requested.
+   if (!this.env.conf.parsoid.useBatchAPI) {
+   size.height = Math.round(info.height * 
ratio);
+   size.width = Math.round(info.width * 
ratio);
+   }
+   }
+   }
+
+   // Handle "responsive" images, i.e. srcset
+   if (info.responsiveUrls) {
+   var density;
+   var candidates = [];
+   for (density in info.responsiveUrls) {
+   candidates.push(
+   
info.responsiveUrls[density].replace(/^https?:\/\//, '//') +
+   ' ' + density + 'x');
+   }
+   if (candidates.length > 0) {
+   img.addAttribute('srcset', candidates.join(', 
'));
+   }
+   }
+   }
+
+   if (size.height) {
+   img.addNormalizedAttribute('height', String(size.height));
+   }
+
+   if (size.width) {
+   img.addNormalizedAttribute('width', String(size.width));
+   }
+
+   return {
+   rdfaType: 'mw:Image',
+   elt: img,
+   hasLink: (opts.link === undefined || 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use videoinfo if it's available

[Arlolra (Code Review)]

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

Change subject: Use videoinfo if it's available
..

Use videoinfo if it's available

 * Would prefer feature detection though.

Change-Id: If9f224c2fac384731d679ccac76ef054ac7ccc95
---
M lib/config/WikiConfig.js
M lib/mw/ApiRequest.js
M lib/wt2html/tt/LinkHandler.js
3 files changed, 25 insertions(+), 7 deletions(-)


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

diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index c51b10d..711cff2 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -492,6 +492,12 @@
this._anchoredProtocolRegex = new RegExp('^(' + alternation + ')', 'i');
this._unanchoredProtocolRegex = new RegExp('(?:\\W|^)(' + alternation + 
')', 'i');
 
+   // FIXME: What's a better way to feature detect?
+   this.useVideoInfo = Array.isArray(resultConf.extensions) &&
+   resultConf.extensions.some(function(o) {
+   return o.name === 'TimedMediaHandler';
+   });
+
// Extension tags on this wiki, indexed by their aliases.
this.extensionTags = new Map();
if (resultConf.extensiontags) {
diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index c2f81fe..0bab9a3 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js
@@ -895,6 +895,7 @@
'languages',
'protocols',
'specialpagealiases',
+   'extensions',
];
var apiargs = {
format: 'json',
@@ -968,10 +969,15 @@
var imgns = conf.namespaceNames[imgnsid];
var props = [
'mediatype',
+   'mime',
'size',
'url',
'badfile',
];
+
+   if (conf.useVideoInfo) {
+   props.push('derivatives');
+   }
 
this.ns = imgns;
 
@@ -979,22 +985,26 @@
filenames[ix] = imgns + ':' + filenames[ix];
}
 
+   var prop = conf.useVideoInfo ? 'videoinfo' : 'imageinfo';
+   var prefix = conf.useVideoInfo ? 'vi' : 'ii';
+
var apiArgs = {
action: 'query',
format: 'json',
-   prop: 'imageinfo',
+   prop: prop,
titles: filenames.join('|'),
-   iiprop: props.join('|'),
-   iibadfilecontexttitle: env.page.name,
rawcontinue: 1,
};
 
+   apiArgs[prefix + 'prop'] = props.join('|');
+   apiArgs[prefix + 'badfilecontexttitle'] = env.page.name;
+
if (dims) {
if (dims.width) {
-   apiArgs.iiurlwidth = dims.width;
+   apiArgs[prefix + 'urlwidth'] = dims.width;
}
if (dims.height) {
-   apiArgs.iiurlheight = dims.height;
+   apiArgs[prefix + 'urlheight'] = dims.height;
}
}
 
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 2ba426d..85c1684 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1041,6 +1041,8 @@
var info;
var errs = [];
 
+   var prop = this.env.conf.wiki.useVideoInfo ? 'videoinfo' : 'imageinfo';
+
if (!err && data) {
if (this.env.conf.parsoid.useBatchAPI) {
info = data.batchResponse;
@@ -1048,12 +1050,12 @@
var ns = data.imgns;
// title is guaranteed to be not null here
var image = data.pages[ns + ':' + title.getKey()];
-   if (!image || !image.imageinfo || !image.imageinfo[0] ||
+   if (!image || !image[prop] || !image[prop][0] ||
// Fallback to adding mw:Error
(image.missing !== undefined && 
image.known === undefined)) {
info = false;
} else {
-   info = image.imageinfo[0];
+   info = image[prop][0];
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Refactor figure html2wt to be a little more elt agnostic

[Arlolra (Code Review)]

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

Change subject: Refactor figure html2wt to be a little more elt agnostic
..

Refactor figure html2wt to be a little more elt agnostic

Change-Id: I9d46bdbd920ee3d6c44c813fd2757e13ccf668d9
---
M lib/html2wt/LinkHandler.js
1 file changed, 49 insertions(+), 32 deletions(-)


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

diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index b0ebec8..e544b02 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -705,64 +705,81 @@
});
 });
 
+function getEltName(type) {
+   switch (type) {
+   default:
+   return 'IMG';
+   }
+}
+
 var figureHandlerImpl;  // Forward declaration
+
+// All figures have a fixed structure:
+//
+// 
+//  
+//  
+// 
+//
+// Pull out this fixed structure, being as generous as possible with
+// possibly-broken HTML.
 
 var figureHandler = Promise.method(function(node) {
var env = this.env;
var state = this.state;
-   // All figures have a fixed structure:
-   //
-   // 
-   //  
-   //  
-   // 
-   //
-   // Pull out this fixed structure, being as generous as possible with
-   // possibly-broken HTML.
var outerElt = node;
-   var imgElt = node.querySelector('IMG'); // first IMG tag
+
+   var typeOf = node.getAttribute('typeof') || '';
+   var match = typeOf.match(/(?:^|\s)(mw:Image)(?:\/\w*)?(?:\s|$)/);
+   var rdfaType = match && match[1] || '';
+
+   var eltName = getEltName(rdfaType);
+   var elt = node.querySelector(eltName);
+
var linkElt = null;
-   // parent of img is probably the linkElt
-   if (imgElt &&
-   (imgElt.parentElement.tagName === 'A' ||
-   (imgElt.parentElement.tagName === 'SPAN' &&
-   imgElt.parentElement !== outerElt))) {
-   linkElt = imgElt.parentElement;
+   // parent of elt is probably the linkElt
+   if (elt &&
+   (elt.parentElement.tagName === 'A' ||
+   (elt.parentElement.tagName === 'SPAN' &&
+   elt.parentElement !== outerElt))) {
+   linkElt = elt.parentElement;
}
+
// FIGCAPTION or last child (which is not the linkElt) is the caption.
var captionElt = node.querySelector('FIGCAPTION');
if (!captionElt) {
for (captionElt = node.lastElementChild;
captionElt;
captionElt = captionElt.previousElementSibling) 
{
-   if (captionElt !== linkElt && captionElt !== imgElt &&
+   if (captionElt !== linkElt && captionElt !== elt &&
/^(SPAN|DIV)$/.test(captionElt.tagName)) {
break;
}
}
}
-   // special case where `node` is the IMG tag itself!
-   if (node.tagName === 'IMG') {
+
+   // special case where `node` is the ELT tag itself!
+   if (node.tagName === eltName) {
linkElt = captionElt = null;
-   outerElt = imgElt = node;
+   outerElt = elt = node;
}
 
-   // The only essential thing is the IMG tag!
-   if (!imgElt) {
+   // The only essential thing is the ELT tag!
+   if (!elt) {
env.log("error/html2wt/figure",
-   "In WSP.figureHandler, node does not have any img 
elements:",
+   "In WSP.figureHandler, node does not have any " + 
eltName + " elements:",
node.outerHTML);
state.emitChunk('', node);
return;
}
 
// Try to identify the local title to use for this image.
-   return this.serializedImageAttrVal(outerElt, imgElt, 'resource')
+   return this.serializedImageAttrVal(outerElt, elt, 'resource')
.then(function(resource) {
if (resource.value === null) {
// from non-parsoid HTML: try to reconstruct resource 
from src?
// (this won't work for manual-thumb images)
-   var src = imgElt.getAttribute('src');
+   var src = elt.getAttribute('src');
if (!src) {
env.log("error/html2wt/figure",
"In WSP.figureHandler, img does not 
have resource or src:",
@@ -784,12 +801,12 @@
if (!resource.fromsrc) {
resource.value = resource.value.replace(/^(\.\.?\/)+/, 
'');
}
-   return figureHandlerImpl(node, state, resource, imgElt, 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Refactor file handling a bit

[Arlolra (Code Review)]

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

Change subject: Refactor file handling a bit
..

Refactor file handling a bit

 * So that variables are closer to where they're used, making it easier
   to split up functionality.

Change-Id: I7084a9278baae7fdeac89d6eae81c990eaa66022
---
M lib/wt2html/tt/LinkHandler.js
1 file changed, 72 insertions(+), 53 deletions(-)


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

diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 3ffe731..cbaf697 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -934,37 +934,22 @@
 }
 
 // Handle a response to an imageinfo API request.
-// Set up the actual image structure, attributes etc
-WikiLinkHandler.prototype.handleImageInfo = function(cb, token, title, opts, 
optSources, err, data) {
+WikiLinkHandler.prototype.handleInfo = function(cb, token, title, opts, 
optSources, err, data) {
// FIXME: Not doing this till we fix up wt2html error handling
//
// Bump resource use
// this.manager.env.bumpParserResourceUse('image');
 
-   var image, info;
-   var rdfaType = 'mw:Image';
-   var hasImageLink = (opts.link === undefined || opts.link && opts.link.v 
!== '');
-   var iContainerName = hasImageLink ? 'a' : 'span';
-   var innerContain = new TagTk(iContainerName, []);
-   var innerContainClose = new EndTagTk(iContainerName);
-   var img = new SelfclosingTagTk('img', []);
-   var wrapperInfo = getWrapperInfo(opts);
-   var wrapperClasses = wrapperInfo.classes;
-   var useFigure = wrapperInfo.isInline !== true;
-   var dataMW = token.getAttribute("data-mw");
-   var dataMWObj = null;
-   var containerName = useFigure ? 'figure' : 'span';
-   var container = new TagTk(containerName, [], 
Util.clone(token.dataAttribs));
-   var dataAttribs = container.dataAttribs;
-   var containerClose = new EndTagTk(containerName);
+   var info;
+   var errs = [];
 
if (!err && data) {
-   if (data.batchResponse !== undefined) {
+   if (this.env.conf.parsoid.useBatchAPI) {
info = data.batchResponse;
} else {
var ns = data.imgns;
// title is guaranteed to be not null here
-   image = data.pages[ns + ':' + title.getKey()];
+   var image = data.pages[ns + ':' + title.getKey()];
if (!image || !image.imageinfo || !image.imageinfo[0] ||
// Fallback to adding mw:Error
(image.missing !== undefined && 
image.known === undefined)) {
@@ -975,7 +960,7 @@
}
}
 
-   // FIXME gwicke: Make sure our filename is never of the form
+   // FIXME: Make sure our filename is never of the form
// 'File:foo.png|Some caption', as is the case for example in
// [[:de:Portal:Thüringen]]. The href is likely templated where
// the expansion includes the pipe and caption. We don't currently
@@ -985,6 +970,7 @@
// full 'filename' does not match any of them, so image is then
// undefined here. So for now (as a workaround) check if we
// actually have an image to work with instead of crashing.
+
if (!info) {
// Use sane defaults.
info = {
@@ -994,18 +980,6 @@
width: opts.size.v.width || 220,
height: opts.size.v.height || opts.size.v.width || 220,
};
-
-   // Add mw:Error to the RDFa type.
-   // Prepend since rdfaType is updated with / further 
down.
-   rdfaType = "mw:Error " + rdfaType;
-
-   // Add error info to data-mw
-   dataMWObj = dataMW ? JSON.parse(dataMW) : {};
-   var errs = dataMWObj.errors;
-   if (!errs) {
-   errs = [];
-   dataMWObj.errors = errs;
-   }
 
// Set appropriate error info
if (title && (err || !data)) {
@@ -1023,6 +997,27 @@
errs.push({"key": "missing-image", "message": "This 
image does not exist." });
}
}
+
+   switch (info.mediatype && info.mediatype.toLowerCase()) {
+   default:
+   this.handleImage(cb, token, opts, optSources, errs, 
info);
+   }
+};
+
+// Set up the actual image structure, attributes etc
+WikiLinkHandler.prototype.handleImage = function(cb, token, opts, optSources, 
errs, info) {
+   var hasImageLink = (opts.link === undefined || opts.link && opts.link.v 
!== '');
+   var iContainerName = hasImageLink ? 'a' : 'span';
+ 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] T64270: Support video and audio content

[Arlolra (Code Review)]

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

Change subject: [WIP] T64270: Support video and audio content
..

[WIP] T64270: Support video and audio content

Change-Id: I53c6fa8d862c152bb1c8dd3ae96f4ee464a60d32
---
M lib/html2wt/DOMHandlers.js
M lib/html2wt/LinkHandler.js
M lib/wt2html/tt/LinkHandler.js
M lib/wt2html/tt/Sanitizer.js
4 files changed, 54 insertions(+), 3 deletions(-)


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

diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index 172cc1f..36bea30 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -38,6 +38,10 @@
'mw:Image/Frameless',
'mw:Image/Frame',
'mw:Image/Thumb',
+   'mw:Video',
+   'mw:Video/Frameless',
+   'mw:Video/Frame',
+   'mw:Video/Thumb',
'mw:Entity',
'mw:DiffMarker',
'mw:Placeholder',
@@ -1160,7 +1164,7 @@
}, null).then(function() {

WTSUtils.emitEndTag('', node, state);
});
-   } else if 
(/(?:^|\s)mw\:Image(\/(Frame|Frameless|Thumb))?/.test(type)) {
+   } else if 
(/(?:^|\s)mw:(?:Image|Video)(\/(Frame|Frameless|Thumb))?/.test(type)) {
return 
state.serializer.figureHandler(node);
} else if (/(?:^|\s)mw\:Entity/.test(type) && 
node.childNodes.length === 1) {
// handle a new mw:Entity (not handled 
by selser) by
@@ -1250,6 +1254,11 @@
}
}),
},
+   video: {
+   handle: Promise.method(function(node, state, wrapperUnmodified) 
{
+   return state.serializer.figureHandler(node);
+   }),
+   },
hr: {
handle: Promise.method(function(node, state, wrapperUnmodified) 
{
state.emitChunk('-'.repeat(4 + 
(DU.getDataParsoid(node).extra_dashes || 0)), node);
diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index e544b02..ce81379 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -707,6 +707,8 @@
 
 function getEltName(type) {
switch (type) {
+   case 'mw:Video':
+   return 'VIDEO';
default:
return 'IMG';
}
@@ -730,7 +732,7 @@
var outerElt = node;
 
var typeOf = node.getAttribute('typeof') || '';
-   var match = typeOf.match(/(?:^|\s)(mw:Image)(?:\/\w*)?(?:\s|$)/);
+   var match = 
typeOf.match(/(?:^|\s)(mw:(?:Image|Video))(?:\/\w*)?(?:\s|$)/);
var rdfaType = match && match[1] || '';
 
var eltName = getEltName(rdfaType);
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 85c1684..484428c 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1031,6 +1031,40 @@
};
 };
 
+WikiLinkHandler.prototype.handleVideo = function(opts, info, errs) {
+   var start = new TagTk('video');
+   if (info.thumburl) {
+   start.addAttribute('poster', info.thumburl);
+   }
+   start.addAttribute('controls', '');
+   start.addAttribute('preload', 'none');
+   start.addAttribute('class', 'video-js');
+
+   start.addNormalizedAttribute('resource',
+   this.env.makeLink(opts.title.v), opts.title.src);
+
+   var derivatives = Array.isArray(info.derivatives) ?
+   info.derivatives : [{ src: info.url, type: info.mime }];
+
+   var sources = derivatives.map(function(o) {
+   var source = new SelfclosingTagTk('source');
+   source.addAttribute('src', o.src);
+   source.addAttribute('type', o.type);
+   return source;
+   });
+
+   var tracks = [];
+
+   var end = new EndTagTk('video');
+   var elt = [start].concat(sources, tracks, end);
+
+   return {
+   rdfaType: 'mw:Video',
+   elt: elt,
+   hasLink: false,
+   };
+};
+
 // Handle a response to an imageinfo API request.
 WikiLinkHandler.prototype.handleInfo = function(cb, token, title, opts, 
optSources, err, data) {
// FIXME: Not doing this till we fix up wt2html error handling
@@ -1100,6 +1134,9 @@
 
var o;
switch (info.mediatype && info.mediatype.toLowerCase()) {
+   case 'video':
+   o = this.handleVideo(opts, info, errs);
+   break;
default:
o = this.handleImage(opts, info, errs);
}
diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index 183b673..4e8aa4c 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [wip^n] Define interaction states for filters

[Mooeypoo (Code Review)]

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

Change subject: [wip^n] Define interaction states for filters
..

[wip^n] Define interaction states for filters

Interactions of 'conflicts', 'subset's and whether a group is
'full coverage'.

Bug: T156864
Bug: T156861
Bug: T156860
Change-Id: If20bbe9f1442cfcfce046e56f6150b38dd3a4efc
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
9 files changed, 526 insertions(+), 391 deletions(-)


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

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index bc911f4..9e7c898 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -10,8 +10,8 @@
 * @cfg {string} [type='send_unselected_if_any'] Group type
 * @cfg {string} [title] Group title
 * @cfg {string} [separator='|'] Value separator for 'string_options' 
groups
-* @cfg {string} [exclusionType='default'] Group exclusion type
 * @cfg {boolean} [active] Group is active
+* @cfg {boolean} [fullCoverage] This group has items that are full 
coverage
 */
mw.rcfilters.dm.FilterGroup = function MwRcfiltersDmFilterGroup( config 
) {
config = config || {};
@@ -23,8 +23,12 @@
this.type = config.type || 'send_unselected_if_any';
this.title = config.title;
this.separator = config.separator || '|';
-   this.exclusionType = config.exclusionType || 'default';
+
this.active = !!config.active;
+   this.fullCoverage = !!config.fullCoverage;
+
+   this.aggregate( { update: 'filterItemUpdate' } );
+   this.connect( this, { filterItemUpdate: 'onFilterItemUpdate' } 
);
};
 
/* Initialization */
@@ -43,23 +47,13 @@
/* Methods */
 
/**
-* Check the active status of the group and set it accordingly.
+* Respond to filterItem update event
 *
 * @fires update
 */
-   mw.rcfilters.dm.FilterGroup.prototype.checkActive = function () {
-   var active,
-   count = 0;
-
-   // Recheck group activity
-   this.getItems().forEach( function ( filterItem ) {
-   count += Number( filterItem.isSelected() );
-   } );
-
-   active = (
-   count > 0 &&
-   count < this.getItemCount()
-   );
+   mw.rcfilters.dm.FilterGroup.prototype.onFilterItemUpdate = function () {
+   // Update state
+   var active = this.areAnySelected();
 
if ( this.active !== active ) {
this.active = active;
@@ -74,6 +68,54 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.isActive = function () {
return this.active;
+   };
+
+   /**
+* Check whether there are any items selected
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.areAnySelected = function () {
+   return this.getItems().some( function ( filterItem ) {
+   return filterItem.isSelected();
+   } );
+   };
+
+   /**
+* Check whether all items selected
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.areAllSelected = function () {
+   return this.getItems().every( function ( filterItem ) {
+   return filterItem.isSelected();
+   } );
+   };
+
+   /**
+* Get all selected items in this group
+*
+* @return {mw.rcfilters.dm.FilterItem[]} Selected items
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.getSelectedItems = function () {
+   var items = [];
+
+   this.getItems().forEach( function ( item ) {
+   if ( item.isSelected() ) {
+   items.push( item );
+   }
+   } );
+
+   return items;
+   };
+
+   /**
+* 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mysql: Linting changes

[Dzahn (Code Review)]

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

Change subject: mysql: Linting changes
..


mysql: Linting changes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645

Change-Id: I60b79346d81d97dba56d93da17d128b5d1011baf
---
M modules/mysql/manifests/server.pp
M modules/mysql/manifests/server/config.pp
M modules/mysql/tests/backup.pp
M modules/mysql/tests/init.pp
M modules/mysql/tests/java.pp
M modules/mysql/tests/mysql_database.pp
M modules/mysql/tests/mysql_user.pp
M modules/mysql/tests/python.pp
M modules/mysql/tests/ruby.pp
M modules/mysql/tests/server.pp
M modules/mysql/tests/server/account_security.pp
M modules/mysql/tests/server/config.pp
12 files changed, 22 insertions(+), 22 deletions(-)

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



diff --git a/modules/mysql/manifests/server.pp 
b/modules/mysql/manifests/server.pp
index f700489..4ebb8f1 100644
--- a/modules/mysql/manifests/server.pp
+++ b/modules/mysql/manifests/server.pp
@@ -34,7 +34,7 @@
 
   create_resources( 'class', $config_class )
 
-  class {'mysql::server::package':
+  class {'::mysql::server::package':
 package_name => $package_name,
   }
 
@@ -49,7 +49,7 @@
   }
 
   if $use_apparmor {
-  include apparmor
+  include ::apparmor
   # mysql is protected by apparmor.  Need to
   # reload apparmor if the file changes.
   file { '/etc/apparmor.d/usr.sbin.mysqld':
@@ -69,7 +69,7 @@
 require => [File['/etc/apparmor.d/usr.sbin.mysqld']],
 tries   => 2,
 refreshonly => true,
-subscribe   => File['/etc/mysql/my.cnf']
+subscribe   => File['/etc/mysql/my.cnf'],
   }
   }
 }
diff --git a/modules/mysql/manifests/server/config.pp 
b/modules/mysql/manifests/server/config.pp
index 65dc784..a446673 100644
--- a/modules/mysql/manifests/server/config.pp
+++ b/modules/mysql/manifests/server/config.pp
@@ -85,7 +85,7 @@
   $settings,
   $notify_service = false
 ) {
-  include mysql::config
+  include ::mysql::config
 
   if is_hash($settings) {
 $content = template('mysql/my.conf.cnf.erb')
diff --git a/modules/mysql/tests/backup.pp b/modules/mysql/tests/backup.pp
index cb669e6..9bff3ed 100644
--- a/modules/mysql/tests/backup.pp
+++ b/modules/mysql/tests/backup.pp
@@ -1,7 +1,7 @@
-class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
+class { '::mysql::server':
+  config_hash => {'root_password' => 'password'},
 }
-class { 'mysql::backup':
+class { '::mysql::backup':
   backupuser => 'myuser',
   backuppassword => 'mypassword',
   backupdir  => '/tmp/backups',
diff --git a/modules/mysql/tests/init.pp b/modules/mysql/tests/init.pp
index 846121b..783c7af 100644
--- a/modules/mysql/tests/init.pp
+++ b/modules/mysql/tests/init.pp
@@ -1 +1 @@
-include mysql
+include ::mysql
diff --git a/modules/mysql/tests/java.pp b/modules/mysql/tests/java.pp
index 0fc009a..0b14e05 100644
--- a/modules/mysql/tests/java.pp
+++ b/modules/mysql/tests/java.pp
@@ -1 +1 @@
-class { 'mysql::java':}
+class { '::mysql::java':}
diff --git a/modules/mysql/tests/mysql_database.pp 
b/modules/mysql/tests/mysql_database.pp
index 8747f70..7e272ce 100644
--- a/modules/mysql/tests/mysql_database.pp
+++ b/modules/mysql/tests/mysql_database.pp
@@ -1,5 +1,5 @@
-class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
+class { '::mysql::server':
+  config_hash => {'root_password' => 'password'},
 }
 database{ ['test1', 'test2', 'test3']:
   ensure  => present,
diff --git a/modules/mysql/tests/mysql_user.pp 
b/modules/mysql/tests/mysql_user.pp
index f639084..48ee938 100644
--- a/modules/mysql/tests/mysql_user.pp
+++ b/modules/mysql/tests/mysql_user.pp
@@ -1,9 +1,9 @@
 $mysql_root_pw = 'password'
 
-class { 'mysql::server':
+class { '::mysql::server':
   config_hash => {
 root_password => 'password',
-  }
+  },
 }
 
 database_user{ 'redmine@localhost':
@@ -14,7 +14,7 @@
 
 database_user{ 'dan@localhost':
   ensure=> present,
-  password_hash => mysql_password('blah')
+  password_hash => mysql_password('blah'),
 }
 
 database_user{ 'dan@%':
diff --git a/modules/mysql/tests/python.pp b/modules/mysql/tests/python.pp
index 04f7ffa..7079511 100644
--- a/modules/mysql/tests/python.pp
+++ b/modules/mysql/tests/python.pp
@@ -1 +1 @@
-class { 'mysql::python':}
+class { '::mysql::python':}
diff --git a/modules/mysql/tests/ruby.pp b/modules/mysql/tests/ruby.pp
index e84c046..8455c2a 100644
--- a/modules/mysql/tests/ruby.pp
+++ b/modules/mysql/tests/ruby.pp
@@ -1 +1 @@
-include mysql::ruby
+include ::mysql::ruby
diff --git a/modules/mysql/tests/server.pp b/modules/mysql/tests/server.pp
index 47e2fa3..f5a13f7 100644
--- a/modules/mysql/tests/server.pp
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...Lingo[master]: Update Readme for Customization changes with extension.json

[Foxtrott (Code Review)]

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

Change subject: Update Readme for Customization changes with extension.json
..


Update Readme for Customization changes with extension.json

Have to use a hook now.

Change-Id: I4d48aeb301c3cb68c99f0d9613dc0db4cc574253
---
M README.md
1 file changed, 18 insertions(+), 10 deletions(-)

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



diff --git a/README.md b/README.md
index cc3de9e..eda9706 100644
--- a/README.md
+++ b/README.md
@@ -45,20 +45,28 @@
 
 ## Customization
 
-The following settings may be used:
+Add the following to `LocalSettings.php` and uncomment/modify as needed:
 
-* `$wgexLingoPage` to specify the name of the terminology page
-  Example: `$wgexLingoPage = 'Glossary'`;
+```php
+$wgHooks['SetupAfterCache'][] = function() {
 
-* `$wgexLingoDisplayOnce` to specify that each term should be annotated only
-  once per page
-  Example: `$wgexLingoDisplayOnce = true`;
+// specify a different name for the terminology page (Default: 
'Terminology' (or localised version). See MediaWiki:Lingo-terminologypagename.)
+//$GLOBALS['wgexLingoPage'] = 'Terminology';
 
-* `$wgexLingoUseNamespaces` to specify what namespaces should or should not be
-  used
-  Example: `$wgexLingoUseNamespaces[NS_TALK] = false`;
+// specify that each term should be annotated only once per page (Default: 
false)
+//$GLOBALS['wgexLingoDisplayOnce'] = false;
 
-If you want to use these settings, just include them in LocalSettings.php.
+// specify what namespaces should or should not be used (Default: Empty, 
i.e. use all namespaces)
+//$GLOBALS['wgexLingoUseNamespaces'][NS_SPECIAL] = false;
+
+// set default cache type (Default: null, i.e. use main cache)
+//$GLOBALS['wgexLingoCacheType'] = CACHE_NONE;
+
+// use ApprovedRevs extension on the Terminology page (Default: false)
+//$GLOBALS['wgexLingoEnableApprovedRevs'] = true;
+
+};
+```
 
 ## Usage
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d48aeb301c3cb68c99f0d9613dc0db4cc574253
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lingo
Gerrit-Branch: master
Gerrit-Owner: Foxtrott 
Gerrit-Reviewer: Foxtrott 
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]: FieldLayout: Remove the need for 'simulateLabelClick'

[jenkins-bot (Code Review)]

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

Change subject: FieldLayout: Remove the need for 'simulateLabelClick'
..


FieldLayout: Remove the need for 'simulateLabelClick'

* Set 'for' attribute using 'getInputId' on $body
* Deprecate InputWidget#simulateLabelClick

Bug: T100219
Change-Id: I3424ecfd741b5e268513a5dd778e5082de8f7674
---
M php/layouts/FieldLayout.php
M src/layouts/FieldLayout.js
M src/widgets/InputWidget.js
3 files changed, 7 insertions(+), 14 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index c3fdf1e..e7b638b 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -110,6 +110,9 @@
array_merge( $config, [ 'titled' => $this->label ] ) );
 
// Initialization
+   if ( $hasInputWidget ) {
+   $this->body->setAttributes( [ 'for' => 
$this->fieldWidget->getInputId() ] );
+   }
$this
->addClasses( [ 'oo-ui-fieldLayout' ] )
->toggleClasses( [ 'oo-ui-fieldLayout-disable' ], 
$this->fieldWidget->isDisabled() )
diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index 06acc4e..7d6a739 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -93,12 +93,12 @@
}
 
// Events
-   if ( hasInputWidget ) {
-   this.$label.on( 'click', this.onLabelClick.bind( this ) );
-   }
this.fieldWidget.connect( this, { disable: 'onFieldDisable' } );
 
// Initialization
+   if ( hasInputWidget ) {
+   this.$body.attr( 'for', this.fieldWidget.getInputId() );
+   }
this.$element
.addClass( 'oo-ui-fieldLayout' )
.toggleClass( 'oo-ui-fieldLayout-disabled', 
this.fieldWidget.isDisabled() )
@@ -131,17 +131,6 @@
  */
 OO.ui.FieldLayout.prototype.onFieldDisable = function ( value ) {
this.$element.toggleClass( 'oo-ui-fieldLayout-disabled', value );
-};
-
-/**
- * Handle label mouse click events.
- *
- * @private
- * @param {jQuery.Event} e Mouse click event
- */
-OO.ui.FieldLayout.prototype.onLabelClick = function () {
-   this.fieldWidget.simulateLabelClick();
-   return false;
 };
 
 /**
diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js
index 9b1a16f..6f553a8 100644
--- a/src/widgets/InputWidget.js
+++ b/src/widgets/InputWidget.js
@@ -232,6 +232,7 @@
  * called directly.
  */
 OO.ui.InputWidget.prototype.simulateLabelClick = function () {
+   OO.ui.warnDeprecation( 'InputWidget: simulateLabelClick() is 
deprecated.' );
if ( !this.isDisabled() ) {
if ( this.$input.is( ':checkbox, :radio' ) ) {
this.$input.click();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3424ecfd741b5e268513a5dd778e5082de8f7674
Gerrit-PatchSet: 15
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: Bartosz Dziewoński 
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] oojs/ui[master]: FieldLayout: Move from $body to $label

[jenkins-bot (Code Review)]

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

Change subject: FieldLayout: Move  from $body to $label
..


FieldLayout: Move  from $body to $label

When the  element (currently, $body is one) wraps anything else
than the actual label and the actual input it pertains to, weird
things happen. In particular, for ActionFieldLayout, hovering/clicking
the button causes hover/click effects on the main input.

We put  on the $body, because we were relying on the nesting for
the  to work. But since I3424ecfd741b5e268513a5dd778e5082de8f7674
added the 'for' attribute, we no longer need this.

Additionally, let's always use  rather than  for consistency.
We did this to avoid wrapping  around complicated widgets, but
now we no longer wrap it around anything.

Change-Id: Ic4651a7d0868c505dee85ace8d7ac3b6017cfac1
---
M php/layouts/FieldLayout.php
M src/layouts/FieldLayout.js
2 files changed, 12 insertions(+), 14 deletions(-)

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



diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index e7b638b..d17d846 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -77,8 +77,6 @@
throw new Exception( 'Widget not found' );
}
 
-   $hasInputWidget = $fieldWidget::$supportsSimpleLabel;
-
// Config initialization
$config = array_merge( [ 'align' => 'left' ], $config );
 
@@ -92,7 +90,7 @@
$this->field = new Tag( 'div' );
$this->messages = new Tag( 'ul' );
$this->header = new Tag( 'div' );
-   $this->body = new Tag( $hasInputWidget ? 'label' : 'div' );
+   $this->body = new Tag( 'div' );
if ( isset( $config['help'] ) ) {
$this->help = new ButtonWidget( [
'classes' => [ 'oo-ui-fieldLayout-help' ],
@@ -105,13 +103,15 @@
}
 
// Traits
-   $this->initializeLabelElement( $config );
+   $this->initializeLabelElement( array_merge( $config, [
+   'labelElement' => new Tag( 'label' )
+   ] ) );
$this->initializeTitledElement(
array_merge( $config, [ 'titled' => $this->label ] ) );
 
// Initialization
-   if ( $hasInputWidget ) {
-   $this->body->setAttributes( [ 'for' => 
$this->fieldWidget->getInputId() ] );
+   if ( $fieldWidget::$supportsSimpleLabel ) {
+   $this->label->setAttributes( [ 'for' => 
$this->fieldWidget->getInputId() ] );
}
$this
->addClasses( [ 'oo-ui-fieldLayout' ] )
diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index 7d6a739..ee6a34c 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -39,8 +39,6 @@
  * @throws {Error} An error is thrown if no widget is specified
  */
 OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) {
-   var hasInputWidget;
-
// Allow passing positional parameters inside the config object
if ( OO.isPlainObject( fieldWidget ) && config === undefined ) {
config = fieldWidget;
@@ -52,8 +50,6 @@
throw new Error( 'Widget not found' );
}
 
-   hasInputWidget = fieldWidget.constructor.static.supportsSimpleLabel;
-
// Configuration initialization
config = $.extend( { align: 'left' }, config );
 
@@ -61,7 +57,9 @@
OO.ui.FieldLayout.parent.call( this, config );
 
// Mixin constructors
-   OO.ui.mixin.LabelElement.call( this, config );
+   OO.ui.mixin.LabelElement.call( this, $.extend( {}, config, {
+   $label: $( '' )
+   } ) );
OO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: 
this.$label } ) );
 
// Properties
@@ -71,7 +69,7 @@
this.$field = $( '' );
this.$messages = $( '' );
this.$header = $( '' );
-   this.$body = $( '<' + ( hasInputWidget ? 'label' : 'div' ) + '>' );
+   this.$body = $( '' );
this.align = null;
if ( config.help ) {
this.popupButtonWidget = new OO.ui.PopupButtonWidget( {
@@ -96,8 +94,8 @@
this.fieldWidget.connect( this, { disable: 'onFieldDisable' } );
 
// Initialization
-   if ( hasInputWidget ) {
-   this.$body.attr( 'for', this.fieldWidget.getInputId() );
+   if ( fieldWidget.constructor.static.supportsSimpleLabel ) {
+   this.$label.attr( 'for', this.fieldWidget.getInputId() );
}
this.$element
.addClass( 'oo-ui-fieldLayout' )

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] mediawiki...Lingo[master]: Update Readme for Customization changes with extension.json

[Foxtrott (Code Review)]

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

Change subject: Update Readme for Customization changes with extension.json
..

Update Readme for Customization changes with extension.json

Have to use a hook now.

Change-Id: I4d48aeb301c3cb68c99f0d9613dc0db4cc574253
---
M README.md
1 file changed, 18 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Lingo 
refs/changes/50/335950/1

diff --git a/README.md b/README.md
index cc3de9e..eda9706 100644
--- a/README.md
+++ b/README.md
@@ -45,20 +45,28 @@
 
 ## Customization
 
-The following settings may be used:
+Add the following to `LocalSettings.php` and uncomment/modify as needed:
 
-* `$wgexLingoPage` to specify the name of the terminology page
-  Example: `$wgexLingoPage = 'Glossary'`;
+```php
+$wgHooks['SetupAfterCache'][] = function() {
 
-* `$wgexLingoDisplayOnce` to specify that each term should be annotated only
-  once per page
-  Example: `$wgexLingoDisplayOnce = true`;
+// specify a different name for the terminology page (Default: 
'Terminology' (or localised version). See MediaWiki:Lingo-terminologypagename.)
+//$GLOBALS['wgexLingoPage'] = 'Terminology';
 
-* `$wgexLingoUseNamespaces` to specify what namespaces should or should not be
-  used
-  Example: `$wgexLingoUseNamespaces[NS_TALK] = false`;
+// specify that each term should be annotated only once per page (Default: 
false)
+//$GLOBALS['wgexLingoDisplayOnce'] = false;
 
-If you want to use these settings, just include them in LocalSettings.php.
+// specify what namespaces should or should not be used (Default: Empty, 
i.e. use all namespaces)
+//$GLOBALS['wgexLingoUseNamespaces'][NS_SPECIAL] = false;
+
+// set default cache type (Default: null, i.e. use main cache)
+//$GLOBALS['wgexLingoCacheType'] = CACHE_NONE;
+
+// use ApprovedRevs extension on the Terminology page (Default: false)
+//$GLOBALS['wgexLingoEnableApprovedRevs'] = true;
+
+};
+```
 
 ## Usage
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d48aeb301c3cb68c99f0d9613dc0db4cc574253
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lingo
Gerrit-Branch: master
Gerrit-Owner: Foxtrott 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Add twitter meta tag for image

[Ladsgroup (Code Review)]

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

Change subject: Add twitter meta tag for image
..

Add twitter meta tag for image

Bug: T157145
Change-Id: I8605b69b658b99941d63db3707ae6c2c0cf1b2ce
---
M includes/PageImages.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/includes/PageImages.php b/includes/PageImages.php
index 4a8004b..35ef710 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -212,6 +212,8 @@
}
 
$out->addMeta( 'og:image', wfExpandUrl( $thumb->getUrl(), 
PROTO_CANONICAL ) );
+   // Make twitter understand: T157145
+   $out->addMeta( 'twitter:card', 'summary_large_image' );
}
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: graphoid/gridengine/grub/haproxy/hhvm lint fixes

[Dzahn (Code Review)]

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

Change subject: graphoid/gridengine/grub/haproxy/hhvm lint fixes
..


graphoid/gridengine/grub/haproxy/hhvm lint fixes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: I2bf2974312af9e7991d44fd1b1426e39a1651bad
---
M modules/graphoid/manifests/init.pp
M modules/gridengine/manifests/exec_host.pp
M modules/grub/manifests/bootparam.pp
M modules/grub/manifests/defaults.pp
M modules/haproxy/manifests/init.pp
M modules/hhvm/manifests/init.pp
6 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/modules/graphoid/manifests/init.pp 
b/modules/graphoid/manifests/init.pp
index 652f526..46cd6a4 100644
--- a/modules/graphoid/manifests/init.pp
+++ b/modules/graphoid/manifests/init.pp
@@ -44,7 +44,7 @@
 errorHeaders   => $error_headers,
 no_proxy_list  => inline_template(
 '<%= @allowed_domains.values.flatten.sort.join(",") %>'
-)
+),
 },
 has_spec=> true,
 healthcheck_url => '',
diff --git a/modules/gridengine/manifests/exec_host.pp 
b/modules/gridengine/manifests/exec_host.pp
index 05019e5..4950862 100644
--- a/modules/gridengine/manifests/exec_host.pp
+++ b/modules/gridengine/manifests/exec_host.pp
@@ -4,7 +4,7 @@
 $config = undef,
 ) {
 
-include gridengine
+include ::gridengine
 
 package { 'gridengine-exec':
 ensure  => latest,
diff --git a/modules/grub/manifests/bootparam.pp 
b/modules/grub/manifests/bootparam.pp
index 33fe21e..18da81b 100644
--- a/modules/grub/manifests/bootparam.pp
+++ b/modules/grub/manifests/bootparam.pp
@@ -37,7 +37,7 @@
   $value=undef,
   $glob=true,
 ) {
-include grub
+include ::grub
 
 if versioncmp($::augeasversion, '1.2.0') < 0 {
 fail('not supported on systems running an old augeas')
diff --git a/modules/grub/manifests/defaults.pp 
b/modules/grub/manifests/defaults.pp
index c8b297a..10a2934 100644
--- a/modules/grub/manifests/defaults.pp
+++ b/modules/grub/manifests/defaults.pp
@@ -12,7 +12,7 @@
 #
 
 class grub::defaults {
-include grub
+include ::grub
 
 # The augeas Shellvars_list lens can't handle backticks for versions < 1.2
 # We fallback to the legacy grep/sed method in that case.
diff --git a/modules/haproxy/manifests/init.pp 
b/modules/haproxy/manifests/init.pp
index 63a094f..74c9e53 100644
--- a/modules/haproxy/manifests/init.pp
+++ b/modules/haproxy/manifests/init.pp
@@ -52,7 +52,7 @@
 group   => 'root',
 source  => 'puppet:///modules/haproxy/haproxy.service',
 require => File['/usr/local/bin/generate_haproxy_default.sh'],
-notify  => Exec['/bin/systemctl daemon-reload']
+notify  => Exec['/bin/systemctl daemon-reload'],
 }
 
 exec { '/bin/systemctl daemon-reload':
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 133ac3b..40956f1 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -160,8 +160,8 @@
 perf_pid_map  => true,  # See 

 repo  => {
 central => {
-path => "${cache_dir}/fcgi.hhbc.sq3"
-}
+path => "${cache_dir}/fcgi.hhbc.sq3",
+},
 },
 admin_server  => { port => 9001 },
 server=> {
@@ -184,8 +184,8 @@
 repo => {
 central => { path => "${cache_dir}/cli.hhbc.sq3" },
 local   => { mode => '--' },
-}
-}
+},
+},
 }
 
 $cli_hiera= hiera_hash('hhvm::extra::cli', {})

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bf2974312af9e7991d44fd1b1426e39a1651bad
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Bump various dev dependencies to latest

[jenkins-bot (Code Review)]

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

Change subject: build: Bump various dev dependencies to latest
..


build: Bump various dev dependencies to latest

 grunt-contrib-cssmin1.0.1  →  1.0.2
 grunt-contrib-less  1.3.0  →  1.4.0
 grunt-contrib-uglify1.0.1  →  2.0.0
 grunt-exec  1.0.0  →  1.0.1

Leaving all the qunit and karma ones as-is for now, due to the complex
breaking changes there for our CI. Leaving grunt-image because it seems
to segfault.

Change-Id: Ib304f053022a191b4a025094ad091ce2816e389c
---
M package.json
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/package.json b/package.json
index 4cfa299..b6b03fb 100644
--- a/package.json
+++ b/package.json
@@ -32,14 +32,14 @@
 "grunt-contrib-clean": "1.0.0",
 "grunt-contrib-concat": "1.0.1",
 "grunt-contrib-copy": "1.0.0",
-"grunt-contrib-cssmin": "1.0.1",
-"grunt-contrib-less": "1.3.0",
-"grunt-contrib-uglify": "1.0.1",
+"grunt-contrib-cssmin": "1.0.2",
+"grunt-contrib-less": "1.4.0",
+"grunt-contrib-uglify": "2.0.0",
 "grunt-contrib-watch": "1.0.0",
 "grunt-csscomb": 
"git://github.com/jdforrester/grunt-csscomb.git#v3.1.0-wmf.1",
 "grunt-cssjanus": "0.3.2",
 "grunt-eslint": "19.0.0",
-"grunt-exec": "1.0.0",
+"grunt-exec": "1.0.1",
 "grunt-file-exists": "0.1.4",
 "grunt-image": "1.5.2",
 "grunt-jsonlint": "1.1.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib304f053022a191b4a025094ad091ce2816e389c
Gerrit-PatchSet: 6
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mooeypoo 
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] oojs/ui[master]: LabelWidget: Remove the need for 'simulateLabelClick'

[jenkins-bot (Code Review)]

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

Change subject: LabelWidget: Remove the need for 'simulateLabelClick'
..


LabelWidget: Remove the need for 'simulateLabelClick'

* Add a 'getInputId()' method to InputWidget
* Convert all LabelWidgets to use '' instead of ''
* Use the 'for' attribute instead of 'simulateLabelClick'
* Update PHP code to match
* Ignore unimportant differences in 'for' value in the tests

Bug: T100219
Change-Id: If299593c9b5d703bc5ac3e2ceb0857820240d730
---
M php/widgets/InputWidget.php
M php/widgets/LabelWidget.php
M src/widgets/InputWidget.js
M src/widgets/LabelWidget.js
M tests/QUnit.assert.equalDomElement.js
5 files changed, 49 insertions(+), 20 deletions(-)

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



diff --git a/php/widgets/InputWidget.php b/php/widgets/InputWidget.php
index 2cb409b..d804cf9 100644
--- a/php/widgets/InputWidget.php
+++ b/php/widgets/InputWidget.php
@@ -83,6 +83,25 @@
}
 
/**
+* Get input element's ID.
+*
+* If the element already has an ID then that is returned, otherwise 
unique ID is
+* generated, set on the element, and returned.
+*
+* @return {string} The ID of the element
+*/
+   public function getInputId() {
+   $id = $this->input->getAttribute( 'id' );
+
+   if ( $id === null ) {
+   $id = Tag::generateElementId();
+   $this->setAttributes( [ 'id' => $id ] );
+   }
+
+   return $id;
+   }
+
+   /**
 * Get the value of the input.
 *
 * @return string Input value
diff --git a/php/widgets/LabelWidget.php b/php/widgets/LabelWidget.php
index 35afe09..f57cc4c 100644
--- a/php/widgets/LabelWidget.php
+++ b/php/widgets/LabelWidget.php
@@ -10,7 +10,7 @@
 
/* Static Properties */
 
-   public static $tagName = 'span';
+   public static $tagName = 'label';
 
/* Properties */
 
@@ -37,6 +37,9 @@
$this->input = isset( $config['input'] ) ? $config['input'] : 
null;
 
// Initialization
+   if ( $this->input instanceof InputWidget ) {
+   $this->setAttributes( [ 'for' => 
$this->input->getInputId() ] );
+   }
$this->addClasses( [ 'oo-ui-labelWidget' ] );
}
 
diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js
index b7e7106..9b1a16f 100644
--- a/src/widgets/InputWidget.js
+++ b/src/widgets/InputWidget.js
@@ -126,6 +126,25 @@
 };
 
 /**
+ * Get input element's ID.
+ *
+ * If the element already has an ID then that is returned, otherwise unique ID 
is
+ * generated, set on the element, and returned.
+ *
+ * @return {string} The ID of the element
+ */
+OO.ui.InputWidget.prototype.getInputId = function () {
+   var id = this.$input.attr( 'id' );
+
+   if ( id === undefined ) {
+   id = OO.ui.generateElementId();
+   this.$input.attr( 'id', id );
+   }
+
+   return id;
+};
+
+/**
  * Handle potentially value-changing events.
  *
  * @private
diff --git a/src/widgets/LabelWidget.js b/src/widgets/LabelWidget.js
index f64d970..c2f2336 100644
--- a/src/widgets/LabelWidget.js
+++ b/src/widgets/LabelWidget.js
@@ -51,12 +51,10 @@
// Properties
this.input = config.input;
 
-   // Events
-   if ( this.input instanceof OO.ui.InputWidget ) {
-   this.$element.on( 'click', this.onClick.bind( this ) );
-   }
-
// Initialization
+   if ( this.input instanceof OO.ui.InputWidget ) {
+   this.$element.attr( 'for', this.input.getInputId() );
+   }
this.$element.addClass( 'oo-ui-labelWidget' );
 };
 
@@ -72,17 +70,4 @@
  * @static
  * @inheritdoc
  */
-OO.ui.LabelWidget.static.tagName = 'span';
-
-/* Methods */
-
-/**
- * Handles label mouse click events.
- *
- * @private
- * @param {jQuery.Event} e Mouse click event
- */
-OO.ui.LabelWidget.prototype.onClick = function () {
-   this.input.simulateLabelClick();
-   return false;
-};
+OO.ui.LabelWidget.static.tagName = 'label';
diff --git a/tests/QUnit.assert.equalDomElement.js 
b/tests/QUnit.assert.equalDomElement.js
index 0cf44b6..9cae0f6 100644
--- a/tests/QUnit.assert.equalDomElement.js
+++ b/tests/QUnit.assert.equalDomElement.js
@@ -85,6 +85,9 @@
if ( summary.attributes.id !== undefined && 
summary.attributes.id.match( /^(ooui-|oojsui-)/ ) ) {
delete summary.attributes.id;
}
+   if ( summary.attributes.for !== undefined && 
summary.attributes.for.match( /^(ooui-|oojsui-)/ ) ) {
+   delete summary.attributes.for;
+   }
// Infusion data
if ( summary.attributes[ 'data-ooui' ] !== undefined ) {

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Mediawiki theme: Fix focus inset to overlap scrollbars

[jenkins-bot (Code Review)]

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

Change subject: Mediawiki theme: Fix focus inset to overlap scrollbars
..


Mediawiki theme: Fix focus inset to overlap scrollbars

Fix focus inset on TextinputWidget's textareas by applying `outline` and
`outline-offset`. As IE/Edge are the only browser which don't support this
property, let's hack them out of our way.

Bug: T103851
Change-Id: Iad03f82cee0d2c06ebb4a3c6f28e54881e7f8cdb
---
M src/themes/mediawiki/widgets.less
1 file changed, 11 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  Esanders: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 8b852e3..93349c2 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -767,6 +767,17 @@
}
}
 
+   // HACK: Exclude IE/Edge (and Saf<6) from this selector as it
+   // doesn't understand `outline-offset`. All other browsers do. 
:/
+   @media screen {
+   @media ( min-width: 0 ) {
+   textarea:focus {
+   outline: 1px solid @color-progressive;
+   outline-offset: -2px;
+   }
+   }
+   }
+
.mw-placeholder();
 
&.oo-ui-flaggedElement-invalid {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad03f82cee0d2c06ebb4a3c6f28e54881e7f8cdb
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
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] oojs/ui[master]: demo: Remove 'Constructive' button from the icons page

[jenkins-bot (Code Review)]

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

Change subject: demo: Remove 'Constructive' button from the icons page
..


demo: Remove 'Constructive' button from the icons page

Constructive colors were deprecated in the Mediawiki theme, and the
Apex theme doesn't generate icons in this variant.

Bug: T156870
Change-Id: I3475b8d56c34729be390e00f92bb6e7d672284ea
---
M demos/pages/icons.js
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 6829529..10b689d 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -263,15 +263,6 @@
}
} ),
new OO.ui.ButtonOptionWidget( {
-   label: 'Constructive',
-   flags: [ 'constructive' ],
-   data: {
-   progressive: false,
-   constructive: true,
-   destructive: false
-   }
-   } ),
-   new OO.ui.ButtonOptionWidget( {
label: 'Destructive',
flags: [ 'destructive' ],
data: {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3475b8d56c34729be390e00f92bb6e7d672284ea
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
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] oojs/ui[master]: DraggableGroupElement: Add mandatory ARIA role

[jenkins-bot (Code Review)]

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

Change subject: DraggableGroupElement: Add mandatory ARIA role
..


DraggableGroupElement: Add mandatory ARIA role

Adding mandatory ARIA role `listbox` for widget, which contains
`role=option` items.

Bug: T149650
Change-Id: I6ba78fb6b4ae696efacfa93a91ef377037481eb7
---
M src/mixins/DraggableGroupElement.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/src/mixins/DraggableGroupElement.js 
b/src/mixins/DraggableGroupElement.js
index 1f51416..b595e38 100644
--- a/src/mixins/DraggableGroupElement.js
+++ b/src/mixins/DraggableGroupElement.js
@@ -46,6 +46,7 @@
}
this.$element
.addClass( 'oo-ui-draggableGroupElement' )
+   .attr( 'role', 'listbox' )
.append( this.$status )
.toggleClass( 'oo-ui-draggableGroupElement-horizontal', 
this.orientation === 'horizontal' );
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ba78fb6b4ae696efacfa93a91ef377037481eb7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Apex theme: Get rid of toolbar-shadow div (only used by Apex)

[jenkins-bot (Code Review)]

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

Change subject: Apex theme: Get rid of toolbar-shadow div (only used by Apex)
..


Apex theme: Get rid of toolbar-shadow div (only used by Apex)

The technique used by MW (CSS `box-shadow`) is good enough and
doesn't require extra DOM and a PNG.

Change-Id: Ib41228e3c497ba5a1d626ec91499aeee34620870
---
M src/Toolbar.js
M src/styles/Toolbar.less
D src/themes/apex/images/toolbar-shadow.png
M src/themes/apex/tools.less
4 files changed, 4 insertions(+), 22 deletions(-)

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



diff --git a/src/Toolbar.js b/src/Toolbar.js
index 2a1ad04..7a8581f 100644
--- a/src/Toolbar.js
+++ b/src/Toolbar.js
@@ -278,7 +278,6 @@
  * @cfg {boolean} [actions] Add an actions section to the toolbar. Actions are 
commands that are included
  *  in the toolbar, but are not configured as tools. By default, actions are 
displayed on the right side of
  *  the toolbar.
- * @cfg {boolean} [shadow] Add a shadow below the toolbar.
  * @cfg {string} [position='top'] Whether the toolbar is positioned above 
('top') or below ('bottom') content.
  */
 OO.ui.Toolbar = function OoUiToolbar( toolFactory, toolGroupFactory, config ) {
@@ -324,9 +323,6 @@
this.$bar
.addClass( 'oo-ui-toolbar-bar' )
.append( this.$group, '' );
-   if ( config.shadow ) {
-   this.$bar.append( '' );
-   }
this.$element.addClass( 'oo-ui-toolbar oo-ui-toolbar-position-' + 
this.position ).append( this.$bar );
 };
 
diff --git a/src/styles/Toolbar.less b/src/styles/Toolbar.less
index 3c8f0cc..10a4d21 100644
--- a/src/styles/Toolbar.less
+++ b/src/styles/Toolbar.less
@@ -9,8 +9,7 @@
}
 
&-tools,
-   &-actions,
-   &-shadow {
+   &-actions {
.oo-ui-unselectable();
}
 
@@ -38,14 +37,6 @@
.oo-ui-popupWidget {
.oo-ui-selectable();
}
-   }
-
-   &-shadow {
-   background-position: left top;
-   background-repeat: repeat-x;
-   position: absolute;
-   width: 100%;
-   pointer-events: none;
}
 
.theme-oo-ui-toolbar();
diff --git a/src/themes/apex/images/toolbar-shadow.png 
b/src/themes/apex/images/toolbar-shadow.png
deleted file mode 100644
index eeb20b0..000
--- a/src/themes/apex/images/toolbar-shadow.png
+++ /dev/null
Binary files differ
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index ff55180..d29cb34 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -6,15 +6,18 @@
 
.oo-ui-toolbar-position-top > & {
border-bottom: 1px solid #ccc;
+   box-shadow: 0 2px 2px 0 rgba( 0, 0, 0, 0.1 );
}
 
.oo-ui-toolbar-position-bottom > & {
border-top: 1px solid #ccc;
+   box-shadow: 0 -2px 2px 0 rgba( 0, 0, 0, 0.1 );
}
 
.oo-ui-toolbar-bar {
border: 0;
background: none;
+   box-shadow: none;
}
}
 
@@ -40,14 +43,6 @@
}
}
}
-   }
-
-   &-shadow {
-   
.oo-ui-background-image('@{oo-ui-default-image-path}/toolbar-shadow.png');
-   bottom: -9px;
-   height: 9px;
-   opacity: 0.5;
-   .oo-ui-transition(opacity @slow-ease);
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib41228e3c497ba5a1d626ec91499aeee34620870
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: SimonWalkerAlt 
<6a2vwa+5l3ci66f4r9775klk2dtkffz4waf7x...@guerrillamail.com>
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] oojs/ui[master]: Make toolbar position selectors more specific

[jenkins-bot (Code Review)]

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

Change subject: Make toolbar position selectors more specific
..


Make toolbar position selectors more specific

Nested toolbars *should* use the same direction, but
this CSS rule would just make such an error less
visible to the user.

Change-Id: I41fac5476aef118f25c23488230d6089d7da873b
---
M src/themes/apex/tools.less
M src/themes/mediawiki/tools.less
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index 3465f51..ff55180 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -4,11 +4,11 @@
&-bar {
.oo-ui-vertical-gradient(#fff, #F1F7FB);
 
-   .oo-ui-toolbar-position-top & {
+   .oo-ui-toolbar-position-top > & {
border-bottom: 1px solid #ccc;
}
 
-   .oo-ui-toolbar-position-bottom & {
+   .oo-ui-toolbar-position-bottom > & {
border-top: 1px solid #ccc;
}
 
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index afc2887..421853f 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -7,11 +7,11 @@
box-shadow: @box-shadow-toolbar;
font-weight: 500;
 
-   .oo-ui-toolbar-position-top & {
+   .oo-ui-toolbar-position-top > & {
border-bottom: @border-toolbar;
}
 
-   .oo-ui-toolbar-position-bottom & {
+   .oo-ui-toolbar-position-bottom > & {
border-top: @border-toolbar;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41fac5476aef118f25c23488230d6089d7da873b
Gerrit-PatchSet: 2
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...CirrusSearch[es5]: Let elastica handle transport creation

[EBernhardson (Code Review)]

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

Change subject: Let elastica handle transport creation
..

Let elastica handle transport creation

Older version of Elastica didn't allow defining transports outside
the Elastica\Transport namespace, but this has been fixed. Remove
our hack that allowed it previously.

Change-Id: Ie35e5bf5104f52250ee6d0b43d889e06a095acc2
---
M includes/Connection.php
1 file changed, 0 insertions(+), 14 deletions(-)


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

diff --git a/includes/Connection.php b/includes/Connection.php
index af2a881..9a8dab5 100644
--- a/includes/Connection.php
+++ b/includes/Connection.php
@@ -165,20 +165,6 @@
throw new \RuntimeException( "No configuration 
available for cluster: {$this->cluster}" );
}
 
-   // Elastica will only create transports from within it's own
-   // namespace. To use the CirrusSearch PooledHttp(s) this
-   // clause is necessary.
-   foreach ( $config as $idx => $server ) {
-   if (
-   isset( $server['transport'] ) &&
-   is_string( $server['transport'] ) &&
-   class_exists( $server['transport'] )
-   ) {
-   $transportClass = $server['transport'];
-   $config[$idx]['transport'] = new 
$transportClass;
-   }
-   }
-
return $config;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie35e5bf5104f52250ee6d0b43d889e06a095acc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: es5
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Puppet style: Use one line per include/require

[Dzahn (Code Review)]

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

Change subject: Puppet style: Use one line per include/require
..


Puppet style: Use one line per include/require

Use one line per include/require to abide by the Coding Style guidelines

Also use full names for class names, as relative names are not allowed
in future Puppet versions

Change-Id: I31cf5969dc8142d5e5fc825ca8c82f190b69eee8
---
M modules/role/manifests/analytics_cluster/hue.pp
M modules/role/manifests/ci/master.pp
M modules/role/manifests/dnsrecursor.pp
M modules/ssh/manifests/init.pp
4 files changed, 16 insertions(+), 15 deletions(-)

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



diff --git a/modules/role/manifests/analytics_cluster/hue.pp 
b/modules/role/manifests/analytics_cluster/hue.pp
index 6fc62c1..a6ec51b 100644
--- a/modules/role/manifests/analytics_cluster/hue.pp
+++ b/modules/role/manifests/analytics_cluster/hue.pp
@@ -10,15 +10,15 @@
 # have their corresponding clients
 # and configs installed.
 # Include Hadoop ecosystem client classes.
-require ::role::analytics_cluster::hadoop::client,
-role::analytics_cluster::hive::client,
-role::analytics_cluster::oozie::client,
-# These don't require any extra configuration,
-# so no role class is needed.
-cdh::pig,
-cdh::sqoop,
-cdh::mahout,
-cdh::spark
+require ::role::analytics_cluster::hadoop::client
+require ::role::analytics_cluster::hive::client
+require ::role::analytics_cluster::oozie::client
+# These don't require any extra configuration,
+# so no role class is needed.
+require ::cdh::pig
+require ::cdh::sqoop
+require ::cdh::mahout
+require ::cdh::spark
 
 # LDAP Labs config is the same as LDAP in production.
 include ::ldap::role::config::labs
diff --git a/modules/role/manifests/ci/master.pp 
b/modules/role/manifests/ci/master.pp
index cecc9ad..56b660b 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -16,8 +16,8 @@
 require role::ci::website
 
 # Load the Jenkins module, that setup a Jenkins master
-include ::jenkins,
-contint::proxy_jenkins
+include ::jenkins
+include ::contint::proxy_jenkins
 
 # Backups
 include role::backup::host
diff --git a/modules/role/manifests/dnsrecursor.pp 
b/modules/role/manifests/dnsrecursor.pp
index 6a95720..4680b06 100644
--- a/modules/role/manifests/dnsrecursor.pp
+++ b/modules/role/manifests/dnsrecursor.pp
@@ -3,8 +3,9 @@
 class role::dnsrecursor {
 system::role { 'role::dnsrecursor': description => 'Recursive DNS server' }
 
-include lvs::configuration, network::constants
-include base::firewall
+include ::lvs::configuration
+include ::network::constants
+include ::base::firewall
 
 class {
 '::lvs::realserver':
diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index bb70a76..8153843 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -1,5 +1,5 @@
 class ssh {
-include ssh::client,
-ssh::server
+include ::ssh::client
+include ::ssh::server
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31cf5969dc8142d5e5fc825ca8c82f190b69eee8
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use var/let in screenshot.js

[jenkins-bot (Code Review)]

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

Change subject: Use var/let in screenshot.js
..


Use var/let in screenshot.js

Change-Id: I70082dd6e4df38616e5c33c2b71f0aaae22bac63
---
M build/screenshots.js
1 file changed, 415 insertions(+), 412 deletions(-)

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



diff --git a/build/screenshots.js b/build/screenshots.js
index 99b0275..22bd0cc 100644
--- a/build/screenshots.js
+++ b/build/screenshots.js
@@ -1,438 +1,441 @@
 /* eslint-env node, es6 */
 /* global seleniumUtils, langs */
-var i, l, clientSize,
-   accessKey = process.env.SAUCE_ONDEMAND_ACCESS_KEY,
-   chrome = require( 'selenium-webdriver/chrome' ),
-   fs = require( 'fs' ),
-   Jimp = require( 'jimp' ),
-   test = require( 'selenium-webdriver/testing' ),
-   username = process.env.SAUCE_ONDEMAND_USERNAME,
-   webdriver = require( 'selenium-webdriver' );
 
-function runTests( lang ) {
-   test.describe( 'Screenshots: ' + lang, function () {
-   var driver;
+( function () {
+   'use strict';
+   var accessKey = process.env.SAUCE_ONDEMAND_ACCESS_KEY,
+   chrome = require( 'selenium-webdriver/chrome' ),
+   fs = require( 'fs' ),
+   Jimp = require( 'jimp' ),
+   test = require( 'selenium-webdriver/testing' ),
+   username = process.env.SAUCE_ONDEMAND_USERNAME,
+   webdriver = require( 'selenium-webdriver' );
 
-   test.beforeEach( function () {
-   // Use Sauce Labs when running on Jenins
-   if ( process.env.JENKINS_URL ) {
-   driver = new 
webdriver.Builder().withCapabilities( {
-   browserName: process.env.BROWSER,
-   platform: process.env.PLATFORM,
-   username: username,
-   accessKey: accessKey
-   } ).usingServer( 'http://' + username + ':' + 
accessKey +
-   '@ondemand.saucelabs.com:80/wd/hub' 
).build();
-   } else {
-   // If not running on Jenkins, use local browser
-   driver = new chrome.Driver();
+   function runTests( lang ) {
+   test.describe( 'Screenshots: ' + lang, function () {
+   var clientSize, driver;
+
+   test.beforeEach( function () {
+   // Use Sauce Labs when running on Jenins
+   if ( process.env.JENKINS_URL ) {
+   driver = new 
webdriver.Builder().withCapabilities( {
+   browserName: 
process.env.BROWSER,
+   platform: process.env.PLATFORM,
+   username: username,
+   accessKey: accessKey
+   } ).usingServer( 'http://' + username + 
':' + accessKey +
+   
'@ondemand.saucelabs.com:80/wd/hub' ).build();
+   } else {
+   // If not running on Jenkins, use local 
browser
+   driver = new chrome.Driver();
+   }
+
+   driver.manage().timeouts().setScriptTimeout( 
4 );
+   driver.manage().window().setSize( 1200, 1000 );
+
+   driver.get( 
'https://en.wikipedia.org/wiki/PageDoesNotExist?veaction=edit=' + lang 
);
+   driver.wait(
+   driver.executeAsyncScript(
+   // This function is converted 
to a string and executed in the browser
+   function () {
+   var $lastHighlighted,
+   done = 
arguments[ arguments.length - 1 ];
+
+   window.seleniumUtils = {
+   
getBoundingRect: function ( elements ) {
+   var i, 
l, rect, boundingRect;
+   for ( i 
= 0, l = elements.length; i < l; i++ ) {
+   
rect = elements[ i ].getBoundingClientRect();
+  

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Mark all node files as ES6

[jenkins-bot (Code Review)]

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

Change subject: Mark all node files as ES6
..


Mark all node files as ES6

Change-Id: I85d1ea2bf26647d04891574d1cc5a9828a5d4bbb
---
M Gruntfile.js
M build/screenshots.js
M build/tasks/jsduckcatconfig.js
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index b903a12..d0efcc5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,7 +6,7 @@
 
 require( 'babel-polyfill' );
 
-/* eslint-env node */
+/* eslint-env node, es6 */
 module.exports = function ( grunt ) {
var modules = grunt.file.readJSON( 'lib/ve/build/modules.json' );
 
diff --git a/build/screenshots.js b/build/screenshots.js
index c2c2ac3..99b0275 100644
--- a/build/screenshots.js
+++ b/build/screenshots.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-env node, es6 */
 /* global seleniumUtils, langs */
 var i, l, clientSize,
accessKey = process.env.SAUCE_ONDEMAND_ACCESS_KEY,
diff --git a/build/tasks/jsduckcatconfig.js b/build/tasks/jsduckcatconfig.js
index 90468b3..987a767 100644
--- a/build/tasks/jsduckcatconfig.js
+++ b/build/tasks/jsduckcatconfig.js
@@ -2,7 +2,7 @@
  * Merge jsduck configuration files with a downstream one
  */
 
-/* eslint-env node */
+/* eslint-env node, es6 */
 module.exports = function ( grunt ) {
var _ = grunt.util._;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85d1ea2bf26647d04891574d1cc5a9828a5d4bbb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
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...VisualEditor[master]: Use var/let in screenshot.js

[Esanders (Code Review)]

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

Change subject: Use var/let in screenshot.js
..

Use var/let in screenshot.js

Change-Id: I70082dd6e4df38616e5c33c2b71f0aaae22bac63
---
M build/screenshots.js
1 file changed, 415 insertions(+), 412 deletions(-)


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

diff --git a/build/screenshots.js b/build/screenshots.js
index 99b0275..22bd0cc 100644
--- a/build/screenshots.js
+++ b/build/screenshots.js
@@ -1,438 +1,441 @@
 /* eslint-env node, es6 */
 /* global seleniumUtils, langs */
-var i, l, clientSize,
-   accessKey = process.env.SAUCE_ONDEMAND_ACCESS_KEY,
-   chrome = require( 'selenium-webdriver/chrome' ),
-   fs = require( 'fs' ),
-   Jimp = require( 'jimp' ),
-   test = require( 'selenium-webdriver/testing' ),
-   username = process.env.SAUCE_ONDEMAND_USERNAME,
-   webdriver = require( 'selenium-webdriver' );
 
-function runTests( lang ) {
-   test.describe( 'Screenshots: ' + lang, function () {
-   var driver;
+( function () {
+   'use strict';
+   var accessKey = process.env.SAUCE_ONDEMAND_ACCESS_KEY,
+   chrome = require( 'selenium-webdriver/chrome' ),
+   fs = require( 'fs' ),
+   Jimp = require( 'jimp' ),
+   test = require( 'selenium-webdriver/testing' ),
+   username = process.env.SAUCE_ONDEMAND_USERNAME,
+   webdriver = require( 'selenium-webdriver' );
 
-   test.beforeEach( function () {
-   // Use Sauce Labs when running on Jenins
-   if ( process.env.JENKINS_URL ) {
-   driver = new 
webdriver.Builder().withCapabilities( {
-   browserName: process.env.BROWSER,
-   platform: process.env.PLATFORM,
-   username: username,
-   accessKey: accessKey
-   } ).usingServer( 'http://' + username + ':' + 
accessKey +
-   '@ondemand.saucelabs.com:80/wd/hub' 
).build();
-   } else {
-   // If not running on Jenkins, use local browser
-   driver = new chrome.Driver();
+   function runTests( lang ) {
+   test.describe( 'Screenshots: ' + lang, function () {
+   var clientSize, driver;
+
+   test.beforeEach( function () {
+   // Use Sauce Labs when running on Jenins
+   if ( process.env.JENKINS_URL ) {
+   driver = new 
webdriver.Builder().withCapabilities( {
+   browserName: 
process.env.BROWSER,
+   platform: process.env.PLATFORM,
+   username: username,
+   accessKey: accessKey
+   } ).usingServer( 'http://' + username + 
':' + accessKey +
+   
'@ondemand.saucelabs.com:80/wd/hub' ).build();
+   } else {
+   // If not running on Jenkins, use local 
browser
+   driver = new chrome.Driver();
+   }
+
+   driver.manage().timeouts().setScriptTimeout( 
4 );
+   driver.manage().window().setSize( 1200, 1000 );
+
+   driver.get( 
'https://en.wikipedia.org/wiki/PageDoesNotExist?veaction=edit=' + lang 
);
+   driver.wait(
+   driver.executeAsyncScript(
+   // This function is converted 
to a string and executed in the browser
+   function () {
+   var $lastHighlighted,
+   done = 
arguments[ arguments.length - 1 ];
+
+   window.seleniumUtils = {
+   
getBoundingRect: function ( elements ) {
+   var i, 
l, rect, boundingRect;
+   for ( i 
= 0, l = elements.length; i < l; i++ ) {
+   
rect = elements[ i ].getBoundingClientRect();
+  

[MediaWiki-commits] [Gerrit] operations/dns[master]: switch webproxies away from carbon to install1002/2002

[Dzahn (Code Review)]

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

Change subject: switch webproxies away from carbon to install1002/2002
..


switch webproxies away from carbon to install1002/2002

Bug: T123733
Change-Id: I2e4cd072a0050d51b77cc29acd494b6e803c8ed9
---
M templates/wmnet
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index e60bc3f..8f01ed4 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -24,7 +24,7 @@
 
 ; Service aliases
 syslog  1H  IN CNAMElithium.eqiad.wmnet.
-webproxy5M  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEinstall1002.wikimedia.org.
 carbon-relay1H  IN CNAMEgraphite1001.eqiad.wmnet.
 graphite1H  IN CNAMEgraphite1001.eqiad.wmnet.
 graphite-in 1H  IN CNAMEgraphite1001.eqiad.wmnet.
@@ -2224,7 +2224,7 @@
 ; Service aliases
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  1H  IN CNAMEpuppetmaster2001.codfw.wmnet.
-webproxy5M  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEinstall2002.wikimedia.org.
 deployment  1H  IN CNAMEtin.eqiad.wmnet.
 statsd  1H  IN CNAMEgraphite2001.codfw.wmnet.
 syslog  1H  IN CNAMEwezen.codfw.wmnet.
@@ -4071,7 +4071,7 @@
 ;
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
-webproxy5M  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEinstall1002.wikimedia.org.
 
 ; etcd client discovery
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1001.eqiad.wmnet.
@@ -4263,7 +4263,7 @@
 ;
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  5M  IN CNAMEpuppetmaster2001.codfw.wmnet.
-webproxy5M  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEinstall2002.wikimedia.org.
 
 ; etcd client discovery
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1001.eqiad.wmnet.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e4cd072a0050d51b77cc29acd494b6e803c8ed9
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: upgrade to OkHttp 3.6.0

[Niedzielski (Code Review)]

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

Change subject: Hygiene: upgrade to OkHttp 3.6.0
..

Hygiene: upgrade to OkHttp 3.6.0

https://github.com/square/okhttp/blob/master/CHANGELOG.md#version-342
https://github.com/square/okhttp/blob/master/CHANGELOG.md#version-350
https://github.com/square/okhttp/blob/master/CHANGELOG.md#version-360

Change-Id: Iaa079c122b6ec998c9680ec0ae80358c0d52ae7c
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 2eb39c2..2f44c2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,7 +157,7 @@
 // use http://gradleplease.appspot.com/ or http://search.maven.org/.
 // Debug with ./gradlew -q app:dependencies --configuration compile
 
-String okHttpVersion = '3.4.1'
+String okHttpVersion = '3.6.0'
 String retrofitVersion = '2.1.0'
 String supportVersion = '25.0.1'
 String espressoVersion = '2.2.2'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa079c122b6ec998c9680ec0ae80358c0d52ae7c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "mwopenstackclients: Use keystoneauath1 for our sess...

[Andrew Bogott (Code Review)]

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

Change subject: Revert "mwopenstackclients:  Use keystoneauath1 for our session"
..


Revert "mwopenstackclients:  Use keystoneauath1 for our session"

This package is not available in all the places I expected it.

This reverts commit ece40ac61621fc54c44dd31967e9c6a9abcdd53d.

Change-Id: Idcd7e61f31b2b823aa5bf44f60e5a9989a3d4150
---
M modules/openstack/files/mwopenstackclients.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/openstack/files/mwopenstackclients.py 
b/modules/openstack/files/mwopenstackclients.py
index 122c0a9..33182fe 100644
--- a/modules/openstack/files/mwopenstackclients.py
+++ b/modules/openstack/files/mwopenstackclients.py
@@ -3,7 +3,7 @@
 
 import glanceclient
 from keystoneclient.auth.identity import generic
-from keystoneauth1 import session as keystone_session
+from keystoneclient import session as keystone_session
 from keystoneclient.v3 import client as keystone_client
 from novaclient import client as nova_client
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idcd7e61f31b2b823aa5bf44f60e5a9989a3d4150
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WebPlatformAuth[master]: Use existing description message in php entry point

[Hashar (Code Review)]

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

Change subject: Use existing description message in php entry point
..


Use existing description message in php entry point

Change-Id: I75691477a9b28dca6321599b2a9ef4a3866ff8eb
---
M WebPlatformAuth.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Hashar: Verified; Looks good to me, approved
  Siebrand: Looks good to me, but someone else must approve



diff --git a/WebPlatformAuth.php b/WebPlatformAuth.php
index 3c8033b..fd49e35 100644
--- a/WebPlatformAuth.php
+++ b/WebPlatformAuth.php
@@ -35,7 +35,7 @@
   'version'=> '2.0-dev',
   'author' => array('[https://renoirboulanger.com Renoir Boulanger]'),
   'url'=> 
'http://docs.webplatform.org/wiki/WPD:Projects/SSO/MediaWikiExtension',
-  'description'=> 'Single Sign On MediaWiki extension',
+  'descriptionmsg' => 'webplatformauth-desc',
 );
 
 $wgAutoloadClasses['WebPlatformAuthHooks']   = $dir . 
'includes/WebPlatformAuthHooks.php';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75691477a9b28dca6321599b2a9ef4a3866ff8eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WebPlatformAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...OOUIPlayground[master]: Make load of vendor/autoload.php conditional

[jenkins-bot (Code Review)]

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

Change subject: Make load of vendor/autoload.php conditional
..


Make load of vendor/autoload.php conditional

vendor/autoload.php is not there on integration system

Fatal error: File not found:
/home/jenkins/workspace/mwext-testextension-hhvm-jessie-non-voting/src/extensions/OOUIPlayground/vendor/autoload.php
in
/home/jenkins/workspace/mwext-testextension-hhvm-jessie-non-voting/src/extensions/OOUIPlayground/OOUIPlayground.php
on line 48

Change-Id: I6e9be1de916e9f732e4dfd8a875c8363b6b7bbad
---
M OOUIPlayground.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/OOUIPlayground.php b/OOUIPlayground.php
index 414b7e9..7badfa3 100644
--- a/OOUIPlayground.php
+++ b/OOUIPlayground.php
@@ -45,7 +45,9 @@
 $dir = dirname( __FILE__ );
 
 require_once __DIR__ . "/autoload.php";
-require_once __DIR__ . "/vendor/autoload.php";
+if ( file_exists( __DIR__ . "/vendor/autoload.php" ) ) {
+require_once __DIR__ . "/vendor/autoload.php";
+}
 
 require_once __DIR__ . "/resources/Resources.php";
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e9be1de916e9f732e4dfd8a875c8363b6b7bbad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OOUIPlayground
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WindowsAzureSDK[master]: Make load of vendor/autoload.php conditional

[jenkins-bot (Code Review)]

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

Change subject: Make load of vendor/autoload.php conditional
..


Make load of vendor/autoload.php conditional

vendor/autoload.php is not there on integration system

Fatal error: File not found:
/home/jenkins/workspace/mwext-testextension-hhvm-jessie-non-voting/src/extensions/WindowsAzureSDK/vendor/autoload.php
in
/home/jenkins/workspace/mwext-testextension-hhvm-jessie-non-voting/src/extensions/WindowsAzureSDK/WindowsAzureSDK.php
on line 22

Change-Id: I78c095a50b9394899b45153f7928f11d639bd7ce
---
M WindowsAzureSDK.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/WindowsAzureSDK.php b/WindowsAzureSDK.php
index 0124539..26074ae 100644
--- a/WindowsAzureSDK.php
+++ b/WindowsAzureSDK.php
@@ -19,4 +19,6 @@
 $wgMessagesDirs['WindowsAzureSDK'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['WindowsAzureSDK'] = $dir . 
'WindowsAzureSDK.i18n.php';
 
-require_once( $dir . 'vendor/autoload.php' );
+if ( file_exists( $dir . 'vendor/autoload.php' ) ) {
+require_once $dir . 'vendor/autoload.php';
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78c095a50b9394899b45153f7928f11d639bd7ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WindowsAzureSDK
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...CirrusSearch[master]: Fix parse error handling

[jenkins-bot (Code Review)]

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

Change subject: Fix parse error handling
..


Fix parse error handling

Sometimes there's no ['reason']['caused_by']['reason'] just 
['reason']['reason'].
Also sometimes the message does not have newlines.
Reproducing example: put this:
"type" => 'custom_field', params' => 'label_count', 'missing' => 0
as a score chain function.

Change-Id: I79c7a9ce36bac0428abac401f273106a6744dbc6
---
M includes/ElasticaErrorHandler.php
1 file changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ElasticaErrorHandler.php 
b/includes/ElasticaErrorHandler.php
index d13078a..2c2694f 100644
--- a/includes/ElasticaErrorHandler.php
+++ b/includes/ElasticaErrorHandler.php
@@ -170,8 +170,19 @@
// and comes before the next new line so lets slurp it 
up and log it rather than
// the huge clump of error.
$shardFailure = reset( $error['failed_shards'] );
-   $message = 
$shardFailure['reason']['caused_by']['reason'];
+   if ( !empty( $shardFailure['reason'] ) ) {
+   if ( !empty( 
$shardFailure['reason']['caused_by'] ) ) {
+   $message = 
$shardFailure['reason']['caused_by']['reason'];
+   } else {
+   $message = 
$shardFailure['reason']['reason'];
+   }
+   } else {
+   $message = "???";
+   }
$end = strpos( $message, "\n", 0 );
+   if ( $end === false ) {
+   $end = strlen( $message );
+   }
$parseError = substr( $message, 0, $end );
 
return [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79c7a9ce36bac0428abac401f273106a6744dbc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Fix test scenario names

[jenkins-bot (Code Review)]

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

Change subject: Fix test scenario names
..


Fix test scenario names

Bug: T152526
Change-Id: Ieb9baba935dca087019085d0b2173804866eb8df
---
M tests/browser/features/ui.feature
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/browser/features/ui.feature 
b/tests/browser/features/ui.feature
index 40c2822..00899dd 100644
--- a/tests/browser/features/ui.feature
+++ b/tests/browser/features/ui.feature
@@ -27,12 +27,12 @@
 Then I should see a link to the terms of use
 
   @smoke @integration
-  Scenario: Check that the beta mode indicator is hidden.
+  Scenario: Check that the beta mode indicator is hidden in stable.
 Given I am on the "Main Page" page
 Then I should not see the beta mode indicator
 
   @smoke @integration
-  Scenario: Check that the beta mode indicator is hidden.
+  Scenario: Check that the beta mode indicator is visible in beta.
 Given I am on the "Main Page" page
   And I am in beta mode
 Then I should see the beta mode indicator

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb9baba935dca087019085d0b2173804866eb8df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: branding
Gerrit-Owner: Bmansurov 
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] mediawiki...VisualChat[master]: Fix class name in $wgSpecialPages

[Umherirrender (Code Review)]

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

Change subject: Fix class name in $wgSpecialPages
..

Fix class name in $wgSpecialPages

Change-Id: Ib9fe9812466a3b96f8df3f65eb6c00393c322ee4
---
M visualchat.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/visualchat.php b/visualchat.php
index 8963f78..012ea13 100644
--- a/visualchat.php
+++ b/visualchat.php
@@ -32,5 +32,5 @@
 $wgAutoloadClasses[ 'SpecialVisualChat' ] = __DIR__ . 
'/visualchat.special.php';
 $wgMessagesDirs['visualchat'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles[ 'visualchat' ] = __DIR__ . '/visualchat.i18n.php';
-$wgSpecialPages[ 'visualchat' ] = 'VisualChat';
+$wgSpecialPages[ 'visualchat' ] = 'SpecialVisualChat';
 $wgExtensionMessagesFiles['visualchatAlias'] = dirname( __FILE__ ) . 
'/visualchat.alias.php';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9fe9812466a3b96f8df3f65eb6c00393c322ee4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualChat
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] labs...heritage[master]: Add unit test for populate_image_table.getSources

[Code Review]

Jean-Frédéric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/335935 )

Change subject: Add unit test for populate_image_table.getSources
..

Add unit test for populate_image_table.getSources

Also change the retrieval of the monuments_config from
using the `countries` constant to the method `get_countries`.

Using `countries` was for backwards compatibility before
we splitted out the monuments config. And having a method
makes it easier to mock out in tests.

Change-Id: Ia436a30acba06df322ec7e89a54c87704ee940ec
---
M erfgoedbot/populate_image_table.py
A tests/test_populate_image_table.py
2 files changed, 46 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/35/335935/1

diff --git a/erfgoedbot/populate_image_table.py 
b/erfgoedbot/populate_image_table.py
index 76f7a1b..86ff08b 100644
--- a/erfgoedbot/populate_image_table.py
+++ b/erfgoedbot/populate_image_table.py
@@ -40,7 +40,7 @@
 Get a dictionary of sources to go harvest
 '''
 sources = {}
-for (icountrycode, lang), countryconfig in mconfig.countries.iteritems():
+for (icountrycode, lang), countryconfig in 
mconfig.get_countries().iteritems():
 if not countrycode or (countrycode and countrycode == icountrycode):
 if icountrycode not in sources:
 if countryconfig.get('commonsTemplate') and 
countryconfig.get('commonsTrackerCategory'):
diff --git a/tests/test_populate_image_table.py 
b/tests/test_populate_image_table.py
new file mode 100644
index 000..f1d44be
--- /dev/null
+++ b/tests/test_populate_image_table.py
@@ -0,0 +1,45 @@
+"""Unit tests for update_database."""
+
+import mock
+import unittest
+
+from erfgoedbot import populate_image_table
+
+
+class TestGetSources(unittest.TestCase):
+
+def setUp(self):
+country_config_1 = {
+"country": "aa",
+"lang": "xx",
+"commonsTemplate": "Template A",
+"commonsTrackerCategory": "Tracker category A",
+}
+country_config_2 = {
+"country": "bb",
+"lang": "yy",
+"commonsTemplate": "Template B",
+"commonsTrackerCategory": "Tracker category B",
+}
+country_config = {
+(u'aa', u'xx'): country_config_1,
+(u'bb', u'yy'): country_config_2
+}
+patcher = mock.patch('erfgoedbot.monuments_config.get_countries')
+self.mock_get_countries = patcher.start()
+self.mock_get_countries.return_value = country_config
+self.addCleanup(patcher.stop)
+
+def test_getSources(self):
+result = populate_image_table.getSources()
+expected = {
+u'aa': {
+'commonsTrackerCategory': 'Tracker category A',
+'commonsTemplate': 'Template A'
+},
+u'bb': {
+'commonsTrackerCategory': 'Tracker category B',
+'commonsTemplate': 'Template B'
+}
+}
+self.assertItemsEqual(result, expected)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia436a30acba06df322ec7e89a54c87704ee940ec
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Convey beta mode through site branding

[jenkins-bot (Code Review)]

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

Change subject: Convey beta mode through site branding
..


Convey beta mode through site branding

Add the symbol β after the logo in the header in beta mode.

Bug: T152526
Change-Id: Iba2ed4cf19f483aa91eba927e93b7ab95faa012c
---
M includes/skins/minerva.mustache
M resources/skins.minerva.base.styles/ui.less
M tests/browser/features/step_definitions/ui_links_steps.rb
M tests/browser/features/support/pages/article_page.rb
R tests/browser/features/ui.feature
5 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 9ec03a0..b10f914 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -14,6 +14,7 @@


{{{headinghtml}}}
+   



diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 06d6c06..a95665d 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -138,6 +138,15 @@
> * {
float: left;
}
+
+   sup {
+   color: @colorGray5;
+   display: none;
+
+   .beta & {
+   display: initial;
+   }
+   }
}
}
 
diff --git a/tests/browser/features/step_definitions/ui_links_steps.rb 
b/tests/browser/features/step_definitions/ui_links_steps.rb
index 07ed1db..6ec33a3 100644
--- a/tests/browser/features/step_definitions/ui_links_steps.rb
+++ b/tests/browser/features/step_definitions/ui_links_steps.rb
@@ -18,6 +18,14 @@
   expect(on(ArticlePage).standalone_edit_history_link_element).to be_visible
 end
 
+Then(/^I should see the beta mode indicator$/) do
+  expect(on(ArticlePage).beta_mode_indicator_element).to be_visible
+end
+
+Then(/^I should not see the beta mode indicator$/) do
+  expect(on(ArticlePage).beta_mode_indicator_element).not_to be_visible
+end
+
 Then(/^I should see the last modified bar history link$/) do
   expect(on(ArticlePage).last_modified_bar_history_link_element).to be_visible
 end
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index a6b24ca..8b45c0b 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -11,6 +11,8 @@
   h1(:first_heading, id: 'section_0')
   # standalone history link
   a(:standalone_edit_history_link, css: '.last-modified-bar a')
+  # beta mode indicator
+  a(:beta_mode_indicator, css: '.branding-box sup')
 
   # left nav
   nav(:navigation, css: 'nav')
diff --git a/tests/browser/features/ui_links.feature 
b/tests/browser/features/ui.feature
similarity index 74%
rename from tests/browser/features/ui_links.feature
rename to tests/browser/features/ui.feature
index 3036f81..40c2822 100644
--- a/tests/browser/features/ui_links.feature
+++ b/tests/browser/features/ui.feature
@@ -25,3 +25,14 @@
   And the page "Selenium UI test" exists
   And I am on the "Selenium UI test" page
 Then I should see a link to the terms of use
+
+  @smoke @integration
+  Scenario: Check that the beta mode indicator is hidden.
+Given I am on the "Main Page" page
+Then I should not see the beta mode indicator
+
+  @smoke @integration
+  Scenario: Check that the beta mode indicator is hidden.
+Given I am on the "Main Page" page
+  And I am in beta mode
+Then I should see the beta mode indicator

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba2ed4cf19f483aa91eba927e93b7ab95faa012c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: branding
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Bmansurov 
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] mediawiki...CommunityTwitter[master]: Fix class name in $wgSpecialPages

[Umherirrender (Code Review)]

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

Change subject: Fix class name in $wgSpecialPages
..

Fix class name in $wgSpecialPages

Change-Id: Id38288149effa1e2e26b3d2a3296e7585080852f
---
M CommunityTwitter.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/CommunityTwitter.php b/CommunityTwitter.php
index 79fe608..f43c476 100755
--- a/CommunityTwitter.php
+++ b/CommunityTwitter.php
@@ -63,7 +63,7 @@
 $wgMessagesDirs['CommunityTwitter'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['CommunityTwitter'] = $wgtwitterIP . 
'CommunityTwitter.i18n.php';
 $wgExtensionMessagesFiles['CommunityTwitterAlias'] = __DIR__ . 
'/CommunityTwitter.alias.php';
-$wgSpecialPages['CommunityTwitter'] = 'SpecialCommunityTwitter';
+$wgSpecialPages['CommunityTwitter'] = 'CommunityTwitter';
 // Define aliases.
 if(!empty($ctAliases)) {
foreach ($ctAliases as $alias) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id38288149effa1e2e26b3d2a3296e7585080852f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommunityTwitter
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]: Labstore: set openstack::version: mitaka on 1004 and 1005

[Andrew Bogott (Code Review)]

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

Change subject: Labstore: set openstack::version: mitaka on 1004 and 1005
..


Labstore: set openstack::version: mitaka on 1004 and 1005

This is just to get the right openstack packages running there
so we can query the keystone and nova apis.

Bug: T104575
Change-Id: I147586ade152dea52ad5bad8b144e777a278ed5f
---
A hieradata/hosts/labstore1004.yaml
A hieradata/hosts/labstore1005.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/labstore1004.yaml 
b/hieradata/hosts/labstore1004.yaml
new file mode 100644
index 000..6bcecbc
--- /dev/null
+++ b/hieradata/hosts/labstore1004.yaml
@@ -0,0 +1 @@
+openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml 
b/hieradata/hosts/labstore1005.yaml
new file mode 100644
index 000..6bcecbc
--- /dev/null
+++ b/hieradata/hosts/labstore1005.yaml
@@ -0,0 +1 @@
+openstack::version: mitaka

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I147586ade152dea52ad5bad8b144e777a278ed5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Madhuvishy 
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]: DNS/Decom: Remove mgmt dns productions DNS for db2015, db2025...

[Dzahn (Code Review)]

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

Change subject: DNS/Decom: Remove mgmt dns productions DNS for 
db2015,db2025-db2027 Bug:T156342,T149102
..


DNS/Decom: Remove mgmt dns productions DNS for db2015,db2025-db2027
Bug:T156342,T149102

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

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 8d68108..123e9f0 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2667,9 +2667,7 @@
 10  1H IN PTR   db2022.codfw.wmnet.
 11  1H IN PTR   db2023.codfw.wmnet.
 12  1H IN PTR   db2024.codfw.wmnet.
-13  1H IN PTR   db2025.codfw.wmnet.
-14  1H IN PTR   db2026.codfw.wmnet.
-15  1H IN PTR   db2027.codfw.wmnet.
+
 16  1H IN PTR   db2028.codfw.wmnet.
 17  1H IN PTR   db2029.codfw.wmnet.
 18  1H IN PTR   db2030.codfw.wmnet.
@@ -3343,8 +3341,7 @@
 63  1H IN PTR  wmf3657.mgmt.codfw.wmnet.
 64  1H IN PTR  db2014.mgmt.codfw.wmnet.
 64  1H IN PTR  wmf3709.mgmt.codfw.wmnet.
-65  1H IN PTR  db2015.mgmt.codfw.wmnet.
-65  1H IN PTR  wmf3710.mgmt.codfw.wmnet.
+
 66  1H IN PTR  db2016.mgmt.codfw.wmnet.
 66  1H IN PTR  wmf3738.mgmt.codfw.wmnet.
 67  1H IN PTR  db2017.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 90d23d1..e60bc3f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2330,9 +2330,6 @@
 db2022  1H  IN A10.192.16.10
 db2023  1H  IN A10.192.16.11
 db2024  1H  IN A10.192.16.12
-db2025  1H  IN A10.192.16.13
-db2026  1H  IN A10.192.16.14
-db2027  1H  IN A10.192.16.15
 db2028  1H  IN A10.192.16.16
 db2029  1H  IN A10.192.16.17
 db2030  1H  IN A10.192.16.18
@@ -3028,7 +3025,6 @@
 db2011  1H  IN A10.193.1.61
 db2012  1H  IN A10.193.1.62
 db2014  1H  IN A10.193.1.64
-db2015  1H  IN A10.193.1.65
 db2016  1H  IN A10.193.1.66
 db2017  1H  IN A10.193.1.67
 db2018  1H  IN A10.193.1.68
@@ -3522,7 +3518,6 @@
 wmf3663 1H  IN A10.193.1.35
 wmf3664 1H  IN A10.193.1.36
 wmf3709 1H  IN A10.193.1.64
-wmf3710 1H  IN A10.193.1.65
 wmf3722 1H  IN A10.193.2.3
 wmf3723 1H  IN A10.193.2.5
 wmf3724 1H  IN A10.193.2.4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53754d967c200e490f1f7d32aa91e78e0539a2f0
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Papaul 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
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]: Labstore: set openstack::version: mitaka on 1004 and 1005

[Andrew Bogott (Code Review)]

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

Change subject: Labstore: set openstack::version: mitaka on 1004 and 1005
..

Labstore: set openstack::version: mitaka on 1004 and 1005

This is just to get the right openstack packages running there
so we can query the keystone and nova apis.

Bug: T104575
Change-Id: I147586ade152dea52ad5bad8b144e777a278ed5f
---
A hieradata/hosts/labstore1004.yaml
A hieradata/hosts/labstore1005.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/labstore1004.yaml 
b/hieradata/hosts/labstore1004.yaml
new file mode 100644
index 000..6bcecbc
--- /dev/null
+++ b/hieradata/hosts/labstore1004.yaml
@@ -0,0 +1 @@
+openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml 
b/hieradata/hosts/labstore1005.yaml
new file mode 100644
index 000..6bcecbc
--- /dev/null
+++ b/hieradata/hosts/labstore1005.yaml
@@ -0,0 +1 @@
+openstack::version: mitaka

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Fix test scenario names

[Bmansurov (Code Review)]

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

Change subject: Fix test scenario names
..

Fix test scenario names

Bug: T152526
Change-Id: Ieb9baba935dca087019085d0b2173804866eb8df
---
M tests/browser/features/ui.feature
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/browser/features/ui.feature 
b/tests/browser/features/ui.feature
index 40c2822..00899dd 100644
--- a/tests/browser/features/ui.feature
+++ b/tests/browser/features/ui.feature
@@ -27,12 +27,12 @@
 Then I should see a link to the terms of use
 
   @smoke @integration
-  Scenario: Check that the beta mode indicator is hidden.
+  Scenario: Check that the beta mode indicator is hidden in stable.
 Given I am on the "Main Page" page
 Then I should not see the beta mode indicator
 
   @smoke @integration
-  Scenario: Check that the beta mode indicator is hidden.
+  Scenario: Check that the beta mode indicator is visible in beta.
 Given I am on the "Main Page" page
   And I am in beta mode
 Then I should see the beta mode indicator

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb9baba935dca087019085d0b2173804866eb8df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: branding
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "mwopenstackclients: Use keystoneauath1 for our sess...

[Andrew Bogott (Code Review)]

Hello Alex Monk, jenkins-bot, Volans,

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

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

to review the following change.


Change subject: Revert "mwopenstackclients:  Use keystoneauath1 for our session"
..

Revert "mwopenstackclients:  Use keystoneauath1 for our session"

This package is not available in all the places I expected it.

This reverts commit ece40ac61621fc54c44dd31967e9c6a9abcdd53d.

Change-Id: Idcd7e61f31b2b823aa5bf44f60e5a9989a3d4150
---
M modules/openstack/files/mwopenstackclients.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/openstack/files/mwopenstackclients.py 
b/modules/openstack/files/mwopenstackclients.py
index 122c0a9..33182fe 100644
--- a/modules/openstack/files/mwopenstackclients.py
+++ b/modules/openstack/files/mwopenstackclients.py
@@ -3,7 +3,7 @@
 
 import glanceclient
 from keystoneclient.auth.identity import generic
-from keystoneauth1 import session as keystone_session
+from keystoneclient import session as keystone_session
 from keystoneclient.v3 import client as keystone_client
 from novaclient import client as nova_client
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcd7e61f31b2b823aa5bf44f60e5a9989a3d4150
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Don't use wikitech API to find labs instances in n...

[Andrew Bogott (Code Review)]

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

Change subject: labstore: Don't use wikitech API to find labs instances in 
nfs-exportd
..


labstore: Don't use wikitech API to find labs instances in nfs-exportd

Use the OpenStack API instead. The new observer credentials will do
for this purpose.

Some parts tested.

Bug: T104575
Change-Id: Iff63395c01ac3dd0dd6edd3a437c88bf7aa28e71
---
M hieradata/role/common/labs/nfs/primary.yaml
M hieradata/role/common/labs/nfs/secondary.yaml
M modules/labstore/files/nfs-exportd
M modules/labstore/manifests/fileserver/exports.pp
M modules/labstore/templates/initscripts/nfs-exportd.systemd.erb
5 files changed, 41 insertions(+), 23 deletions(-)

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



diff --git a/hieradata/role/common/labs/nfs/primary.yaml 
b/hieradata/role/common/labs/nfs/primary.yaml
index e4092ad..cd162b9 100644
--- a/hieradata/role/common/labs/nfs/primary.yaml
+++ b/hieradata/role/common/labs/nfs/primary.yaml
@@ -13,3 +13,5 @@
 debdeploy::grains:
   debdeploy-labsnfs:
 value: standard
+
+openstack::version: mitaka
diff --git a/hieradata/role/common/labs/nfs/secondary.yaml 
b/hieradata/role/common/labs/nfs/secondary.yaml
index e4092ad..cd162b9 100644
--- a/hieradata/role/common/labs/nfs/secondary.yaml
+++ b/hieradata/role/common/labs/nfs/secondary.yaml
@@ -13,3 +13,5 @@
 debdeploy::grains:
   debdeploy-labsnfs:
 value: standard
+
+openstack::version: mitaka
diff --git a/modules/labstore/files/nfs-exportd 
b/modules/labstore/files/nfs-exportd
index 1e33d9a..79b1edd 100755
--- a/modules/labstore/files/nfs-exportd
+++ b/modules/labstore/files/nfs-exportd
@@ -19,17 +19,19 @@
 #  THIS FILE IS MANAGED BY PUPPET
 #
 
-from urllib.request import urlopen
 import ipaddress
 import argparse
 import yaml
-import json
 import os
 import time
 import logging
 import sys
 import subprocess
 
+from keystoneclient.session import Session as KeystoneSession
+from keystoneclient.auth.identity.v3 import Password as KeystonePassword
+
+from novaclient import client as novaclient
 
 # Volumes that need an entry in exports.d
 VOLUMES_NEEDING_EXPORTS = ['project', 'home', 'tools-home', 'tools-project']
@@ -72,30 +74,33 @@
 )
 
 
-def get_instance_ips(project):
+def get_instance_ips(project, observer_pass):
 """
 Return a list of Instance internal IPs for a given project
 
 This uses the Wikitech API to fetch this data
 """
-url = ("https://wikitech.wikimedia.org/w/api.php; +
-   "?action=query=novainstances=%s" +
-   "=eqiad=json") % project
-try:
-data = json.loads(urlopen(url, timeout=15).read().decode('utf-8'))
-except:
-logging.exception('Error fetching instance ip list for project %s', 
project)
-sys.exit(1)
-
+client = novaclient.Client(
+"2.0",
+session=KeystoneSession(auth=KeystonePassword(
+auth_url="http://labcontrol1001.wikimedia.org:5000/v3;,
+username="novaobserver",
+password=observer_pass,
+project_name=project,
+user_domain_name='default',
+project_domain_name='default'
+))
+)
 ips = []
-if 'query' in data and 'novainstances' in data['query']:
-for instance in data['query']['novainstances']:
-# Only provide internal IPs!
-ips += [ip for ip in instance['ip']
-if is_valid_ipv4(ip) and ip.startswith('10.')]
+for instance in client.servers.list():
+# Only provide internal IPs!
+ips += [
+str(ip['addr']) for ip in instance.addresses['public']
+if ip['OS-EXT-IPS:type'] == 'fixed' and is_valid_ipv4(ip)
+]
 return ips
 
-def get_projects_with_nfs(mounts_config):
+def get_projects_with_nfs(mounts_config, observer_pass):
 """
 Get populated project objects that need NFS exports
 :param mounts_config: dict
@@ -112,7 +117,7 @@
 continue
 else:
 continue
-project = Project(name, config['gid'], get_instance_ips(name), mounts)
+project = Project(name, config['gid'], get_instance_ips(name, 
observer_pass), mounts)
 projects.append(project)
 logging.debug('project %s has %s instances',
  name, len(project.instance_ips))
@@ -154,12 +159,12 @@
 logging.info("found %s public NFS exports" % (len(public_paths)))
 return public_paths
 
-def write_project_exports(mounts_config, exports_d_path):
+def write_project_exports(mounts_config, exports_d_path, observer_pass):
 """ output project export definitions
 :param mounts_config: dict of defined exports
 """
 project_paths = []
-projects = get_projects_with_nfs(mounts_config)
+projects = 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Add support for editing mw-collapsible/mw-collapsed

[Esanders (Code Review)]

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

Change subject: Add support for editing mw-collapsible/mw-collapsed
..

Add support for editing mw-collapsible/mw-collapsed

Change-Id: I647b2a544fd16952696d0de8d07cb72189b27ecb
---
M extension.json
M modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js
5 files changed, 44 insertions(+), 5 deletions(-)


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

diff --git a/extension.json b/extension.json
index 5aa0764..a44295c 100644
--- a/extension.json
+++ b/extension.json
@@ -1237,6 +1237,8 @@
"visualeditor-beta-label",
"visualeditor-beta-warning",
"visualeditor-browserwarning",
+   "visualeditor-dialog-table-collapsed",
+   "visualeditor-dialog-table-collapsible",
"visualeditor-dialog-table-sortable",
"visualeditor-dialog-table-wikitable",
"visualeditor-diff-nochanges",
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
index 9e8c168..ebb09f4 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
@@ -36,7 +36,9 @@
 
 ve.dm.MWTableNode.static.classAttributes = {
wikitable: { wikitable: true },
-   sortable: { sortable: true }
+   sortable: { sortable: true },
+   'mw-collapsible': { collapsible: true },
+   'mw-collapsed': { collapsed: true }
 };
 
 // HACK: users of parentNodeTypes should be fixed to check for inherited 
classes.
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 435e656..963dc10 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -191,6 +191,8 @@
"visualeditor-dialog-meta-settings-toc-label": "Show the Table of 
Contents",
"visualeditor-dialog-meta-templatesused-noresults": "No templates 
found.",
"visualeditor-dialog-meta-title": "Options",
+   "visualeditor-dialog-table-collapsed": "Collapsed initially",
+   "visualeditor-dialog-table-collapsible": "Collapsible",
"visualeditor-dialog-table-sortable": "Sortable",
"visualeditor-dialog-table-wikitable": "Styled (wikitable)",
"visualeditor-dialog-template-title": "Template",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 792e077..e14a2d6 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -204,6 +204,8 @@
"visualeditor-dialog-meta-settings-toc-label": "Prompt to let the user 
set the Table Of Contents (TOC) behaviour.",
"visualeditor-dialog-meta-templatesused-noresults": "Message displayed 
when no existing templates found on the page.",
"visualeditor-dialog-meta-title": "Text of the title for the meta 
dialog to set categories, language links and other page 
settings.\n{{Identical|Options}}",
+   "visualeditor-dialog-table-collapsed": "Label for toggle to make a 
table collapsed initially",
+   "visualeditor-dialog-table-collapsible": "Label for toggle to make a 
table collapsible",
"visualeditor-dialog-table-sortable": "Label for toggle to make a table 
sortable",
"visualeditor-dialog-table-wikitable": "Label for toggle to make a 
table a wikitable",
"visualeditor-dialog-template-title": "{{Identical|Template}}",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js
index 4813fa3..6ebf29d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js
@@ -38,22 +38,37 @@
  * @inheritdoc
  */
 ve.ui.MWTableDialog.prototype.initialize = function () {
+   var wikitableField, sortableField, collapsibleField, collapsedField;
// Parent method
ve.ui.MWTableDialog.super.prototype.initialize.call( this );
 
this.wikitableToggle = new OO.ui.ToggleSwitchWidget();
-   this.wikitableField = new OO.ui.FieldLayout( this.wikitableToggle, {
+   wikitableField = new OO.ui.FieldLayout( this.wikitableToggle, {
align: 'left',
label: ve.msg( 'visualeditor-dialog-table-wikitable' )
} );
 
this.sortableToggle = new OO.ui.ToggleSwitchWidget();
-   this.sortableField = new OO.ui.FieldLayout( this.sortableToggle, {
+   sortableField = new OO.ui.FieldLayout( this.sortableToggle, {
align: 'left',
label: ve.msg( 'visualeditor-dialog-table-sortable' )
} );
 
-   this.panel.$element.prepend( this.wikitableField.$element, 

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix parse error handling

[Smalyshev (Code Review)]

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

Change subject: Fix parse error handling
..

Fix parse error handling

Sometimes there's no ['reason']['caused_by']['reason'] just 
['reason']['reason'].
Also sometimes the message does not have newlines.
Reproducing example: put this:
"type" => 'custom_field', params' => 'label_count', 'missing' => 0
as a score chain function.

Change-Id: I79c7a9ce36bac0428abac401f273106a6744dbc6
---
M includes/ElasticaErrorHandler.php
1 file changed, 12 insertions(+), 1 deletion(-)


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

diff --git a/includes/ElasticaErrorHandler.php 
b/includes/ElasticaErrorHandler.php
index d13078a..2c2694f 100644
--- a/includes/ElasticaErrorHandler.php
+++ b/includes/ElasticaErrorHandler.php
@@ -170,8 +170,19 @@
// and comes before the next new line so lets slurp it 
up and log it rather than
// the huge clump of error.
$shardFailure = reset( $error['failed_shards'] );
-   $message = 
$shardFailure['reason']['caused_by']['reason'];
+   if ( !empty( $shardFailure['reason'] ) ) {
+   if ( !empty( 
$shardFailure['reason']['caused_by'] ) ) {
+   $message = 
$shardFailure['reason']['caused_by']['reason'];
+   } else {
+   $message = 
$shardFailure['reason']['reason'];
+   }
+   } else {
+   $message = "???";
+   }
$end = strpos( $message, "\n", 0 );
+   if ( $end === false ) {
+   $end = strlen( $message );
+   }
$parseError = substr( $message, 0, $end );
 
return [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add a bunch of filtertags to puppet class comments

[Andrew Bogott (Code Review)]

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

Change subject: Add a bunch of filtertags to puppet class comments
..

Add a bunch of filtertags to puppet class comments

These tags are used by the horizon puppet web UI to
provide hints about what classes should be used in what
projects.

We may remove the 'all' filter entirely, at which point
these will be even more important.

Bug: T149589
Change-Id: I921057f489d521a0eabff85076d850b18abec84f
---
M modules/role/manifests/analytics_cluster/druid/hadoop.pp
M modules/role/manifests/analytics_cluster/druid/worker.pp
M modules/role/manifests/analytics_cluster/hadoop/client.pp
M modules/role/manifests/analytics_cluster/hadoop/master.pp
M modules/role/manifests/analytics_cluster/hadoop/standby.pp
M modules/role/manifests/analytics_cluster/hadoop/worker.pp
M modules/role/manifests/analytics_cluster/hive/client.pp
M modules/role/manifests/analytics_cluster/hive/metastore.pp
M modules/role/manifests/analytics_cluster/hive/metastore/database.pp
M modules/role/manifests/analytics_cluster/hive/server.pp
M modules/role/manifests/analytics_cluster/hue.pp
M modules/role/manifests/analytics_cluster/oozie/client.pp
M modules/role/manifests/analytics_cluster/oozie/server.pp
M modules/role/manifests/analytics_cluster/oozie/server/database.pp
M modules/role/manifests/apertium.pp
M modules/role/manifests/aqs.pp
M modules/role/manifests/beta/availability_collector.pp
M modules/role/manifests/beta/deploymentserver.pp
M modules/role/manifests/beta/mediawiki.pp
M modules/role/manifests/beta/puppetmaster.pp
M modules/role/manifests/builder.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
M modules/role/manifests/calico/builder.pp
M modules/role/manifests/cassandra.pp
M modules/role/manifests/changeprop.pp
M modules/role/manifests/ci/castor/server.pp
M modules/role/manifests/ci/master.pp
M modules/role/manifests/ci/publisher/labs.pp
M modules/role/manifests/ci/slave/android.pp
M modules/role/manifests/ci/slave/labs.pp
M modules/role/manifests/ci/slave/labs/common.pp
M modules/role/manifests/citoid.pp
M modules/role/manifests/cxserver.pp
M modules/role/manifests/deployment/salt_masters.pp
M modules/role/manifests/deployment/server.pp
M modules/role/manifests/deprecated/mediawiki/install.pp
M modules/role/manifests/elasticsearch/cirrus.pp
M modules/role/manifests/etcd.pp
M modules/role/manifests/etcd/common.pp
M modules/role/manifests/eventbus/eventbus.pp
M modules/role/manifests/eventlogging/analytics/files.pp
M modules/role/manifests/eventlogging/analytics/mysql.pp
M modules/role/manifests/eventlogging/analytics/processor.pp
M modules/role/manifests/eventlogging/analytics/zeromq.pp
M modules/role/manifests/eventstreams.pp
M modules/role/manifests/extdist.pp
M modules/role/manifests/gerrit/server.pp
M modules/role/manifests/graphite/base.pp
M modules/role/manifests/graphoid.pp
M modules/role/manifests/jobqueue_redis.pp
M modules/role/manifests/kafka/analytics/broker.pp
M modules/role/manifests/kafka/main/broker.pp
M modules/role/manifests/kibana.pp
M modules/role/manifests/kubernetes/worker.pp
M modules/role/manifests/labs/bastion.pp
M modules/role/manifests/labs/bootstrapvz.pp
M modules/role/manifests/labs/dnsrecursor.pp
M modules/role/manifests/labs/novaproxy.pp
M modules/role/manifests/labs/ores/lb.pp
M modules/role/manifests/labs/ores/redis.pp
M modules/role/manifests/labs/ores/staging.pp
M modules/role/manifests/labs/ores/web.pp
M modules/role/manifests/labs/ores/worker.pp
M modules/role/manifests/labs/quarry/celeryrunner.pp
M modules/role/manifests/labs/quarry/database.pp
M modules/role/manifests/labs/quarry/killer.pp
M modules/role/manifests/labs/quarry/redis.pp
M modules/role/manifests/labs/quarry/web.pp
M modules/role/manifests/labs/redirector.pp
M modules/role/manifests/labs/sentry.pp
M modules/role/manifests/labs/shinken.pp
M modules/role/manifests/labs/vagrant_lxc.pp
M modules/role/manifests/labs/vmbuilder.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
M modules/role/manifests/logstash/apifeatureusage.pp
M modules/role/manifests/logstash/collector.pp
M modules/role/manifests/logstash/eventlogging.pp
M modules/role/manifests/logstash/puppetreports.pp
M modules/role/manifests/mail/mx.pp
M modules/role/manifests/mariadb.pp
M modules/role/manifests/mathoid.pp
M modules/role/manifests/mediawiki/appserver.pp
M modules/role/manifests/mediawiki/jobrunner.pp
M modules/role/manifests/mediawiki/videoscaler.pp
M modules/role/manifests/memcached.pp
M modules/role/manifests/mw_rc_irc.pp
M modules/role/manifests/ocg.pp
M modules/role/manifests/ores/web.pp
M modules/role/manifests/ores/worker.pp
M modules/role/manifests/otrs/webserver.pp
M modules/role/manifests/package/builder.pp
M modules/role/manifests/parsoid.pp
M modules/role/manifests/phabricator/main.pp
M modules/role/manifests/phragile/labs.pp
M 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix datachecks extension.

[jenkins-bot (Code Review)]

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

Change subject: Fix datachecks extension.
..


Fix datachecks extension.

In review of this extension we fixed the id column in the temp table to be 
explicitly 'min'
but I didn't re-test that change & it requires me to declare the alias.

Bug: T145873
Change-Id: I5c1f9c74de5eb6dfb70d469e14cfb0d9448b2a57
---
M 
sites/default/civicrm/extensions/org.wikimedia.datachecks/CRM/Datachecks/PrimaryLocation.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.datachecks/CRM/Datachecks/PrimaryLocation.php
 
b/sites/default/civicrm/extensions/org.wikimedia.datachecks/CRM/Datachecks/PrimaryLocation.php
index efe2cf2..7c6f71f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.datachecks/CRM/Datachecks/PrimaryLocation.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.datachecks/CRM/Datachecks/PrimaryLocation.php
@@ -77,7 +77,7 @@
 
 CRM_Core_DAO::executeQuery("
   CREATE TEMPORARY TABLE {$this->temporaryTable} (
-  SELECT contact_id, min(id), count(id) as count_entities, sum(is_primary) 
as c
+  SELECT contact_id, min(id) as id, count(id) as count_entities, 
sum(is_primary) as c
   FROM civicrm_{$entity}
   WHERE contact_id IS NOT NULL
   GROUP BY contact_id

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Use mediawiki cache for IP Velocity

[Ejegg (Code Review)]

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

Change subject: Use mediawiki cache for IP Velocity
..

Use mediawiki cache for IP Velocity

Change-Id: I8a831b7ef95614609e60561b8a4db8eb6f85769d
TODO: more tests
---
M README.txt
M extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
A tests/phpunit/IPVelocityTest.php
3 files changed, 114 insertions(+), 53 deletions(-)


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

diff --git a/README.txt b/README.txt
index 3308f57..2ee6d4a 100644
--- a/README.txt
+++ b/README.txt
@@ -468,8 +468,6 @@
 $wgDonationInterfaceCustomFiltersInitialFunctions = array()
 
 //IP velocity filter globals
-$wgDonationInterfaceMemcacheHost = 'localhost'
-$wgDonationInterfaceMemcachePort = '11211'
 $wgDonationInterfaceIPVelocityFailScore = 100
 $wgDonationInterfaceIPVelocityTimeout = 60 * 5 //5 minutes in seconds
 $wgDonationInterfaceIPVelocityThreshhold = 3   //3 transactions per timeout
diff --git a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php 
b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
index 58b24ca..9b05f21 100644
--- a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
+++ b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
@@ -17,8 +17,8 @@
protected $cfo;
 
/**
-* Memcached instance we use to store and retrieve scores
-* @var Memcached
+* Cache instance we use to store and retrieve scores
+* @var BagOStuff
 */
protected $cache_obj;
 
@@ -29,6 +29,7 @@
 
parent::__construct( $gateway_adapter );
$this->cfo = $custom_filter_object;
+   $this->cache_obj = ObjectCache::getLocalClusterInstance();
}
 
protected function filter() {
@@ -46,64 +47,38 @@
$this->cfo->addRiskScore( 
$this->gateway_adapter->getGlobal( 'IPVelocityFailScore' ), 'IPBlacklist' );
return true;
}
-   
-   //if the user ip was in neither list, check the velocity. 
-   if ( $this->connectToMemcache() ){
 
-   $stored = $this->getMemcachedValue();
+   $stored = $this->getCachedValue();
 
-   if (!$stored){ //we don't have anything in memcache for 
this dude yet.
-   $this->gateway_adapter->debugarray[] = "Found 
no memcached data for $user_ip";
-   $this->cfo->addRiskScore( 0, 'IPVelocityFilter' 
); //want to see the explicit zero
-   return true;
+   if (!$stored){ //we don't have anything in memcache for this 
dude yet.
+   $this->gateway_adapter->debugarray[] = "Found no 
memcached data for $user_ip";
+   $this->cfo->addRiskScore( 0, 'IPVelocityFilter' ); 
//want to see the explicit zero
+   return true;
+   } else {
+   $count = count( $stored );
+   $this->gateway_adapter->debugarray[] = "Found a 
memcached bit of data for $user_ip: " . print_r($stored, true);
+   $this->gateway_logger->info( "IPVelocityFilter: 
$user_ip has $count hits" );
+   if ( $count >= $this->gateway_adapter->getGlobal( 
'IPVelocityThreshhold' ) ){
+   $this->cfo->addRiskScore( 
$this->gateway_adapter->getGlobal( 'IPVelocityFailScore' ), 'IPVelocityFilter' 
);
+   //cool off, sucker. Muahahaha.
+   $this->addNowToCachedValue( $stored, true );
} else {
-   $count = count( $stored );
-   $this->gateway_adapter->debugarray[] = "Found a 
memcached bit of data for $user_ip: " . print_r($stored, true);
-   $this->gateway_logger->info( "IPVelocityFilter: 
$user_ip has $count hits" );
-   if ( $count >= 
$this->gateway_adapter->getGlobal( 'IPVelocityThreshhold' ) ){
-   $this->cfo->addRiskScore( 
$this->gateway_adapter->getGlobal( 'IPVelocityFailScore' ), 'IPVelocityFilter' 
);
-   //cool off, sucker. Muahahaha. 
-   $this->addNowToMemcachedValue( $stored, 
true );
-   } else {
-   $this->cfo->addRiskScore( 0, 
'IPVelocityFilter' ); //want to see the explicit zero here, too.
-   }
-   }   
+   $this->cfo->addRiskScore( 0, 'IPVelocityFilter' 
); //want to see the explicit zero here, too.
+   }
}

[MediaWiki-commits] [Gerrit] translatewiki[master]: repong: Increase export timeout to ten minutes

[Raimond Spekking (Code Review)]

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

Change subject: repong: Increase export timeout to ten minutes
..

repong: Increase export timeout to ten minutes

Follow up to https://gerrit.wikimedia.org/r/#/c/334572/
5 minutes are not enough in case of a skipped day or 2 in export

Change-Id: I7bba87bf44630c04bf7bb23fce21a49e632b1092
---
M repong/repong.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/66/335866/1

diff --git a/repong/repong.php b/repong/repong.php
index 69399d5..7bd23d0 100644
--- a/repong/repong.php
+++ b/repong/repong.php
@@ -49,7 +49,7 @@
}
 
$process = new Process( $command );
-   $process->setTimeout( 300 );
+   $process->setTimeout( 600 );
$process->mustRun();
print $process->getOutput();
}

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: repong: Increase export timeout to ten minutes

[Raimond Spekking (Code Review)]

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

Change subject: repong: Increase export timeout to ten minutes
..


repong: Increase export timeout to ten minutes

Follow up to https://gerrit.wikimedia.org/r/#/c/334572/
5 minutes are not enough in case of a skipped day or 2 in export

Change-Id: I7bba87bf44630c04bf7bb23fce21a49e632b1092
---
M repong/repong.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/repong/repong.php b/repong/repong.php
index 69399d5..7bd23d0 100644
--- a/repong/repong.php
+++ b/repong/repong.php
@@ -49,7 +49,7 @@
}
 
$process = new Process( $command );
-   $process->setTimeout( 300 );
+   $process->setTimeout( 600 );
$process->mustRun();
print $process->getOutput();
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Update browser test to run on desktop

[jenkins-bot (Code Review)]

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

Change subject: Update browser test to run on desktop
..


Update browser test to run on desktop

This previously passed with a false positive as it replicated
the scenario `ReadMore is not present in minerva stable` by running
on the mobile domain.

This change makes it run on the desktop domain and pass (it now
fails given it runs on Minerva skin)

Bug: T157165
Change-Id: Idb2002b0f2d378cc0b6df73ad1381bfee32448c9
---
M tests/browser/features/read_more.feature
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/features/read_more.feature 
b/tests/browser/features/read_more.feature
index 71cb74d..80a6cf1 100644
--- a/tests/browser/features/read_more.feature
+++ b/tests/browser/features/read_more.feature
@@ -19,7 +19,7 @@
 Then I must see ReadMore
   And ReadMore must have three cards
 
-  @en.m.wikipedia.beta.wmflabs.org
+  @en.wikipedia.beta.wmflabs.org
   Scenario: ReadMore is not present when disabled as a BetaFeature
 Given I am on the "Related Articles 1" page
   And page has fully loaded without ReadMore code

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb2002b0f2d378cc0b6df73ad1381bfee32448c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
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...RelatedArticles[master]: Don't run the test for minerva stable against the beta cluster

[jenkins-bot (Code Review)]

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

Change subject: Don't run the test for minerva stable against the beta cluster
..


Don't run the test for minerva stable against the beta cluster

On the beta cluster, the browser test should pass.
Add a new test to reflect the two different states.

Bug: T157165
Change-Id: I2a777436dfa3a14d58855449c39cc144b7149a62
---
M tests/browser/features/read_more.feature
1 file changed, 13 insertions(+), 6 deletions(-)

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



diff --git a/tests/browser/features/read_more.feature 
b/tests/browser/features/read_more.feature
index 80a6cf1..744bf7f 100644
--- a/tests/browser/features/read_more.feature
+++ b/tests/browser/features/read_more.feature
@@ -1,17 +1,24 @@
-@chrome @integration @staging
+@chrome @staging
 Feature: ReadMore
   Background:
 Given RelatedArticles test pages are installed
 
   @en.m.wikipedia.beta.wmflabs.org @extension-mobilefrontend
-  Scenario: ReadMore is not present in minerva stable
+  Scenario: ReadMore is present in minerva stable on beta cluster.
+Given I am using the mobile site
+  And I am on the "Related Articles 1" page
+  And page has fully loaded with ReadMore code
+Then I must see ReadMore
+
+  @integration
+  Scenario: ReadMore is not present in minerva stable in default install
 Given I am using the mobile site
   And I am on the "Related Articles 1" page
   And page has fully loaded without ReadMore code
 Then I must not see ReadMore
 
-  @en.m.wikipedia.beta.wmflabs.org @extension-mobilefrontend
-  Scenario: ReadMore is present in minerva beta
+  @en.m.wikipedia.beta.wmflabs.org @integration @extension-mobilefrontend
+  Scenario: ReadMore is present in minerva beta in default installs and beta 
cluster
 Given I am using the mobile site
   And I am in mobile beta mode
   And I am on the "Related Articles 1" page
@@ -19,13 +26,13 @@
 Then I must see ReadMore
   And ReadMore must have three cards
 
-  @en.wikipedia.beta.wmflabs.org
+  @en.wikipedia.beta.wmflabs.org @integration
   Scenario: ReadMore is not present when disabled as a BetaFeature
 Given I am on the "Related Articles 1" page
   And page has fully loaded without ReadMore code
 Then I must not see ReadMore
 
-  @en.wikipedia.beta.wmflabs.org @extension-betafeatures
+  @en.wikipedia.beta.wmflabs.org @extension-betafeatures @integration
   Scenario: ReadMore is present when enabled as a BetaFeature
 Given I am logged in
   And ReadMore is enabled as a beta feature

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a777436dfa3a14d58855449c39cc144b7149a62
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
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...RelatedArticles[master]: Allow more control for skins should show Related pages as be...

[Jdlrobson (Code Review)]

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

Change subject: Allow more control for skins should show Related pages as beta 
feature
..

Allow more control for skins should show Related pages as beta feature

* Remove minerva specific hack
* Make config a little less confusing

One side effect of this is that RelatedPages on minerva will also follow
the user preference for beta features and will not follow the MobileFrontend
model (which should be fine provided we don't want to put this in beta again!)

Bug: T146436
Change-Id: Ifd7e9dc92ede6e8f3b2f115adbe9dd5bb341049b
---
M extension.json
M includes/FooterHooks.php
2 files changed, 7 insertions(+), 4 deletions(-)


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

diff --git a/extension.json b/extension.json
index 7aff868..fdffbd5 100644
--- a/extension.json
+++ b/extension.json
@@ -99,7 +99,9 @@
"RelatedArticlesOnlyUseCirrusSearch": false,
"RelatedArticlesLoggingSamplingRate": 0.01,
"RelatedArticlesEnabledSamplingRate": 1,
-   "@RelatedArticlesFooterBlacklistedSkins": "List of skin names 
(e.g. 'minerva') where related articles won't be shown in the footer. If absent 
related articles will show in stable on Minerva or beta on all other skins.",
+   "@RelatedArticlesDesktopBetaFeatureSkins": "List of skins for 
which related pages won't be shown in the footer unless the user has opted into 
the beta feature. BetaFeatures must be installed to support this.",
+   "RelatedArticlesBetaFeatureSkins": [ "vector", "monobook", 
"modern", "cologne-blue" ],
+   "@RelatedArticlesFooterBlacklistedSkins": "List of skin names 
(e.g. 'minerva') where related articles won't be shown in the footer. If empty 
and no BetaFeatures RelatedArticles will be installed on all skins.",
"RelatedArticlesFooterBlacklistedSkins": []
},
"ConfigRegistry": {
diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index 191b943..1be58cc 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -82,13 +82,14 @@
$blacklistedSkins = $config->get( 
'RelatedArticlesFooterBlacklistedSkins' );
$skinName = $skin->getSkinName();
$isBlacklistedSkin = in_array( $skinName, $blacklistedSkins );
+   $isBetaFeatureSkin = in_array( $skinName, $config->get( 
'RelatedArticlesBetaFeatureSkins' ) );
 
if ( !$isBlacklistedSkin ) {
-   // Minerva has its own beta mode and doesn't use the 
BetaFeatures extension.
-   if ( $skinName === 'minerva' ) {
+   if ( $isBetaFeatureSkin ) {
+   return !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $user, 'read-more' );
+   } else {
return true;
}
-   return !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $user, 'read-more' );
}
 
return false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd7e9dc92ede6e8f3b2f115adbe9dd5bb341049b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Bouquet[master]: Move description from skin.json to message file

[jenkins-bot (Code Review)]

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

Change subject: Move description from skin.json to message file
..


Move description from skin.json to message file

Change-Id: I8dfffe6e11640c7086edc5b2466cca93687039a1
---
M i18n/en.json
A i18n/qqq.json
M skin.json
3 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index ff2ee69..788d70a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,5 +2,6 @@
"@metadata": {
"authors": []
},
+   "bouquet-desc": "Elegant, simple theme inspired by the beauty found in 
flowers",
"bouquet-navigation": "* mainpage|mainpage-description\n\n** 
recentchanges-url|recentchanges\n\n** randompage-url|randompage\n\n* 
faqpage|FAQ\n\n* helppage|help\n\n* portal-url|portal\n\n* 
currentevents-url|currentevents"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..90999e5
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+   "@metadata": {},
+   "bouquet-desc": 
"{{desc|name=Bouquet|url=https://www.mediawiki.org/wiki/Skin:Bouquet}};
+}
diff --git a/skin.json b/skin.json
index bd60aae..4efeaef 100644
--- a/skin.json
+++ b/skin.json
@@ -6,7 +6,7 @@
"Jack Phoenix"
],
"url": "https://www.mediawiki.org/wiki/Skin:Bouquet;,
-   "description": "Elegant, simple theme inspired by the beauty found in 
flowers",
+   "descriptionmsg": "bouquet-desc",
"license-name": "GPL-2.0+",
"type": "skin",
"ValidSkinNames": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8dfffe6e11640c7086edc5b2466cca93687039a1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Bouquet
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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] translatewiki[master]: Fix JSON error, add wikipedia apps to autosync

[jenkins-bot (Code Review)]

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

Change subject: Fix JSON error, add wikipedia apps to autosync
..


Fix JSON error, add wikipedia apps to autosync

Change-Id: Ic685cb0fd57066537e50b465dbd9aa197d348114
---
M bin/EXTERNAL-PROJECTS
M repoconfig.json
2 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index b2b58da..4bdd657 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -45,3 +45,5 @@
 wikiedudashboard
 wikimania
 wikimedia-portals
+wikipedia-android
+wikipedia-ios
diff --git a/repoconfig.json b/repoconfig.json
index 6e85c99..58c4add 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -559,7 +559,7 @@
"repos": {
"wikipedia-android": {
"type": "wmgerrit",
-   "url": 
"https://gerrit.wikimedia.org/r/apps/android/wikipedia;
+   "url": 
"https://gerrit.wikimedia.org/r/apps/android/wikipedia;,
"auto-merge": false
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic685cb0fd57066537e50b465dbd9aa197d348114
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Optimizations

[Siddparmar (Code Review)]

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

Change subject: Optimizations
..


Optimizations

Minify HTML, CSS, and JS.
Optimize images and svgs

Change-Id: I5b2bc2acd95d5f2b8b57c90f46b3db530f862e87
---
M Gemfile
M Gemfile.lock
M build/content.html
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/index.html
M build/fr/privacy.html
M build/fr/stories.html
M build/images/chevron.svg
D build/images/chev...@2x.svg
M build/images/content.svg
M build/images/content1.svg
M build/images/faq.svg
M build/images/haruki.png
D build/images/har...@2x.png
M build/images/heather.jpg
D build/images/heat...@2x.jpg
M build/images/kozinski.jpg
D build/images/kozin...@2x.jpg
M build/images/logo.png
D build/images/l...@2x.png
M build/images/malala.jpg
D build/images/pie.png
D build/images/p...@2x.png
D build/images/pie_dec2015.png
D build/images/pie_june2015.png
D build/images/pie_june2...@2x.png
M build/images/quote_bohr.png
D build/images/quote_b...@2x.png
M build/images/quote_brandeis.png
D build/images/quote_brand...@2x.png
M build/images/quote_franklin.png
D build/images/quote_frank...@2x.png
M build/images/quote_gaiman.png
D build/images/quote_gai...@2x.png
M build/images/quote_hosseini.png
M build/images/quote_jay.png
D build/images/quote_...@2x.png
M build/images/quote_monroe.png
D build/images/quote_mon...@2x.png
M build/images/quote_netanel.png
D build/images/quote_neta...@2x.png
M build/images/quote_ocean.png
D build/images/quote_oc...@2x.png
M build/images/quote_oconnor.png
D build/images/quote_ocon...@2x.png
D build/images/quote_ocon...@2x.pxm
M build/images/quote_orwell.png
D build/images/quote_orw...@2x.png
M build/images/quote_paine.png
D build/images/quote_pa...@2x.png
M build/images/quote_poehler.png
D build/images/quote_poeh...@2x.png
M build/images/quote_samuelson.png
D build/images/quote_samuel...@2x.png
M build/images/quote_sotomayor.png
D build/images/quote_sotoma...@2x.png
M build/images/quote_wilde.png
D build/images/quote_wi...@2x.png
M build/images/story_aboriginal.png
D build/images/story_aborigi...@2x.png
M build/images/story_barnstar.png
D build/images/story_barns...@2x.png
M build/images/story_bedtime.png
D build/images/story_bedt...@2x.png
M build/images/story_bern.jpg
D build/images/story_b...@2x.jpg
M build/images/story_change.png
M build/images/story_cinema.jpg
D build/images/story_cin...@2x.jpg
M build/images/story_classics.png
D build/images/story_class...@2x.png
M build/images/story_coffee.png
D build/images/story_cof...@2x.png
M build/images/story_copywrong.png
D build/images/story_copywr...@2x.png
M build/images/story_dance.png
M build/images/story_dcri.png
D build/images/story_d...@2x.png
M build/images/story_dial.jpg
D build/images/story_d...@2x.jpg
M build/images/story_dictating.jpg
D build/images/story_dictat...@2x.jpg
M build/images/story_disputed.jpg
D build/images/story_dispu...@2x.jpg
M build/images/story_dmca.png
D build/images/story_d...@2x.png
M build/images/story_emergency.png
D build/images/story_emerge...@2x.png
M build/images/story_grave.jpg
D build/images/story_gr...@2x.jpg
M build/images/story_guru.png
D build/images/story_g...@2x.png
M build/images/story_identity.png
D build/images/story_ident...@2x.png
M build/images/story_kempler.png
D build/images/story_kemp...@2x.png
M build/images/story_letitgo.png
D build/images/story_leti...@2x.png
M build/images/story_license.jpg
D build/images/story_lice...@2x.jpg
M build/images/story_missing.png
D build/images/story_miss...@2x.png
M build/images/story_missing_link.jpg
D build/images/story_missing_l...@2x.jpg
M build/images/story_monkey.png
D build/images/story_mon...@2x.png
M build/images/story_myanmar.png
D build/images/story_myan...@2x.png
M build/images/story_newspaper.jpg
D build/images/story_newspa...@2x.jpg
M build/images/story_obama.png
D build/images/story_ob...@2x.png
M build/images/story_political.png
D build/images/story_politi...@2x.png
M build/images/story_principle.png
D build/images/story_princi...@2x.png
M build/images/story_ruth.png
D build/images/story_r...@2x.png
M build/images/story_seer.png
D build/images/story_s...@2x.png
M build/images/story_stock.png
D build/images/story_st...@2x.png
M build/images/story_studio.png
D build/images/story_stu...@2x.png
M build/images/story_suicide.png
D build/images/story_suic...@2x.png
M build/images/story_trademark.jpg
D build/images/story_tradem...@2x.jpg
M build/images/story_whisky.jpg
D build/images/story_whi...@2x.jpg
M build/images/story_whitehouse.png
D build/images/story_whiteho...@2x.png
M build/images/story_zanni.jpg
D build/images/story_za...@2x.jpg
M build/images/userdata.svg
M build/index.html
M build/javascripts/all.js
M build/javascripts/content.js
M build/javascripts/faq.js
M build/javascripts/privacy.js
M build/javascripts/rag.js
M build/privacy.html
M build/stories.html
M build/stylesheets/graph.css
M 

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix JSON error, add wikipedia apps to autosync

[Nikerabbit (Code Review)]

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

Change subject: Fix JSON error, add wikipedia apps to autosync
..

Fix JSON error, add wikipedia apps to autosync

Change-Id: Ic685cb0fd57066537e50b465dbd9aa197d348114
---
M bin/EXTERNAL-PROJECTS
M repoconfig.json
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/63/335863/1

diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index b2b58da..4bdd657 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -45,3 +45,5 @@
 wikiedudashboard
 wikimania
 wikimedia-portals
+wikipedia-android
+wikipedia-ios
diff --git a/repoconfig.json b/repoconfig.json
index 6e85c99..58c4add 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -559,7 +559,7 @@
"repos": {
"wikipedia-android": {
"type": "wmgerrit",
-   "url": 
"https://gerrit.wikimedia.org/r/apps/android/wikipedia;
+   "url": 
"https://gerrit.wikimedia.org/r/apps/android/wikipedia;,
"auto-merge": false
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic685cb0fd57066537e50b465dbd9aa197d348114
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Optimizations

[Siddparmar (Code Review)]

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

Change subject: Optimizations
..

Optimizations

Minify HTML, CSS, and JS.
Optimize images and svgs

Change-Id: I5b2bc2acd95d5f2b8b57c90f46b3db530f862e87
---
M Gemfile
M Gemfile.lock
M build/content.html
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/index.html
M build/fr/privacy.html
M build/fr/stories.html
M build/images/chevron.svg
D build/images/chev...@2x.svg
M build/images/content.svg
M build/images/content1.svg
M build/images/faq.svg
M build/images/haruki.png
D build/images/har...@2x.png
M build/images/heather.jpg
D build/images/heat...@2x.jpg
M build/images/kozinski.jpg
D build/images/kozin...@2x.jpg
M build/images/logo.png
D build/images/l...@2x.png
M build/images/malala.jpg
D build/images/pie.png
D build/images/p...@2x.png
D build/images/pie_dec2015.png
D build/images/pie_june2015.png
D build/images/pie_june2...@2x.png
M build/images/quote_bohr.png
D build/images/quote_b...@2x.png
M build/images/quote_brandeis.png
D build/images/quote_brand...@2x.png
M build/images/quote_franklin.png
D build/images/quote_frank...@2x.png
M build/images/quote_gaiman.png
D build/images/quote_gai...@2x.png
M build/images/quote_hosseini.png
M build/images/quote_jay.png
D build/images/quote_...@2x.png
M build/images/quote_monroe.png
D build/images/quote_mon...@2x.png
M build/images/quote_netanel.png
D build/images/quote_neta...@2x.png
M build/images/quote_ocean.png
D build/images/quote_oc...@2x.png
M build/images/quote_oconnor.png
D build/images/quote_ocon...@2x.png
D build/images/quote_ocon...@2x.pxm
M build/images/quote_orwell.png
D build/images/quote_orw...@2x.png
M build/images/quote_paine.png
D build/images/quote_pa...@2x.png
M build/images/quote_poehler.png
D build/images/quote_poeh...@2x.png
M build/images/quote_samuelson.png
D build/images/quote_samuel...@2x.png
M build/images/quote_sotomayor.png
D build/images/quote_sotoma...@2x.png
M build/images/quote_wilde.png
D build/images/quote_wi...@2x.png
M build/images/story_aboriginal.png
D build/images/story_aborigi...@2x.png
M build/images/story_barnstar.png
D build/images/story_barns...@2x.png
M build/images/story_bedtime.png
D build/images/story_bedt...@2x.png
M build/images/story_bern.jpg
D build/images/story_b...@2x.jpg
M build/images/story_change.png
M build/images/story_cinema.jpg
D build/images/story_cin...@2x.jpg
M build/images/story_classics.png
D build/images/story_class...@2x.png
M build/images/story_coffee.png
D build/images/story_cof...@2x.png
M build/images/story_copywrong.png
D build/images/story_copywr...@2x.png
M build/images/story_dance.png
M build/images/story_dcri.png
D build/images/story_d...@2x.png
M build/images/story_dial.jpg
D build/images/story_d...@2x.jpg
M build/images/story_dictating.jpg
D build/images/story_dictat...@2x.jpg
M build/images/story_disputed.jpg
D build/images/story_dispu...@2x.jpg
M build/images/story_dmca.png
D build/images/story_d...@2x.png
M build/images/story_emergency.png
D build/images/story_emerge...@2x.png
M build/images/story_grave.jpg
D build/images/story_gr...@2x.jpg
M build/images/story_guru.png
D build/images/story_g...@2x.png
M build/images/story_identity.png
D build/images/story_ident...@2x.png
M build/images/story_kempler.png
D build/images/story_kemp...@2x.png
M build/images/story_letitgo.png
D build/images/story_leti...@2x.png
M build/images/story_license.jpg
D build/images/story_lice...@2x.jpg
M build/images/story_missing.png
D build/images/story_miss...@2x.png
M build/images/story_missing_link.jpg
D build/images/story_missing_l...@2x.jpg
M build/images/story_monkey.png
D build/images/story_mon...@2x.png
M build/images/story_myanmar.png
D build/images/story_myan...@2x.png
M build/images/story_newspaper.jpg
D build/images/story_newspa...@2x.jpg
M build/images/story_obama.png
D build/images/story_ob...@2x.png
M build/images/story_political.png
D build/images/story_politi...@2x.png
M build/images/story_principle.png
D build/images/story_princi...@2x.png
M build/images/story_ruth.png
D build/images/story_r...@2x.png
M build/images/story_seer.png
D build/images/story_s...@2x.png
M build/images/story_stock.png
D build/images/story_st...@2x.png
M build/images/story_studio.png
D build/images/story_stu...@2x.png
M build/images/story_suicide.png
D build/images/story_suic...@2x.png
M build/images/story_trademark.jpg
D build/images/story_tradem...@2x.jpg
M build/images/story_whisky.jpg
D build/images/story_whi...@2x.jpg
M build/images/story_whitehouse.png
D build/images/story_whiteho...@2x.png
M build/images/story_zanni.jpg
D build/images/story_za...@2x.jpg
M build/images/userdata.svg
M build/index.html
M build/javascripts/all.js
M build/javascripts/content.js
M build/javascripts/faq.js
M build/javascripts/privacy.js
M build/javascripts/rag.js
M build/privacy.html
M build/stories.html
M build/stylesheets/graph.css
M 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make LogPage::isRestricted() do what it actually says

[Legoktm (Code Review)]

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

Change subject: Make LogPage::isRestricted() do what it actually says
..

Make LogPage::isRestricted() do what it actually says

Most sysadmins are more likely to grant a restricted log permission
(e.g. spamblacklistlog) to all users (via $wgGroupPermissions) instead
of changing $wgLogRestrictions.

So do what LogPage::isRestricted() says it does - if all users can see
the log type, it's not restricted.

Change-Id: Ida5cc5bb322d88b0726ad6edefb329e5e513513c
---
M includes/logging/LogPage.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/335861/1

diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 64102b7..01d4fdf 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -493,6 +493,10 @@
public function isRestricted() {
$restriction = $this->getRestriction();
 
-   return $restriction !== '' && $restriction !== '*';
+   if ( $restriction === '' && $restriction === '*' ) {
+   return true;
+   }
+
+   return User::isEveryoneAllowed( $restriction );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida5cc5bb322d88b0726ad6edefb329e5e513513c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki...RelatedArticles[master]: Update browser test to run on desktop

[Jdlrobson (Code Review)]

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

Change subject: Update browser test to run on desktop
..

Update browser test to run on desktop

This previously passed with a false positive as it replicated
the scenario `ReadMore is not present in minerva stable` by running
on the mobile domain.

This change makes it run on the desktop domain and pass (it now
fails given it runs on Minerva skin)

Bug: T157165
Change-Id: Idb2002b0f2d378cc0b6df73ad1381bfee32448c9
---
M tests/browser/features/read_more.feature
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/read_more.feature 
b/tests/browser/features/read_more.feature
index 71cb74d..80a6cf1 100644
--- a/tests/browser/features/read_more.feature
+++ b/tests/browser/features/read_more.feature
@@ -19,7 +19,7 @@
 Then I must see ReadMore
   And ReadMore must have three cards
 
-  @en.m.wikipedia.beta.wmflabs.org
+  @en.wikipedia.beta.wmflabs.org
   Scenario: ReadMore is not present when disabled as a BetaFeature
 Given I am on the "Related Articles 1" page
   And page has fully loaded without ReadMore code

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb2002b0f2d378cc0b6df73ad1381bfee32448c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...HitCounters[master]: Use full class name in wgSpecialPages

[Umherirrender (Code Review)]

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

Change subject: Use full class name in wgSpecialPages
..

Use full class name in wgSpecialPages

This avoids the use of the hook, which does it correct.

Change-Id: I99e6414c36ce02cc90a00d2a83adf6fcec9181eb
---
M extension.json
M includes/HitCounters.hooks.php
2 files changed, 1 insertion(+), 8 deletions(-)


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

diff --git a/extension.json b/extension.json
index 83b6457..193be7a 100644
--- a/extension.json
+++ b/extension.json
@@ -19,12 +19,9 @@
"HitCountersAlias": "HitCounters.i18n.alias.php"
},
"SpecialPages": {
-   "PopularPages": "SpecialPopularPages"
+   "PopularPages": "HitCounters\\SpecialPopularPages"
},
"Hooks": {
-   "SpecialPage_initList": [
-   "HitCounters\\Hooks::onSpecialPage_initList"
-   ],
"SpecialStatsAddExtra": [
"HitCounters\\Hooks::onSpecialStatsAddExtra"
],
diff --git a/includes/HitCounters.hooks.php b/includes/HitCounters.hooks.php
index f38e388..1d5105f 100644
--- a/includes/HitCounters.hooks.php
+++ b/includes/HitCounters.hooks.php
@@ -25,10 +25,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Hooks {
-   public static function onSpecialPage_initList( array &$specialPages ) {
-   $specialPages['PopularPages'] = 
'HitCounters\SpecialPopularPages';
-   }
-
public static function onLoadExtensionSchemaUpdates(
DatabaseUpdater $updater
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99e6414c36ce02cc90a00d2a83adf6fcec9181eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HitCounters
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...RelatedArticles[master]: Don't run the test for minerva stable against the beta cluster

[Jdlrobson (Code Review)]

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

Change subject: Don't run the test for minerva stable against the beta cluster
..

Don't run the test for minerva stable against the beta cluster

On the beta cluster, the browser test should pass.
Add a new test to reflect the two different states.

Bug: T157165
Change-Id: I2a777436dfa3a14d58855449c39cc144b7149a62
---
M tests/browser/features/read_more.feature
1 file changed, 13 insertions(+), 6 deletions(-)


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

diff --git a/tests/browser/features/read_more.feature 
b/tests/browser/features/read_more.feature
index 71cb74d..2c49ea5 100644
--- a/tests/browser/features/read_more.feature
+++ b/tests/browser/features/read_more.feature
@@ -1,17 +1,24 @@
-@chrome @integration @staging
+@chrome @staging
 Feature: ReadMore
   Background:
 Given RelatedArticles test pages are installed
 
   @en.m.wikipedia.beta.wmflabs.org @extension-mobilefrontend
-  Scenario: ReadMore is not present in minerva stable
+  Scenario: ReadMore is present in minerva stable on beta cluster.
+Given I am using the mobile site
+  And I am on the "Related Articles 1" page
+  And page has fully loaded with ReadMore code
+Then I must see ReadMore
+
+  @integration
+  Scenario: ReadMore is not present in minerva stable in default install
 Given I am using the mobile site
   And I am on the "Related Articles 1" page
   And page has fully loaded without ReadMore code
 Then I must not see ReadMore
 
-  @en.m.wikipedia.beta.wmflabs.org @extension-mobilefrontend
-  Scenario: ReadMore is present in minerva beta
+  @en.m.wikipedia.beta.wmflabs.org @integration @extension-mobilefrontend
+  Scenario: ReadMore is present in minerva beta in default installs and beta 
cluster
 Given I am using the mobile site
   And I am in mobile beta mode
   And I am on the "Related Articles 1" page
@@ -19,13 +26,13 @@
 Then I must see ReadMore
   And ReadMore must have three cards
 
-  @en.m.wikipedia.beta.wmflabs.org
+  @en.m.wikipedia.beta.wmflabs.org @integration
   Scenario: ReadMore is not present when disabled as a BetaFeature
 Given I am on the "Related Articles 1" page
   And page has fully loaded without ReadMore code
 Then I must not see ReadMore
 
-  @en.wikipedia.beta.wmflabs.org @extension-betafeatures
+  @en.wikipedia.beta.wmflabs.org @extension-betafeatures @integration
   Scenario: ReadMore is present when enabled as a BetaFeature
 Given I am logged in
   And ReadMore is enabled as a beta feature

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a777436dfa3a14d58855449c39cc144b7149a62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: lower TTL for webproxy.$dc.wmnet

[Dzahn (Code Review)]

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

Change subject: lower TTL for webproxy.$dc.wmnet
..


lower TTL for webproxy.$dc.wmnet

Soon switching these away from carbon, in case something
is bad with replacement, make reverting faster.

Bug: T123733
Change-Id: I44781c4b48dc2be6bd7c59164f349639772f6fdd
---
M templates/wmnet
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index e5c5b5b..90d23d1 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -24,7 +24,7 @@
 
 ; Service aliases
 syslog  1H  IN CNAMElithium.eqiad.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 carbon-relay1H  IN CNAMEgraphite1001.eqiad.wmnet.
 graphite1H  IN CNAMEgraphite1001.eqiad.wmnet.
 graphite-in 1H  IN CNAMEgraphite1001.eqiad.wmnet.
@@ -2224,7 +2224,7 @@
 ; Service aliases
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  1H  IN CNAMEpuppetmaster2001.codfw.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 deployment  1H  IN CNAMEtin.eqiad.wmnet.
 statsd  1H  IN CNAMEgraphite2001.codfw.wmnet.
 syslog  1H  IN CNAMEwezen.codfw.wmnet.
@@ -4076,7 +4076,7 @@
 ;
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 
 ; etcd client discovery
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1001.eqiad.wmnet.
@@ -4268,7 +4268,7 @@
 ;
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  5M  IN CNAMEpuppetmaster2001.codfw.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 
 ; etcd client discovery
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1001.eqiad.wmnet.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44781c4b48dc2be6bd7c59164f349639772f6fdd
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
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]: lower TTL for webproxy.$dc.wmnet

[Dzahn (Code Review)]

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

Change subject: lower TTL for webproxy.$dc.wmnet
..

lower TTL for webproxy.$dc.wmnet

Soon switching these away from carbon, in case something
is bad with replacement, make reverting faster.

Change-Id: I44781c4b48dc2be6bd7c59164f349639772f6fdd
---
M templates/wmnet
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/57/335857/1

diff --git a/templates/wmnet b/templates/wmnet
index e5c5b5b..90d23d1 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -24,7 +24,7 @@
 
 ; Service aliases
 syslog  1H  IN CNAMElithium.eqiad.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 carbon-relay1H  IN CNAMEgraphite1001.eqiad.wmnet.
 graphite1H  IN CNAMEgraphite1001.eqiad.wmnet.
 graphite-in 1H  IN CNAMEgraphite1001.eqiad.wmnet.
@@ -2224,7 +2224,7 @@
 ; Service aliases
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  1H  IN CNAMEpuppetmaster2001.codfw.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 deployment  1H  IN CNAMEtin.eqiad.wmnet.
 statsd  1H  IN CNAMEgraphite2001.codfw.wmnet.
 syslog  1H  IN CNAMEwezen.codfw.wmnet.
@@ -4076,7 +4076,7 @@
 ;
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 
 ; etcd client discovery
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1001.eqiad.wmnet.
@@ -4268,7 +4268,7 @@
 ;
 config-master   1H  IN CNAMEpuppetmaster1001.eqiad.wmnet.
 puppet  5M  IN CNAMEpuppetmaster2001.codfw.wmnet.
-webproxy1H  IN CNAMEcarbon.wikimedia.org.
+webproxy5M  IN CNAMEcarbon.wikimedia.org.
 
 ; etcd client discovery
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1001.eqiad.wmnet.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44781c4b48dc2be6bd7c59164f349639772f6fdd
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
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...Popups[mpga]: DONOTMERGE: Another way

[Jdlrobson (Code Review)]

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

Change subject: DONOTMERGE: Another way
..

DONOTMERGE: Another way

A few subtle changes here.
1) Exports are moved to the bottom of the JS file
2) Dependencies are moved to the top
3) The createGateway method takes an api meaning
gateway.js has no dependency on mediawiki.api - only
boot.js does.
4) When stubbing we only need to stub the local variable
not the global mw.Api prototype

Change-Id: Ib847df0de91066ecedffcdb22813fccdc5a24a80
---
M resources/ext.popups/boot.js
M resources/ext.popups/gateway.js
M tests/qunit/ext.popups/gateway.test.js
3 files changed, 33 insertions(+), 45 deletions(-)


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

diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index 52b08ce..bee4946 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -1,26 +1,14 @@
 ( function ( mw, Redux, ReduxThunk ) {
-   var BLACKLISTED_LINKS = [
-   '.extiw',
-   '.image',
-   '.new',
-   '.internal',
-   '.external',
-   '.oo-ui-buttonedElement-button',
-   '.cancelLink a'
-   ];
-
-   /**
-* Creates a gateway with sensible values for the dependencies.
-*
-* See `mw.popups.createGateway`.
-*
-* @param {mw.Map} config
-* @return {ext.popups.Gateway}
-*/
-   function createGateway( config ) {
-   return mw.popups.createGateway(
-   config.get( 'wgPopupsAPIUseRESTBase' ) );
-   }
+   var api = mw.config.get( 'wgPopupsAPIUseRESTBase' ) ? undefined : new 
mw.Api(),
+   BLACKLISTED_LINKS = [
+   '.extiw',
+   '.image',
+   '.new',
+   '.internal',
+   '.external',
+   '.oo-ui-buttonedElement-button',
+   '.cancelLink a'
+   ];
 
/**
 * Subscribes the registered change listeners to the
@@ -88,7 +76,7 @@
 
// So-called "services".
generateToken = mw.user.generateRandomSessionId,
-   gateway = createGateway( mw.config ),
+   gateway = mw.popups.createGateway( api ),
userSettings,
settingsDialog,
isEnabled,
diff --git a/resources/ext.popups/gateway.js b/resources/ext.popups/gateway.js
index 7579f12..8f9262d 100644
--- a/resources/ext.popups/gateway.js
+++ b/resources/ext.popups/gateway.js
@@ -3,6 +3,7 @@
// FIXME: These constants (and others like 'em) should be in some 
top-level
// configuration file.
var EXTRACT_LENGTH = 525,
+   preview = mw.popups.preview,
THUMBNAIL_SIZE = 300 * $.bracketedDevicePixelRatio(),
CACHE_LIFETIME = 300, // Public and private cache lifetime (5 
minutes)
RESTBASE_ENDPOINT = '/api/rest_v1/page/summary/',
@@ -87,22 +88,6 @@
}
 
/**
-* Creates a function that fetches all of the data required to give the 
user a
-* preview of the page from either the MediaWiki API or RESTBase given 
the
-* title of the page (see `mw.popups.processLinks` for the definition 
of "title").
-*
-* @param {bool} useRESTBase Whether to use RESTBase rather than the
-*  MediaWiki API
-* @return {ext.popups.Gateway}
-*/
-   mw.popups.createGateway = function ( useRESTBase ) {
-   if ( useRESTBase ) {
-   return new RESTBaseGateway();
-   }
-   return new MediaWikiAPIGateway( new mw.Api() );
-   };
-
-   /**
 * Mangles the page as represented by the MediaWiki API (including the
 * additional data requested above) and passes it to
 * `mw.popups.preview.createModel`.
@@ -111,7 +96,7 @@
 * @returns {ext.popups.PreviewModel}
 */
function convertMediaWikiAPIPageToModel( page ) {
-   return mw.popups.preview.createModel(
+   return preview.createModel(
page.title,
page.canonicalurl,
page.pagelanguagehtmlcode,
@@ -129,7 +114,7 @@
 * @returns {ext.popups.PreviewModel}
 */
function convertRESTBasePageToModel( page ) {
-   return mw.popups.preview.createModel(
+   return preview.createModel(
page.title,
new mw.Title( page.title ).getUrl(),
page.lang,
@@ -139,4 +124,19 @@
);
}
 
+   /**
+* Creates a function that 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Diamond collector to track tools home and project ...

[Madhuvishy (Code Review)]

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

Change subject: labstore: Diamond collector to track tools home and project dir 
sizes
..

labstore: Diamond collector to track tools home and project dir sizes

Change-Id: I41c68ae468f0de3d5c368344f189071226339a24
---
A modules/labstore/files/monitor/tools_nfs_usage.py
M modules/role/manifests/labs/nfs/secondary.pp
2 files changed, 74 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/335855/1

diff --git a/modules/labstore/files/monitor/tools_nfs_usage.py 
b/modules/labstore/files/monitor/tools_nfs_usage.py
new file mode 100644
index 000..5aa331e
--- /dev/null
+++ b/modules/labstore/files/monitor/tools_nfs_usage.py
@@ -0,0 +1,64 @@
+"""
+Diamond collector that publishes directory sizes for tools home and project
+directories, to track growth over time
+"""
+import diamond.collector
+import ldap3
+import os
+import shlex
+import subprocess
+import yaml
+
+
+class ToolsNFSUsageCollector(diamond.collector.Collector):
+
+def get_default_config(self):
+"""
+Returns the default collector settings
+"""
+config = super(ToolsNFSUsageCollector, self).get_default_config()
+config.update({
+'path_prefix': 'labstore',
+'hostname': 'labstore-secondary'
+'byte_unit': 'kilobyte',
+'tools_base_path': '/srv/tools/shared/tools',
+})
+return config
+
+def directory_size(self, directory):
+"""
+Return directory size in kilobytes
+"""
+if os.path.isdir(directory):
+size = subprocess.check_output(['du', '-s', directory]).decode(
+'utf-8').split('\t')[0]
+return size
+
+def tools_dirs(self, subdir):
+"""
+Return list of directory names in TOOLS_PATH/subdir
+"""
+dirs = subprocess.check_output(shlex.split('ls {}/{}'.format(
+self.config['tools_base_path'], 
subdir))).decode('utf-8').rstrip().split('\n')
+tool_dirs = [d for d in dirs
+ if os.path.isdir('{}/{}/{}'.format(
+self.config['tools_base_path'], subdir, d))]
+return tool_dirs
+
+def project_dir(self, project):
+return '{}/project/{}'.format(self.config['tools_base_path'], project)
+
+def home_dir(self, user):
+return '{}/home/{}'.format(self.config['tools_base_path'], user)
+
+def collect(self):
+"""
+Publish tools home and project directory sizes in kilobytes
+"""
+for project in self.tools_dirs('project'):
+size = self.directory_size(self.project_dir(project))
+self.publish_gauge('tools.project.{}.size'.format(project), size)
+
+for user in self.tools_dirs('home'):
+size = self.directory_size(self.home_dir(user))
+self.publish_gauge('tools.home.{}.size'.format(user), size)
diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index ecc5ee8..bd5e3c6 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -104,4 +104,14 @@
 drbd_role  => $drbd_role,
 cluster_ip => $cluster_ip,
 }
+
+if($drbd_role == 'primary') {
+diamond::collector { 'ToolsNFSUsage':
+source   => 
'puppet:///modules/labstore/monitor/tools_nfs_usage.py',
+settings => {
+tools_base_path => '/srv/tools/shared/tools',
+hostname=> 'labstore-secondary',
+},
+}
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Adding uaprser to eventlogging deps

[Nuria (Code Review)]

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

Change subject: Adding uaprser to eventlogging deps
..

Adding uaprser to eventlogging deps

Bug: T153207
Change-Id: I056088b98b6e10e4f41b7973c7d3068ed5c14d95
---
M modules/eventlogging/manifests/dependencies.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/335854/1

diff --git a/modules/eventlogging/manifests/dependencies.pp 
b/modules/eventlogging/manifests/dependencies.pp
index 5c24d56..ac85d06 100644
--- a/modules/eventlogging/manifests/dependencies.pp
+++ b/modules/eventlogging/manifests/dependencies.pp
@@ -15,6 +15,7 @@
 class eventlogging::dependencies {
 # Install all eventlogging dependencies from .debs.
 require_package([
+'python-uaparser',
 'python-dateutil',
 'python-jsonschema',
 'python-confluent-kafka',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: three_d role: Add dependency on libgif-dev required by node ...

[Jforrester (Code Review)]

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

Change subject: three_d role: Add dependency on libgif-dev required by node 
canvas
..

three_d role: Add dependency on libgif-dev required by node canvas

Change-Id: Ib5d464d9215cb6bfa31dacd0c643df0ce8db9dc2
---
M puppet/modules/three_d/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/53/335853/1

diff --git a/puppet/modules/three_d/manifests/init.pp 
b/puppet/modules/three_d/manifests/init.pp
index 51d2103..82b329e 100644
--- a/puppet/modules/three_d/manifests/init.pp
+++ b/puppet/modules/three_d/manifests/init.pp
@@ -16,6 +16,7 @@
 require_package('libxi-dev')
 require_package('libglu1-mesa-dev')
 require_package('libglew-dev')
+require_package('libgif-dev')
 
 file { $three_d_2png_dir:
 ensure => directory,

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

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

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

[MediaWiki-commits] [Gerrit] labs...stashbot[master]: Fix LDAP cache expiration check

[jenkins-bot (Code Review)]

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

Change subject: Fix LDAP cache expiration check
..


Fix LDAP cache expiration check

The time comparison was inverted.

Change-Id: I2b33c888078782e1e2bf3d027ea0b8bc95f2d7b8
---
M stashbot/sal.py
1 file changed, 9 insertions(+), 5 deletions(-)

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



diff --git a/stashbot/sal.py b/stashbot/sal.py
index fe615cd..b03de15 100644
--- a/stashbot/sal.py
+++ b/stashbot/sal.py
@@ -91,7 +91,7 @@
 if channel == '#wikimedia-labs':
 bang['project'], bang['message'] = bang['message'].split(None, 1)
 if bang['project'] not in self._get_projects():
-self.logger.warning('Invalid project %s', bang['project'])
+self.logger.warning('Invalid project "%s"', bang['project'])
 if respond_to_channel:
 self.irc.respond(
 conn, event,
@@ -173,23 +173,27 @@
 
 def _get_projects(self):
 """Get a list of valid Labs projects"""
-if (self._cached_projects and
-self._cached_projects[0] + 300 > time.time()
-):
+if self._cached_projects and self._cached_projects[0] < time.time():
 # Clear expired cache
 self._cached_projects = None
+self.logger.info('Cleared stale project cache')
 
 if self._cached_projects is None:
 projects = self._get_ldap_names('projects')
 servicegroups = self._get_ldap_names('servicegroups')
 if projects and servicegroups:
 self._cached_projects = (
-time.time(),
+time.time() + 300,
 projects + servicegroups
+)
+self.logger.info(
+'Caching project list until %d',
+self._cached_projects[0]
 )
 else:
 # One or both lists empty probably means LDAP failures
 # Don't cache the result.
+self.logger.warning('Returning partial project list')
 return projects + servicegroups
 
 return self._cached_projects[1]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b33c888078782e1e2bf3d027ea0b8bc95f2d7b8
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/stashbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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