[MediaWiki-commits] [Gerrit] mediawiki...Nostalgia[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I4330600c64e7888a5ecee4081aa4dffd06fa0d02
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 8599d9b..1c2721a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 2903f07..d22cabf 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4330600c64e7888a5ecee4081aa4dffd06fa0d02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Always put {{Related}} template on separate line

[jenkins-bot (Code Review)]

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

Change subject: Always put {{Related}} template on separate line
..


Always put {{Related}} template on separate line

The template usually works even at the end of another line, but not when
the line belongs to a list (see, for example, [1]). To avoid confusion,
simply always put it on a separate line.

[1]: 
https://translatewiki.net/w/i.php?title=MediaWiki:Wbqc-violation-message-no-qualifiers/qqq=7384019

Change-Id: I260b38a446f9bc56b66e1b9482e3b665e63c
---
M i18n/qqq.json
1 file changed, 16 insertions(+), 16 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/qqq.json b/i18n/qqq.json
index d12b77b..9feeddd 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -33,12 +33,12 @@
"wbqc-constraintreport-result-link-to-claim": "Text for the link to a 
claim group on the entity page.",
"wbqc-constraintreport-result-link-to-constraint": "Text for the link 
to a constraint on the property page.",
"wbqc-constraintreport-no-parameter": "Text that is displayed when 
there was no value for a parameter given.\n{{Identical|None}}",
-   "wbqc-potentialissues-short": "Headline of the constraint report popup 
section for violations of non-mandatory constraints. Should be easy to 
understand for users, and convey that the reported violations are not always 
errors, but should be thought of as hints to the user that something might be 
wrong.\n\n{{Related|wbqc-constraintreport}}",
-   "wbqc-potentialissues-long": "Title for the icon shown on statements 
with non-mandatory constraint violations, usually displayed by the browser when 
the user hovers over the icon with the mouse 
cursor.{{Related|wbqc-potentialissues-short}}",
+   "wbqc-potentialissues-short": "Headline of the constraint report popup 
section for violations of non-mandatory constraints. Should be easy to 
understand for users, and convey that the reported violations are not always 
errors, but should be thought of as hints to the user that something might be 
wrong.\n{{Related|wbqc-constraintreport}}",
+   "wbqc-potentialissues-long": "Title for the icon shown on statements 
with non-mandatory constraint violations, usually displayed by the browser when 
the user hovers over the icon with the mouse 
cursor.\n{{Related|wbqc-potentialissues-short}}",
"wbqc-badparameters-short": "Headline of the constraint parameter 
report popup shown on constraint statements with invalid constraint 
parameters.",
-   "wbqc-badparameters-long": "Title for the icon shown on constraint 
statements with invalid constraint parameters, usually displayed by the browser 
when the user hovers over the icon with the mouse 
cursor.{{Related|wbqc-badparameters-short}}",
+   "wbqc-badparameters-long": "Title for the icon shown on constraint 
statements with invalid constraint parameters, usually displayed by the browser 
when the user hovers over the icon with the mouse 
cursor.\n{{Related|wbqc-badparameters-short}}",
"wbqc-parameterissues-short": "Headline of the section of the 
constraint parameter report popup that contains problems about the constraint 
parameters. The section is collapsed by default, since these problems are 
harder to understand and fix than normal constraint violations. The headline 
should convey that normal users are not expected to deal with these 
problems.\n\nThese problems are also displayed on property pages in a separate 
popup: see {{msg-mw|wbqc-badparameters-short}} / 
{{msg-mw|wbqc-badparameters-long}}.",
-   "wbqc-parameterissues-long": "Longer explanation of the section of the 
constraint parameter report popup that contains problems about the constraint 
parameters.\n\n{{Related|wbqc-parameterissues-short}}",
+   "wbqc-parameterissues-long": "Longer explanation of the section of the 
constraint parameter report popup that contains problems about the constraint 
parameters.\n{{Related|wbqc-parameterissues-short}}",
"wbqc-problems-short": "Headline of the constraint report popup section 
for violations of mandatory constraints.{{Related|wbqc-potentialissues-short}}",
"wbqc-problems-long": "Title for the icon shown on statements with 
mandatory constraint violations, usually displayed by the browser when the user 
hovers over the icon with the mouse 
cursor.\n{{Related|wbqc-problems-short}}\n{{Related|wbqc-potentialissues-long}}",
"apihelp-wbcheckconstraints-description": 
"{{doc-apihelp-description|wbcheckconstraints}}",
@@ -69,20 +69,20 @@
"wbqc-violation-message-target-entity-must-exist": "Message for when an 
entity is referenced, but it doesn't exist (any more).",
"wbqc-violation-message-value-entity-must-exist": "Message for when the 
property has an entity as its value, but it doesn't exist (any 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Removing Explore Similar AB Test

[jenkins-bot (Code Review)]

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

Change subject: Removing Explore Similar AB Test
..


Removing Explore Similar AB Test

Removing Explore Similar AB test code, but
keeping the explore similar event logging around
for any future deployment of this feature.

Bug: T171320
Change-Id: I26a162a6ff88109e29248b2624e10d99f4829647
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 4 insertions(+), 17 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 004f929..07f7849 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,8 +113,8 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   // Explore Similar AB test
-   validBuckets = [ 'explore_similar_control', 
'explore_similar_test' ],
+   // No sub-tests currently running
+   validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -136,8 +136,8 @@
subTest: null
},
enwiki: {
-   test: 1000,
-   subTest: 2
+   test: 2000,
+   subTest: null
},
enwiktionary: {
test: 40,
@@ -688,12 +688,6 @@
);
 
/**
-* Loading Explore Similar module for A/B test
-*/
-   if ( session.get( 'subTest' ) === 
'explore_similar_test' ) {
-   mw.loader.load( 'ext.cirrus.explore-similar' );
-   }
-   /**
 * Explore similar event logging
 * Listens for custom event sent by the Explore Similar 
module.
 * These events pass along extra data that conforms to 
the
@@ -744,13 +738,6 @@
 
logEvent( 'esclick', esParams );
} );
-
-   /**
-* Loading Explore Similar module for A/B test
-*/
-   if ( session.get( 'subTest' ) === 
'explore_similar_test' ) {
-   mw.loader.load( 'ext.cirrus.explore-similar' );
-   }
 
serpExtras = {
offset: $( '.results-info' ).data( 
'mw-num-results-offset' )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26a162a6ff88109e29248b2624e10d99f4829647
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak 
Gerrit-Reviewer: Bearloga 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Jdrewniak 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Mostly re-enable Generic.Arrays.DisallowLongArraySyntax.Found

[jenkins-bot (Code Review)]

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

Change subject: Mostly re-enable Generic.Arrays.DisallowLongArraySyntax.Found
..


Mostly re-enable Generic.Arrays.DisallowLongArraySyntax.Found

Change-Id: If20459f85b6f80e0321d8571fe7b52c48fa471fd
---
M docroot/noc/db.php
M docroot/search.wikimedia.org/index.php
M phpcs.xml
M tests/DBList.php
M tests/SiteConfiguration.php
M tests/TestServices.php
M tests/cirrusTest.php
M tests/dbconfigTest.php
M tests/dblistTest.php
M tests/loggingTest.php
M tests/noc-conf/highlightTest.php
11 files changed, 135 insertions(+), 134 deletions(-)

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



diff --git a/docroot/noc/db.php b/docroot/noc/db.php
index b4509b2..98c5745 100644
--- a/docroot/noc/db.php
+++ b/docroot/noc/db.php
@@ -37,7 +37,7 @@
}
public function getDBs( $clusterName ) {
global $wgLBFactoryConf;
-   $ret = array();
+   $ret = [];
foreach ( $wgLBFactoryConf['sectionsByDB'] as $db => $cluster ) 
{
if ( $cluster == $clusterName ) {
$ret[] = $db;
@@ -68,13 +68,13 @@
 $wmf = new WmfClusters();
 
 if ( $format === 'json' ) {
-   $data = array();
+   $data = [];
foreach ( $wmf->getNames() as $name ) {
-   $data[$name] = array(
+   $data[$name] = [
'hosts' => $wmf->getHosts( $name ),
'loads' => $wmf->getLoads( $name ),
'dbs' => $wmf->getDBs( $name ),
-   );
+   ];
}
header( 'Content-Type: application/json; charset=utf-8' );
echo json_encode( $data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES );
diff --git a/docroot/search.wikimedia.org/index.php 
b/docroot/search.wikimedia.org/index.php
index 803f4c8..3c40cda 100644
--- a/docroot/search.wikimedia.org/index.php
+++ b/docroot/search.wikimedia.org/index.php
@@ -21,11 +21,12 @@
 $search = '';
 $limit = 20;
 
-$allowedSites = array(
+$allowedSites = [
'wikipedia',
'wiktionary',
'wikinews',
-   'wikisource' );
+   'wikisource'
+];
 
 if ( isset( $_GET['site'] ) ) {
if ( is_string( $_GET['site'] ) && in_array( $_GET['site'], 
$allowedSites ) ) {
@@ -65,11 +66,11 @@
 # OpenSearch JSON suggest API
 $url = 
"https://$lang.$site.org/w/api.php?action=opensearch=$urlSearch=$limit;;
 $c = curl_init( $url );
-curl_setopt_array( $c, array(
+curl_setopt_array( $c, [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_TIMEOUT_MS => 5000,
CURLOPT_USERAGENT => 'Wikimedia OpenSearch to Apple Dictionary bridge'
-) );
+] );
 $result = curl_exec( $c );
 $code = curl_getinfo( $c, CURLINFO_HTTP_CODE );
 if ( $result === false || !$code ) {
diff --git a/phpcs.xml b/phpcs.xml
index b4b763d..eb4716c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -22,7 +22,7 @@



-   0
+   wmf-config/trusted-xff.php


wmf-config/interwiki.php
diff --git a/tests/DBList.php b/tests/DBList.php
index ea84b19..1e03283 100644
--- a/tests/DBList.php
+++ b/tests/DBList.php
@@ -12,7 +12,7 @@
 class DBList {
# List of project names. This array is used to verify that the various
# dblist project files only contains names of databases that belong to 
them
-   private static $wiki_projects = array(
+   private static $wiki_projects = [
'wikibooks',
'wikinews',
'wikipedia',
@@ -20,7 +20,7 @@
'wikisource',
'wikiversity',
'wiktionary',
-   );
+   ];
 
public static function getLists() {
static $list = null;
diff --git a/tests/SiteConfiguration.php b/tests/SiteConfiguration.php
index 9acc4f39..a86090a 100644
--- a/tests/SiteConfiguration.php
+++ b/tests/SiteConfiguration.php
@@ -39,15 +39,15 @@
  *
  * @code
  * $conf = new SiteConfiguration;
- * $conf->wikis = array( 'de', 'en', 'beta' );
+ * $conf->wikis = [ 'de', 'en', 'beta' ];
  * @endcode
  *
  * When configuring the MediaWiki global settings (the $wg variables),
  * the identifiers will be available to specify settings on a per wiki basis.
  *
  * @code
- * $conf->settings = array(
- * 'wgSomeSetting' => array(
+ * $conf->settings = [
+ * 'wgSomeSetting' => [
  *
  * # production:
  * 'de' => false,
@@ -55,8 +55,8 @@
  *
  * # test:
  * 'beta=> true,
- * ),
- * );
+ * ],
+ * ];
  * @endcode
  *
  * With three wikis, that is easy to manage. But what about a farm with
@@ -65,15 +65,15 @@
  * the above code could be written:
  *
  * @code
- * $conf->settings = array(
- * 'wgSomeSetting' => array(

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: Use yaml.safe_load in nova_fullstack_test.py

[Rush (Code Review)]

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

Change subject: wmcs: Use yaml.safe_load in nova_fullstack_test.py
..


wmcs: Use yaml.safe_load in nova_fullstack_test.py

Python's yaml module unfortunately defaults to unsafe de-serialization
behavior. The do provide a `safe_load` method however which will not
create arbitrary objects from a YAML content stream.

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

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



diff --git a/modules/openstack/files/nova_fullstack_test.py 
b/modules/openstack/files/nova_fullstack_test.py
index b11c22c..d368b3d 100644
--- a/modules/openstack/files/nova_fullstack_test.py
+++ b/modules/openstack/files/nova_fullstack_test.py
@@ -186,7 +186,7 @@
 
 logging.debug(out)
 try:
-yprun = yaml.load(out)
+yprun = yaml.safe_load(out)
 except:
 logging.warning("Yaml conversion failed for Puppet results")
 yprun = {}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7303906045f61da15309c103326c8c05ae5cb02e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: wmcs: Use yaml.safe_load in archive-project-volumes

[Rush (Code Review)]

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

Change subject: wmcs: Use yaml.safe_load in archive-project-volumes
..


wmcs: Use yaml.safe_load in archive-project-volumes

Python's yaml module unfortunately defaults to unsafe de-serialization
behavior. The do provide a `safe_load` method however which will not
create arbitrary objects from a YAML content stream.

Change-Id: I4b6826479fc947257a9f31ee80fed60f5a81b447
---
M modules/labstore/files/archive-project-volumes
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/labstore/files/archive-project-volumes 
b/modules/labstore/files/archive-project-volumes
index 7c5e6e0..fe3b205 100755
--- a/modules/labstore/files/archive-project-volumes
+++ b/modules/labstore/files/archive-project-volumes
@@ -98,7 +98,7 @@
 vol_list = [options.volume]
 else:
 with open(self.active_volumes_file, 'r') as f:
-y = yaml.load(f)
+y = yaml.safe_load(f)
 projects_in_yaml = y['private']
 
 projects_on_disk = os.listdir(self.base_dir)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b6826479fc947257a9f31ee80fed60f5a81b447
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] eventlogging...eventbus[master]: Improve the deployment process for production

[Ottomata (Code Review)]

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

Change subject: Improve the deployment process for production
..


Improve the deployment process for production

Added specific pool/depool steps and a service check,
plus the constraint of only one host deployed at the same time.

Change-Id: I447ebc8be8e2d1a59feffa67c0137e9510aa45f5
---
A checks.yaml
M scap.cfg
2 files changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/checks.yaml b/checks.yaml
new file mode 100644
index 000..b3afc43
--- /dev/null
+++ b/checks.yaml
@@ -0,0 +1,13 @@
+checks:
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_eventlogging-service-eventbus
+  depool:
+type: command
+stage: promote
+command: depool-eventbus
+  repool:
+type: command
+stage: restart_service
+command: pool-eventbus
diff --git a/scap.cfg b/scap.cfg
index f56c962..8479e1d 100644
--- a/scap.cfg
+++ b/scap.cfg
@@ -17,9 +17,13 @@
 
 # There are submodules that need to be pulled from tin
 git_submodules: True
+
 # Until https://phabricator.wikimedia.org/T121884 is fixed
 git_upstream_submodules: True
 
+# Serialize deployments to one host at the time
+group_size: 1$
+
 # There is a service that needs to be restarted
 service_name: eventlogging-service-eventbus
 service_port: 8085

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I447ebc8be8e2d1a59feffa67c0137e9510aa45f5
Gerrit-PatchSet: 2
Gerrit-Project: eventlogging/scap/eventbus
Gerrit-Branch: master
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[wmf/1.30.0-wmf.10]: Add missing jQueryMsg dependency for mobile diff view

[jenkins-bot (Code Review)]

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

Change subject: Add missing jQueryMsg dependency for mobile diff view
..


Add missing jQueryMsg dependency for mobile diff view

Bug: T170917
Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
(cherry picked from commit 545a7de5e2eaadaa7d245e92eabe472b784d6b1b)
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 314b78f..5e30b49 100644
--- a/extension.json
+++ b/extension.json
@@ -102,6 +102,7 @@
],
"dependencies": [
"mediawiki.api",
+   "mediawiki.jqueryMsg",
"mediawiki.notify"
],
"targets": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: wmf/1.30.0-wmf.10
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Add index on oresc_probability

[Catrope (Code Review)]

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

Change subject: Add index on oresc_probability
..

Add index on oresc_probability

Change-Id: I9bc116c43ebcab352ab66dc3d285b9a807ea755b
---
M includes/Hooks.php
M sql/ores_classification.sql
A sql/patch-ores-classification-model-class-prob-index.sql
3 files changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/includes/Hooks.php b/includes/Hooks.php
index a60ac5c..2425c7f 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -50,6 +50,8 @@
__DIR__ . 
'/../sql/patch-ores-classification-unique-indexes.sql' );
$updater->addExtensionIndex( 'ores_model', 'oresm_model_status',
__DIR__ . '/../sql/patch-ores-model-indexes.sql' );
+   $updater->addExtensionIndex( 'ores_classification', 
'oresc_model_class_prob',
+   __DIR__ . 
'/../sql/patch-ores-classification-model-class-prob-index.sql' );
}
 
/**
diff --git a/sql/ores_classification.sql b/sql/ores_classification.sql
index 067da78..2f886af 100644
--- a/sql/ores_classification.sql
+++ b/sql/ores_classification.sql
@@ -20,3 +20,4 @@
 
 CREATE UNIQUE INDEX /*i*/oresc_rev_model_class ON /*_*/ores_classification 
(oresc_rev, oresc_model, oresc_class);
 CREATE UNIQUE INDEX /*i*/oresc_rev_predicted_model ON /*_*/ores_classification 
(oresc_rev, oresc_is_predicted, oresc_model);
+CREATE INDEX /*i*/oresc_model_class_prob ON /*_*/ores_classification 
(oresc_model, oresc_class, oresc_probability);
diff --git a/sql/patch-ores-classification-model-class-prob-index.sql 
b/sql/patch-ores-classification-model-class-prob-index.sql
new file mode 100644
index 000..d296d02
--- /dev/null
+++ b/sql/patch-ores-classification-model-class-prob-index.sql
@@ -0,0 +1,6 @@
+--
+-- patch-ores-classification-model-class-prob-index.sql
+--
+-- Add index on probability to ores_classification
+
+CREATE INDEX /*i*/oresc_model_class_prob ON /*_*/ores_classification 
(oresc_model, oresc_class, oresc_probability);

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Cirrus search of wbsearchentities when using useCirrus=1

[jenkins-bot (Code Review)]

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

Change subject: Enable Cirrus search of wbsearchentities when using useCirrus=1
..


Enable Cirrus search of wbsearchentities when using useCirrus=1

Bug: T125500
Change-Id: I955f5150f6916398ab4ad4a742aca582bb28e592
---
M wmf-config/Wikibase.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 175559e..4943a1c 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -153,6 +153,9 @@
// on either Item or Property pages. T86453
$wgCaptchaTriggersOnNamespace[NS_MAIN]['addurl'] = false;
$wgCaptchaTriggersOnNamespace[WB_NS_PROPERTY]['addurl'] = false;
+   // Soft-enable Cirrus usage for wbsearchentities
+   // Cirrus search will be used if useCirrus=1 parameter is set
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I955f5150f6916398ab4ad4a742aca582bb28e592
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Lydia Pintscher (WMDE) 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update phpunit to 4.8.36

[jenkins-bot (Code Review)]

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

Change subject: Update phpunit to 4.8.36
..


Update phpunit to 4.8.36

Change-Id: I8fe43af41be327043c2ec4fa1142804026f6fa46
---
M composer.json
M composer.lock
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/composer.json b/composer.json
index 520064c..4f1c334 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.8.0",
-   "phpunit/phpunit": "4.8.35"
+   "phpunit/phpunit": "4.8.36"
},
"scripts": {
"lint": "parallel-lint --exclude multiversion/vendor 
--ignore-fails .",
diff --git a/composer.lock b/composer.lock
index 0d0b384..a5e65f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "1842ce8b6d5b3555db6e01bb492e34a7",
+"content-hash": "6a48c72fe973fe0e63f901d46925b629",
 "packages": [
 {
 "name": "mongofill/mongofill",
@@ -135,7 +135,7 @@
 }
 ],
 "description": "Polyfill of PECL Mongo extension",
-"time": "2016-11-13T21:50:29+00:00"
+"time": "2016-11-13 21:50:29"
 },
 {
 "name": "perftools/xhgui",
@@ -992,16 +992,16 @@
 },
 {
 "name": "phpunit/phpunit",
-"version": "4.8.35",
+"version": "4.8.36",
 "source": {
 "type": "git",
 "url": "https://github.com/sebastianbergmann/phpunit.git;,
-"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
+"reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87;,
-"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
+"url": 
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517;,
+"reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
 "shasum": ""
 },
 "require": {
@@ -1060,7 +1060,7 @@
 "testing",
 "xunit"
 ],
-"time": "2017-02-06T05:18:07+00:00"
+"time": "2017-06-21T08:07:12+00:00"
 },
 {
 "name": "phpunit/phpunit-mock-objects",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: Use yaml.safe_load in kube2proxy.py

[Rush (Code Review)]

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

Change subject: wmcs: Use yaml.safe_load in kube2proxy.py
..


wmcs: Use yaml.safe_load in kube2proxy.py

Python's yaml module unfortunately defaults to unsafe de-serialization
behavior. The do provide a `safe_load` method however which will not
create arbitrary objects from a YAML content stream.

Change-Id: I7fb306a4091b133f27f8cda83cc79d1639f1571d
---
M modules/toollabs/files/kube2proxy.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/kube2proxy.py 
b/modules/toollabs/files/kube2proxy.py
index 5dae300..8d8ec50 100755
--- a/modules/toollabs/files/kube2proxy.py
+++ b/modules/toollabs/files/kube2proxy.py
@@ -210,7 +210,7 @@
 logging.basicConfig(format=LOG_FORMAT, level=level)
 
 with open(args.config, 'r') as fh:
-config = yaml.load(fh)
+config = yaml.safe_load(fh)
 
 rhost, rport = config['redis'].split(':')
 conn = redis.Redis(host=rhost, port=rport)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fb306a4091b133f27f8cda83cc79d1639f1571d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Volans 
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] wikimedia...golden[master]: Use new functions in polloi to get geo data

[Chelsyx (Code Review)]

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

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

Use new functions in polloi to get geo data

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/56/367456/1

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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Metrolook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[Umherirrender (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I7a2438ca32371993cb81e7c10267b6cf493f3370
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/34/367434/1

diff --git a/composer.json b/composer.json
index ba67647..74cbe77 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index bc9fe00..5c84271 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,6 +11,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a2438ca32371993cb81e7c10267b6cf493f3370
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
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...Nostalgia[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[Umherirrender (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I4330600c64e7888a5ecee4081aa4dffd06fa0d02
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nostalgia 
refs/changes/41/367441/1

diff --git a/composer.json b/composer.json
index 8599d9b..1c2721a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 2903f07..d22cabf 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4330600c64e7888a5ecee4081aa4dffd06fa0d02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
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...Timeless[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[Umherirrender (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I629d068e4dd753c9e123b0ea7a461c9b31bca4b2
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/42/367442/1

diff --git a/composer.json b/composer.json
index e616608..380d2ae 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index eecaea2..3797dd8 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,6 +6,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I629d068e4dd753c9e123b0ea7a461c9b31bca4b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
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] wikidata...gui[master]: Inline selectorBox as a replace for popover

[jenkins-bot (Code Review)]

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

Change subject: Inline selectorBox as a replace for popover
..


Inline selectorBox as a replace for popover

Replaces links in Query Helper triples section with selectorBox from
popover.

Change-Id: I0bb08bcb3eb7f2adf8847fa02cbf3c7b2377bf62
---
M embed.html
M style.css
M wikibase/queryService/ui/queryHelper/SelectorBox.js
M wikibase/tests/QueryHelper.html
M wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
5 files changed, 39 insertions(+), 1 deletion(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, but someone else must approve
  Lucas Werkmeister (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/embed.html b/embed.html
index 76c00c3..0e8bb47 100644
--- a/embed.html
+++ b/embed.html
@@ -79,9 +79,19 @@
background-color: rgba(255,255,255,0.8);
 }
 .popover {
+   max-width: 80vw;
min-width: 300px;
white-space: nowrap;
 }
+
+.select2-container {
+   z-index: 2000;
+   min-width: 200px;
+}
+
+.tooltip {
+   z-index: 2001;
+}
 
 
 
diff --git a/style.css b/style.css
index 3b0d111..4468ecd 100644
--- a/style.css
+++ b/style.css
@@ -518,9 +518,13 @@
 }
 
 .select2-container {
-   z-index: 2000;
+   min-width: 150px;
+}
+
+.popover .select2-container {
min-width: 200px;
 }
+
 .query-helper .popover {
min-width: 250px;
white-space: nowrap;
diff --git a/wikibase/queryService/ui/queryHelper/SelectorBox.js 
b/wikibase/queryService/ui/queryHelper/SelectorBox.js
index e66f3e6..d009bb3 100644
--- a/wikibase/queryService/ui/queryHelper/SelectorBox.js
+++ b/wikibase/queryService/ui/queryHelper/SelectorBox.js
@@ -346,6 +346,11 @@
$toolbar = this._getToolbar( toolbar, $element ),
$content = $( '' ).append( $close, ' ', $select, ' 
', $toolbar );
 
+   if ( $element.children().length === 0 ) {
+   this._createSelectInline( $element, triple, listener );
+   return;
+   }
+
$element.clickover( {
placement: 'bottom',
'global_close': false,
@@ -380,6 +385,23 @@
/**
 * @private
 */
+   SELF.prototype._createSelectInline = function( $element, triple, 
listener ) {
+   var $select = this._getSelectBox( $element );
+
+   $element.replaceWith( $select );
+   this._renderSelect2( $select, $element, triple );
+
+   $select.change( function( e ) {
+   if ( listener ) {
+   listener( $select.val(), $select.find( 
'option:selected' ).text(), $( e.target ).data( 'options' ) );
+   }
+   } );
+
+   };
+
+   /**
+* @private
+*/
SELF.prototype._getSelectBox = function( $element ) {
var id = $element.data( 'id' );
var label = $element.text();
diff --git a/wikibase/tests/QueryHelper.html b/wikibase/tests/QueryHelper.html
index c7e08a9..f0879e4 100644
--- a/wikibase/tests/QueryHelper.html
+++ b/wikibase/tests/QueryHelper.html
@@ -19,6 +19,7 @@

 

+   


  
diff --git a/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js 
b/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
index facc092..b3908de 100644
--- a/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
+++ b/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
@@ -104,6 +104,7 @@
var $html = $( '' );
qh.draw( $html );
$html.find( '.btn' ).remove();
+   $html.find( '.select2' ).remove();
 
assert.equal( qh.getQuery().trim(), testCase.sparqlOut 
);
assert.equal( $html.text().trim(), testCase.text );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bb08bcb3eb7f2adf8847fa02cbf3c7b2377bf62
Gerrit-PatchSet: 7
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I1e4fc4fc234b4108c42473e53be608f5f9ba9021
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index c5104f8..ed03ccd 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index 44c8a5e..83414ea 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -9,6 +9,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e4fc4fc234b4108c42473e53be608f5f9ba9021
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Niedzielski 
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...Modern[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I7fccb17fe1bb5b2dca7603a7641e8775fa3a3e3b
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 8599d9b..1c2721a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 9d0caee..3553f4e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,6 +6,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fccb17fe1bb5b2dca7603a7641e8775fa3a3e3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: Ie72e50522e6b12f503696b791b94bb4fabfccfa9
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 8599d9b..1c2721a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 3afbf2c..6f84c69 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,6 +8,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie72e50522e6b12f503696b791b94bb4fabfccfa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: Remove stray pmtpa references

[Andrew Bogott (Code Review)]

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

Change subject: openstack: Remove stray pmtpa references
..


openstack: Remove stray pmtpa references

Change-Id: I55be73c44018133f9280d76a0304245507de5eb9
---
M modules/openstack/files/kilo/nova/wikistatus/wikistatus.py
M modules/openstack/files/monitor_labs_salt_keys.py
2 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/modules/openstack/files/kilo/nova/wikistatus/wikistatus.py 
b/modules/openstack/files/kilo/nova/wikistatus/wikistatus.py
index 41f4e24..4b62f99 100644
--- a/modules/openstack/files/kilo/nova/wikistatus/wikistatus.py
+++ b/modules/openstack/files/kilo/nova/wikistatus/wikistatus.py
@@ -44,7 +44,7 @@
help='Hard-coded region name for wiki page.  A bit of a hack.'),
 cfg.StrOpt('wiki_instance_dns_domain',
default='',
-   help='Hard-coded domain for wiki page. E.g. pmtpa.wmflabs'),
+   help='Hard-coded domain for wiki page. E.g. example.wmflabs'),
 cfg.StrOpt('wiki_login',
default='login',
help='Account used to edit wiki pages.'),
diff --git a/modules/openstack/files/monitor_labs_salt_keys.py 
b/modules/openstack/files/monitor_labs_salt_keys.py
index 97e1a39..55450ef 100644
--- a/modules/openstack/files/monitor_labs_salt_keys.py
+++ b/modules/openstack/files/monitor_labs_salt_keys.py
@@ -254,8 +254,7 @@
 convert the hostname we get back from a salt
 command to the standard form, tossing the region
 and the 'wmflabs' stuff on the end
-'region' should be eqiad/pmtpa/ etc depending
-on the dc this script runs in
+'region' should be the dc this script runs in (e.g. eqiad)
 '''
 domain = '.' + region + '.wmflabs'
 truncate_by = -1 * len(domain)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55be73c44018133f9280d76a0304245507de5eb9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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...WikibaseQualityConstraints[master]: Fix classes without namespace

[Lucas Werkmeister (WMDE) (Code Review)]

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367431 )

Change subject: Fix classes without namespace
..

Fix classes without namespace

WikibaseQualityConstraintsHooks is moved to the
WikibaseQuality\ConstraintReport namespace; as far as I can tell,
there’s no reason it shouldn’t be there. (Note that you’ll need to run
`composer install` to update the classmap.)

tests/bootstrap.php can be removed completely. It is an exact copy of
the MediaWiki core bootstrap.php file (except with $IP instead of
__DIR__, and some whitespace changes), and no other extension outside of
WikibaseQuality seems to have this file. (Some have bootstrap files for
their tests, but with different content, but I don’t think we need to
redefine Core’s bootstrapping.)

This lets us drop an exception from the Wikibase phpcs ruleset.

Change-Id: I6301ec265b9816ded9ce89456ca8806cb978149c
---
M WikibaseQualityConstraintsHooks.php
M extension.json
M phpcs.xml
D tests/bootstrap.php
4 files changed, 7 insertions(+), 38 deletions(-)


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

diff --git a/WikibaseQualityConstraintsHooks.php 
b/WikibaseQualityConstraintsHooks.php
index 1137f70..14bd020 100644
--- a/WikibaseQualityConstraintsHooks.php
+++ b/WikibaseQualityConstraintsHooks.php
@@ -1,5 +1,7 @@
 
 
-   
-   
-   
-   
+   
 

 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index d8933dd..000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gerrit.wikimedia.org/r/367431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6301ec265b9816ded9ce89456ca8806cb978149c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Extract parameter parsing in DiffWithinRangeChecker

[Lucas Werkmeister (WMDE) (Code Review)]

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367430 )

Change subject: Extract parameter parsing in DiffWithinRangeChecker
..

Extract parameter parsing in DiffWithinRangeChecker

This lets us lower the cyclomatic complexity limit for phpcs to the
default value (10).

(Note that we can’t use the extracted function for
checkConstraintParameters() because we don’t want to stop with the first
exception.)

Change-Id: Iddec2495581fa53dda77bb043eb3aad1693831e8
---
M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M phpcs.xml
2 files changed, 24 insertions(+), 21 deletions(-)


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

diff --git a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php 
b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
index a563a08..bd5050e 100644
--- a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++ b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -52,6 +52,28 @@
$this->constraintParameterRenderer = 
$constraintParameterRenderer;
}
 
+   private function parseConstraintParameters( Constraint $constraint ) {
+   list( $min, $max ) = 
$this->constraintParameterParser->parseRangeParameter(
+   $constraint->getConstraintParameters(),
+   $constraint->getConstraintTypeItemId(),
+   'quantity'
+   );
+   $property = 
$this->constraintParameterParser->parsePropertyParameter(
+   $constraint->getConstraintParameters(),
+   $constraint->getConstraintTypeItemId()
+   );
+
+   if ( $min !== null ) {
+   $parameters['minimum_quantity'] = [ $min ];
+   }
+   if ( $max !== null ) {
+   $parameters['maximum_quantity'] = [ $max ];
+   }
+   $parameters['property'] = [ $property ];
+
+   return [ $min, $max, $property, $parameters ];
+   }
+
/**
 * Checks 'Diff within range' constraint.
 *
@@ -84,21 +106,7 @@
 
$dataValue = $mainSnak->getDataValue();
 
-   list( $min, $max ) = 
$this->constraintParameterParser->parseRangeParameter(
-   $constraintParameters,
-   $constraint->getConstraintTypeItemId(),
-   'quantity'
-   );
-   $property = 
$this->constraintParameterParser->parsePropertyParameter( 
$constraintParameters, $constraint->getConstraintTypeItemId() );
-
-   $parameterKey = $dataValue->getType() === 'quantity' ? 
'quantity' : 'date';
-   if ( $min !== null ) {
-   $parameters['minimum_' . $parameterKey] = [ $min ];
-   }
-   if ( $max !== null ) {
-   $parameters['maximum_' . $parameterKey] = [ $max ];
-   }
-   $parameters['property'] = [ $property ];
+   list ( $min, $max, $property, $parameters ) = 
$this->parseConstraintParameters( $constraint );
 
// checks only the first occurrence of the referenced property 
(this constraint implies a single value constraint on that property)
/** @var Statement $otherStatement */
diff --git a/phpcs.xml b/phpcs.xml
index c2b3310..2a75c01 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -18,12 +18,7 @@

 

-   
-   
-   
-   
-   
-   
+   

 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddec2495581fa53dda77bb043eb3aad1693831e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[Umherirrender (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I62ec4814b4c69071787412c06664d3cd7c6943ce
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/32/367432/1

diff --git a/composer.json b/composer.json
index 6c15db1..d517daf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index dc69ac8..6df021b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -19,6 +19,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62ec4814b4c69071787412c06664d3cd7c6943ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
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...CologneBlue[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[Umherirrender (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I25c5ac249f7804689ab93b279dda31bd69387407
---
M composer.json
M phpcs.xml
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/CologneBlue 
refs/changes/33/367433/1

diff --git a/composer.json b/composer.json
index 8599d9b..1c2721a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 6541006..a98c1bb 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,6 +11,4 @@
.


-   vendor
-   node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25c5ac249f7804689ab93b279dda31bd69387407
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
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...WikibaseQualityConstraints[master]: Don’t store overly long constraint parameters

[jenkins-bot (Code Review)]

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

Change subject: Don’t store overly long constraint parameters
..


Don’t store overly long constraint parameters

The constraint_parameters column of the wbqc_constraints table has type
TEXT, which is limited to 65535 bytes. If we attempt to store any longer
constraint parameters in it (for example, from a constraint with a very
long exception list), the database will either throw an error or
silently truncate the constraint parameters, depending on configuration.
We don’t want either of that to happen, so check the length (in bytes)
of the encoded constraint parameters before they are stored and replace
them with an error object if they’re too long.

If the constraint parameters still can’t be decoded for some reason,
also record an error object, but without the truncation indicator (since
we have no idea why the constraint parameters are invalid).

A second commit (Ia11092746c) teaches the rest of the extension to
recognize the error objects and properly report the error when a
constraint check happens.

Bug: T171479
Change-Id: I52e842e50b4fd60fbaacf9455a46bc031b982d0c
---
M includes/ConstraintRepository.php
M tests/phpunit/ConstraintRepositoryTest.php
2 files changed, 75 insertions(+), 2 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ConstraintRepository.php 
b/includes/ConstraintRepository.php
index 497e5c1..7bda1a9 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -33,6 +33,16 @@
return $this->convertToConstraints( $results );
}
 
+   private function encodeConstraintParameters( array 
$constraintParameters ) {
+   $json = json_encode( $constraintParameters, JSON_FORCE_OBJECT );
+
+   if ( strlen( $json ) > 5 ) {
+   $json = json_encode( [ '@error' => [ 'toolong' => true 
] ] );
+   }
+
+   return $json;
+   }
+
/**
 * @param Constraint[] $constraints
 *
@@ -46,7 +56,7 @@
'constraint_guid' => 
$constraint->getConstraintId(),
'pid' => 
$constraint->getPropertyId()->getNumericId(),
'constraint_type_qid' => 
$constraint->getConstraintTypeItemId(),
-   'constraint_parameters' => json_encode( 
$constraint->getConstraintParameters(), JSON_FORCE_OBJECT )
+   'constraint_parameters' => 
$this->encodeConstraintParameters( $constraint->getConstraintParameters() )
];
},
$constraints
@@ -146,7 +156,7 @@
'constraintId' => 
$result->constraint_guid,
'constraintParameters' => 
$result->constraint_parameters,
] );
-   $constraintParameters = [];
+   $constraintParameters = [ '@error' => [ /* 
unknown */ ] ];
}
 
$constraints[] = new Constraint(
diff --git a/tests/phpunit/ConstraintRepositoryTest.php 
b/tests/phpunit/ConstraintRepositoryTest.php
index 065211e..3971342 100644
--- a/tests/phpunit/ConstraintRepositoryTest.php
+++ b/tests/phpunit/ConstraintRepositoryTest.php
@@ -39,6 +39,23 @@
$this->assertEmpty( $constraints );
}
 
+   public function testQueryConstraintsForPropertyBrokenParameters() {
+   $this->db->delete( CONSTRAINT_TABLE, '*' );
+   $this->db->insert( CONSTRAINT_TABLE, [
+   [
+   'constraint_guid' => 
'P3$514751bb-1656-4d2d-a386-b0f0a69e02ed',
+   'pid' => 3,
+   'constraint_type_qid' => 'Multi value',
+   'constraint_parameters' => 'this is not valid 
JSON'
+   ]
+   ] );
+
+   $repo = new ConstraintRepository();
+   $constraints = $repo->queryConstraintsForProperty( new 
PropertyId( 'P3' ) );
+
+   $this->assertSame( [ '@error' => [] ], 
$constraints[0]->getConstraintParameters() );
+   }
+
public function testInsertBatch() {
$this->insertTestData();
 
@@ -94,6 +111,52 @@
);
}
 
+   public function testInsertBatchTooLongParameters() {
+   $this->db->delete( CONSTRAINT_TABLE, '*' );
+
+   $constraintParameters = [ 'known_exception' => [] ];
+   for ( $i = 0; $i < 1; $i++ ) {
+   $constraintParameters['known_exception'][] = [
+

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Fix height of echo counter badges being a little bit too tall

[jenkins-bot (Code Review)]

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

Change subject: Fix height of echo counter badges being a little bit too tall
..


Fix height of echo counter badges being a little bit too tall

HT to Jack Phoenix :)

Change-Id: I28b4ef70379d9d8247a680b01752d3373ef588ec
---
M refreshed/extensions/Echo/echo.badge.less
M skin.json
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/refreshed/extensions/Echo/echo.badge.less 
b/refreshed/extensions/Echo/echo.badge.less
index 7887883..85d646f 100644
--- a/refreshed/extensions/Echo/echo.badge.less
+++ b/refreshed/extensions/Echo/echo.badge.less
@@ -10,6 +10,7 @@
margin: 0.9em 0.2em 0 0;
a {
color: transparent;
+   line-height: 1.5em;
}
&:hover {
background: none;
diff --git a/skin.json b/skin.json
index 0dcbcee..993597b 100755
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Refreshed",
-   "version": "3.3.2",
+   "version": "3.3.3",
"author": [
"Adam Carter",
"Drew1200",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set proofreadpage-showheaders = 1 for tawikisource bnwikisource

[jenkins-bot (Code Review)]

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

Change subject: Set proofreadpage-showheaders = 1 for tawikisource bnwikisource
..


Set proofreadpage-showheaders = 1 for tawikisource bnwikisource

Refactoring to setting variable

Bug: T169478
Bug: T169481
Change-Id: I862897ad36cc6d00e1a02cc3d90c18df8d7ffe0d
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ae2d0b9..06dfb70 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -801,10 +801,13 @@
wfLoadExtension( 'ProofreadPage' );
if ( $wgDBname === 'dewikisource' ) {
$wgGroupPermissions['*']['pagequality'] = true; # 27516
-   } elseif ( $wgDBname === 'enwikisource' || $wgDBname === 'svwikisource' 
) {
+   }
+
+   if ( $wmgProofreadPageShowHeaders ) {
$wgDefaultUserOptions['proofreadpage-showheaders'] = 1;
}
 }
+
 if ( $wmgUseLabeledSectionTransclusion ) {
wfLoadExtension( 'LabeledSectionTransclusion' );
 }
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a4e52b3..a0107eb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11925,6 +11925,14 @@
'frrwiki' => true, // T40023
 ],
 
+'wmgProofreadPageShowHeaders' => [
+   'default' => false,
+   'bnwikisource' => true,
+   'enwikisource' => true,
+   'svwikisource' => true,
+   'tawikisource' => true,
+],
+
 'wmgUseDPL' => [
// DynamicPageList extension
'default' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I862897ad36cc6d00e1a02cc3d90c18df8d7ffe0d
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update phpunit to 4.8.36

[Reedy (Code Review)]

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

Change subject: Update phpunit to 4.8.36
..

Update phpunit to 4.8.36

Change-Id: I8fe43af41be327043c2ec4fa1142804026f6fa46
---
M composer.json
M composer.lock
2 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/composer.json b/composer.json
index 520064c..4f1c334 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.8.0",
-   "phpunit/phpunit": "4.8.35"
+   "phpunit/phpunit": "4.8.36"
},
"scripts": {
"lint": "parallel-lint --exclude multiversion/vendor 
--ignore-fails .",
diff --git a/composer.lock b/composer.lock
index 0d0b384..a5e65f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "1842ce8b6d5b3555db6e01bb492e34a7",
+"content-hash": "6a48c72fe973fe0e63f901d46925b629",
 "packages": [
 {
 "name": "mongofill/mongofill",
@@ -135,7 +135,7 @@
 }
 ],
 "description": "Polyfill of PECL Mongo extension",
-"time": "2016-11-13T21:50:29+00:00"
+"time": "2016-11-13 21:50:29"
 },
 {
 "name": "perftools/xhgui",
@@ -992,16 +992,16 @@
 },
 {
 "name": "phpunit/phpunit",
-"version": "4.8.35",
+"version": "4.8.36",
 "source": {
 "type": "git",
 "url": "https://github.com/sebastianbergmann/phpunit.git;,
-"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
+"reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87;,
-"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
+"url": 
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517;,
+"reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
 "shasum": ""
 },
 "require": {
@@ -1060,7 +1060,7 @@
 "testing",
 "xunit"
 ],
-"time": "2017-02-06T05:18:07+00:00"
+"time": "2017-06-21T08:07:12+00:00"
 },
 {
 "name": "phpunit/phpunit-mock-objects",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update mediawiki-codesniffer to 0.10.1

[Reedy (Code Review)]

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

Change subject: Update mediawiki-codesniffer to 0.10.1
..

Update mediawiki-codesniffer to 0.10.1

Change-Id: I8e8400f41fb942a4f141dd945d4bda2370cb5d74
---
M composer.json
M composer.lock
2 files changed, 19 insertions(+), 46 deletions(-)


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

diff --git a/composer.json b/composer.json
index 4f1c334..4cb6232 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.8.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"phpunit/phpunit": "4.8.36"
},
"scripts": {
diff --git a/composer.lock b/composer.lock
index a5e65f1..f43c379 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "6a48c72fe973fe0e63f901d46925b629",
+"content-hash": "20ae7ddbd81c88deb91eea11d94d5eda",
 "packages": [
 {
 "name": "mongofill/mongofill",
@@ -499,25 +499,25 @@
 },
 {
 "name": "mediawiki/mediawiki-codesniffer",
-"version": "v0.8.0",
+"version": "v0.10.1",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-tools-codesniffer.git;,
-"reference": "439149cc2fe5ccc29aadfd49ce22c36122d51c4c"
+"reference": "620a412e33219cc4c4007a579f9601178b01ce11"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/439149cc2fe5ccc29aadfd49ce22c36122d51c4c;,
-"reference": "439149cc2fe5ccc29aadfd49ce22c36122d51c4c",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/620a412e33219cc4c4007a579f9601178b01ce11;,
+"reference": "620a412e33219cc4c4007a579f9601178b01ce11",
 "shasum": ""
 },
 "require": {
 "php": ">= 5.5.9",
-"squizlabs/php_codesniffer": "2.9.0"
+"squizlabs/php_codesniffer": "3.0.2"
 },
 "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.*",
-"mikey179/vfsstream": "~1.6",
+"jakub-onderka/php-console-highlighter": "0.3.2",
+"jakub-onderka/php-parallel-lint": "0.9.2",
 "phpunit/phpunit": "~4.1"
 },
 "type": "library",
@@ -531,7 +531,7 @@
 "codesniffer",
 "mediawiki"
 ],
-"time": "2017-05-04T19:15:03+00:00"
+"time": "2017-07-23T00:59:17+00:00"
 },
 {
 "name": "phpdocumentor/reflection-common",
@@ -1492,63 +1492,36 @@
 },
 {
 "name": "squizlabs/php_codesniffer",
-"version": "2.9.0",
+"version": "3.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git;,
-"reference": "f7dfecbee89d68ab475a6c9e17d22bc9b69aed97"
+"reference": "c7594a88ae75401e8f8d0bd4deb8431b39045c51"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f7dfecbee89d68ab475a6c9e17d22bc9b69aed97;,
-"reference": "f7dfecbee89d68ab475a6c9e17d22bc9b69aed97",
+"url": 
"https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/c7594a88ae75401e8f8d0bd4deb8431b39045c51;,
+"reference": "c7594a88ae75401e8f8d0bd4deb8431b39045c51",
 "shasum": ""
 },
 "require": {
 "ext-simplexml": "*",
 "ext-tokenizer": "*",
 "ext-xmlwriter": "*",
-"php": ">=5.1.2"
+"php": ">=5.4.0"
 },
 "require-dev": {
 "phpunit/phpunit": "~4.0"
 },
 "bin": [
-"scripts/phpcs",
-"scripts/phpcbf"
+"bin/phpcs",
+"bin/phpcbf"
 ],
 "type": "library",
 "extra": {
 "branch-alias": {
-"dev-master": "2.x-dev"
+"dev-master": "3.x-dev"
 }
-},
-"autoload": {
-"classmap": [
-

[MediaWiki-commits] [Gerrit] mediawiki...GraphViz[master]: Avoid duplicate vendor entry in gitignore

[Umherirrender (Code Review)]

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

Change subject: Avoid duplicate vendor entry in gitignore
..

Avoid duplicate vendor entry in gitignore

Change-Id: I03ff1a6d76385b40088a325b31045cb2b55662de
---
M .gitignore
1 file changed, 3 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index d64df9a..eb12f7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.kate-swp
 .*.swp
 
-node_modules/**
-vendor/**
-composer.lock
-vendor/
+/node_modules
+/vendor
+/composer.lock

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03ff1a6d76385b40088a325b31045cb2b55662de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GraphViz
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...GraphViz[master]: Avoid duplicate vendor entry in gitignore

[jenkins-bot (Code Review)]

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

Change subject: Avoid duplicate vendor entry in gitignore
..


Avoid duplicate vendor entry in gitignore

Change-Id: I03ff1a6d76385b40088a325b31045cb2b55662de
---
M .gitignore
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index d64df9a..eb12f7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.kate-swp
 .*.swp
 
-node_modules/**
-vendor/**
-composer.lock
-vendor/
+/node_modules
+/vendor
+/composer.lock

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...prince[develop]: Get all country names with portal traffic from polloi

[Chelsyx (Code Review)]

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

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

Get all country names with portal traffic from polloi

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/prince 
refs/changes/59/367459/1

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

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

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

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

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

[VolkerE (Code Review)]

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

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

Apex theme: Improve alignment of TextInputWidget and its elements

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

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


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

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

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

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

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

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

[Ejegg (Code Review)]

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

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

Fix PayPal EC recurring profile created messages

We should send currency and amount to Civi

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


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

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

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

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

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

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

[Catrope (Code Review)]

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

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

SpecialRecentchanges: Handle ?days= parameter more sanely

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

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

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


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

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

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

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

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

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

[Ayounsi (Code Review)]

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

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


Add fasw-c-codfw mgmt interfaces to DNS

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

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



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

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

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

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

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

[MaxSem (Code Review)]

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

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

Don't call ParserOuptut::setTOCEnabled()

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

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


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

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

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Move WebPageTest to a dedicated slave
..


Move WebPageTest to a dedicated slave

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

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

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d552d65b88bff6167925c2ab8aef8d0f9c604b5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Phedenskog 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...extdist[master]: De-reference symlinks in tarball

[jenkins-bot (Code Review)]

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

Change subject: De-reference symlinks in tarball
..


De-reference symlinks in tarball

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

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

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



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

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

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

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

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

[Andrew Bogott (Code Review)]

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

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

puppetmaster frontend profile:  Allow hiera to configure the hostname

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

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


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

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

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

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

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

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

[Jdlrobson (Code Review)]

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

Change subject: Fix stylesheet
..

Fix stylesheet

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

This is a follow up to I453ae43099796a74c39d965b796f2fa13942106c

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


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

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

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

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

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

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

[Smalyshev (Code Review)]

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

Change subject: Properly set search limit
..

Properly set search limit

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


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

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

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

[Jack Phoenix (Code Review)]

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

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

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

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


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

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

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

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


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


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

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

[jenkins-bot (Code Review)]

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

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


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

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

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



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

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

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


-   {$avatar->getAvatarURL()}
+

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

[jenkins-bot (Code Review)]

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

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


Don't call ParserOuptut::setTOCEnabled()

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

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

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



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

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Fix bundled extensions
..


Fix bundled extensions

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69d7a1676ff0898aa1856cf99b6df5526d3ada3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: MacFan4000 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Mholloway (Code Review)]

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

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

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

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

https://phabricator.wikimedia.org/P5792

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

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


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

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

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

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

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

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

[Catrope (Code Review)]

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

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

Add missing max value to rowiki ORES config

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


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

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

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Add missing max value to rowiki ORES config

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

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



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

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

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

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

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

[Rush (Code Review)]

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

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

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

Currently running on a degraded RAID1

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


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

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

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

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

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

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

[Austinoneil (Code Review)]

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

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

Add ctrl-F and F3 functionality for physical keyboard users

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

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


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

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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Avoid stupid class naming conflicts with MediaWiki core

[jenkins-bot (Code Review)]

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

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


Avoid stupid class naming conflicts with MediaWiki core

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

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



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


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


-   
+   



-   
+   
 $item ) {

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

?>



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

+   








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





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

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

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

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

[jenkins-bot (Code Review)]

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

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


Also load CSS for Monaco when using the pollembed tag

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad3795268e231c0691d7d9a87575ab206e7306d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

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


config: Fix invalid EtcdConfig return value after JSON parse error

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

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

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



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

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

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

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

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

[Ayounsi (Code Review)]

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

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

Add fasw-c-codfw mgmt interfaces to DNS

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


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

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

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

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

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

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

[Catrope (Code Review)]

Hello Jack Phoenix, jenkins-bot, Mooeypoo,

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

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

to review the following change.


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

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

This reverts commit c7c112a8f219857fb5527713aaacb50a599ee1f6.

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


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

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

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

[Smalyshev (Code Review)]

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

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

Make limit/offset available to extending classes

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


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

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

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Fix sleep call
..


Fix sleep call

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

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

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

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



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

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

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

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

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

[Jack Phoenix (Code Review)]

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

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

Also load CSS for Monaco when using the pollembed tag

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


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

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

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

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

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

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

[Krinkle (Code Review)]

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

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

rdbms: Add more @covers to DatabaseSQLTest

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

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


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

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

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Avoid using deprecated PreparedEdit::$pst

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

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



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

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

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

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

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

[jenkins-bot (Code Review)]

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

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


WikiPage: Update comments related to new PreparedEdit object

Follows up 85585c47ecbf219.

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

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



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

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

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

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

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

[Krinkle (Code Review)]

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

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


MultiWriteBagOStuff: Fix async writes of mutable objects

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

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

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

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



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

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

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

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

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

[Krinkle (Code Review)]

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

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

rdbms: Increase coverage for Database::selectSQLText()

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

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


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

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

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

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

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

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

[jenkins-bot (Code Review)]

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

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


config: Add more EtcdConfig::fetchAllFromEtcdServer tests

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

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



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

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

[jenkins-bot (Code Review)]

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

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


Enable Article Reminder feature flag on beta

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id61af723074fe406e2792d001267aa5c6c2ac5e8
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Foxy brown 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Krinkle (Code Review)]

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

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

Re-introduce use of mime_content_type()

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

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

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

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

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

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

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


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

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

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Don't need to update submodules recursively

[Reedy (Code Review)]

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

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

Don't need to update submodules recursively

Follows up If86301a13c419a0f67913f57ac061e06c92bf64a

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


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

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

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Restrict query helper width

[Lucas Werkmeister (WMDE) (Code Review)]

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367372 )

Change subject: Restrict query helper width
..

Restrict query helper width

In CSS, set a maximum width of 80% of the viewport width. This should
ensure that the splitter is always still in view, so the user can still
resize the query helper even if it’s very wide.

In JS, cap the minimum width we set for the query helper at 50% of the
viewport width. Being blocked from making the query helper any smaller
is fairly annoying, so this cap needs to be way below the 80% from CSS.

Change-Id: I24aef51030478a1b67710367c1f1167f2ca6e240
---
M style.css
M wikibase/queryService/ui/App.js
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/72/367372/1

diff --git a/style.css b/style.css
index 3b0d111..ed597a3 100644
--- a/style.css
+++ b/style.css
@@ -481,6 +481,7 @@
 .query-helper {
flex: 0 0 auto;
min-width: 300px;
+   max-width: 80vw;
z-index: 100;
 }
 
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 3336056..73bbf75 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -270,7 +270,10 @@
if ( tableWidth > $queryHelper.width() ) {
$queryHelper.css(
'min-width',
-   tableWidth + $tables.offset().left - 
$queryHelper.offset().left
+   Math.min(
+   tableWidth + $tables.offset().left - 
$queryHelper.offset().left,
+   $( window ).width() * 0.5
+   )
);
}
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24aef51030478a1b67710367c1f1167f2ca6e240
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: thumbor: bump MemoryLimit to 15%

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367373 )

Change subject: thumbor: bump MemoryLimit to 15%
..

thumbor: bump MemoryLimit to 15%

The memory cgroup is a blunt tool, namely all memory (including caches) is
limited by the setting. The 1G limit caused thumbor instances and their
subprocesses to often swap and possibly trigger an OOM killer.

Bump the limit to 15% of system memory instead to give more room for buffers,
caches and so on and limit swap activity.

Bug: T121388
Change-Id: I772af48ff30e7464eba47ddba50844c09d661b2d
---
M modules/thumbor/templates/initscripts/thum...@.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/thumbor/templates/initscripts/thum...@.systemd.erb 
b/modules/thumbor/templates/initscripts/thum...@.systemd.erb
index c961612..25408c8 100644
--- a/modules/thumbor/templates/initscripts/thum...@.systemd.erb
+++ b/modules/thumbor/templates/initscripts/thum...@.systemd.erb
@@ -10,7 +10,7 @@
 PrivateTmp=yes
 Restart=always
 SyslogIdentifier=thumbor@%i
-MemoryLimit=1G
+MemoryLimit=15%
 
 [Install]
 WantedBy=multi-user.target

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::prometheus::hhmv_exporter: move to profile

[Elukey (Code Review)]

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

Change subject: role::prometheus::hhmv_exporter: move to profile
..


role::prometheus::hhmv_exporter: move to profile

Change-Id: If9dfc3b2c080a3654865d8b5ed20ea8fb575cd1c
---
R modules/profile/manifests/prometheus/hhvm_exporter.pp
M modules/role/manifests/mediawiki/appserver.pp
M modules/role/manifests/mediawiki/appserver/api.pp
M modules/role/manifests/mediawiki/imagescaler.pp
M modules/role/manifests/mediawiki/jobrunner.pp
M modules/role/manifests/mediawiki/videoscaler.pp
6 files changed, 9 insertions(+), 10 deletions(-)

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



diff --git a/modules/role/manifests/prometheus/hhvm_exporter.pp 
b/modules/profile/manifests/prometheus/hhvm_exporter.pp
similarity index 77%
rename from modules/role/manifests/prometheus/hhvm_exporter.pp
rename to modules/profile/manifests/prometheus/hhvm_exporter.pp
index cc9eeec..e61ff11 100644
--- a/modules/role/manifests/prometheus/hhvm_exporter.pp
+++ b/modules/profile/manifests/prometheus/hhvm_exporter.pp
@@ -1,7 +1,7 @@
-class role::prometheus::hhvm_exporter {
+class profile::prometheus::hhvm_exporter (
+$prometheus_nodes = hiera('prometheus_nodes'),
+) {
 prometheus::hhvm_exporter { 'default': }
-
-$prometheus_nodes = hiera('prometheus_nodes')
 $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
 $ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
 
@@ -10,4 +10,4 @@
 port   => '9192',
 srange => $ferm_srange,
 }
-}
+}
\ No newline at end of file
diff --git a/modules/role/manifests/mediawiki/appserver.pp 
b/modules/role/manifests/mediawiki/appserver.pp
index c2b4912..8168c29 100644
--- a/modules/role/manifests/mediawiki/appserver.pp
+++ b/modules/role/manifests/mediawiki/appserver.pp
@@ -4,6 +4,6 @@
 
 include ::role::mediawiki::webserver
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 
 }
diff --git a/modules/role/manifests/mediawiki/appserver/api.pp 
b/modules/role/manifests/mediawiki/appserver/api.pp
index cd7c161..445e980 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -3,7 +3,7 @@
 
 include ::role::mediawiki::webserver
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 
 # Using fastcgi we need more local ports
 sysctl::parameters { 'raise_port_range':
diff --git a/modules/role/manifests/mediawiki/imagescaler.pp 
b/modules/role/manifests/mediawiki/imagescaler.pp
index c8a3ef1..c359caf 100644
--- a/modules/role/manifests/mediawiki/imagescaler.pp
+++ b/modules/role/manifests/mediawiki/imagescaler.pp
@@ -4,7 +4,7 @@
 include ::role::mediawiki::scaler
 include ::role::mediawiki::webserver
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 include ::base::firewall
 }
 
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp 
b/modules/role/manifests/mediawiki/jobrunner.pp
index b00a50f..78f2c27 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -6,8 +6,7 @@
 include ::role::mediawiki::common
 
 include ::profile::prometheus::apache_exporter
-# This should really be a profile
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 
 include ::profile::mediawiki::jobrunner
 }
diff --git a/modules/role/manifests/mediawiki/videoscaler.pp 
b/modules/role/manifests/mediawiki/videoscaler.pp
index 438cd09..62544c5 100644
--- a/modules/role/manifests/mediawiki/videoscaler.pp
+++ b/modules/role/manifests/mediawiki/videoscaler.pp
@@ -7,7 +7,7 @@
 
 # Profiles
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 include ::profile::mediawiki::jobrunner
 include ::base::firewall
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-07-24T10:00:02+0000

[WikidataBuilder (Code Review)]

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

Change subject: New Wikidata Build - 2017-07-24T10:00:02+
..

New Wikidata Build - 2017-07-24T10:00:02+

Change-Id: I7a02af92fd7d2f610a39a59c6b8bda8fb46a477d
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/pt-br.json
M extensions/Constraints/extension.json
M extensions/Constraints/i18n/ar.json
M extensions/Constraints/i18n/ast.json
A extensions/Constraints/i18n/be.json
M extensions/Constraints/i18n/de.json
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/es.json
M extensions/Constraints/i18n/eu.json
M extensions/Constraints/i18n/fr.json
M extensions/Constraints/i18n/he.json
M extensions/Constraints/i18n/ko.json
M extensions/Constraints/i18n/lb.json
M extensions/Constraints/i18n/pt-br.json
M extensions/Constraints/i18n/pt.json
M extensions/Constraints/i18n/qqq.json
M extensions/Constraints/i18n/zh-hans.json
M 
extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintParameterParser.php
M extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
M extensions/Constraints/includes/ConstraintRepository.php
M extensions/Constraints/modules/SpecialConstraintReportPage.css
M extensions/Constraints/modules/gadget.js
M extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php
M extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php
M extensions/Constraints/tests/phpunit/Helper/ConstraintParameterParserTest.php
M extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php
M extensions/Wikibase/client/i18n/pt-br.json
M extensions/Wikibase/client/i18n/skr-arab.json
M extensions/Wikibase/composer.json
M extensions/Wikibase/lib/i18n/pt-br.json
M extensions/Wikibase/lib/includes/Store/WikiPagePropertyOrderProvider.php
M extensions/Wikibase/repo/Wikibase.hooks.php
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/i18n/skr-arab.json
M extensions/Wikibase/repo/includes/Api/ApiErrorReporter.php
M extensions/Wikibase/repo/includes/Api/EntityLoadingHelper.php
M extensions/Wikibase/repo/includes/Api/EntitySavingHelper.php
M extensions/Wikibase/repo/includes/Api/GetEntities.php
M 
extensions/Wikibase/repo/includes/ChangeOp/Deserialization/SiteLinkBadgeChangeOpSerializationValidator.php
M extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGenerator.php
M extensions/Wikibase/repo/includes/Store/Sql/SqlStore.php
M extensions/Wikibase/repo/includes/Store/Sql/WikiPageEntityStore.php
M extensions/Wikibase/repo/maintenance/dispatchChanges.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Api/EntityLoadingHelperTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/RepoHooksTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
M vendor/composer/installed.json
51 files changed, 494 insertions(+), 86 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 8098f23..b47ff09 100644
--- a/composer.lock
+++ b/composer.lock
@@ -756,12 +756,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "31e27f4c8eb0e94c042b985ffe574c6fcfb5113f"
+"reference": "71904258618ca4818790cc71b0e965d3bb9bfe7a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/31e27f4c8eb0e94c042b985ffe574c6fcfb5113f;,
-"reference": "31e27f4c8eb0e94c042b985ffe574c6fcfb5113f",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/71904258618ca4818790cc71b0e965d3bb9bfe7a;,
+"reference": "71904258618ca4818790cc71b0e965d3bb9bfe7a",
 "shasum": ""
 },
 "require": {
@@ -790,7 +790,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2017-07-20 20:33:52"
+"time": "2017-07-22 20:26:23"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -966,7 +966,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;,
-"reference": "5c1eaffb37a25649621c9a3388387f84f3ca3f0d"
+   

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Removing Explore Similar AB Test

[Jdrewniak (Code Review)]

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

Change subject: Removing Explore Similar AB Test
..

Removing Explore Similar AB Test

Removing Explore Similar AB test code, but
keeping the explore similar event logging around
for any future deployment of this feature.

Bug: T171320
Change-Id: I26a162a6ff88109e29248b2624e10d99f4829647
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 4 insertions(+), 17 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 004f929..07f7849 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,8 +113,8 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   // Explore Similar AB test
-   validBuckets = [ 'explore_similar_control', 
'explore_similar_test' ],
+   // No sub-tests currently running
+   validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -136,8 +136,8 @@
subTest: null
},
enwiki: {
-   test: 1000,
-   subTest: 2
+   test: 2000,
+   subTest: null
},
enwiktionary: {
test: 40,
@@ -688,12 +688,6 @@
);
 
/**
-* Loading Explore Similar module for A/B test
-*/
-   if ( session.get( 'subTest' ) === 
'explore_similar_test' ) {
-   mw.loader.load( 'ext.cirrus.explore-similar' );
-   }
-   /**
 * Explore similar event logging
 * Listens for custom event sent by the Explore Similar 
module.
 * These events pass along extra data that conforms to 
the
@@ -744,13 +738,6 @@
 
logEvent( 'esclick', esParams );
} );
-
-   /**
-* Loading Explore Similar module for A/B test
-*/
-   if ( session.get( 'subTest' ) === 
'explore_similar_test' ) {
-   mw.loader.load( 'ext.cirrus.explore-similar' );
-   }
 
serpExtras = {
offset: $( '.results-info' ).data( 
'mw-num-results-offset' )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26a162a6ff88109e29248b2624e10d99f4829647
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak 

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

[MediaWiki-commits] [Gerrit] operations...logster[master]: Reduce the DNS queries for the statsd domain

[Elukey (Code Review)]

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

Change subject: Reduce the DNS queries for the statsd domain
..


Reduce the DNS queries for the statsd domain

The sendto() function issues a DNS query if the host[0] parameter
is not an IP address. We run several instances of logster once every
minute, and for each metric a DNS query for the statsd domain is
issued.

Bug: T171318
Change-Id: Id08c3d1f647b2a0209e6aee0a0a1c7402493567d
---
M logster/logster.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/logster/logster.py b/logster/logster.py
index ba7c748..ac1e113 100755
--- a/logster/logster.py
+++ b/logster/logster.py
@@ -272,6 +272,7 @@
 def submit_statsd(metrics, options):
 if (not options.dry_run):
 host = options.statsd_host.split(':')
+host[0] = socket.gethostbyname(host[0])
 
 for metric in metrics:
 metric_name = metric.name

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id08c3d1f647b2a0209e6aee0a0a1c7402493567d
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/logster
Gerrit-Branch: master
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: thumbor: bump MemoryLimit to 15%

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367373 )

Change subject: thumbor: bump MemoryLimit to 15%
..


thumbor: bump MemoryLimit to 15%

The memory cgroup is a blunt tool, namely all memory (including caches) is
limited by the setting. The 1G limit caused thumbor instances and their
subprocesses to often swap and possibly trigger an OOM killer.

Bump the limit to 15% of system memory instead to give more room for buffers,
caches and so on and limit swap activity.

Bug: T121388
Change-Id: I772af48ff30e7464eba47ddba50844c09d661b2d
---
M modules/thumbor/templates/initscripts/thum...@.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ema: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/modules/thumbor/templates/initscripts/thum...@.systemd.erb 
b/modules/thumbor/templates/initscripts/thum...@.systemd.erb
index c961612..25408c8 100644
--- a/modules/thumbor/templates/initscripts/thum...@.systemd.erb
+++ b/modules/thumbor/templates/initscripts/thum...@.systemd.erb
@@ -10,7 +10,7 @@
 PrivateTmp=yes
 Restart=always
 SyslogIdentifier=thumbor@%i
-MemoryLimit=1G
+MemoryLimit=15%
 
 [Install]
 WantedBy=multi-user.target

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I772af48ff30e7464eba47ddba50844c09d661b2d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...logster[master]: Revert "Reduce the DNS queries for the statsd domain"

[Elukey (Code Review)]

Hello Ema, Ottomata, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Reduce the DNS queries for the statsd domain"
..

Revert "Reduce the DNS queries for the statsd domain"

Patch merged in the wrong branch, unnecessary code was merged in as consequence.

This reverts commit 700194179e4ad19fda33e3f5f489079d07df551f.

Change-Id: I060d4ca48a66d1e8c87d80673e77202aaf0ade50
---
M logster/logster.py
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/logster 
refs/changes/77/367377/1

diff --git a/logster/logster.py b/logster/logster.py
index ac1e113..ba7c748 100755
--- a/logster/logster.py
+++ b/logster/logster.py
@@ -272,7 +272,6 @@
 def submit_statsd(metrics, options):
 if (not options.dry_run):
 host = options.statsd_host.split(':')
-host[0] = socket.gethostbyname(host[0])
 
 for metric in metrics:
 metric_name = metric.name

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I060d4ca48a66d1e8c87d80673e77202aaf0ade50
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/logster
Gerrit-Branch: master
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...logster[master]: Revert "Reduce the DNS queries for the statsd domain"

[Elukey (Code Review)]

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

Change subject: Revert "Reduce the DNS queries for the statsd domain"
..


Revert "Reduce the DNS queries for the statsd domain"

Patch merged in the wrong branch, unnecessary code was merged in as consequence.

This reverts commit 700194179e4ad19fda33e3f5f489079d07df551f.

Change-Id: I060d4ca48a66d1e8c87d80673e77202aaf0ade50
---
M logster/logster.py
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/logster/logster.py b/logster/logster.py
index ac1e113..ba7c748 100755
--- a/logster/logster.py
+++ b/logster/logster.py
@@ -272,7 +272,6 @@
 def submit_statsd(metrics, options):
 if (not options.dry_run):
 host = options.statsd_host.split(':')
-host[0] = socket.gethostbyname(host[0])
 
 for metric in metrics:
 metric_name = metric.name

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I060d4ca48a66d1e8c87d80673e77202aaf0ade50
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/logster
Gerrit-Branch: master
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikibase/wikiba.se[master]: Fix composer tests

[jenkins-bot (Code Review)]

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

Change subject: Fix composer tests
..


Fix composer tests

Bug: T171160
Change-Id: Ib99b632fe67d128c51becfb2cd16559608a9b426
---
M composer.json
A phpcs.xml
M tests/SmokeTest.php
M tests/bootstrap.php
4 files changed, 33 insertions(+), 2 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 0cf7826..8f55d63 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,21 @@
"worldskills/bootstrap": "~3.2",
"dflydev/embedded-composer": "^1.0@dev"
},
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "phpunit/phpunit": "~4.8",
+   "wikibase/wikibase-codesniffer": "^0.1.0"
+   },
"config": {
"component-dir": "source/components"
+   },
+   "scripts": {
+   "fix": "phpcbf",
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s",
+   "phpunit"
+   ]
}
 }
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..7622b32
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,18 @@
+
+
+   
+
+   
+   
+   
+   
+   
+   
+   tests/bootstrap\.php
+   
+   
+   tests/SmokeTest\.php
+   
+   .
+   node_modules
+
diff --git a/tests/SmokeTest.php b/tests/SmokeTest.php
index 6f8364e..1f97518 100644
--- a/tests/SmokeTest.php
+++ b/tests/SmokeTest.php
@@ -8,7 +8,6 @@
 
private static $PAGE_PATH;
 
-
public static function setUpBeforeClass() {
self::$PAGE_PATH = __DIR__ . '/../output_test/';
exec( 'vendor/bin/sculpin generate --env=test' );
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 64171d3..876b9ec 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -11,4 +11,4 @@
die( 'You need to install this package with Composer before you can run 
the tests' );
 }
 
-require_once( __DIR__ . '/../vendor/autoload.php' );
+require_once ( __DIR__ . '/../vendor/autoload.php' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib99b632fe67d128c51becfb2cd16559608a9b426
Gerrit-PatchSet: 2
Gerrit-Project: wikibase/wikiba.se
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Hashar 
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/extensions[master]: Register some more extensions

[Hashar (Code Review)]

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

Change subject: Register some more extensions
..

Register some more extensions

ArticleCreationWorkflow
PluggableSSO
RandomSelection
ReadingLists
Wigo3

Change-Id: Ibf37fb599bef5bc4b9f7c27370bbbd1d30dcaa49
---
M .gitmodules
A ArticleCreationWorkflow
A PluggableSSO
A RandomSelection
A ReadingLists
A Wigo3
6 files changed, 25 insertions(+), 0 deletions(-)


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

diff --git a/.gitmodules b/.gitmodules
index 9d9f279..7284e3a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -110,6 +110,10 @@
path = Arrays
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Arrays
branch = .
+[submodule "ArticleCreationWorkflow"]
+   path = ArticleCreationWorkflow
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticleCreationWorkflow
+   branch = .
 [submodule "ArticleFeedbackv5"]
path = ArticleFeedbackv5
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticleFeedbackv5
@@ -1930,6 +1934,10 @@
path = PluggableAuth
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PluggableAuth
branch = .
+[submodule "PluggableSSO"]
+   path = PluggableSSO
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PluggableSSO
+   branch = .
 [submodule "Poem"]
path = Poem
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Poem
@@ -2078,6 +2086,10 @@
path = RandomInCategory
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/RandomInCategory
branch = .
+[submodule "RandomSelection"]
+   path = RandomSelection
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/RandomSelection
+   branch = .
 [submodule "RandomUsersWithAvatars"]
path = RandomUsersWithAvatars
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/RandomUsersWithAvatars
@@ -2085,6 +2097,10 @@
 [submodule "ReaderFeedback"]
path = ReaderFeedback
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ReaderFeedback
+   branch = .
+[submodule "ReadingLists"]
+   path = ReadingLists
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ReadingLists
branch = .
 [submodule "ReassignEdits"]
path = ReassignEdits
@@ -2942,6 +2958,10 @@
path = Widgets
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Widgets
branch = .
+[submodule "Wigo3"]
+   path = Wigo3
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wigo3
+   branch = .
 [submodule "WikEdDiff"]
path = WikEdDiff
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikEdDiff
diff --git a/ArticleCreationWorkflow b/ArticleCreationWorkflow
new file mode 16
index 000..c93fe0c
--- /dev/null
+++ b/ArticleCreationWorkflow
@@ -0,0 +1 @@
+Subproject commit c93fe0cadc38c2a07bd547906c227a42bc8517c2
diff --git a/PluggableSSO b/PluggableSSO
new file mode 16
index 000..3a2187d
--- /dev/null
+++ b/PluggableSSO
@@ -0,0 +1 @@
+Subproject commit 3a2187d3b4ff83fe48da2234b4259fccbe5ac181
diff --git a/RandomSelection b/RandomSelection
new file mode 16
index 000..c0eee5e
--- /dev/null
+++ b/RandomSelection
@@ -0,0 +1 @@
+Subproject commit c0eee5e325529539cb4ebe38ec72f7b93625683e
diff --git a/ReadingLists b/ReadingLists
new file mode 16
index 000..6bd0906
--- /dev/null
+++ b/ReadingLists
@@ -0,0 +1 @@
+Subproject commit 6bd090623e504dc1603ecde03e4d66ce9311ea2e
diff --git a/Wigo3 b/Wigo3
new file mode 16
index 000..7febd7d
--- /dev/null
+++ b/Wigo3
@@ -0,0 +1 @@
+Subproject commit 7febd7dddceb7c33dc9b6cec6496d94260cebc71

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf37fb599bef5bc4b9f7c27370bbbd1d30dcaa49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

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

[Hashar (Code Review)]

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

Change subject: Register some more extensions
..


Register some more extensions

ArticleCreationWorkflow
PluggableSSO
RandomSelection
ReadingLists
Wigo3

Change-Id: Ibf37fb599bef5bc4b9f7c27370bbbd1d30dcaa49
---
M .gitmodules
A ArticleCreationWorkflow
A PluggableSSO
A RandomSelection
A ReadingLists
A Wigo3
6 files changed, 25 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index 9d9f279..7284e3a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -110,6 +110,10 @@
path = Arrays
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Arrays
branch = .
+[submodule "ArticleCreationWorkflow"]
+   path = ArticleCreationWorkflow
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticleCreationWorkflow
+   branch = .
 [submodule "ArticleFeedbackv5"]
path = ArticleFeedbackv5
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticleFeedbackv5
@@ -1930,6 +1934,10 @@
path = PluggableAuth
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PluggableAuth
branch = .
+[submodule "PluggableSSO"]
+   path = PluggableSSO
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PluggableSSO
+   branch = .
 [submodule "Poem"]
path = Poem
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Poem
@@ -2078,6 +2086,10 @@
path = RandomInCategory
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/RandomInCategory
branch = .
+[submodule "RandomSelection"]
+   path = RandomSelection
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/RandomSelection
+   branch = .
 [submodule "RandomUsersWithAvatars"]
path = RandomUsersWithAvatars
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/RandomUsersWithAvatars
@@ -2085,6 +2097,10 @@
 [submodule "ReaderFeedback"]
path = ReaderFeedback
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ReaderFeedback
+   branch = .
+[submodule "ReadingLists"]
+   path = ReadingLists
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ReadingLists
branch = .
 [submodule "ReassignEdits"]
path = ReassignEdits
@@ -2942,6 +2958,10 @@
path = Widgets
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Widgets
branch = .
+[submodule "Wigo3"]
+   path = Wigo3
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wigo3
+   branch = .
 [submodule "WikEdDiff"]
path = WikEdDiff
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikEdDiff
diff --git a/ArticleCreationWorkflow b/ArticleCreationWorkflow
new file mode 16
index 000..c93fe0c
--- /dev/null
+++ b/ArticleCreationWorkflow
@@ -0,0 +1 @@
+Subproject commit c93fe0cadc38c2a07bd547906c227a42bc8517c2
diff --git a/PluggableSSO b/PluggableSSO
new file mode 16
index 000..3a2187d
--- /dev/null
+++ b/PluggableSSO
@@ -0,0 +1 @@
+Subproject commit 3a2187d3b4ff83fe48da2234b4259fccbe5ac181
diff --git a/RandomSelection b/RandomSelection
new file mode 16
index 000..c0eee5e
--- /dev/null
+++ b/RandomSelection
@@ -0,0 +1 @@
+Subproject commit c0eee5e325529539cb4ebe38ec72f7b93625683e
diff --git a/ReadingLists b/ReadingLists
new file mode 16
index 000..6bd0906
--- /dev/null
+++ b/ReadingLists
@@ -0,0 +1 @@
+Subproject commit 6bd090623e504dc1603ecde03e4d66ce9311ea2e
diff --git a/Wigo3 b/Wigo3
new file mode 16
index 000..7febd7d
--- /dev/null
+++ b/Wigo3
@@ -0,0 +1 @@
+Subproject commit 7febd7dddceb7c33dc9b6cec6496d94260cebc71

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf37fb599bef5bc4b9f7c27370bbbd1d30dcaa49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Disable mariadb main instance starting for multisource

[Jcrespo (Code Review)]

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

Change subject: mariadb: Disable mariadb main instance starting for multisource
..


mariadb: Disable mariadb main instance starting for multisource

On multisources hosts, there is a risk of starting the main
instance (mariadb.service) by mistake. While we make sure mariadb@
instances cannot be started if they are not pre-configured (by,
checking the mysql specific config file exists), the mariad
main one can start by accident with certain deafults and
potentially destroy data. While we can mask it on a host bases,
it has the problem that it could be accidentally unmasked.

By puppetizing an override, we can send a message of why it is
disabled, and indicate the probably thing that a dba/sysadmin
would want to do iunstead.

Bug: T169514
Change-Id: I597f53fbf3b34b299f72060d25a14684ddbd9560
---
M modules/role/manifests/mariadb/dbstore_multiinstance.pp
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/manifests/mariadb/dbstore_multiinstance.pp 
b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
index 8a62209..4cbc9cc 100644
--- a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
+++ b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
@@ -24,9 +24,8 @@
 
 class {'mariadb::packages_wmf': }
 class {'mariadb::service':
-# multiinstance => true, # for now, we will not do anything special
-# for now we will keep things simple, we probably should have a
-# higher-level interface with templates
+override => "ExecStartPre=/bin/sh -c \"echo 'mariadb main service is 
disabled, \
+use mariadb@ instead'; exit 1\"",
 }
 
 if os_version('debian >= stretch') {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb-multiinstance: Fix missing header on override

[Jcrespo (Code Review)]

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

Change subject: mariadb-multiinstance: Fix missing header on override
..


mariadb-multiinstance: Fix missing header on override

Bug: T169514
Change-Id: I83bd025bea3f0fea14cde8f322681a13e392548c
---
M modules/role/manifests/mariadb/dbstore_multiinstance.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/mariadb/dbstore_multiinstance.pp 
b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
index 4cbc9cc..c61195e 100644
--- a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
+++ b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
@@ -24,8 +24,8 @@
 
 class {'mariadb::packages_wmf': }
 class {'mariadb::service':
-override => "ExecStartPre=/bin/sh -c \"echo 'mariadb main service is 
disabled, \
-use mariadb@ instead'; exit 1\"",
+override => "[Service]\nExecStartPre=/bin/sh -c \"echo 'mariadb main 
service is \
+disabled, use mariadb@ instead'; exit 1\"",
 }
 
 if os_version('debian >= stretch') {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::prometheus::hhmv_exporter: move to profile

[Elukey (Code Review)]

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

Change subject: role::prometheus::hhmv_exporter: move to profile
..

role::prometheus::hhmv_exporter: move to profile

Change-Id: If9dfc3b2c080a3654865d8b5ed20ea8fb575cd1c
---
R modules/profile/manifests/prometheus/hhvm_exporter.pp
M modules/role/manifests/mediawiki/appserver.pp
M modules/role/manifests/mediawiki/appserver/api.pp
M modules/role/manifests/mediawiki/imagescaler.pp
M modules/role/manifests/mediawiki/jobrunner.pp
M modules/role/manifests/mediawiki/videoscaler.pp
6 files changed, 9 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/367362/1

diff --git a/modules/role/manifests/prometheus/hhvm_exporter.pp 
b/modules/profile/manifests/prometheus/hhvm_exporter.pp
similarity index 77%
rename from modules/role/manifests/prometheus/hhvm_exporter.pp
rename to modules/profile/manifests/prometheus/hhvm_exporter.pp
index cc9eeec..e61ff11 100644
--- a/modules/role/manifests/prometheus/hhvm_exporter.pp
+++ b/modules/profile/manifests/prometheus/hhvm_exporter.pp
@@ -1,7 +1,7 @@
-class role::prometheus::hhvm_exporter {
+class profile::prometheus::hhvm_exporter (
+$prometheus_nodes = hiera('prometheus_nodes'),
+) {
 prometheus::hhvm_exporter { 'default': }
-
-$prometheus_nodes = hiera('prometheus_nodes')
 $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
 $ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
 
@@ -10,4 +10,4 @@
 port   => '9192',
 srange => $ferm_srange,
 }
-}
+}
\ No newline at end of file
diff --git a/modules/role/manifests/mediawiki/appserver.pp 
b/modules/role/manifests/mediawiki/appserver.pp
index c2b4912..8168c29 100644
--- a/modules/role/manifests/mediawiki/appserver.pp
+++ b/modules/role/manifests/mediawiki/appserver.pp
@@ -4,6 +4,6 @@
 
 include ::role::mediawiki::webserver
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 
 }
diff --git a/modules/role/manifests/mediawiki/appserver/api.pp 
b/modules/role/manifests/mediawiki/appserver/api.pp
index cd7c161..445e980 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -3,7 +3,7 @@
 
 include ::role::mediawiki::webserver
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 
 # Using fastcgi we need more local ports
 sysctl::parameters { 'raise_port_range':
diff --git a/modules/role/manifests/mediawiki/imagescaler.pp 
b/modules/role/manifests/mediawiki/imagescaler.pp
index c8a3ef1..c359caf 100644
--- a/modules/role/manifests/mediawiki/imagescaler.pp
+++ b/modules/role/manifests/mediawiki/imagescaler.pp
@@ -4,7 +4,7 @@
 include ::role::mediawiki::scaler
 include ::role::mediawiki::webserver
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 include ::base::firewall
 }
 
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp 
b/modules/role/manifests/mediawiki/jobrunner.pp
index b00a50f..78f2c27 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -6,8 +6,7 @@
 include ::role::mediawiki::common
 
 include ::profile::prometheus::apache_exporter
-# This should really be a profile
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 
 include ::profile::mediawiki::jobrunner
 }
diff --git a/modules/role/manifests/mediawiki/videoscaler.pp 
b/modules/role/manifests/mediawiki/videoscaler.pp
index 438cd09..62544c5 100644
--- a/modules/role/manifests/mediawiki/videoscaler.pp
+++ b/modules/role/manifests/mediawiki/videoscaler.pp
@@ -7,7 +7,7 @@
 
 # Profiles
 include ::profile::prometheus::apache_exporter
-include ::role::prometheus::hhvm_exporter
+include ::profile::prometheus::hhvm_exporter
 include ::profile::mediawiki::jobrunner
 include ::base::firewall
 

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

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

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

[MediaWiki-commits] [Gerrit] operations...logster[master]: Reduce the DNS queries for the statsd domain

[Elukey (Code Review)]

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

Change subject: Reduce the DNS queries for the statsd domain
..

Reduce the DNS queries for the statsd domain

The sendto() function issues a DNS query if the host[0] parameter
is not an IP address. We run several instances of logster once every
minute, and for each metric a DNS query for the statsd domain is
issued.

Bug: T171318
Change-Id: Id08c3d1f647b2a0209e6aee0a0a1c7402493567d
---
M logster/logster.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/logster 
refs/changes/70/367370/1

diff --git a/logster/logster.py b/logster/logster.py
index ba7c748..ac1e113 100755
--- a/logster/logster.py
+++ b/logster/logster.py
@@ -272,6 +272,7 @@
 def submit_statsd(metrics, options):
 if (not options.dry_run):
 host = options.statsd_host.split(':')
+host[0] = socket.gethostbyname(host[0])
 
 for metric in metrics:
 metric_name = metric.name

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id08c3d1f647b2a0209e6aee0a0a1c7402493567d
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/logster
Gerrit-Branch: master
Gerrit-Owner: Elukey 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::prometheus::memcached_exporter: move to profile

[Elukey (Code Review)]

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

Change subject: role::prometheus::memcached_exporter: move to profile
..

role::prometheus::memcached_exporter: move to profile

Change-Id: I74da1d7cf3e95e3324a780eb6543d7cff7385a20
---
M modules/profile/manifests/memcached/instance.pp
A modules/profile/manifests/prometheus/memcached_exporter.pp
D modules/role/manifests/prometheus/memcached_exporter.pp
3 files changed, 15 insertions(+), 38 deletions(-)


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

diff --git a/modules/profile/manifests/memcached/instance.pp 
b/modules/profile/manifests/memcached/instance.pp
index e0a0dc1..0a46bc1 100644
--- a/modules/profile/manifests/memcached/instance.pp
+++ b/modules/profile/manifests/memcached/instance.pp
@@ -20,18 +20,15 @@
 # [*size*]
 #   Memcached max memory allocated size.
 #
-# [*prometheus_nodes*]
-#   Hosts allowed by the firewall to poll the memcached exporter
-#   to retrieve memcached metrics.
-#
 class profile::memcached::instance (
 $growth_factor= hiera('profile::memcached::growth_factor'),
 $extended_options = hiera_array('profile::memcached::extended_options'),
 $version  = hiera('profile::memcached::version'),
 $port = hiera('profile::memcached::port'),
 $size = hiera('profile::memcached::size'),
-$prometheus_nodes = hiera('prometheus_nodes')
 ) {
+include ::profile::prometheus::memcached_exporter
+
 class { '::memcached':
 size  => $size,
 port  => $port,
@@ -46,21 +43,5 @@
 ferm::service { 'memcached':
 proto => 'tcp',
 port  => $port,
-}
-
-$prometheus_port  = '9150'
-prometheus::memcached_exporter { 'default': }
-
-if $::realm == 'labs' {
-$ferm_srange = '$LABS_NETWORKS'
-} else {
-$prometheus_ferm_nodes = join($prometheus_nodes, ' ')
-$ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
-}
-
-ferm::service { 'prometheus-memcached-exporter':
-proto  => 'tcp',
-port   => $prometheus_port,
-srange => $ferm_srange,
 }
 }
diff --git a/modules/profile/manifests/prometheus/memcached_exporter.pp 
b/modules/profile/manifests/prometheus/memcached_exporter.pp
new file mode 100644
index 000..8d7bbd4
--- /dev/null
+++ b/modules/profile/manifests/prometheus/memcached_exporter.pp
@@ -0,0 +1,13 @@
+class profile::prometheus::memcached_exporter (
+$prometheus_nodes = hiera('prometheus_nodes'),
+) {
+prometheus::memcached_exporter { 'default': }
+$prometheus_ferm_nodes = join($prometheus_nodes, ' ')
+$ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
+
+ferm::service { 'prometheus-memcached-exporter':
+proto  => 'tcp',
+port   => '9150',
+srange => $ferm_srange,
+}
+}
\ No newline at end of file
diff --git a/modules/role/manifests/prometheus/memcached_exporter.pp 
b/modules/role/manifests/prometheus/memcached_exporter.pp
deleted file mode 100644
index 6829ebe..000
--- a/modules/role/manifests/prometheus/memcached_exporter.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class role::prometheus::memcached_exporter {
-prometheus::memcached_exporter { 'default': }
-
-if $::realm == 'labs' {
-$ferm_srange = '$LABS_NETWORKS'
-} else {
-$prometheus_nodes = hiera('prometheus_nodes')
-$prometheus_ferm_nodes = join($prometheus_nodes, ' ')
-$ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
-}
-
-ferm::service { 'prometheus-memcached-exporter':
-proto  => 'tcp',
-port   => '9150',
-srange => $ferm_srange,
-}
-}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remove code for magnify icon from figcaption node

[Esanders (Code Review)]

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

Change subject: Remove code for magnify icon from figcaption node
..

Remove code for magnify icon from figcaption node

This icon is now added by Parsoid content CSS.

Change-Id: I8d76d759641b091c1821ff658b1201ca625fd146
Depends-On: Id66f09c54103854ccbaa54a03e7c62890b67cba9
Bug: T160960
---
M modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
1 file changed, 0 insertions(+), 32 deletions(-)


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

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
index a9b5dd3..88b33b0 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
@@ -29,38 +29,6 @@
 
 ve.ce.MWImageCaptionNode.static.tagName = 'figcaption';
 
-/* Methods */
-
-/**
- * Reset the magnify button if the structure of the caption changed,
- * so it is always rendered in the right place.
- *
- * The magnify icon will always be attached to the caption; we
- * handle hiding and showing it per block image type in the CSS rules.
- */
-ve.ce.MWImageCaptionNode.prototype.onSplice = function () {
-   if ( this.$magnify ) {
-   this.$magnify.detach();
-   } else {
-   this.buildMagnify();
-   }
-
-   // Parent method
-   ve.ce.MWImageCaptionNode.super.prototype.onSplice.apply( this, 
arguments );
-
-   // Reset the magnify icon, prepend it to the caption
-   this.$magnify.prependTo( this.$element );
-};
-
-/** */
-ve.ce.MWImageCaptionNode.prototype.buildMagnify = function () {
-   this.$magnify = $( '' )
-   .addClass( 'magnify' );
-   this.$a = $( '' )
-   .addClass( 'internal' )
-   .appendTo( this.$magnify );
-};
-
 /* Registration */
 
 ve.ce.nodeFactory.register( ve.ce.MWImageCaptionNode );

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Move some trailing ] onto newlines to make more balanced

[Jcrespo (Code Review)]

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

Change subject: Move some trailing ] onto newlines to make more balanced
..


Move some trailing ] onto newlines to make more balanced

Change-Id: Id4f7920fb0d811a3281ca3fd4cfa6bc7db06b255
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 28 insertions(+), 14 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index b59742b..0e695ae 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -175,43 +175,50 @@
's1' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's1', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's1', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
's2' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's2', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's2', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
'DEFAULT' /* s3 */  => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's3', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's3', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
's4' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's4', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's4', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
's5' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's5', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's5', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
's6' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's6', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's6', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
's7' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's7', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's7', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
 ],
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index c3dc19c..ce1b2d5 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -190,43 +190,50 @@
's1' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's1', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's1', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
's2' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's2', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's2', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
'DEFAULT' /* s3 */  => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's3', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's3', 'datacenter' => 
$wmfMasterDatacenter ]
+   ],
'useGTIDs' => true
],
's4' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
-   'conds' => [ 'shard' => 's4', 'datacenter' => 
$wmfMasterDatacenter ] ],
+   'conds' => [ 'shard' => 's4', 'datacenter' => 

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Unregister Cards

[Hashar (Code Review)]

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

Change subject: Unregister Cards
..

Unregister Cards

Bug: T167452
Change-Id: Id293318f364356575ceb873b47379e48fd5e6c56
---
M .gitmodules
D Cards
2 files changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/.gitmodules b/.gitmodules
index aa89675..9d9f279 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -298,10 +298,6 @@
path = Capiunto
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Capiunto
branch = .
-[submodule "Cards"]
-   path = Cards
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cards
-   branch = .
 [submodule "Cargo"]
path = Cargo
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cargo
diff --git a/Cards b/Cards
deleted file mode 16
index 9e96cd4..000
--- a/Cards
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9e96cd44ed9e7550ecc1e86aff133f5f3b828963

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id293318f364356575ceb873b47379e48fd5e6c56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't empty the changes list on first load

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Don't empty the changes list on first load
..


RCFilters: Don't empty the changes list on first load

jQuery.empty() apparently also unattaches event handlers.
Only empty before we re-append if we are not in the first
load of the changes list.

Bug: T171085
Change-Id: I68754e99a6c5c821be47b1b1e8e22f23db85746c
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 6512f04..0e9e843 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -125,7 +125,9 @@
this.$element.append( $message );
} else {
this.$changesListContent = $changesListContent;
-   this.$element.empty().append( this.$changesListContent 
);
+   if ( !isInitialDOM ) {
+   this.$element.empty().append( 
this.$changesListContent );
+   }
// Set up highlight containers
this.setupHighlightContainers( this.$element );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68754e99a6c5c821be47b1b1e8e22f23db85746c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Unregister Cards

[Hashar (Code Review)]

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

Change subject: Unregister Cards
..


Unregister Cards

Bug: T167452
Change-Id: Id293318f364356575ceb873b47379e48fd5e6c56
---
M .gitmodules
D Cards
2 files changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index aa89675..9d9f279 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -298,10 +298,6 @@
path = Capiunto
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Capiunto
branch = .
-[submodule "Cards"]
-   path = Cards
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cards
-   branch = .
 [submodule "Cargo"]
path = Cargo
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cargo
diff --git a/Cards b/Cards
deleted file mode 16
index 9e96cd4..000
--- a/Cards
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9e96cd44ed9e7550ecc1e86aff133f5f3b828963

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id293318f364356575ceb873b47379e48fd5e6c56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::prometheus::apache_exporter: move to profiles

[Elukey (Code Review)]

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

Change subject: role::prometheus::apache_exporter: move to profiles
..


role::prometheus::apache_exporter: move to profiles

Change-Id: I92c9ae7b6abf4f5c1e2af187158b3302d1d93059
---
M modules/profile/manifests/otrs.pp
M modules/profile/manifests/piwik/webserver.pp
R modules/profile/manifests/prometheus/apache_exporter.pp
M modules/role/manifests/mediawiki/appserver.pp
M modules/role/manifests/mediawiki/appserver/api.pp
M modules/role/manifests/mediawiki/imagescaler.pp
M modules/role/manifests/mediawiki/jobrunner.pp
M modules/role/manifests/mediawiki/videoscaler.pp
8 files changed, 13 insertions(+), 34 deletions(-)

Approvals:
  Elukey: Looks good to me, approved
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, but someone else must approve



diff --git a/modules/profile/manifests/otrs.pp 
b/modules/profile/manifests/otrs.pp
index 21b206f..2cb00ca 100644
--- a/modules/profile/manifests/otrs.pp
+++ b/modules/profile/manifests/otrs.pp
@@ -12,8 +12,8 @@
 $prometheus_nodes = hiera('prometheus_nodes'),
 ){
 include ::base::firewall
-
 include network::constants
+include ::profile::prometheus::apache_exporter
 
 class { '::otrs':
 otrs_database_host => $otrs_database_host,
@@ -63,17 +63,6 @@
 nrpe::monitor_service{ 'freshclam':
 description  => 'freshclam running',
 nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u 
clamav -C freshclam'
-}
-
-prometheus::apache_exporter { 'default': }
-
-$prometheus_ferm_nodes = join($prometheus_nodes, ' ')
-$ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
-
-ferm::service { 'prometheus-apache_exporter':
-proto  => 'tcp',
-port   => '9117',
-srange => $ferm_srange,
 }
 
 # can conflict with ferm module
diff --git a/modules/profile/manifests/piwik/webserver.pp 
b/modules/profile/manifests/piwik/webserver.pp
index 86700ff..60293f3 100644
--- a/modules/profile/manifests/piwik/webserver.pp
+++ b/modules/profile/manifests/piwik/webserver.pp
@@ -7,6 +7,8 @@
 class profile::piwik::webserver(
 $prometheus_nodes = hiera('prometheus_nodes')
 ){
+include ::profile::prometheus::apache_exporter
+
 class { '::apache::mod::authnz_ldap': }
 class { '::apache::mod::headers': }
 class { '::apache::mod::php5': }
@@ -55,17 +57,6 @@
 match  => '^;?memory_limit\s*\=',
 path   => '/etc/php5/apache2/php.ini',
 notify => Class['::apache'],
-}
-
-prometheus::apache_exporter { 'default': }
-
-$prometheus_ferm_nodes = join($prometheus_nodes, ' ')
-$ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
-
-ferm::service { 'prometheus-apache_exporter':
-proto  => 'tcp',
-port   => '9117',
-srange => $ferm_srange,
 }
 
 ferm::service { 'piwik_http':
diff --git a/modules/role/manifests/prometheus/apache_exporter.pp 
b/modules/profile/manifests/prometheus/apache_exporter.pp
similarity index 77%
rename from modules/role/manifests/prometheus/apache_exporter.pp
rename to modules/profile/manifests/prometheus/apache_exporter.pp
index 3e8dffb..dd372ef 100644
--- a/modules/role/manifests/prometheus/apache_exporter.pp
+++ b/modules/profile/manifests/prometheus/apache_exporter.pp
@@ -1,7 +1,7 @@
-class role::prometheus::apache_exporter {
+class profile::prometheus::apache_exporter (
+$prometheus_nodes = hiera('prometheus_nodes'),
+) {
 prometheus::apache_exporter { 'default': }
-
-$prometheus_nodes = hiera('prometheus_nodes')
 $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
 $ferm_srange = "(@resolve((${prometheus_ferm_nodes})) 
@resolve((${prometheus_ferm_nodes}), ))"
 
@@ -10,5 +10,4 @@
 port   => '9117',
 srange => $ferm_srange,
 }
-}
-
+}
\ No newline at end of file
diff --git a/modules/role/manifests/mediawiki/appserver.pp 
b/modules/role/manifests/mediawiki/appserver.pp
index d113a58..c2b4912 100644
--- a/modules/role/manifests/mediawiki/appserver.pp
+++ b/modules/role/manifests/mediawiki/appserver.pp
@@ -3,7 +3,7 @@
 system::role { 'mediawiki::appserver': }
 
 include ::role::mediawiki::webserver
-include ::role::prometheus::apache_exporter
+include ::profile::prometheus::apache_exporter
 include ::role::prometheus::hhvm_exporter
 
 }
diff --git a/modules/role/manifests/mediawiki/appserver/api.pp 
b/modules/role/manifests/mediawiki/appserver/api.pp
index 763180a..cd7c161 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -2,7 +2,7 @@
 system::role { 'mediawiki::appserver::api': }
 
 include ::role::mediawiki::webserver
-include ::role::prometheus::apache_exporter
+include 

[MediaWiki-commits] [Gerrit] mediawiki...PluggableSSO[master]: build: add json-lint / banana i18n checker

[Hashar (Code Review)]

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

Change subject: build: add json-lint / banana i18n checker
..

build: add json-lint / banana i18n checker

Add builders based on the list in the BoilerPlate extension.

Document i18n message "pluggablesso-extensionname"

Change-Id: Ia50ccaf49d4d1b64ffb72525c3662eb1065f09ab
---
M .gitignore
A Gruntfile.js
M i18n/qqq.json
A package.json
4 files changed, 34 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index f7e6fe6..79aeeb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .\#*
 .tramp_history
 PHPTAGS.sqlite
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..e0408b8
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/* eslint-env node */
+module.exports = function ( grunt ) {
+   var conf = grunt.file.readJSON( 'extension.json' );
+
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 86db968..4e62758 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,6 +4,7 @@
"MarkAHershberger"
]
},
+   "pluggablesso-extensionname": "{{optional}} Name of the extension as 
display on Special:Version.",
"pluggablesso-desc": 
"{{desc|name=PluggableSSO|url=https://www.mediawiki.org/wiki/Extension:PluggableSSO}};,
"pluggablesso-no-session": "Message to return when we don't have a 
username",
"pluggablesso-username-mismatch": "Username we got doesn't match what 
was passed"
diff --git a/package.json b/package.json
new file mode 100644
index 000..cca4845
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.6.0",
+"grunt-jsonlint": "1.1.0"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia50ccaf49d4d1b64ffb72525c3662eb1065f09ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableSSO
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

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

[Eileen (Code Review)]

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

Change subject: Update Silverpopconnector
..

Update Silverpopconnector

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

Bug: T161762

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/66/367366/1

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

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Query Helper suggestions for empty queries

[jenkins-bot (Code Review)]

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

Change subject: Query Helper suggestions for empty queries
..


Query Helper suggestions for empty queries

Use generic suggestions if current query is empty.

Change-Id: Ida18670c948ee84d0d415789ec9950f9103344ca
---
M wikibase/queryService/ui/queryHelper/QueryHelper.js
M wikibase/queryService/ui/queryHelper/SelectorBox.js
2 files changed, 40 insertions(+), 4 deletions(-)

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



diff --git a/wikibase/queryService/ui/queryHelper/QueryHelper.js 
b/wikibase/queryService/ui/queryHelper/QueryHelper.js
index d2fbb0a..7f8cb1f 100644
--- a/wikibase/queryService/ui/queryHelper/QueryHelper.js
+++ b/wikibase/queryService/ui/queryHelper/QueryHelper.js
@@ -343,10 +343,7 @@
this._selectorBox.add( $button, null, function( id, name ) {
var prop = 'http://www.wikidata.org/prop/direct/' + 
id;// FIXME technical debt
 
-   var subject = self._query.getBoundVariables().shift();
-   if ( !subject ) {
-   return;
-   }
+   var subject = self._query.getBoundVariables().shift() 
|| '?item';
var variable2 = '?' + name.replace( /( |[^a-z0-9])/gi, 
'_' );// FIXME technical debt
 
var triple = self._query.addTriple( subject, prop, 
variable2, true );
diff --git a/wikibase/queryService/ui/queryHelper/SelectorBox.js 
b/wikibase/queryService/ui/queryHelper/SelectorBox.js
index 4c82bb6..e66f3e6 100644
--- a/wikibase/queryService/ui/queryHelper/SelectorBox.js
+++ b/wikibase/queryService/ui/queryHelper/SelectorBox.js
@@ -26,6 +26,23 @@
}\
LIMIT 100',
genericSuggest: function() { // Find items that 
are most often used with the first selected item of the current query
+   var instanceOfTemplate =// Find items 
that are used with property 'instance of'
+   'SELECT ?id ?label ?description 
WHERE {\
+   hint:Query hint:optimizer 
"None".\
+   {\
+   SELECT DISTINCT 
?id WHERE { ?i wdt:P31 ?id. }\
+   LIMIT 100\
+   }\
+   ?id rdfs:label ?label.\
+   ?id schema:description 
?description.\
+   FILTER((LANG(?label)) = 
"{LANGUAGE}")\
+   
FILTER((LANG(?description)) = "{LANGUAGE}")\
+   }\
+   LIMIT 100';
+   if ( this._query.getTriples().length 
=== 0 ) {
+   return instanceOfTemplate;
+   }
+
var template = '{PREFIXES}\n\
SELECT ?id ?label ?description 
?property WITH {\n\
{QUERY}\n\
@@ -112,6 +129,28 @@
}\
LIMIT 100',
genericSuggest: function() { // Find properties that 
are most often used with the first selected item of the current query
+
+   var genericTemplate = // Find properties that 
are most often used with all items
+   'SELECT ?id ?label ?description WITH {\
+   SELECT ?pred (COUNT(?value) AS ?count) 
WHERE\
+   {\
+   ?subj ?pred ?value .\
+   } GROUP BY ?pred ORDER BY DESC(?count) 
LIMIT 1000\
+   } AS %inner\
+   WHERE {\
+   INCLUDE %inner\
+   ?id wikibase:claim ?pred.\
+   ?id rdfs:label ?label.\
+   ?id schema:description ?description.\
+   FILTER((LANG(?label)) = "en")\
+   FILTER((LANG(?description)) = "en")\
+   } ORDER BY DESC(?count)\
+   LIMIT 100';
+
+   

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtendedSearch: Fixed indexing of Open Document files

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367368 )

Change subject: BSExtendedSearch: Fixed indexing of Open Document files
..

BSExtendedSearch: Fixed indexing of Open Document files

Open document file formats could not be indexed as the MIME => "file extension"
mapping was missing

Also changed default settings.

Change-Id: I64c396b25c7e76be9ee010de583a16d313ced752
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/includes/BuildIndex/AbstractBuildIndexFile.class.php
2 files changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/ExtendedSearch/ExtendedSearch.class.php 
b/ExtendedSearch/ExtendedSearch.class.php
index 2a36062..ab0caa7 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -70,7 +70,7 @@
BsConfig::registerVar( 'MW::ExtendedSearch::HighlightSnippets', 
'3', BsConfig::TYPE_INT|BsConfig::LEVEL_PUBLIC, 
'bs-extendedsearch-pref-highlightsnippets', 'int' );
BsConfig::registerVar( 'MW::ExtendedSearch::LogUsers', true, 
BsConfig::TYPE_BOOL|BsConfig::LEVEL_PUBLIC, 'bs-extendedsearch-pref-logusers', 
'toggle' );
BsConfig::registerVar( 'MW::ExtendedSearch::Logging', true, 
BsConfig::TYPE_BOOL|BsConfig::LEVEL_PUBLIC, 'bs-extendedsearch-pref-logging', 
'toggle' );
-   BsConfig::registerVar( 'MW::ExtendedSearch::IndexFileTypes', 
'doc, docx, pdf, ppt, pptx, xls, xlsx, txt', 
BsConfig::TYPE_STRING|BsConfig::LEVEL_PUBLIC, 
'bs-extendedsearch-pref-indexfiletypes' );
+   BsConfig::registerVar( 'MW::ExtendedSearch::IndexFileTypes', 
'doc, docx, pdf, ppt, pptx, xls, xlsx, txt, odp, ods, odt', 
BsConfig::TYPE_STRING|BsConfig::LEVEL_PUBLIC, 
'bs-extendedsearch-pref-indexfiletypes' );
BsConfig::registerVar( 'MW::ExtendedSearch::SolrServiceUrl', 
'http://127.0.0.1:8080/solr', BsConfig::TYPE_STRING|BsConfig::LEVEL_PUBLIC, 
'bs-extendedsearch-pref-solrserviceurl' );
BsConfig::registerVar( 'MW::ExtendedSearch::SolrPingTime', 2, 
BsConfig::TYPE_INT|BsConfig::LEVEL_PUBLIC, 
'bs-extendedsearch-pref-solrpingtime', 'int' );
BsConfig::registerVar( 'MW::ExtendedSearch::SetFocus', true, 
BsConfig::LEVEL_USER|BsConfig::RENDER_AS_JAVASCRIPT|BsConfig::TYPE_BOOL, 
'bs-extendedsearch-pref-setfocus', 'toggle' );
diff --git 
a/ExtendedSearch/includes/BuildIndex/AbstractBuildIndexFile.class.php 
b/ExtendedSearch/includes/BuildIndex/AbstractBuildIndexFile.class.php
index efe7589..642ab1b 100644
--- a/ExtendedSearch/includes/BuildIndex/AbstractBuildIndexFile.class.php
+++ b/ExtendedSearch/includes/BuildIndex/AbstractBuildIndexFile.class.php
@@ -124,6 +124,13 @@

'vnd.openxmlformats-officedocument.wordprocessingml.template' => 'doc',
'vnd.ms-word.document.macroEnabled.12' => 'doc',
'vnd.ms-word.template.macroEnabled.12' => 'doc',
+   'vnd.oasis.opendocument.chart' =>  'odc',
+   'vnd.oasis.opendocument.formula' =>  'odf',
+   'vnd.oasis.opendocument.graphics' =>  'odg',
+   'vnd.oasis.opendocument.image' =>  'odi',
+   'vnd.oasis.opendocument.presentation' =>  'odp',
+   'vnd.oasis.opendocument.spreadsheet' =>  'ods',
+   'vnd.oasis.opendocument.text' =>  'odt',
'acad' => 'm',
'x-mathcad' => 'mcd'
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64c396b25c7e76be9ee010de583a16d313ced752
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Article: Remove unused variable

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367371 )

Change subject: Article: Remove unused variable
..

Article: Remove unused variable

Follow-up to 97a8fb78faa4ca2d9604140e5547f5deae5a2524.

Change-Id: I8822742f15c3972cec3ac2ec47a2f594453b8672
---
M includes/page/Article.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/71/367371/1

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 28db73c..e2cf2cf 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1669,7 +1669,6 @@
$title = $this->getTitle();
$ctx = $this->getContext();
$outputPage = $ctx->getOutput();
-   $useMediaWikiUIEverywhere = $ctx->getConfig()->get( 
'UseMediaWikiUIEverywhere' );
$outputPage->setPageTitle( wfMessage( 'delete-confirm', 
$title->getPrefixedText() ) );
$outputPage->addBacklinkSubtitle( $title );
$outputPage->setRobotPolicy( 'noindex,nofollow' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8822742f15c3972cec3ac2ec47a2f594453b8672
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb-multiinstance: Fix missing header on override

[Jcrespo (Code Review)]

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

Change subject: mariadb-multiinstance: Fix missing header on override
..

mariadb-multiinstance: Fix missing header on override

Bug: T169514
Change-Id: I83bd025bea3f0fea14cde8f322681a13e392548c
---
M modules/role/manifests/mariadb/dbstore_multiinstance.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/mariadb/dbstore_multiinstance.pp 
b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
index 4cbc9cc..c61195e 100644
--- a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
+++ b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
@@ -24,8 +24,8 @@
 
 class {'mariadb::packages_wmf': }
 class {'mariadb::service':
-override => "ExecStartPre=/bin/sh -c \"echo 'mariadb main service is 
disabled, \
-use mariadb@ instead'; exit 1\"",
+override => "[Service]\nExecStartPre=/bin/sh -c \"echo 'mariadb main 
service is \
+disabled, use mariadb@ instead'; exit 1\"",
 }
 
 if os_version('debian >= stretch') {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WebInstaller: Use instead of

[jenkins-bot (Code Review)]

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

Change subject: WebInstaller: Use  instead of 
..


WebInstaller: Use  instead of 

The parser output is enclosed by a  and must not enclosed into a
 because of an HTML validation error.

Bug: T171423
Change-Id: I034d54436a622803fe07d3c93483b9fe705bc925
---
M includes/installer/WebInstaller.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/installer/WebInstaller.php 
b/includes/installer/WebInstaller.php
index a311ce96..27300f3 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -703,7 +703,7 @@
"escaped() . "\">" .
wfMessage( 'config-help' )->escaped() . "\n" .
-   "" . $html . 
"\n" .
+   "" . $html . 
"\n" .
"\n";
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I034d54436a622803fe07d3c93483b9fe705bc925
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
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] operations/software[master]: dblists: Update manual database lists for dbstore2002 changes

[Jcrespo (Code Review)]

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

Change subject: dblists: Update manual database lists for dbstore2002 changes
..


dblists: Update manual database lists for dbstore2002 changes

dbstore2002 multisource instance deleted, now it has x1, s1 and s2
as multiple instances.

Bug: T171321
Change-Id: I0f113c1a4e86cfbaf3c40fe78112f636f4f42c50
---
M dbtools/s1.hosts
M dbtools/s3.hosts
M dbtools/s4.hosts
M dbtools/s5.hosts
M dbtools/x1.hosts
5 files changed, 3 insertions(+), 5 deletions(-)

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



diff --git a/dbtools/s1.hosts b/dbtools/s1.hosts
index e1a6387..0eca466 100644
--- a/dbtools/s1.hosts
+++ b/dbtools/s1.hosts
@@ -1,4 +1,3 @@
-db2072.codfw.wmnet 3306
 db2034.codfw.wmnet 3306
 db2042.codfw.wmnet 3306
 db2048.codfw.wmnet 3306
@@ -7,8 +6,9 @@
 db2069.codfw.wmnet 3306
 db2070.codfw.wmnet 3306
 db2071.codfw.wmnet 3306
+db2072.codfw.wmnet 3306
 dbstore2001.codfw.wmnet3306
-dbstore2002.codfw.wmnet3306
+dbstore2002.codfw.wmnet3311
 db2016.codfw.wmnet 3306
 labsdb1003.eqiad.wmnet 3306
 labsdb1001.eqiad.wmnet 3306
diff --git a/dbtools/s3.hosts b/dbtools/s3.hosts
index b65a88a..256611b 100644
--- a/dbtools/s3.hosts
+++ b/dbtools/s3.hosts
@@ -1,5 +1,4 @@
 dbstore2001.codfw.wmnet3306
-dbstore2002.codfw.wmnet3306
 db2036.codfw.wmnet 3306
 db2043.codfw.wmnet 3306
 db2050.codfw.wmnet 3306
diff --git a/dbtools/s4.hosts b/dbtools/s4.hosts
index b1d51fb..4fa0811 100644
--- a/dbtools/s4.hosts
+++ b/dbtools/s4.hosts
@@ -1,4 +1,3 @@
-dbstore2002.codfw.wmnet3306
 dbstore2001.codfw.wmnet3306
 db2065.codfw.wmnet 3306
 db2058.codfw.wmnet 3306
diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index 78dba87..73465f2 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -1,5 +1,4 @@
 dbstore2001.codfw.wmnet3306
-dbstore2002.codfw.wmnet3306
 db2038.codfw.wmnet 3306
 db2045.codfw.wmnet 3306
 db2052.codfw.wmnet 3306
diff --git a/dbtools/x1.hosts b/dbtools/x1.hosts
index f75a7ab..ddf8866 100644
--- a/dbtools/x1.hosts
+++ b/dbtools/x1.hosts
@@ -1,4 +1,5 @@
 dbstore2001.codfw.wmnet3306
+dbstore2002.codfw.wmnet3320
 db2033.codfw.wmnet 3306
 dbstore1001.eqiad.wmnet3306
 dbstore1002.eqiad.wmnet3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f113c1a4e86cfbaf3c40fe78112f636f4f42c50
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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