[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Type hint against IDatabase instead of Database

[jenkins-bot (Code Review)]

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

Change subject: Type hint against IDatabase instead of Database
..


Type hint against IDatabase instead of Database

Change-Id: Ibb067ca33fd71464d48c0144470df3d082a97cbe
---
M includes/ArticleStore.php
M includes/Events/EventStore.php
M includes/Store/CourseStore.php
M includes/UPCUserCourseFinder.php
M includes/pagers/RevisionPager.php
M includes/rows/ORMRow.php
M includes/tables/IORMTable.php
M includes/tables/ORMTable.php
8 files changed, 36 insertions(+), 36 deletions(-)

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



diff --git a/includes/ArticleStore.php b/includes/ArticleStore.php
index f08a676..9d57eb8 100644
--- a/includes/ArticleStore.php
+++ b/includes/ArticleStore.php
@@ -3,7 +3,7 @@
 namespace EducationProgram;
 
 use InvalidArgumentException;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Store for EPArticle objects.
@@ -84,7 +84,7 @@
 *
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
protected function getReadConnection() {
return wfGetDB( $this->readConnectionId );
@@ -96,7 +96,7 @@
 *
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
protected function getWriteConnection() {
return wfGetDB( DB_MASTER );
diff --git a/includes/Events/EventStore.php b/includes/Events/EventStore.php
index 507031e..b1dd839 100644
--- a/includes/Events/EventStore.php
+++ b/includes/Events/EventStore.php
@@ -3,7 +3,7 @@
 namespace EducationProgram\Events;
 
 use InvalidArgumentException;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Service via which EducationProgram events can be saved and queried.
@@ -66,7 +66,7 @@
/**
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
private function getReadConnection() {
return wfGetDB( $this->readConnectionId );
@@ -75,7 +75,7 @@
/**
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
private function getWriteConnection() {
return wfGetDB( DB_MASTER );
diff --git a/includes/Store/CourseStore.php b/includes/Store/CourseStore.php
index 4e8d236..c934b1c 100644
--- a/includes/Store/CourseStore.php
+++ b/includes/Store/CourseStore.php
@@ -6,7 +6,7 @@
 use EducationProgram\CourseNotFoundException;
 use EducationProgram\CourseTitleNotFoundException;
 use EducationProgram\Courses;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * This program is free software; you can redistribute it and/or modify
@@ -40,11 +40,11 @@
private $tableName;
 
/**
-* @var Database
+* @var IDatabase
 */
private $readDatabase;
 
-   public function __construct( $tableName, Database $readDatabase ) {
+   public function __construct( $tableName, IDatabase $readDatabase ) {
$this->readDatabase = $readDatabase;
$this->tableName = $tableName;
}
diff --git a/includes/UPCUserCourseFinder.php b/includes/UPCUserCourseFinder.php
index f5e0cf8..2296869 100644
--- a/includes/UPCUserCourseFinder.php
+++ b/includes/UPCUserCourseFinder.php
@@ -2,7 +2,7 @@
 
 namespace EducationProgram;
 
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Implementation of the UserCourseFinder interface that works by doing
@@ -39,16 +39,16 @@
/**
 * @since 0.3
 *
-* @var Database
+* @var IDatabase
 */
private $db;
 
/**
 * @since 0.3
 *
-* @param Database $db
+* @param IDatabase $db
 */
-   public function __construct( Database $db ) {
+   public function __construct( IDatabase $db ) {
$this->db = $db;
}
 
diff --git a/includes/pagers/RevisionPager.php 
b/includes/pagers/RevisionPager.php
index de96c04..a0bcab0 100644
--- a/includes/pagers/RevisionPager.php
+++ b/includes/pagers/RevisionPager.php
@@ -173,8 +173,8 @@
 * This function should be overridden to provide all parameters
 * needed for the main paged query. It returns an associative
 * array with the following elements:
-*  tables => Table(s) for passing to Database::select()
-*  fields => Field(s) for passing to Database::select(), may be *
+*  tables => Table(s) for passing to IDatabase::select()
+*  fields => Field(s) for passing to IDatabase::select(), may be *
 *  conds => WHERE conditions
 *  options => option array
 *  join_conds => JOIN conditions
diff --git a/includes/rows/ORMRow.php 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Avoid OOUI/download icon nameclash

[jenkins-bot (Code Review)]

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

Change subject: Avoid OOUI/download icon nameclash
..


Avoid OOUI/download icon nameclash

Short term fix to ensure icon doesn't change
when oo-ui is loaded.

Prefix with 'mf-' (we do this in main menu) to avoid nameclashes

Bug: T182162
Change-Id: Ia6ceb620ed2710d97387a326b74f1a02236cd0d0
---
M resources/skins.minerva.scripts/DownloadIcon.js
M skin.json
2 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/resources/skins.minerva.scripts/DownloadIcon.js 
b/resources/skins.minerva.scripts/DownloadIcon.js
index 5f9e3d2..bbaeda2 100644
--- a/resources/skins.minerva.scripts/DownloadIcon.js
+++ b/resources/skins.minerva.scripts/DownloadIcon.js
@@ -2,6 +2,7 @@
 
var msg = mw.msg,
MAX_PRINT_TIMEOUT = 3000,
+   GLYPH = 'mf-download',
Icon = M.require( 'mobile.startup/Icon' );
 
/**
@@ -17,7 +18,7 @@
this.skin = skin;
options.tagName = 'li';
options.title = msg( 'minerva-download' );
-   options.name = 'download';
+   options.name = GLYPH;
Icon.call( this, options );
}
 
@@ -33,7 +34,7 @@
 * Restore download icon from spinner state
 */
hideSpinner: function () {
-   this.options.name = 'download';
+   this.options.name = GLYPH;
this.render();
},
isTemplateMode: false,
diff --git a/skin.json b/skin.json
index 070d5fe..c1758a7 100644
--- a/skin.json
+++ b/skin.json
@@ -168,7 +168,7 @@
"selector": ".mw-ui-icon-{name}:before",
"position": "bottom",
"images": {
-   "download": 
"resources/skins.minerva.icons.images.scripts/download.svg",
+   "mf-download": 
"resources/skins.minerva.icons.images.scripts/download.svg",
"watch": 
"resources/skins.minerva.icons.images.scripts/watch.svg",
"watched": 
"resources/skins.minerva.icons.images.scripts/watched.svg",
"user": 
"resources/skins.minerva.icons.images.scripts/userNormal.svg",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6ceb620ed2710d97387a326b74f1a02236cd0d0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Don't emit missing-end-tag warnings for builder-inserted tags

[jenkins-bot (Code Review)]

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

Change subject: Don't emit missing-end-tag warnings for builder-inserted tags
..


Don't emit missing-end-tag warnings for builder-inserted tags

* These have both auto-inserted start and end set. There is no
  useful information conveyed to editors by these lint errors.

  This also has the benefit of suppressing the false positive
  multiple-unclosed-formatting-tags errors without more state.

Change-Id: I5e5b77af8b7e2b3d2fc41f56d9a32c41c32f9568
---
M lib/wt2html/pp/processors/linter.js
1 file changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/lib/wt2html/pp/processors/linter.js 
b/lib/wt2html/pp/processors/linter.js
index 1394fab..8339b4c 100644
--- a/lib/wt2html/pp/processors/linter.js
+++ b/lib/wt2html/pp/processors/linter.js
@@ -351,11 +351,8 @@
}
adjDp.tmp.linted = true;
env.log('lint/misnested-tag', lintObj);
-   } else if (!endTagOptional(c)) {
+   } else if (!endTagOptional(c) && 
!dp.autoInsertedStart) {
lintObj.params.inTable = 
DU.hasAncestorOfName(c, 'TABLE');
-   if (dp.autoInsertedStart) {
-   lintObj.params.aiStart = true;
-   }
env.log('lint/missing-end-tag', 
lintObj);
if 
(Consts.HTML.FormattingTags.has(c.nodeName) && matchedOpenTagPairExists(c, dp)) 
{

env.log('lint/multiple-unclosed-formatting-tags', lintObj);
@@ -762,7 +759,7 @@
var multiUnclosedTagName = null;
lints.find(function(item) {
// Unclosed tags in tables don't leak out of the table
-   if (item.type === 'missing-end-tag' && !item.params.aiStart && 
!item.params.inTable) {
+   if (item.type === 'missing-end-tag' && !item.params.inTable) {
if (item.params.name === 'small' || item.params.name 
=== 'big') {
var tagName = item.params.name;
if (!firstUnclosedTag[tagName]) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e5b77af8b7e2b3d2fc41f56d9a32c41c32f9568
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
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]: Add support for parsing constraint scope parameter

[Lucas Werkmeister (WMDE) (Code Review)]

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

Change subject: Add support for parsing constraint scope parameter
..

Add support for parsing constraint scope parameter

This constraint parameter holds one of three possible values, indicating
that a constraint should be checked on the main snak, qualifiers, and/or
references. The three values (items) are translated to context types and
returned in an array.

Bug: T184202
Change-Id: I34111535994dd7cfc8d564fdb9f37662c3aa876e
---
M extension.json
M src/ConstraintCheck/Helper/ConstraintParameterParser.php
M tests/phpunit/Helper/ConstraintParameterParserTest.php
3 files changed, 131 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index 7be24ea..887c600 100644
--- a/extension.json
+++ b/extension.json
@@ -375,6 +375,26 @@
"description": "The property ID of the 'syntax 
clarification' property (data type: monolingual text), which specifies 
human-readable explanations of a 'format' constraint.",
"public": true
},
+   "WBQualityConstraintsConstraintScopeId": {
+   "value": "P4680",
+   "description": "The property ID of the 'constraint 
scope' property (data type: item), which specifies the context(s) in which a 
constraint is checked.",
+   "public": true
+   },
+   "WBQualityConstraintsConstraintCheckedOnMainValueId": {
+   "value": "Q46466787",
+   "description": "The item ID of the 'constraint checked 
on main value' item, which, when used in a 'constraint scope' qualifier of a 
'property constraint' statement on a property, indicates that the constraint 
should be checked on the main snak of a statement.",
+   "public": true
+   },
+   "WBQualityConstraintsConstraintCheckedOnQualifiersId": {
+   "value": "Q46466783",
+   "description": "The item ID of the 'constraint checked 
on qualifiers' item, which, when used in a 'constraint scope' qualifier of a 
'property constraint' statement on a property, indicates that the constraint 
should be checked on the qualifier snaks of a statement.",
+   "public": true
+   },
+   "WBQualityConstraintsConstraintCheckedOnReferencesId": {
+   "value": "Q46466805",
+   "description": "The item ID of the 'constraint checked 
on references' item, which, when used in a 'constraint scope' qualifier of a 
'property constraint' statement on a property, indicates that the constraint 
should be checked on the reference snaks of a statement.",
+   "public": true
+   },
"WBQualityConstraintsPropertiesWithViolatingQualifiers": {
"value": [],
"description": "Property IDs of statements whose 
qualifiers are expected to violate constraints, and where constraints checks 
are therefore skipped, as if the subject entity was an exception to the 
constraints defined on the qualifier properties.",
diff --git a/src/ConstraintCheck/Helper/ConstraintParameterParser.php 
b/src/ConstraintCheck/Helper/ConstraintParameterParser.php
index 2177456..2926c1c 100644
--- a/src/ConstraintCheck/Helper/ConstraintParameterParser.php
+++ b/src/ConstraintCheck/Helper/ConstraintParameterParser.php
@@ -18,6 +18,7 @@
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Snak\Snak;
 use Wikibase\Repo\Parsers\TimeParserFactory;
+use WikibaseQuality\ConstraintReport\ConstraintCheck\Context\Context;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\ItemIdSnakValue;
 use WikibaseQuality\ConstraintReport\ConstraintParameterRenderer;
 use WikibaseQuality\ConstraintReport\Role;
@@ -667,4 +668,57 @@
return null;
}
 
+   /**
+* @param array $constraintParameters see {@link 
\WikibaseQuality\Constraint::getConstraintParameters()}
+* @throws ConstraintParameterException if the parameter is invalid
+* @return string[]|null Context::TYPE_* constants
+*/
+   public function parseConstraintScopeParameter( array 
$constraintParameters ) {
+   $constraintScopeId = $this->config->get( 
'WBQualityConstraintsConstraintScopeId' );
+   $mainSnakId = $this->config->get( 
'WBQualityConstraintsConstraintCheckedOnMainValueId' );
+   $qualifiersId = $this->config->get( 
'WBQualityConstraintsConstraintCheckedOnQualifiersId' );
+   $referencesId = $this->config->get( 
'WBQualityConstraintsConstraintCheckedOnReferencesId' );
+
+

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Improve ConstraintParameterParserTest function names

[Lucas Werkmeister (WMDE) (Code Review)]

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

Change subject: Improve ConstraintParameterParserTest function names
..

Improve ConstraintParameterParserTest function names

The pattern of all the test functions here is “test”, then the name of
the function under test (“parse*Parameter”), and then optionally some
kind of qualifying detail. To improve readability of these names, add
underscores between the name of the tested function and the details, and
within some of the details as well.

Change-Id: I2a74c79265fae1286a5e7f2eee2108e6d59e4cf2
---
M tests/phpunit/Helper/ConstraintParameterParserTest.php
1 file changed, 52 insertions(+), 52 deletions(-)


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

diff --git a/tests/phpunit/Helper/ConstraintParameterParserTest.php 
b/tests/phpunit/Helper/ConstraintParameterParserTest.php
index 42bd87a..1d783c0 100644
--- a/tests/phpunit/Helper/ConstraintParameterParserTest.php
+++ b/tests/phpunit/Helper/ConstraintParameterParserTest.php
@@ -107,7 +107,7 @@
$this->assertEquals( [ 'Q100', 'Q101' ], $parsed );
}
 
-   public function testParseClassParameterMissing() {
+   public function testParseClassParameter_Missing() {
$this->assertThrowsConstraintParameterException(
'parseClassParameter',
[ [], 'constraint' ],
@@ -115,7 +115,7 @@
);
}
 
-   public function testParseClassParameterNoValue() {
+   public function testParseClassParameter_NoValue() {
$config = $this->getDefaultConfig();
$classId = $config->get( 'WBQualityConstraintsClassId' );
$this->assertThrowsConstraintParameterException(
@@ -132,7 +132,7 @@
);
}
 
-   public function testParseClassParameterStringValue() {
+   public function testParseClassParameter_StringValue() {
$config = $this->getDefaultConfig();
$classId = $config->get( 'WBQualityConstraintsClassId' );
$this->assertThrowsConstraintParameterException(
@@ -163,7 +163,7 @@
$this->assertEquals( 'instance', $parsed );
}
 
-   public function testParseRelationParameterMissing() {
+   public function testParseRelationParameter_Missing() {
$this->assertThrowsConstraintParameterException(
'parseRelationParameter',
[ [], 'constraint' ],
@@ -171,7 +171,7 @@
);
}
 
-   public function testParseRelationParameterNoValue() {
+   public function testParseRelationParameter_NoValue() {
$config = $this->getDefaultConfig();
$relationId = $config->get( 'WBQualityConstraintsRelationId' );
$this->assertThrowsConstraintParameterException(
@@ -188,7 +188,7 @@
);
}
 
-   public function testParseRelationParameterStringValue() {
+   public function testParseRelationParameter_StringValue() {
$config = $this->getDefaultConfig();
$relationId = $config->get( 'WBQualityConstraintsRelationId' );
$this->assertThrowsConstraintParameterException(
@@ -208,7 +208,7 @@
);
}
 
-   public function testParseRelationParameterMultiValue() {
+   public function testParseRelationParameter_MultiValue() {
$config = $this->getDefaultConfig();
$relationId = $config->get( 'WBQualityConstraintsRelationId' );
$instanceOfId = $config->get( 
'WBQualityConstraintsInstanceOfRelationId' );
@@ -228,7 +228,7 @@
);
}
 
-   public function testParseRelationParameterWrongValue() {
+   public function testParseRelationParameter_WrongValue() {
$config = $this->getDefaultConfig();
$relationId = $config->get( 'WBQualityConstraintsRelationId' );
$this->assertThrowsConstraintParameterException(
@@ -253,7 +253,7 @@
$this->assertEquals( new PropertyId( 'P100' ), $parsed );
}
 
-   public function testParsePropertyParameterMissing() {
+   public function testParsePropertyParameter_Missing() {
$this->assertThrowsConstraintParameterException(
'parsePropertyParameter',
[ [], 'constraint' ],
@@ -261,7 +261,7 @@
);
}
 
-   public function testParsePropertyParameterNoValue() {
+   public function testParsePropertyParameter_NoValue() {
$config = $this->getDefaultConfig();
$propertyId = $config->get( 'WBQualityConstraintsPropertyId' );
$this->assertThrowsConstraintParameterException(
@@ -278,7 

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Improved debug logging.

[Cicalese (Code Review)]

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

Change subject: Improved debug logging.
..

Improved debug logging.

Change-Id: Iff8282cf78ac80cce7263c2a0a2bbf9276249575
---
M includes/PluggableAuth.php
M includes/PluggableAuthHooks.php
M includes/PluggableAuthLogin.php
M includes/PluggableAuthPrimaryAuthenticationProvider.php
4 files changed, 19 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth 
refs/changes/00/402100/1

diff --git a/includes/PluggableAuth.php b/includes/PluggableAuth.php
index 87ea991..8ecf4e4 100644
--- a/includes/PluggableAuth.php
+++ b/includes/PluggableAuth.php
@@ -36,7 +36,10 @@
 * @return PluggableAuth a PluggableAuth object
 */
public static function singleton() {
+   wfDebugLog( 'PluggableAuth', 'Getting PluggableAuth singleton' 
);
+   wfDebugLog( 'PluggableAuth', 'Class name: ' .  
$GLOBALS['wgPluggableAuth_Class'] );
if ( !is_null( self::$instance ) ) {
+   wfDebugLog( 'PluggableAuth', 'Singleton already exists' 
);
return self::$instance;
} elseif ( isset( $GLOBALS['wgPluggableAuth_Class'] ) &&
class_exists( $GLOBALS['wgPluggableAuth_Class'] ) &&
@@ -45,7 +48,7 @@
self::$instance = new $GLOBALS['wgPluggableAuth_Class'];
return self::$instance;
}
-   wfDebug( 'Could not get authentication plugin instance.' );
+   wfDebugLog( 'PluggableAuth', 'Could not get authentication 
plugin instance.' );
return false;
}
 }
diff --git a/includes/PluggableAuthHooks.php b/includes/PluggableAuthHooks.php
index 0683b45..ee1e977 100644
--- a/includes/PluggableAuthHooks.php
+++ b/includes/PluggableAuthHooks.php
@@ -89,12 +89,12 @@
if ( $old_user === false ) {
return;
}
-   wfDebug( 'Deauthenticating ' . $old_name );
+   wfDebugLog( 'PluggableAuth', 'Deauthenticating ' . $old_name );
$pluggableauth = PluggableAuth::singleton();
if ( $pluggableauth ) {
$pluggableauth->deauthenticate( $old_user );
}
-   wfDebug( 'Deauthenticated ' . $old_name );
+   wfDebugLog( 'PluggableAuth', 'Deauthenticated ' . $old_name );
}
 
/**
diff --git a/includes/PluggableAuthLogin.php b/includes/PluggableAuthLogin.php
index 833bb40..7d88107 100644
--- a/includes/PluggableAuthLogin.php
+++ b/includes/PluggableAuthLogin.php
@@ -21,6 +21,7 @@
 * @param string|null $param parameters (ignored)
 */
public function execute( $param ) {
+   wfDebugLog( 'PluggableAuth', 'In execute()' );
$authManager = AuthManager::singleton();
$user = $this->getUser();
$pluggableauth = PluggableAuth::singleton();
@@ -35,11 +36,11 @@
$user->mEmail = $email;
$user->mEmailAuthenticated = 
wfTimestamp();
$user->mTouched = wfTimestamp();
-   wfDebug( 'Authenticated new user: ' . 
$username );
+   wfDebugLog( 'PluggableAuth', 
'Authenticated new user: ' . $username );
} else {
$user->mId = $id;
$user->loadFromId();
-   wfDebug( 'Authenticated existing user: 
' . $user->mName );
+   wfDebugLog( 'PluggableAuth', 
'Authenticated existing user: ' . $user->mName );
}
Hooks::run( 'PluggableAuthPopulateGroups', [ 
$user ] );
$authorized = true;
@@ -51,20 +52,20 @@
self::REALNAME_SESSION_KEY, 
$realname );

$authManager->setAuthenticationSessionData(
self::EMAIL_SESSION_KEY, $email 
);
-   wfDebug( 'User is authorized.' );
+   wfDebugLog( 'PluggableAuth', 'User is 
authorized.' );
} else {
-   wfDebug( 'Authorization failure.' );
+   wfDebugLog( 'PluggableAuth', 
'Authorization failure.' );
$error = wfMessage( 
'pluggableauth-not-authorized', $username )->text();
}
} else {
-  

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update blacklist after 7c6e86d

[jenkins-bot (Code Review)]

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

Change subject: Update blacklist after 7c6e86d
..


Update blacklist after 7c6e86d

Change-Id: I5c374d2240a80c99f54b27786c3f1b2c14969e04
---
M tests/citeParserTests-blacklist.js
M tests/parserTests-blacklist.js
2 files changed, 23 insertions(+), 23 deletions(-)

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



diff --git a/tests/citeParserTests-blacklist.js 
b/tests/citeParserTests-blacklist.js
index 756199d..9a3491a 100644
--- a/tests/citeParserTests-blacklist.js
+++ b/tests/citeParserTests-blacklist.js
@@ -40,37 +40,37 @@
 
 // Blacklist for wt2html
 add("wt2html", "Simple , no ", "Wikipedia rocks![1]\n↑  Proceeds of Rockology, vol. XXI");
-add("wt2html", "Simple , with ", "Wikipedia rocks![1]\n\n↑  Proceeds of Rockology, vol. XXI");
-add("wt2html", " with a simple template", "Templating[1]\n\n↑  A
 simple template.");
-add("wt2html", " with a ", "Templating[1]\n\n↑  {{simple template}}");
+add("wt2html", "Simple , with ", "Wikipedia rocks![1]\n\n↑  Proceeds of Rockology, vol. XXI");
+add("wt2html", " with a simple template", "Templating[1]\n\n↑  A
 simple template.");
+add("wt2html", " with a ", "Templating[1]\n\n↑  {{simple template}}");
 add("wt2html", " in a ", "Templatingref>{{simple 
template}}/ref>\n\n");
 add("wt2html", " in a ", "Templating\n\n");
-add("wt2html", " in a  (bug 5384)", "Templating[1]\n\n↑  Text");
-add("wt2html", " after  (bug 6164)", "[1]\n\n\n\n\n\n↑  one");
+add("wt2html", " in a  (bug 5384)", "Templating[1]\n\n↑  Text");
+add("wt2html", " after  (bug 6164)", "[1]\n\n\n\n\n\n↑  one");
 add("wt2html", "{{REVISIONID}} on page with  (bug 6299)", "Parser
 function implementation for pf_revisionid missing in Parsoid.[1]\n↑  elite");
 add("wt2html", "{{REVISIONID}} on page without  (bug 6299 sanity check)", 
"Parser
 function implementation for pf_revisionid missing in Parsoid.");
-add("wt2html", "Ref with content followed by blank ref", "[1]\n\n[1]\n\n1 2 
 content");
-add("wt2html", "Blank ref followed by ref with content", "[1]\n\n[1]\n\n1 2 
 content");
-add("wt2html", "Regression: non-blank ref \"0\" followed by ref with content", 
"[1]\n\n[1]\n\n1 2 
 0");
-add("wt2html", "Regression sanity check: non-blank ref \"1\" followed by ref 
with content", "[1]\n\n[1]\n\n1 2 
 1");
-add("wt2html", "Ref names containing a number", "[1]\n[2]\n[3]\n\n↑  One↑  Two↑  Three");
-add("wt2html", "Erroneous refs", "[1]\n\n[2]\n\n[3]\n\n[4]\n\n[5]\n\n↑  Zero↑  Also zero, but differently! (Normal ref)↑  ↑  ↑  \n\n");
-add("wt2html", "Simple , with  in group", "Wikipedia rocks![1]\nWikipedia rocks![note 
1]\n\n↑  Proceeds of Rockology, vol. XXI\n↑  Proceeds of Rockology, vol. XXI");
+add("wt2html", "Ref with content followed by blank ref", "[1]\n\n[1]\n\n1 2 
 content");
+add("wt2html", "Blank ref followed by ref with content", "[1]\n\n[1]\n\n1 2 
 content");
+add("wt2html", "Regression: non-blank ref \"0\" followed by ref with content", 
"[1]\n\n[1]\n\n1 2 
 0");
+add("wt2html", "Regression sanity check: non-blank ref \"1\" followed by ref 
with content", "[1]\n\n[1]\n\n1 2 
 1");
+add("wt2html", "Ref names containing a number", "[1]\n[2]\n[3]\n\n↑  One↑  Two↑  Three");
+add("wt2html", "Erroneous refs", "[1]\n\n[2]\n\n[3]\n\n[4]\n\n[5]\n\n↑  Zero↑  Also zero, but differently! (Normal ref)↑  ↑  ↑  \n\n");
+add("wt2html", "Simple , with  in group", "Wikipedia rocks![1]\nWikipedia rocks![note 
1]\n\n↑  Proceeds of Rockology, vol. XXI\n↑  Proceeds of Rockology, vol. XXI");
 add("wt2html", "Simple , with  in group, with groupname in 
Chinese", "AAA[参 
1]BBB[注 
1]CCC[参 
2]\n\nrefs\n↑ 
 ref a↑ 
 ref c\nnotes\n↑ 
 note b");
 add("wt2html", " defined in ", "[1]\n\n↑  BAR");
 add("wt2html", " defined in  called with #tag", "[1]\n\n\n[1]\n\n1 2 
 BAR");
-add("wt2html", " defined in  error conditions", "[2 
1]\n\n↑ 
  BAR BAR BAR\n bad group");
-add("wt2html", " with custom group link with number names in Klingon", 
"Wikipedia rocks![klingon 
1]\n\n↑  Proceeds of Rockology, vol. XXI");
-add("wt2html", "Bug 31374 regression check: nested strip items", "note[1]\n\n↑  reference");
+add("wt2html", " defined in  error conditions", "[2 
1]\n\n↑ 
  BAR BAR BAR\n bad group");
+add("wt2html", " with custom group link with number names in Klingon", 
"Wikipedia rocks![klingon 
1]\n\n↑  Proceeds of Rockology, vol. XXI");
+add("wt2html", "Bug 31374 regression check: nested strip items", "note[1]\n\n↑  reference");
 add("wt2html", "Bug 13073 regression check: wrapped ", "[1]\n↑  foo\n");
 add("wt2html", " with no name and no content.", "Bla.[1]\n↑  ");
 add("wt2html", " with an empty-string name parameter and no content.", 
"Bla.[1]\n↑  ");
 add("wt2html", " with a non-empty name parameter and no content.", "Bla.[1]\n↑  ");
-add("wt2html", "s with the follow parameter", "Page one.[1]\n\nPage two.[2]\n\n References \n↑  

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Fix description

[Smalyshev (Code Review)]

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

Change subject: Fix description
..

Fix description

Change-Id: I107772888dd112e2d937e0e3cdf1231127ba15cd
---
M blazegraph/pom.xml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 091bfe5..1acffa8 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -10,6 +10,7 @@
 jar
 
 Blazegraph extension to improve performance for Wikibase
+Code that integrates into Blazegraph and implements custom 
functions, services and mappings for WDQS data types. 
 
 
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename TitleWidget#getTitle so it won't clash with TitledEle...

[Sbisson (Code Review)]

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

Change subject: Rename TitleWidget#getTitle so it won't clash with 
TitledElement#getTitle
..

Rename TitleWidget#getTitle so it won't clash with TitledElement#getTitle

Bug: T184181
Change-Id: I97ff46d8ca60f260af2a0b12e6c053aa91c777d1
---
M resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/402112/1

diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index a78ad82..98d07f3 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
@@ -131,7 +131,7 @@
value = 
mw.widgets.TitleInputWidget.parent.prototype.cleanUpValue.call( this, value );
 
return $.trimByteLength( this.value, value, this.maxLength, 
function ( value ) {
-   var title = widget.getTitle( value );
+   var title = widget.getMWTitle( value );
return title ? title.getMain() : value;
} ).newVal;
};
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 5670ce4..0c6385b 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -355,7 +355,7 @@
 * @param {string} [value] Value to get a title for
 * @return {mw.Title|null} Title object, or null if value is invalid
 */
-   mw.widgets.TitleWidget.prototype.getTitle = function ( value ) {
+   mw.widgets.TitleWidget.prototype.getMWTitle = function ( value ) {
var title = value !== undefined ? value : this.getQueryValue(),
// mw.Title doesn't handle null well
titleObj = mw.Title.newFromText( title, this.namespace 
!== null ? this.namespace : undefined );
@@ -369,7 +369,7 @@
 * @return {boolean} The query is valid
 */
mw.widgets.TitleWidget.prototype.isQueryValid = function () {
-   return this.validateTitle ? !!this.getTitle() : true;
+   return this.validateTitle ? !!this.getMWTitle() : true;
};
 
 }( jQuery, mediaWiki ) );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add tests for ApiFormatRaw

[jenkins-bot (Code Review)]

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

Change subject: Add tests for ApiFormatRaw
..


Add tests for ApiFormatRaw

Bug: T183767
Change-Id: I63ce42dd61f6e47f7278c436cad1e4f05e287b04
---
A tests/phpunit/includes/api/format/ApiFormatRawTest.php
1 file changed, 120 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/api/format/ApiFormatRawTest.php 
b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
new file mode 100644
index 000..0d3e63f
--- /dev/null
+++ b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
@@ -0,0 +1,120 @@
+ 'ApiFormatRaw',
+   'factory' => function ( ApiMain $main ) {
+   return new ApiFormatRaw( $main, new 
ApiFormatJson( $main, 'json' ) );
+   }
+   ];
+
+   return [
+   [
+   [ 'mime' => 'text/plain', 'text' => 'foo' ],
+   'foo',
+   [],
+   $options
+   ],
+   [
+   [ 'mime' => 'text/plain', 'text' => 'fóo' ],
+   'fóo',
+   [],
+   $options
+   ],
+   [
+   [ 'text' => 'some text' ],
+   new MWException( 'No MIME type set for raw 
formatter' ),
+   [],
+   $options
+   ],
+   [
+   [ 'mime' => 'text/plain' ],
+   new MWException( 'No text given for raw 
formatter' ),
+   [],
+   $options
+   ],
+   'test error fallback' => [
+   [ 'mime' => 'text/plain', 'text' => 'some 
text', 'error' => 'some error' ],
+   '{"mime":"text/plain","text":"some 
text","error":"some error"}',
+   [],
+   $options
+   ]
+   ];
+   }
+
+   /**
+* Test specifying filename
+*/
+   public function testFilename() {
+   $printer = new ApiFormatRaw( new ApiMain );
+   $printer->getResult()->addValue( null, 'filename', 
'whatever.raw' );
+   $this->assertSame( 'whatever.raw', $printer->getFilename() );
+   }
+
+   /**
+* Test specifying filename with error fallback printer
+*/
+   public function testErrorFallbackFilename() {
+   $apiMain = new ApiMain;
+   $printer = new ApiFormatRaw( $apiMain, new ApiFormatJson( 
$apiMain, 'json' ) );
+   $printer->getResult()->addValue( null, 'error', 'some error' );
+   $printer->getResult()->addValue( null, 'filename', 
'whatever.raw' );
+   $this->assertSame( 'api-result.json', $printer->getFilename() );
+   }
+
+   /**
+* Test specifying mime
+*/
+   public function testMime() {
+   $printer = new ApiFormatRaw( new ApiMain );
+   $printer->getResult()->addValue( null, 'mime', 'text/plain' );
+   $this->assertSame( 'text/plain', $printer->getMimeType() );
+   }
+
+   /**
+* Test specifying mime with error fallback printer
+*/
+   public function testErrorFallbackMime() {
+   $apiMain = new ApiMain;
+   $printer = new ApiFormatRaw( $apiMain, new ApiFormatJson( 
$apiMain, 'json' ) );
+   $printer->getResult()->addValue( null, 'error', 'some error' );
+   $printer->getResult()->addValue( null, 'mime', 'text/plain' );
+   $this->assertSame( 'application/json', $printer->getMimeType() 
);
+   }
+
+   /**
+* Check that setting failWithHTTPError to true will result in 400 
response status code
+*/
+   public function testFailWithHTTPError() {
+   $apiMain = null;
+
+   $this->testGeneralEncoding(
+   [ 'mime' => 'text/plain', 'text' => 'some text', 
'error' => 'some error' ],
+   '{"mime":"text/plain","text":"some text","error":"some 
error"}',
+   [],
+   [
+   'class' => 'ApiFormatRaw',
+   'factory' => function ( ApiMain $main ) use ( 
&$apiMain ) {
+   $apiMain = $main;
+   $printer = new 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated back-compat HtmlFormatter class

[jenkins-bot (Code Review)]

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

Change subject: Remove deprecated back-compat HtmlFormatter class
..


Remove deprecated back-compat HtmlFormatter class

Change-Id: I9325ae046997812c607e93896e108053edca76d5
---
M RELEASE-NOTES-1.31
M autoload.php
D includes/HtmlFormatter.php
3 files changed, 2 insertions(+), 26 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 4eb4c01..d18c5cf 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -161,6 +161,8 @@
 * The $statementsOnOwnLine parameter of JavaScriptMinifier::minify was removed.
   The corresponding configuration variable 
($wgResourceLoaderMinifierStatementsOnOwnLine)
   has been deprecated since 1.27 and was removed as well.
+* The HtmlFormatter class was removed (deprecated in 1.27). The namespaced
+  HtmlFormatter\HtmlFormatter class should be used instead.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/autoload.php b/autoload.php
index af0b200..351136d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -606,7 +606,6 @@
'Hooks' => __DIR__ . '/includes/Hooks.php',
'Html' => __DIR__ . '/includes/Html.php',
'HtmlArmor' => __DIR__ . '/includes/libs/HtmlArmor.php',
-   'HtmlFormatter' => __DIR__ . '/includes/HtmlFormatter.php',
'Http' => __DIR__ . '/includes/http/Http.php',
'HttpError' => __DIR__ . '/includes/exception/HttpError.php',
'HttpStatus' => __DIR__ . '/includes/libs/HttpStatus.php',
diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
deleted file mode 100644
index 9bae8b5..000
--- a/includes/HtmlFormatter.php
+++ /dev/null
@@ -1,25 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @deprecated since 1.27, use HtmlFormatter\HtmlFormatter
- */
-class HtmlFormatter extends HtmlFormatter\HtmlFormatter {
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9325ae046997812c607e93896e108053edca76d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Florianschmidtwelzow 
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]: Follow-up 6f07389ef2eb: fix variable name

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 6f07389ef2eb: fix variable name
..


Follow-up 6f07389ef2eb: fix variable name

Caused Notice: Undefined variable: text

Bug: T184123
Change-Id: I950a02134b145a2928af33995ca37a6965f265e4
---
M includes/parser/Parser.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b871735..f41ee01 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -5787,9 +5787,9 @@
global $wgFragmentMode;
if ( isset( $wgFragmentMode[1] ) && $wgFragmentMode[1] === 
'legacy' ) {
// ForAttribute() and ForLink() are the same for legacy 
encoding
-   $id = Sanitizer::escapeIdForAttribute( $text, 
Sanitizer::ID_FALLBACK );
+   $id = Sanitizer::escapeIdForAttribute( $sectionName, 
Sanitizer::ID_FALLBACK );
} else {
-   $id = Sanitizer::escapeIdForLink( $text );
+   $id = Sanitizer::escapeIdForLink( $sectionName );
}
 
return "#$id";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I950a02134b145a2928af33995ca37a6965f265e4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 
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] apps...wikipedia[master]: Follow-ups to correctly center text inside TextViews.

[jenkins-bot (Code Review)]

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

Change subject: Follow-ups to correctly center text inside TextViews.
..


Follow-ups to correctly center text inside TextViews.

Change-Id: I8c94c7100ba52a791adaa40524944c6d5c302547
---
M app/src/main/res/layout/date_picker_dialog.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/layout/fragment_on_this_day.xml
M app/src/main/res/layout/fragment_onboarding_pager.xml
M app/src/main/res/layout/fragment_search.xml
M app/src/main/res/layout/fragment_search_recent.xml
M app/src/main/res/layout/view_custom_calendar_day.xml
M app/src/main/res/layout/view_description_edit_success.xml
M app/src/main/res/layout/view_link_preview_overlay.xml
M app/src/main/res/layout/view_onboarding_page.xml
M app/src/main/res/layout/view_wiki_error.xml
M app/src/main/res/values/styles.xml
12 files changed, 26 insertions(+), 7 deletions(-)

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



diff --git a/app/src/main/res/layout/date_picker_dialog.xml 
b/app/src/main/res/layout/date_picker_dialog.xml
index a50cbc3..949b5ac 100644
--- a/app/src/main/res/layout/date_picker_dialog.xml
+++ b/app/src/main/res/layout/date_picker_dialog.xml
@@ -69,6 +69,7 @@
 android:layout_weight="1"
 android:fontFamily="sans-serif-medium"
 android:gravity="center"
+style="@style/TextViewCentered"
 android:layout_gravity="center_vertical"
 android:text=""
 android:textColor="?attr/primary_text_color"
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml 
b/app/src/main/res/layout/fragment_local_compilations.xml
index 304f59a..d032a8c 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -87,6 +87,7 @@
 
android:layout_marginLeft="@dimen/activity_horizontal_margin"
 
android:layout_marginRight="@dimen/activity_horizontal_margin"
 style="@style/MaterialMediumSecondaryCaption"
+android:textAlignment="viewStart"
 android:textSize="12sp"
 android:lineSpacingExtra="4sp"
 android:text="@string/offline_library_packs_hint"/>
@@ -99,6 +100,7 @@
 
android:layout_marginLeft="@dimen/activity_horizontal_margin"
 
android:layout_marginRight="@dimen/activity_horizontal_margin"
 style="@style/MaterialMediumSecondaryCaption"
+android:textAlignment="viewStart"
 android:textSize="12sp"
 android:lineSpacingExtra="4sp"
 android:text="@string/offline_library_data_usage_hint"/>
diff --git a/app/src/main/res/layout/fragment_on_this_day.xml 
b/app/src/main/res/layout/fragment_on_this_day.xml
index eb62b03..871aea5 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -154,7 +154,7 @@
 android:layout_height="10dp"
 android:layout_marginStart="6dp"
 android:layout_marginTop="8dp"
-android:gravity="center"
+style="@style/TextViewCentered"
 android:textColor="@color/base100"
 android:textSize="8sp"
 tools:text="12" />
diff --git a/app/src/main/res/layout/fragment_onboarding_pager.xml 
b/app/src/main/res/layout/fragment_onboarding_pager.xml
index 040c7bb..2733a87 100644
--- a/app/src/main/res/layout/fragment_onboarding_pager.xml
+++ b/app/src/main/res/layout/fragment_onboarding_pager.xml
@@ -31,6 +31,7 @@
 
 
 
diff --git a/app/src/main/res/layout/fragment_search_recent.xml 
b/app/src/main/res/layout/fragment_search_recent.xml
index 263d39b..b77454c 100644
--- a/app/src/main/res/layout/fragment_search_recent.xml
+++ b/app/src/main/res/layout/fragment_search_recent.xml
@@ -31,7 +31,6 @@
 android:layout_marginTop="32dp"
 android:layout_marginLeft="30dp"
 android:layout_marginRight="30dp"
-android:gravity="center"
 android:text="@string/search_empty_message"
 style="@style/MaterialMediumSecondaryCaption"/>
 
diff --git a/app/src/main/res/layout/view_custom_calendar_day.xml 
b/app/src/main/res/layout/view_custom_calendar_day.xml
index a85c4c5..4cc003c 100644
--- a/app/src/main/res/layout/view_custom_calendar_day.xml
+++ b/app/src/main/res/layout/view_custom_calendar_day.xml
@@ -17,7 +17,7 @@
 android:id="@+id/custom_day"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: auto reload log4j2 configuration

[Gehel (Code Review)]

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

Change subject: elasticsearch: auto reload log4j2 configuration
..


elasticsearch: auto reload log4j2 configuration

At the moment, we need a full cluster restart to reload simple changes in
logging configuration. Log4j2 has a mechanism to autoreload the
configuration with very minimal performance impact. Let's use it.

Change-Id: I94fa19375ba13ee4a041f3a3fe65628416b8139d
---
M modules/elasticsearch/templates/log4j2.properties.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/elasticsearch/templates/log4j2.properties.erb 
b/modules/elasticsearch/templates/log4j2.properties.erb
index e079d12..7230945 100644
--- a/modules/elasticsearch/templates/log4j2.properties.erb
+++ b/modules/elasticsearch/templates/log4j2.properties.erb
@@ -1,4 +1,4 @@
-
+monitorInterval=600
 rootLogger.level = info
 rootLogger.appenderRef.file.ref = file
 <% if @send_logs_to_logstash %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94fa19375ba13ee4a041f3a3fe65628416b8139d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
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]: A/PTR for civicrm-eqiad.wm.o at 208.80.152.232, remove depre...

[Jgreen (Code Review)]

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

Change subject: A/PTR for civicrm-eqiad.wm.o at 208.80.152.232, remove 
deprecated frdev hostnames
..

A/PTR for civicrm-eqiad.wm.o at 208.80.152.232, remove deprecated frdev 
hostnames

Change-Id: I276bdfc185cbb455f1c6b9c469ba347a922a01c3
---
M templates/152.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index 6370334..0890f12 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -18,7 +18,7 @@
 229 1H IN PTR   frack-payments-nat-codfw.wikimedia.org.
 230 1H IN PTR   frack-default-nat-codfw.wikimedia.org.
 231 1H IN PTR   rigel.wikimedia.org.
-232 1H IN PTR   civicrm.wikimedia.org.
+232 1H IN PTR   civicrm-codfw.wikimedia.org.
 233 1H IN PTR   payments-listener-codfw.wikimedia.org.
 234 1H IN PTR   fundraising-codfw.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 0135e9f..8ce2232 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -750,8 +750,7 @@
 civicrm  1H  IN MX   10 mx1001
 civicrm  1H  IN MX   50 mx2001
 civicrm.frdev1H  IN CNAMEfrdev-eqiad
-civicrm-gr.frdev 1H  IN CNAMEfrdev-eqiad
-civicrm2-gr.frdev 1H IN CNAMEfrdev-eqiad
+civicrm-codfw1H  IN A208.80.152.232
 coffee   600 IN DYNA geoip!text-addrs
 cs   600 IN DYNA geoip!text-addrs
 cz   600 IN DYNA geoip!text-addrs

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add ordering between script and its execution

[jenkins-bot (Code Review)]

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

Change subject: Add ordering between script and its execution
..


Add ordering between script and its execution

Bug: T183605
Change-Id: Iab45464609aa4e763d0311d28b8314f991b04375
---
M puppet/modules/wikilabels/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/wikilabels/manifests/init.pp 
b/puppet/modules/wikilabels/manifests/init.pp
index e00556d..76a646c 100644
--- a/puppet/modules/wikilabels/manifests/init.pp
+++ b/puppet/modules/wikilabels/manifests/init.pp
@@ -67,6 +67,7 @@
 unless  => "psql -lqt | cut -d \\| -f 1 | grep -qw ${db_name}",
 user=> 'postgres',
 require => [
+  File[$db_script],
   Package['postgresql'],
   VirtualEnv::Package['wikilabels'],
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab45464609aa4e763d0311d28b8314f991b04375
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Gergő Tisza 
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]: pcc: Python3 compatibility

[BryanDavis (Code Review)]

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

Change subject: pcc: Python3 compatibility
..

pcc: Python3 compatibility

Make pcc work with python3 (it's the future!) while still keeping
python2 support for those poor folks for whom `/usr/bin/env python` is
still python2.

Change-Id: Ic0df42ea526ae05b86f238597653496080b05a9e
---
M utils/pcc
1 file changed, 17 insertions(+), 8 deletions(-)


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

diff --git a/utils/pcc b/utils/pcc
index 6e77b47..1afd2a0 100755
--- a/utils/pcc
+++ b/utils/pcc
@@ -30,9 +30,14 @@
   Licensed under the Apache license.
 
 """
+from __future__ import print_function
+
 import sys
-reload(sys)
-sys.setdefaultencoding('utf-8')
+try:
+reload(sys)
+sys.setdefaultencoding('utf-8')
+except NameError:
+pass  # python3 FTW
 
 import argparse
 import json
@@ -41,7 +46,11 @@
 import subprocess
 import textwrap
 import time
-import urllib2
+
+try:
+import urllib2
+except ImportError:
+import urllib.request as urllib2
 
 try:
 import jenkinsapi
@@ -125,7 +134,7 @@
 password=args.api_token
 )
 
-print yellow('Compiling %(change)s on node(s) %(nodes)s...' % vars(args))
+print(yellow('Compiling %(change)s on node(s) %(nodes)s...' % vars(args)))
 
 job = jenkins.get_job('operations-puppet-catalog-compiler')
 build_params = {
@@ -145,7 +154,7 @@
 
 build = invocation.get_build()
 
-print 'Your build URL is %s' % white(build.baseurl)
+print('Your build URL is %s' % white(build.baseurl))
 
 running = True
 output = ''
@@ -153,7 +162,7 @@
 time.sleep(1)
 running = invocation.is_running()
 new_output = build.get_console().rstrip('\n')
-print format_console_output(new_output[len(output):]),
+print(format_console_output(new_output[len(output):]),)
 output = new_output
 
 # Puppet's exit code is not always meaningful, so we grep the output
@@ -161,8 +170,8 @@
 ok = ('Run finished' in output and not
   re.search(r'[1-9]\d* (ERROR|FAIL)', output))
 if ok:
-print green('SUCCESS')
+print(green('SUCCESS'))
 sys.exit(0)
 else:
-print red('FAIL')
+print(red('FAIL'))
 sys.exit(1)

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

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

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

[MediaWiki-commits] [Gerrit] analytics...source[master]: Update changelog to v0.0.57 before deploy

[jenkins-bot (Code Review)]

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

Change subject: Update changelog to v0.0.57 before deploy
..


Update changelog to v0.0.57 before deploy

Change-Id: I65ddc0769242af888d285717a2e466f3237cf881
---
M changelog.md
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/changelog.md b/changelog.md
index 9f04404..7c7a89b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+## v0.0.57
+* Add new package refinery-job-spark-2.1
+* Add spark-streaming job for banner-activity
+
 ## v0.0.56
 * JsonRefine improvements:
 ** Use _REFINE_FAILED flag to indicate previous failure, so we don't

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65ddc0769242af888d285717a2e466f3237cf881
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal 
Gerrit-Reviewer: Fdans 
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] mediawiki...deploy[master]: Update mobileapps to a4ba9fd

[jenkins-bot (Code Review)]

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

Change subject: Update mobileapps to a4ba9fd
..


Update mobileapps to a4ba9fd

List of changes:
29fd37f References: add specific version number
6c7479e References: back_link as object
aa6af69 Fix CI
6f2ae66 Automatically end announcements after configured endTime
f9868c0 News: don't include empty stories
6e8fe5c Media: Mark items in MW galleries with gallery IDs
8eb90cc Media: Add video derivative sizes
ecfe7e9 random: fail early when MW API response has no query.pages
022c7a6 References: citation type
xxx Update node module dependencies

Change-Id: I67c62d7bcd225b43900b047f1cb23323939e64a6
---
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/dist/nodent.min.js
M node_modules/ajv/dist/regenerator.min.js
M node_modules/ajv/lib/ajv.d.ts
M node_modules/ajv/package.json
M node_modules/kad/package.json
M node_modules/moment/locale/af.js
M node_modules/moment/locale/ar-dz.js
M node_modules/moment/locale/ar-kw.js
M node_modules/moment/locale/ar-ly.js
M node_modules/moment/locale/ar-ma.js
M node_modules/moment/locale/ar-sa.js
M node_modules/moment/locale/ar-tn.js
M node_modules/moment/locale/ar.js
M node_modules/moment/locale/az.js
M node_modules/moment/locale/be.js
M node_modules/moment/locale/bg.js
M node_modules/moment/locale/bm.js
M node_modules/moment/locale/bn.js
M node_modules/moment/locale/bo.js
M node_modules/moment/locale/br.js
M node_modules/moment/locale/bs.js
M node_modules/moment/locale/ca.js
M node_modules/moment/locale/cs.js
M node_modules/moment/locale/cv.js
M node_modules/moment/locale/cy.js
M node_modules/moment/locale/da.js
M node_modules/moment/locale/de-at.js
M node_modules/moment/locale/de-ch.js
M node_modules/moment/locale/de.js
M node_modules/moment/locale/dv.js
M node_modules/moment/locale/el.js
M node_modules/moment/locale/en-au.js
M node_modules/moment/locale/en-ca.js
M node_modules/moment/locale/en-gb.js
M node_modules/moment/locale/en-ie.js
M node_modules/moment/locale/en-nz.js
M node_modules/moment/locale/eo.js
M node_modules/moment/locale/es-do.js
M node_modules/moment/locale/es-us.js
M node_modules/moment/locale/es.js
M node_modules/moment/locale/et.js
M node_modules/moment/locale/eu.js
M node_modules/moment/locale/fa.js
M node_modules/moment/locale/fi.js
M node_modules/moment/locale/fo.js
M node_modules/moment/locale/fr-ca.js
M node_modules/moment/locale/fr-ch.js
M node_modules/moment/locale/fr.js
M node_modules/moment/locale/fy.js
M node_modules/moment/locale/gd.js
M node_modules/moment/locale/gl.js
M node_modules/moment/locale/gom-latn.js
M node_modules/moment/locale/gu.js
M node_modules/moment/locale/he.js
M node_modules/moment/locale/hi.js
M node_modules/moment/locale/hr.js
M node_modules/moment/locale/hu.js
M node_modules/moment/locale/hy-am.js
M node_modules/moment/locale/id.js
M node_modules/moment/locale/is.js
M node_modules/moment/locale/it.js
M node_modules/moment/locale/ja.js
M node_modules/moment/locale/jv.js
M node_modules/moment/locale/ka.js
M node_modules/moment/locale/kk.js
M node_modules/moment/locale/km.js
M node_modules/moment/locale/kn.js
M node_modules/moment/locale/ky.js
M node_modules/moment/locale/lb.js
M node_modules/moment/locale/lo.js
M node_modules/moment/locale/lt.js
M node_modules/moment/locale/lv.js
M node_modules/moment/locale/me.js
M node_modules/moment/locale/mi.js
M node_modules/moment/locale/mk.js
M node_modules/moment/locale/ml.js
M node_modules/moment/locale/mr.js
M node_modules/moment/locale/ms-my.js
M node_modules/moment/locale/ms.js
A node_modules/moment/locale/mt.js
M node_modules/moment/locale/my.js
M node_modules/moment/locale/nb.js
M node_modules/moment/locale/ne.js
M node_modules/moment/locale/nl-be.js
M node_modules/moment/locale/nl.js
M node_modules/moment/locale/nn.js
M node_modules/moment/locale/pa-in.js
M node_modules/moment/locale/pl.js
M node_modules/moment/locale/pt.js
M node_modules/moment/locale/ro.js
M node_modules/moment/locale/ru.js
M node_modules/moment/locale/sd.js
M node_modules/moment/locale/se.js
M node_modules/moment/locale/si.js
M node_modules/moment/locale/sk.js
M node_modules/moment/locale/sl.js
M node_modules/moment/locale/sq.js
M node_modules/moment/locale/sr-cyrl.js
M node_modules/moment/locale/sr.js
M node_modules/moment/locale/ss.js
M node_modules/moment/locale/sv.js
M node_modules/moment/locale/sw.js
M node_modules/moment/locale/ta.js
M node_modules/moment/locale/te.js
M node_modules/moment/locale/tet.js
M node_modules/moment/locale/th.js
M node_modules/moment/locale/tl-ph.js
M node_modules/moment/locale/tlh.js
M node_modules/moment/locale/tr.js
M node_modules/moment/locale/tzl.js
M node_modules/moment/locale/tzm-latn.js
M node_modules/moment/locale/tzm.js
M node_modules/moment/locale/uk.js
M node_modules/moment/locale/ur.js
M node_modules/moment/locale/uz-latn.js
M 

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Handle CheckMatrix fields

[jenkins-bot (Code Review)]

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

Change subject: Handle CheckMatrix fields
..


Handle CheckMatrix fields

Bug: T172585
Change-Id: Ic862cc69f8d6a3703fecd86510c79766c4d1c4d5
---
M includes/GlobalPreferencesFactory.php
M includes/Hooks.php
M resources/ext.GlobalPreferences.special.js
3 files changed, 22 insertions(+), 8 deletions(-)

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



diff --git a/includes/GlobalPreferencesFactory.php 
b/includes/GlobalPreferencesFactory.php
index edc1b90..06db523 100644
--- a/includes/GlobalPreferencesFactory.php
+++ b/includes/GlobalPreferencesFactory.php
@@ -69,6 +69,7 @@
'CirrusSearch\HTMLCompletionProfileSettings',
'NewHTMLCheckField',
'HTMLFeatureField',
+   'HTMLCheckMatrix',
];
 
/**
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 7f04f90..bd2dd72 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -82,16 +82,26 @@
 
$prefs = [];
foreach ( $formData as $name => $value ) {
+   // If this is the '-global' counterpart of a preference.
if ( substr( $name, -strlen( 'global' ) ) === 'global' 
&& $value === true ) {
+   // Determine the real name of the preference.
$realName = substr( $name, 0, -strlen( 
'-global' ) );
if ( isset( $formData[$realName] ) ) {
+   // Store normal preference values.
$prefs[$realName] = 
$formData[$realName];
+
} else {
-   // FIXME: Handle checkbox matrixes 
properly
-   /*
-   var_dump($realName);
-   var_dump($name);
-   */
+   // If the real-named preference isn't 
set, this must be a CheckMatrix value
+   // where the preference names are of 
the form "$realName-$column-$row"
+   // (we also have to remove the 
"$realName-global" entry).
+   $checkMatrix = preg_grep( 
"/^$realName/", array_keys( $formData ) );
+   unset( $checkMatrix[ array_search( 
$name, $checkMatrix ) ] );
+   $checkMatrixVals = array_intersect_key( 
$formData, array_flip( $checkMatrix ) );
+   $prefs = array_merge( $prefs, 
$checkMatrixVals );
+   // Also store a global $realName 
preference for benefit of the the
+   // 'globalize-this' checkbox.
+   $prefs[ $realName ] = true;
+
}
}
}
diff --git a/resources/ext.GlobalPreferences.special.js 
b/resources/ext.GlobalPreferences.special.js
index ed1d045..d736fa5 100644
--- a/resources/ext.GlobalPreferences.special.js
+++ b/resources/ext.GlobalPreferences.special.js
@@ -25,12 +25,15 @@
$rows,
 
// The current preference's inputs (can be multiple, 
and not all will have the same name).
-   $inputs = $( ':input[name="' + name + '"]' ).parents( 
'.mw-input' ).find( ':input' );
+   $inputs = $( ':input[name="' + name + '"], 
:input[name="' + name + '[]"]' )
+   .parents( '.mw-input' )
+   .find( ':input' )
+   .not( '.checkmatrix-forced' );
 
-   // All the labels for this preference (not all have for='').
+   // All the labels for this preference (not all have for='' nor 
are even labels).
$labels = $inputs
.closest( fieldSelector )
-   .find( 'label' )
+   .find( 'label, td' )
.not( '[for$="-global"]' );
 
// Collect the related rows. The main field row is sometimes 
followed by a help-tip row.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic862cc69f8d6a3703fecd86510c79766c4d1c4d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Improved debug logging.

[jenkins-bot (Code Review)]

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

Change subject: Improved debug logging.
..


Improved debug logging.

Change-Id: Iff8282cf78ac80cce7263c2a0a2bbf9276249575
---
M includes/PluggableAuth.php
M includes/PluggableAuthHooks.php
M includes/PluggableAuthLogin.php
M includes/PluggableAuthPrimaryAuthenticationProvider.php
4 files changed, 19 insertions(+), 15 deletions(-)

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



diff --git a/includes/PluggableAuth.php b/includes/PluggableAuth.php
index 87ea991..8ecf4e4 100644
--- a/includes/PluggableAuth.php
+++ b/includes/PluggableAuth.php
@@ -36,7 +36,10 @@
 * @return PluggableAuth a PluggableAuth object
 */
public static function singleton() {
+   wfDebugLog( 'PluggableAuth', 'Getting PluggableAuth singleton' 
);
+   wfDebugLog( 'PluggableAuth', 'Class name: ' .  
$GLOBALS['wgPluggableAuth_Class'] );
if ( !is_null( self::$instance ) ) {
+   wfDebugLog( 'PluggableAuth', 'Singleton already exists' 
);
return self::$instance;
} elseif ( isset( $GLOBALS['wgPluggableAuth_Class'] ) &&
class_exists( $GLOBALS['wgPluggableAuth_Class'] ) &&
@@ -45,7 +48,7 @@
self::$instance = new $GLOBALS['wgPluggableAuth_Class'];
return self::$instance;
}
-   wfDebug( 'Could not get authentication plugin instance.' );
+   wfDebugLog( 'PluggableAuth', 'Could not get authentication 
plugin instance.' );
return false;
}
 }
diff --git a/includes/PluggableAuthHooks.php b/includes/PluggableAuthHooks.php
index 0683b45..ee1e977 100644
--- a/includes/PluggableAuthHooks.php
+++ b/includes/PluggableAuthHooks.php
@@ -89,12 +89,12 @@
if ( $old_user === false ) {
return;
}
-   wfDebug( 'Deauthenticating ' . $old_name );
+   wfDebugLog( 'PluggableAuth', 'Deauthenticating ' . $old_name );
$pluggableauth = PluggableAuth::singleton();
if ( $pluggableauth ) {
$pluggableauth->deauthenticate( $old_user );
}
-   wfDebug( 'Deauthenticated ' . $old_name );
+   wfDebugLog( 'PluggableAuth', 'Deauthenticated ' . $old_name );
}
 
/**
diff --git a/includes/PluggableAuthLogin.php b/includes/PluggableAuthLogin.php
index 833bb40..7d88107 100644
--- a/includes/PluggableAuthLogin.php
+++ b/includes/PluggableAuthLogin.php
@@ -21,6 +21,7 @@
 * @param string|null $param parameters (ignored)
 */
public function execute( $param ) {
+   wfDebugLog( 'PluggableAuth', 'In execute()' );
$authManager = AuthManager::singleton();
$user = $this->getUser();
$pluggableauth = PluggableAuth::singleton();
@@ -35,11 +36,11 @@
$user->mEmail = $email;
$user->mEmailAuthenticated = 
wfTimestamp();
$user->mTouched = wfTimestamp();
-   wfDebug( 'Authenticated new user: ' . 
$username );
+   wfDebugLog( 'PluggableAuth', 
'Authenticated new user: ' . $username );
} else {
$user->mId = $id;
$user->loadFromId();
-   wfDebug( 'Authenticated existing user: 
' . $user->mName );
+   wfDebugLog( 'PluggableAuth', 
'Authenticated existing user: ' . $user->mName );
}
Hooks::run( 'PluggableAuthPopulateGroups', [ 
$user ] );
$authorized = true;
@@ -51,20 +52,20 @@
self::REALNAME_SESSION_KEY, 
$realname );

$authManager->setAuthenticationSessionData(
self::EMAIL_SESSION_KEY, $email 
);
-   wfDebug( 'User is authorized.' );
+   wfDebugLog( 'PluggableAuth', 'User is 
authorized.' );
} else {
-   wfDebug( 'Authorization failure.' );
+   wfDebugLog( 'PluggableAuth', 
'Authorization failure.' );
$error = wfMessage( 
'pluggableauth-not-authorized', $username )->text();
}
} else {
-   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add some @noinspection flags to doPostOutputShutdown()

[jenkins-bot (Code Review)]

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

Change subject: Add some @noinspection flags to doPostOutputShutdown()
..


Add some @noinspection flags to doPostOutputShutdown()

This are in "use" clause of $callback, by reference

Change-Id: Iadb1d25263dbafe2bd12223db62e1c93e2188bde
---
M includes/MediaWiki.php
1 file changed, 2 insertions(+), 0 deletions(-)

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

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



diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 9e3bc10..2aeefc6 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -726,10 +726,12 @@
if ( function_exists( 'register_postsend_function' ) ) {
// https://github.com/facebook/hhvm/issues/1230
register_postsend_function( $callback );
+   /** @noinspection PhpUnusedLocalVariableInspection */
$blocksHttpClient = false;
} else {
if ( function_exists( 'fastcgi_finish_request' ) ) {
fastcgi_finish_request();
+   /** @noinspection 
PhpUnusedLocalVariableInspection */
$blocksHttpClient = false;
} else {
// Either all DB and deferred updates should 
happen or none.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadb1d25263dbafe2bd12223db62e1c93e2188bde
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Krinkle 
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...parsoid[master]: Avoid expanding multiline sol transparent template ranges un...

[jenkins-bot (Code Review)]

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

Change subject: Avoid expanding multiline sol transparent template ranges 
unnecessarily
..


Avoid expanding multiline sol transparent template ranges unnecessarily

Follow up to 4d7a25b, where reaching the eol with unmatched meta markers
was unaccounted for.

Fixes all the regressions at,
https://parsoid-rt-tests.wikimedia.org/regressions/between/28d7734fa2385a8fa599e3ce1bfbcd8582c05bc4/5abd780336c54c0fcd8fd953588085fe505bf455

Change-Id: Iaf63202349380c7e1b4c2e6d0a768c49301b1869
---
M lib/wt2html/tt/ParagraphWrapper.js
M tests/parserTests.txt
2 files changed, 27 insertions(+), 2 deletions(-)

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



diff --git a/lib/wt2html/tt/ParagraphWrapper.js 
b/lib/wt2html/tt/ParagraphWrapper.js
index a0483ed..6f84534 100644
--- a/lib/wt2html/tt/ParagraphWrapper.js
+++ b/lib/wt2html/tt/ParagraphWrapper.js
@@ -236,10 +236,10 @@
// Not a transclusion meta; Check for 
nl/sol-transparent tokens
// and leave them out of the p-wrapping.
if (!Util.isSolTransparent(this.env, t) && 
t.constructor !== NlTk) {
-   if (tplStartIndex > -1) { i = tplStartIndex; }
break;
}
}
+   if (tplStartIndex > -1) { i = tplStartIndex; }
out.splice(i, 0, new TagTk('p'));
this.hasOpenPTag = true;
}
@@ -270,10 +270,10 @@
// Not a transclusion meta; Check for 
nl/sol-transparent tokens
// and leave them out of the p-wrapping.
if (!Util.isSolTransparent(this.env, t) && 
t.constructor !== NlTk) {
-   if (tplEndIndex > -1) { i = tplEndIndex; }
break;
}
}
+   if (tplEndIndex > -1) { i = tplEndIndex; }
out.splice(i + 1, 0, new EndTagTk('p'));
this.hasOpenPTag = false;
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 05bc36b..afbd6d6 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -2149,6 +2149,31 @@
 
 !! end
 
+!! test
+Avoid expanding multiline sol transparent template ranges unnecessarily
+!! wikitext
+hi
+
+
+{{echo|
+}}
+
+[[Category:Ho]]
+!! html/php
+hi
+
+
+
+!! html/parsoid
+hi
+
+
+
+
+
+
+!! end
+
 ###
 ### Preformatted text
 ###

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf63202349380c7e1b4c2e6d0a768c49301b1869
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TitleBlacklist[wmf/1.31.0-wmf.15]: TitleBlacklistPreAuthenticationProvider: Add null assert

[20after4 (Code Review)]

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402120 )

Change subject: TitleBlacklistPreAuthenticationProvider: Add null assert
..

TitleBlacklistPreAuthenticationProvider: Add null assert

$req can legitimately be null, so we need to add
null to the assert as well, so the code doesn't
stop immediately.

This is a follow-up for I83f9374b2f3236097860f4aecc694326b891905b

Change-Id: I85dbc1b4c1452d0671879e6cc02c5411090b1d1d
---
M TitleBlacklistPreAuthenticationProvider.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist 
refs/changes/20/402120/1

diff --git a/TitleBlacklistPreAuthenticationProvider.php 
b/TitleBlacklistPreAuthenticationProvider.php
index aaea018..8c737ba 100644
--- a/TitleBlacklistPreAuthenticationProvider.php
+++ b/TitleBlacklistPreAuthenticationProvider.php
@@ -34,9 +34,13 @@
$req = AuthenticationRequest::getRequestByClass( $reqs,
TitleBlacklistAuthenticationRequest::class );
// For phan check, to ensure that $req is instance of 
\TitleBlacklistAuthenticationRequest
-   assert( $req instanceof TitleBlacklistAuthenticationRequest );
+   // or null
+   if ( $req instanceof TitleBlacklistAuthenticationRequest ) {
+   $override = $req->ignoreTitleBlacklist;
+   } else {
+   $override = false;
+   }
 
-   $override = $req && $req->ignoreTitleBlacklist;
return TitleBlacklistHooks::testUserName( $user->getName(), 
$creator, $override, true );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85dbc1b4c1452d0671879e6cc02c5411090b1d1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] mediawiki...TitleBlacklist[wmf/1.31.0-wmf.15]: TitleBlacklistPreAuthenticationProvider: Add null assert

[jenkins-bot (Code Review)]

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

Change subject: TitleBlacklistPreAuthenticationProvider: Add null assert
..


TitleBlacklistPreAuthenticationProvider: Add null assert

$req can legitimately be null, so we need to add
null to the assert as well, so the code doesn't
stop immediately.

This is a follow-up for I83f9374b2f3236097860f4aecc694326b891905b

Change-Id: I85dbc1b4c1452d0671879e6cc02c5411090b1d1d
---
M TitleBlacklistPreAuthenticationProvider.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/TitleBlacklistPreAuthenticationProvider.php 
b/TitleBlacklistPreAuthenticationProvider.php
index aaea018..8c737ba 100644
--- a/TitleBlacklistPreAuthenticationProvider.php
+++ b/TitleBlacklistPreAuthenticationProvider.php
@@ -34,9 +34,13 @@
$req = AuthenticationRequest::getRequestByClass( $reqs,
TitleBlacklistAuthenticationRequest::class );
// For phan check, to ensure that $req is instance of 
\TitleBlacklistAuthenticationRequest
-   assert( $req instanceof TitleBlacklistAuthenticationRequest );
+   // or null
+   if ( $req instanceof TitleBlacklistAuthenticationRequest ) {
+   $override = $req->ignoreTitleBlacklist;
+   } else {
+   $override = false;
+   }
 
-   $override = $req && $req->ignoreTitleBlacklist;
return TitleBlacklistHooks::testUserName( $user->getName(), 
$creator, $override, true );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85dbc1b4c1452d0671879e6cc02c5411090b1d1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Jackmcbarn 
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]: Added Minus-X Support

[Ryan10145 (Code Review)]

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

Change subject: Added Minus-X Support
..

Added Minus-X Support

Bug: T175794
Change-Id: Ia94b3e832ff21f9f76bd63924bf289cd2afdefbc
---
A .minus-x.json
M composer.json
2 files changed, 26 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/402166/1

diff --git a/.minus-x.json b/.minus-x.json
new file mode 100644
index 000..3f725d8
--- /dev/null
+++ b/.minus-x.json
@@ -0,0 +1,19 @@
+{
+"ignore": [
+"./maintenance/dev/install.sh",
+"./maintenance/dev/installmw.sh",
+"./maintenance/dev/installphp.sh",
+"./maintenance/dev/start.sh",
+"./maintenance/hhvm/run-server",
+"./maintenance/language/zhtable/Makefile.py",
+"./maintenance/mwjsduck-gen",
+"./maintenance/postgres/compare_schemas.pl",
+"./maintenance/postgres/mediawiki_mysql2postgres.pl",
+"./maintenance/resources/update-oojs-ui.sh",
+"./maintenance/resources/update-oojs.sh",
+"./maintenance/storage/make-blobs",
+"./maintenance/update.php",
+"./tests/phan/bin/phan",
+"./tests/phpunit/phpunit.php",
+]
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index d92ffc9..926d0eb 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,7 @@
"jetbrains/phpstorm-stubs": 
"dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
"justinrainbow/json-schema": "~5.2",
"mediawiki/mediawiki-codesniffer": "15.0.0",
+   "mediawiki/minus-x": "0.2.1",
"monolog/monolog": "~1.22.1",
"nikic/php-parser": "3.1.3",
"nmred/kafka-php": "0.1.5",
@@ -95,14 +96,18 @@
"scripts": {
"lint": "parallel-lint --exclude vendor",
"phpcs": "phpcs -p -s",
-   "fix": "phpcbf",
+   "fix": [
+   "phpcbf",
+   "minus-x fix ."
+   ],
"pre-install-cmd": "ComposerHookHandler::onPreInstall",
"pre-update-cmd": "ComposerHookHandler::onPreUpdate",
"post-install-cmd": "ComposerVendorHtaccessCreator::onEvent",
"post-update-cmd": "ComposerVendorHtaccessCreator::onEvent",
"test": [
"composer lint",
-   "composer phpcs"
+   "composer phpcs",
+   "minus-x check ."
]
},
"config": {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserPreferences[master]: Added Minus-X Support

[Ryan10145 (Code Review)]

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

Change subject: Added Minus-X Support
..

Added Minus-X Support

Bug: T175794
Change-Id: I49c1f6fd572c6abb8da4f84cd04fc1ea47b44c6b
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/composer.json b/composer.json
index 18e53fb..ed52e4d 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,8 @@
"description": "Renders the BlueSpice tab in preferences",
"license": "GPL-3.0",
"require": {
-   "composer/installers": "~1.0"
+   "composer/installers": "~1.0",
+   "mediawiki/minus-x": "0.2.1"
},
"autoload": {
"psr-4": {
@@ -16,7 +17,11 @@
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49c1f6fd572c6abb8da4f84cd04fc1ea47b44c6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceUserPreferences
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undeploy EducationProgram from test2wiki

[Chad (Code Review)]

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

Change subject: Undeploy EducationProgram from test2wiki
..

Undeploy EducationProgram from test2wiki

Change-Id: Ice08fb61eb83a43a8fb7f5576f0ee9c0982c8004
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7aa293d..d42d744 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17411,7 +17411,6 @@
'ruwiki' => true, // T89588
'srwiki' => true, // T110619
'svwiki' => true, // T51009
-   'test2wiki' => true,
'ukwiki' => true, // T66143
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice08fb61eb83a43a8fb7f5576f0ee9c0982c8004
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[master]: Fix README again

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402169 )

Change subject: Fix README again
..

Fix README again

Change-Id: Ifcb2445b7fc076ba5f9f20e7c59aba9ca361139f
---
M README
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/69/402169/1

diff --git a/README b/README
index ad31810..144b9ad 100644
--- a/README
+++ b/README
@@ -1,4 +1 @@
-This is a PHP extension. To compile it:
-
 For installation instructions, see 
https://www.mediawiki.org/wiki/Extension:Scribunto#LuaSandbox
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcb2445b7fc076ba5f9f20e7c59aba9ca361139f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: peopleweb/publichtml: use module httpd

[Dzahn (Code Review)]

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

Change subject: peopleweb/publichtml: use module httpd
..


peopleweb/publichtml: use module httpd

Change-Id: Ife9544fdd63a3bb536a876fed9a5c5306b918277
---
M modules/profile/manifests/microsites/peopleweb.pp
M modules/publichtml/manifests/init.pp
2 files changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
index 8ccebb2..bf40a6c 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -1,6 +1,10 @@
 # let users publish their own HTML in their home dirs
 class profile::microsites::peopleweb {
 
+class { '::httpd':
+modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
+}
+
 class { '::publichtml':
 sitename => 'people.wikimedia.org',
 server_admin => 'n...@wikimedia.org',
diff --git a/modules/publichtml/manifests/init.pp 
b/modules/publichtml/manifests/init.pp
index bbc46fc..bcc4f3f 100644
--- a/modules/publichtml/manifests/init.pp
+++ b/modules/publichtml/manifests/init.pp
@@ -5,17 +5,12 @@
 $docroot  = '/srv/org/wikimedia/publichtml',
 $server_admin = undef,
 ) {
-include ::apache::mod::userdir
-include ::apache::mod::cgi
-include ::apache::mod::php5
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 system::role { 'publichtml':
 description => 'web server of public_html directories',
 }
 
-apache::site { $sitename:
+httpd::site { $sitename:
 content => template('publichtml/apacheconfig.erb'),
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Generate clover.xml files for tox-py27-coverage-publish

[Legoktm (Code Review)]

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

Change subject: Generate clover.xml files for tox-py27-coverage-publish
..

Generate clover.xml files for tox-py27-coverage-publish

coverage.py can generate cobertura files, so we use a script to turn it
into
a clover.xml file, and publish that. Both the original cobertura XML
file and
the generated clover.xml file are kept as artifacts.

Bug: T179054
Change-Id: I697d130e8c27189636bf0783ce100a5c82c19359
---
M jjb/python-jobs.yaml
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/75/402175/1

diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 40b283b..66e377d 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -112,8 +112,11 @@
  rm -fR coverage log
  mkdir -p log
  set -o pipefail
- TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ | tee "log/tox-coverage.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ --cover-xml | tee "log/tox-coverage.log"
  set +o pipefail
+ mv coverage.xml log/coverage.xml
+ 
/srv/deployment/integration/slave-scripts/bin/cobertura-clover-transform.py 
log/coverage.xml -o log/clover.xml
+ cp log/clover.xml coverage/clover.xml
  - cover-publish:
 src: 'coverage'
 dest: '$DOC_PROJECT'

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

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

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

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

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Depool db1094
..

db-eqiad.php: Depool db1094

Needs alter table

Bug: T174569
Change-Id: I3d782d9a775866e6d2cc4a59f0eef4214f407ead
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..4fe5899 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   'db1094' => 500, # D2 3.6TB 512GB
+   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: move locales include out of module

[Dzahn (Code Review)]

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

Change subject: planet: move locales include out of module
..

planet: move locales include out of module

fixing:

Change-Id: Ic614d857df10a89d64bd01e85c23eeab74310acb
wmf-style: class 'planet_httpd' includes
locales::extended from another module.
---
M modules/planet/manifests/init.pp
M modules/role/manifests/planet_server.pp
2 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 7a3b9ac..c0403b3 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -22,10 +22,6 @@
 $planet_http_proxy,
 ) {
 
-# locales are essential for planet
-# if a new language is added check these too
-include ::locales::extended
-
 # things done once for all planet per languages
 include ::planet::packages
 include ::planet::dirs
diff --git a/modules/role/manifests/planet_server.pp 
b/modules/role/manifests/planet_server.pp
index ecee04b..9977924 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -1,17 +1,21 @@
 # server running a planet RSS feed aggregator
 class role::planet_server {
 
+system::role { 'planet_server':
+description => 'Planet-venus or rawdog RSS feed aggregator'
+}
+
 include ::standard
 include ::profile::base::firewall
+include ::profile::planet::venus
 
 class { '::apache': }
 class { '::apache::mod::rewrite': }
 # so we can vary on X-Forwarded-Proto when behind misc-web
 class { '::apache::mod::headers': }
 
-include ::profile::planet::venus
+# locales are essential for planet
+# if a new language is added check these too
+include ::locales::extended
 
-system::role { 'planet_server':
-description => 'Planet-venus or rawdog RSS feed aggregator'
-}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webserver_misc_static: switch apache to module httpd

[Dzahn (Code Review)]

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

Change subject: webserver_misc_static: switch apache to module httpd
..


webserver_misc_static: switch apache to module httpd

Now that we have the new module httpd we can convert
this host with multiple Apache sites on a single node as well.

Using one "base" profile for the httpd declaration and ferm rule
to avoid duplicate declarations.

Also we can save code lines by removing a ferm section in each
class for each site.

Change-Id: I0e48f233d1c5ca3e43d259120fc66bc57bbb9f9d
---
M modules/bugzilla_static/manifests/init.pp
M modules/profile/manifests/microsites/annualreport.pp
A modules/profile/manifests/microsites/httpd.pp
M modules/profile/manifests/microsites/peopleweb.pp
M modules/profile/manifests/microsites/static_bugzilla.pp
M modules/profile/manifests/microsites/transparency.pp
M modules/profile/manifests/microsites/wikibase.pp
M modules/role/manifests/webserver_misc_static.pp
8 files changed, 23 insertions(+), 52 deletions(-)

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



diff --git a/modules/bugzilla_static/manifests/init.pp 
b/modules/bugzilla_static/manifests/init.pp
index efb45b7..0a6cf66 100644
--- a/modules/bugzilla_static/manifests/init.pp
+++ b/modules/bugzilla_static/manifests/init.pp
@@ -14,10 +14,7 @@
 source => 'puppet:///modules/bugzilla_static/static-bz-index.html';
 }
 
-include ::apache::mod::rewrite
-include ::apache::mod::headers
-
-apache::site { 'static-bugzilla.wikimedia.org':
+httpd::site { 'static-bugzilla.wikimedia.org':
 content  => 
template('bugzilla_static/apache/static-bugzilla.wikimedia.org.erb'),
 priority => 20,
 }
diff --git a/modules/profile/manifests/microsites/annualreport.pp 
b/modules/profile/manifests/microsites/annualreport.pp
index 2aa9ff7..a3f20d4 100644
--- a/modules/profile/manifests/microsites/annualreport.pp
+++ b/modules/profile/manifests/microsites/annualreport.pp
@@ -4,20 +4,11 @@
 # T599 - https://15.wikipedia.org (aka. annual report 2015)
 class profile::microsites::annualreport {
 
-include ::apache
-include ::apache::mod::headers
-
-ferm::service { 'annualreport_http':
-proto  => 'tcp',
-port   => '80',
-srange => '$CACHE_MISC',
-}
-
-apache::site { 'annual.wikimedia.org':
+httpd::site { 'annual.wikimedia.org':
 source => 
'puppet:///modules/profile/annualreport/annual.wikimedia.org',
 }
 
-apache::site { '15.wikipedia.org':
+httpd::site { '15.wikipedia.org':
 source => 'puppet:///modules/profile/annualreport/15.wikipedia.org',
 }
 
diff --git a/modules/profile/manifests/microsites/httpd.pp 
b/modules/profile/manifests/microsites/httpd.pp
new file mode 100644
index 000..6fbdf88
--- /dev/null
+++ b/modules/profile/manifests/microsites/httpd.pp
@@ -0,0 +1,13 @@
+# webserver for misc. static sites
+class profile::microsites::httpd {
+
+class {'::httpd':
+modules => ['headers', 'rewrite', 'authnz_ldap'],
+}
+
+ferm::service { 'microsites_http':
+proto  => 'tcp',
+port   => '80',
+srange => '$CACHE_MISC',
+}
+}
diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
index 0514bb9..8ccebb2 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -6,12 +6,6 @@
 server_admin => 'n...@wikimedia.org',
 }
 
-ferm::service { 'people-http':
-proto  => 'tcp',
-port   => '80',
-srange => '$CACHE_MISC',
-}
-
 motd::script { 'people-motd':
 ensure  => present,
 content => "#!/bin/sh\necho '\nThis is people.wikimedia.org.\nFiles 
you put in 'public_html' in your home dir will be accessible on the web.\nMore 
info on https://wikitech.wikimedia.org/wiki/People.wikimedia.org.\n'",
diff --git a/modules/profile/manifests/microsites/static_bugzilla.pp 
b/modules/profile/manifests/microsites/static_bugzilla.pp
index fd0babc..6b0e7fa 100644
--- a/modules/profile/manifests/microsites/static_bugzilla.pp
+++ b/modules/profile/manifests/microsites/static_bugzilla.pp
@@ -3,12 +3,6 @@
 
 include ::bugzilla_static
 
-ferm::service { 'bugzilla_static_http':
-proto  => 'tcp',
-port   => '80',
-srange => '$CACHE_MISC',
-}
-
 include ::profile::backup::host
 backup::set { 'bugzilla-static' : }
 backup::set { 'bugzilla-backup' : }
diff --git a/modules/profile/manifests/microsites/transparency.pp 
b/modules/profile/manifests/microsites/transparency.pp
index 7606b99..c90fe33 100644
--- a/modules/profile/manifests/microsites/transparency.pp
+++ b/modules/profile/manifests/microsites/transparency.pp
@@ -39,13 +39,7 @@
 ],
 }
 
-apache::site { 'transparency.wikimedia.org':

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Set timezone

[BryanDavis (Code Review)]

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

Change subject: Set timezone
..

Set timezone

Bug: T184215
Change-Id: I16067dba5dc586a77c8f70b28d8bb21b78cd964a
---
M puppet/hieradata/common.yaml
M puppet/modules/mwv/manifests/init.pp
M puppet/modules/mwv/manifests/packages.pp
3 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/76/402176/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 2ef5d23..fabf5cf 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -259,6 +259,7 @@
 mwv::services_dir: /vagrant/srv
 mwv::vendor_dir: /srv
 mwv::tld: '.local.wmftest.net'
+mwv::timezone: Etc/UTC
 mwv::cachefilesd::enable: true
 
 nginx::variant: extras
diff --git a/puppet/modules/mwv/manifests/init.pp 
b/puppet/modules/mwv/manifests/init.pp
index 9c19aa1..6b55118 100644
--- a/puppet/modules/mwv/manifests/init.pp
+++ b/puppet/modules/mwv/manifests/init.pp
@@ -21,12 +21,16 @@
 #   Top level domain to use when creating hostnames. Value should include
 #   leading '.' (example: '.local.wmftest.net').
 #
+# [*timezone*]
+#   Timezone for the VM. (example: 'Etc/UTC')
+#
 class mwv (
 $files_dir,
 $etc_dir,
 $services_dir,
 $vendor_dir,
 $tld,
+$timezone,
 ) {
 include ::apt
 include ::env
@@ -65,4 +69,28 @@
 } -> File <| |>
 }
 
+# Why is this so hard?
+$tzparts = split($timezone, '/')
+$tzarea = $tzparts[0]
+$tzzone = $tzparts[1]
+exec { 'debconf tzarea':
+command => "/bin/echo tzdata tzdata/Areas select ${tzarea} | 
/usr/bin/debconf-set-selections",
+unless  => "/usr/bin/debconf-get-selections | /bin/grep -q -E 
\"^tzdata\\s+tzdata/Areas\\s+select\\s+${tzarea}\"",
+before  => Package['tzdata'],
+}
+exec { 'debconf tzzone':
+command => "/bin/echo tzdata tzdata/Zones/${tzarea} select ${timezone} 
| /usr/bin/debconf-set-selections",
+unless  => "/usr/bin/debconf-get-selections | /bin/grep -q -E 
\"^tzdata\\s+tzdata/Zones/${tzarea}\\s+select\\s+${timezone}\"",
+before  => Package['tzdata'],
+}
+file { '/etc/localtime':
+ensure  => 'link',
+target  => "/usr/share/zoneinfo/${timezone}",
+require => Package['tzdata'],
+}
+file { '/etc/timezone':
+ensure  => 'present',
+content => $timezone,
+require => Package['tzdata'],
+}
 }
diff --git a/puppet/modules/mwv/manifests/packages.pp 
b/puppet/modules/mwv/manifests/packages.pp
index f85d745..b3a1c05 100644
--- a/puppet/modules/mwv/manifests/packages.pp
+++ b/puppet/modules/mwv/manifests/packages.pp
@@ -15,6 +15,7 @@
 'gdb',
 'python-dev',
 'ruby-dev',
+'tzdata',
 )
 
 # Cron resources need a cron provider installed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16067dba5dc586a77c8f70b28d8bb21b78cd964a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add Maven Central link

[jenkins-bot (Code Review)]

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

Change subject: Add Maven Central link
..


Add Maven Central link

Change-Id: I65c3926b5841a911045d9cb28dcb0e5f18417391
---
M README.md
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/README.md b/README.md
index 4c816b7..46f66ac 100644
--- a/README.md
+++ b/README.md
@@ -71,3 +71,5 @@
 The same target can be used directly from your IDE to run in debug mode and 
use all the nice IDE integration (automatic class reloading, ...). Check your 
IDE documentation for details.
 
 Note: `jetty:run` will not automatically detect changes to other modules, but 
if you run `mvn install` in the root of the project, the changes should be 
compiled and jetty should auto reload the application.
+
+Current central released version: [![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/org.wikidata.query.rdf/service/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.wikidata.query.rdf/service)
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: locales: convert to profile

[Dzahn (Code Review)]

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

Change subject: locales: convert to profile
..

locales: convert to profile

Convert the entire "locales" module into 2 profiles.

Get rid of the inclusion of "::locales" from init.pp
just include that in the profile.

locales::extended is actually used by mailman, planet
and toollabs.

locales::all seems to not be used by anything, at least
not in prod, but i keep it anyways.

Adjust the includes in mailman,planet,toollabs and fix
the style issues this way.

Move the only file into profile/files/locales/.

Change-Id: Ib1b02fcb080cdf82120e3ab1c57e56a0dbdbd3b0
---
D modules/locales/manifests/init.pp
M modules/mailman/manifests/listserve.pp
R modules/profile/files/locales/locales-extended
R modules/profile/manifests/locales/all.pp
R modules/profile/manifests/locales/extended.pp
M modules/role/manifests/lists.pp
M modules/role/manifests/planet_server.pp
M modules/toollabs/manifests/exec_environ.pp
8 files changed, 32 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/402164/1

diff --git a/modules/locales/manifests/init.pp 
b/modules/locales/manifests/init.pp
deleted file mode 100644
index 16724e3..000
--- a/modules/locales/manifests/init.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Class: locales
-#
-# Provisions locale data used by the C library for localization (l10n) and
-# internationalization (i18n) support.
-
-class locales {
-package { 'locales':
-ensure => present,
-}
-
-exec { 'locale-gen':
-command => '/usr/sbin/locale-gen --purge',
-refreshonly => true,
-require => Package['locales'],
-}
-}
diff --git a/modules/mailman/manifests/listserve.pp 
b/modules/mailman/manifests/listserve.pp
index 45253e3..790e44f 100644
--- a/modules/mailman/manifests/listserve.pp
+++ b/modules/mailman/manifests/listserve.pp
@@ -10,9 +10,6 @@
 source => 'puppet:///modules/mailman/mm_cfg.py',
 }
 
-# Install as many languages as possible
-include locales::extended
-
 debconf::set { 'mailman/site_languages':
 value  => 'sk, gl, fa, ast, ar, ca, cs, da, de, en, es, et, eu, fi, 
fr, he, hr, hu, ia, it, ja, ko, lt, nl, no, pl, pt, pt_BR, ro, ru, sl, sr, sv, 
tr, uk, vi, zh_CN, zh_TW',
 notify => Exec['dpkg-reconfigure mailman'],
@@ -26,7 +23,7 @@
 exec { 'dpkg-reconfigure mailman':
 command => '/usr/sbin/dpkg-reconfigure -fnoninteractive mailman',
 refreshonly => true,
-require => Class['locales::extended'],
+require => Class['::profile::locales::extended'],
 before  => Service['mailman'],
 }
 
diff --git a/modules/locales/files/locales-extended 
b/modules/profile/files/locales/locales-extended
similarity index 100%
rename from modules/locales/files/locales-extended
rename to modules/profile/files/locales/locales-extended
diff --git a/modules/locales/manifests/all.pp 
b/modules/profile/manifests/locales/all.pp
similarity index 65%
rename from modules/locales/manifests/all.pp
rename to modules/profile/manifests/locales/all.pp
index 5a6f005..f6a3bfa 100644
--- a/modules/locales/manifests/all.pp
+++ b/modules/profile/manifests/locales/all.pp
@@ -1,11 +1,19 @@
-# == Class: locales::all
+# == Class: profile::locales::all
 #
 # Provisions all available supported locales. WARNING: this can take a very
-# long time on Ubuntu systems; consider using locales::extended.
+# long time on Ubuntu systems; consider using profile::locales::extended.
 
-class locales::all {
-include ::locales
+class profile::locales::all {
 
+package { 'locales':
+ensure => present,
+}
+
+exec { 'locale-gen':
+command => '/usr/sbin/locale-gen --purge',
+refreshonly => true,
+require => Package['locales'],
+}
 # Debian ships a locales-all package which has all locales pre-generated.
 # Ubuntu doesn't, so we're forced to generate them locally every time :(
 # lint:ignore:case_without_default
diff --git a/modules/locales/manifests/extended.pp 
b/modules/profile/manifests/locales/extended.pp
similarity index 68%
rename from modules/locales/manifests/extended.pp
rename to modules/profile/manifests/locales/extended.pp
index 21ce54e..2b02e28 100644
--- a/modules/locales/manifests/extended.pp
+++ b/modules/profile/manifests/locales/extended.pp
@@ -1,11 +1,20 @@
-# == Class: locales::extended
+# == Class: profile::locales::extended
 #
 # Provisions a set of "extended" hand-picked locales that are useful on most
 # systems. This is a tradeoff between the cost of generating all locales and
 # their relative usefulness.
 
-class locales::extended {
-include ::locales
+class profile::locales::extended {
+
+package { 'locales':
+ensure => present,
+}
+
+exec { 'locale-gen':
+command => 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Releases: Install composer alongside Jenkins

[Dzahn (Code Review)]

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

Change subject: Releases: Install composer alongside Jenkins
..


Releases: Install composer alongside Jenkins

Change-Id: Iec8034bc05f44a151c9143d8b0090d2889380241
---
M modules/profile/manifests/releases/mediawiki.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/releases/mediawiki.pp 
b/modules/profile/manifests/releases/mediawiki.pp
index 714e3f7..525689a 100644
--- a/modules/profile/manifests/releases/mediawiki.pp
+++ b/modules/profile/manifests/releases/mediawiki.pp
@@ -23,6 +23,8 @@
 prefix   => $prefix,
 }
 
+class { '::contint::composer': }
+
 class { '::apache::mod::rewrite': }
 class { '::apache::mod::headers': }
 class { '::apache::mod::proxy': }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: apache: add httpd module as a replacement

[Dzahn (Code Review)]

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

Change subject: apache: add httpd module as a replacement
..


apache: add httpd module as a replacement

The new httpd module is mostly a cherry-pick of the better parts of our
apache module, with some tweaks:

- Use puppet 4 constructs where appropriate.
- Dependencies are not injected by including the base class
  everywhere. This allows us to make our manifests more compliant with
  the role/profile pattern, and to avoid implicit hiera lookups.
- The use of classes to include for configuring apache modules is
  dropped. Instead, you're supposed to pass the list of
  configuration-less modules you want to declare to the httpd class,
  that you're supposed to declare once anyways.

Also, add the first type aliases into wmflib, ready to use for general purposes.

Change-Id: I7d8bc4c6ed8105021c6a8dbe45e288411e5d1d69
---
A modules/httpd/.fixtures.yml
A modules/httpd/Rakefile
A modules/httpd/files/apache-status
A modules/httpd/files/defaults.conf
A modules/httpd/files/dummy.conf
A modules/httpd/manifests/conf.pp
A modules/httpd/manifests/init.pp
A modules/httpd/manifests/mod_conf.pp
A modules/httpd/manifests/mpm.pp
A modules/httpd/manifests/site.pp
A modules/httpd/spec/.gitignore
A modules/httpd/spec/classes/httpd_mpm_spec.rb
A modules/httpd/spec/classes/httpd_spec.rb
A modules/httpd/spec/defines/httpd_conf_spec.rb
A modules/httpd/spec/defines/httpd_mod_conf_spec.rb
A modules/httpd/spec/spec_helper.rb
M modules/wmflib/README.md
A modules/wmflib/types/ensure.pp
A modules/wmflib/types/sourceurl.pp
19 files changed, 598 insertions(+), 1 deletion(-)

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



diff --git a/modules/httpd/.fixtures.yml b/modules/httpd/.fixtures.yml
new file mode 100644
index 000..cc6ed08
--- /dev/null
+++ b/modules/httpd/.fixtures.yml
@@ -0,0 +1,5 @@
+fixtures:
+symlinks:
+httpd: "#{source_dir}"
+stdlib: "../../../../stdlib"
+wmflib: "../../../../wmflib"
diff --git a/modules/httpd/Rakefile b/modules/httpd/Rakefile
new file mode 100644
index 000..cd3d379
--- /dev/null
+++ b/modules/httpd/Rakefile
@@ -0,0 +1 @@
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/modules/httpd/files/apache-status 
b/modules/httpd/files/apache-status
new file mode 100755
index 000..3d6e87a
--- /dev/null
+++ b/modules/httpd/files/apache-status
@@ -0,0 +1,6 @@
+#!/bin/sh
+WHITE="$(/usr/bin/tput setaf 7; /usr/bin/tput bold)"
+RESET="$(/usr/bin/tput sgr0)"
+file="/tmp/apache_status.$(/bin/hostname).$(/bin/date +%s).txt"
+/usr/bin/links -dump http://127.0.0.1/server-status -width 80 | tee "$file"
+printf "\nOutput saved to ${WHITE}${file}${RESET}.\n"
diff --git a/modules/httpd/files/defaults.conf 
b/modules/httpd/files/defaults.conf
new file mode 100644
index 000..fa3c931
--- /dev/null
+++ b/modules/httpd/files/defaults.conf
@@ -0,0 +1,47 @@
+# Global Apache defaults
+# This file is managed by Puppet
+
+# Disable accept filters for HTTP to force Apache to accept connections from
+# PyBal's IdleConnection monitor. Otherwise Apache sets the TCP_DEFER_ACCEPT
+# option on sockets, which defers the accept() until there's data on the
+# connection. See:
+#  - https://phabricator.wikimedia.org/T119372#1852767
+#  - https://httpd.apache.org/docs/2.4/mod/core.html#acceptfilter
+AcceptFilter http none
+
+# Make 'Server' response header field simply 'Apache'
+ServerTokens Prod
+
+# Reject TRACE requests with HTTP 405 error
+TraceEnable Off
+
+# Tab separated log format
+# https://wikitech.wikimedia.org/wiki/Apache_log_format
+
+LogFormat "%{%Y-%m-%dT%H:%M:%S}t   %D  %a  %R/%>s  %B  %m  
http://%{Host}i%U%q -   %{Content-Type}o%{Referer}i 
%{X-Forwarded-For}i %{User-Agent}i  %{Accept-Language}i %{X-Analytics}i 
%u  %a" wmf
+
+
+LogFormat "%{%Y-%m-%dT%H:%M:%S}t   %D  %a  %R/%>s  %B  %m  
http://%{Host}i%U%q -   %{Content-Type}o%{Referer}i 
%{X-Forwarded-For}i %{User-Agent}i  %{Accept-Language}i %{X-Analytics}i 
%u  %{c}a" wmf
+
+
+# Define an access log for VirtualHosts that don't define their own logfile
+CustomLog /var/log/apache2/other_vhosts_access.log wmf
+
+# Set default contact address to include in error messages
+ServerAdmin webmas...@wikimedia.org
+
+# When receiving a graceful-stop signal, wait up to 5 seconds for client
+# connections to close gracefully.
+GracefulShutdownTimeout 5
+
+# Add a response header with the following format:
+#
+#   Backend-Timing: D=109640 t=1454711664235870
+#
+# Where 't' is a timestamp for when the request was received and 'D'
+# is how long it took to begin serving the request, both measured in
+# microseconds. See:
+#   
+
+Header set Backend-Timing "%D %t"
+
diff --git 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: switch from module apache to module httpd

[Dzahn (Code Review)]

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

Change subject: planet: switch from module apache to module httpd
..


planet: switch from module apache to module httpd

The new module httpd has been added I7d8bc4c6ed8105021
to replace the apache module.

This will be the first service using it and we can fix
style issues due to inclusion of apache classes.

One little change from apache module is that the
priority parameter now must be an integer and it accepted
a string before. So i need to remove those quotes.

Change-Id: I7ee1eabea3e6528fbe15ff4799e7cda9e1b81d54
---
M modules/planet/manifests/apachesite.pp
M modules/planet/manifests/index_site.pp
M modules/profile/manifests/planet/venus.pp
M modules/role/manifests/planet_server.pp
4 files changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index 939017e..9d56219 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -2,12 +2,12 @@
 define planet::apachesite {
 
 if $title == 'en' {
-$priority = '10'
+$priority = 10
 } else {
-$priority = '50'
+$priority = 50
 }
 
-apache::site { "${title}.planet.${planet::planet_domain_name}":
+httpd::site { "${title}.planet.${planet::planet_domain_name}":
 content  => template('planet/apache/planet-language.erb'),
 priority => $priority,
 }
diff --git a/modules/planet/manifests/index_site.pp 
b/modules/planet/manifests/index_site.pp
index d0b08cb..5a14980 100644
--- a/modules/planet/manifests/index_site.pp
+++ b/modules/planet/manifests/index_site.pp
@@ -1,7 +1,7 @@
 # sets up the planet-venus index/portal site
 class planet::index_site {
 
-apache::site { "planet.${planet::planet_domain_name}":
+httpd::site { "planet.${planet::planet_domain_name}":
 content => template('planet/apache/planet.erb'),
 }
 
diff --git a/modules/profile/manifests/planet/venus.pp 
b/modules/profile/manifests/planet/venus.pp
index 4e2a6cf..058b953 100644
--- a/modules/profile/manifests/planet/venus.pp
+++ b/modules/profile/manifests/planet/venus.pp
@@ -190,6 +190,10 @@
 planet_http_proxy  => $planet_http_proxy,
 }
 
+class {'::httpd':
+modules => ['rewrite', 'headers'],
+}
+
 ferm::service { 'planet-http':
 proto  => 'tcp',
 port   => '80',
diff --git a/modules/role/manifests/planet_server.pp 
b/modules/role/manifests/planet_server.pp
index ecee04b..a5fc707 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -3,12 +3,6 @@
 
 include ::standard
 include ::profile::base::firewall
-
-class { '::apache': }
-class { '::apache::mod::rewrite': }
-# so we can vary on X-Forwarded-Proto when behind misc-web
-class { '::apache::mod::headers': }
-
 include ::profile::planet::venus
 
 system::role { 'planet_server':

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webserver_misc_static: switch apache to module httpd

[Dzahn (Code Review)]

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

Change subject: webserver_misc_static: switch apache to module httpd
..

webserver_misc_static: switch apache to module httpd

Change-Id: I0e48f233d1c5ca3e43d259120fc66bc57bbb9f9d
---
M modules/profile/manifests/microsites/annualreport.pp
M modules/profile/manifests/microsites/static_bugzilla.pp
M modules/profile/manifests/microsites/transparency.pp
M modules/profile/manifests/microsites/wikibase.pp
M modules/role/manifests/webserver_misc_static.pp
5 files changed, 22 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/402168/1

diff --git a/modules/profile/manifests/microsites/annualreport.pp 
b/modules/profile/manifests/microsites/annualreport.pp
index 2aa9ff7..89fb2b0 100644
--- a/modules/profile/manifests/microsites/annualreport.pp
+++ b/modules/profile/manifests/microsites/annualreport.pp
@@ -4,8 +4,9 @@
 # T599 - https://15.wikipedia.org (aka. annual report 2015)
 class profile::microsites::annualreport {
 
-include ::apache
-include ::apache::mod::headers
+class {'::httpd':
+modules => ['headers'],
+}
 
 ferm::service { 'annualreport_http':
 proto  => 'tcp',
@@ -13,11 +14,11 @@
 srange => '$CACHE_MISC',
 }
 
-apache::site { 'annual.wikimedia.org':
+httpd::site { 'annual.wikimedia.org':
 source => 
'puppet:///modules/profile/annualreport/annual.wikimedia.org',
 }
 
-apache::site { '15.wikipedia.org':
+httpd::site { '15.wikipedia.org':
 source => 'puppet:///modules/profile/annualreport/15.wikipedia.org',
 }
 
diff --git a/modules/profile/manifests/microsites/static_bugzilla.pp 
b/modules/profile/manifests/microsites/static_bugzilla.pp
index fd0babc..e7799b5 100644
--- a/modules/profile/manifests/microsites/static_bugzilla.pp
+++ b/modules/profile/manifests/microsites/static_bugzilla.pp
@@ -1,6 +1,10 @@
 # static HTML archive of old Bugzilla tickets
 class profile::microsites::static_bugzilla {
 
+class {'::httpd':
+modules => ['headers', 'rewrite'],
+}
+
 include ::bugzilla_static
 
 ferm::service { 'bugzilla_static_http':
diff --git a/modules/profile/manifests/microsites/transparency.pp 
b/modules/profile/manifests/microsites/transparency.pp
index 7606b99..46a8984 100644
--- a/modules/profile/manifests/microsites/transparency.pp
+++ b/modules/profile/manifests/microsites/transparency.pp
@@ -3,6 +3,10 @@
 #
 class profile::microsites::transparency {
 
+class {'::httpd':
+modules => ['headers', 'authnz_ldap'],
+}
+
 include ::passwords::misc::private_static_site
 include ::passwords::ldap::production
 
@@ -39,7 +43,7 @@
 ],
 }
 
-apache::site { 'transparency.wikimedia.org':
+httpd::site { 'transparency.wikimedia.org':
 content => 
template('role/apache/sites/transparency.wikimedia.org.erb'),
 }
 
diff --git a/modules/profile/manifests/microsites/wikibase.pp 
b/modules/profile/manifests/microsites/wikibase.pp
index c7df33c..316f487 100644
--- a/modules/profile/manifests/microsites/wikibase.pp
+++ b/modules/profile/manifests/microsites/wikibase.pp
@@ -4,8 +4,9 @@
   $server_admin = hiera('profile::microsites::wikibase::server_admin'),
 ) {
 
-include ::apache
-include ::apache::mod::headers
+class {'::httpd':
+modules => ['headers'],
+}
 
 ferm::service { 'wikibase_http':
 proto  => 'tcp',
@@ -13,7 +14,7 @@
 srange => '$CACHE_MISC',
 }
 
-apache::site { 'wikiba.se':
+httpd::site { 'wikiba.se':
 content => template('profile/wikibase/apache-wikibase.erb'),
 }
 
diff --git a/modules/role/manifests/webserver_misc_static.pp 
b/modules/role/manifests/webserver_misc_static.pp
index 435616d..0b457c9 100644
--- a/modules/role/manifests/webserver_misc_static.pp
+++ b/modules/role/manifests/webserver_misc_static.pp
@@ -1,20 +1,16 @@
 # a webserver for misc. static sites
 class role::webserver_misc_static {
 
+system::role { 'webserver_misc_static':
+description => 'WMF misc sites web server'
+}
+
 include ::standard
 include ::profile::base::firewall
-
-include ::apache
-include ::apache::mod::authnz_ldap
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 include ::profile::microsites::annualreport# 
https://annual.wikimedia.org
 include ::profile::microsites::static_bugzilla # 
https://static-bugzilla.wikimedia.org
 include ::profile::microsites::transparency# 
https://transparency.wikimedia.org
 include ::profile::microsites::wikibase# https://wikiba.se
 
-system::role { 'webserver_misc_static':
-description => 'WMF misc sites web server'
-}
 }

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for jQuery 3 - removeAttr('disabled') deprecated

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402162 )

Change subject: Fix for jQuery 3 - removeAttr('disabled') deprecated
..


Fix for jQuery 3 - removeAttr('disabled') deprecated

Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
---
M libs/PF_submit.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/libs/PF_submit.js b/libs/PF_submit.js
index 3a2ccf4..598ef32 100644
--- a/libs/PF_submit.js
+++ b/libs/PF_submit.js
@@ -15,7 +15,7 @@
 
function setChanged( event ) {
sacButtons
-   .removeAttr( 'disabled' )
+   .prop( 'disabled', false )
.addClass( 'pf-save_and_continue-changed' );
 
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: Added FancyBox fix for jQuery 3

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402171 )

Change subject: Added FancyBox fix for jQuery 3
..

Added FancyBox fix for jQuery 3

Based on this fix: https://github.com/nvidoni/fancybox/issues/2

The FancyBox library used by PF still needs to be updated.

Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
---
M libs/jquery.fancybox.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/71/402171/2

diff --git a/libs/jquery.fancybox.js b/libs/jquery.fancybox.js
index 68d2865..81f1406 100644
--- a/libs/jquery.fancybox.js
+++ b/libs/jquery.fancybox.js
@@ -577,8 +577,8 @@
 
_finish = function () {
if (!$.support.opacity) {
-   content.get(0).style.removeAttribute('filter');
-   wrap.get(0).style.removeAttribute('filter');
+   content.css('filter', 0);
+   wrap.css('filter', 0);
}
 
if (selectedOpts.autoDimensions) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: peopleweb/publichtml: use module httpd

[Dzahn (Code Review)]

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

Change subject: peopleweb/publichtml: use module httpd
..

peopleweb/publichtml: use module httpd

Change-Id: Ife9544fdd63a3bb536a876fed9a5c5306b918277
---
M modules/publichtml/manifests/init.pp
1 file changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/modules/publichtml/manifests/init.pp 
b/modules/publichtml/manifests/init.pp
index bbc46fc..927a48f 100644
--- a/modules/publichtml/manifests/init.pp
+++ b/modules/publichtml/manifests/init.pp
@@ -5,17 +5,16 @@
 $docroot  = '/srv/org/wikimedia/publichtml',
 $server_admin = undef,
 ) {
-include ::apache::mod::userdir
-include ::apache::mod::cgi
-include ::apache::mod::php5
-include ::apache::mod::rewrite
-include ::apache::mod::headers
+
+class { '::httpd':
+modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
+}
 
 system::role { 'publichtml':
 description => 'web server of public_html directories',
 }
 
-apache::site { $sitename:
+httpd::site { $sitename:
 content => template('publichtml/apacheconfig.erb'),
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Fix 1 change

[Mattflaschen (Code Review)]

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

Change subject: RCFilters: Fix 1 change
..

RCFilters: Fix 1 change

Fix typo so it's '1 change' instead of 'change'.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/402177/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 5e206ef..931e7e1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1366,7 +1366,7 @@
"rcfilters-activefilters": "Active filters",
"rcfilters-advancedfilters": "Advanced filters",
"rcfilters-limit-title": "Results to show",
-   "rcfilters-limit-and-date-label": "{{PLURAL:$1|change|$1 changes}}, $2",
+   "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|change|changes}}, $2",
"rcfilters-date-popup-title": "Time period to search",
"rcfilters-days-title": "Recent days",
"rcfilters-hours-title": "Recent hours",

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Depool db1094
..


db-eqiad.php: Depool db1094

Needs alter table

Bug: T174569
Change-Id: I3d782d9a775866e6d2cc4a59f0eef4214f407ead
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..4fe5899 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   'db1094' => 500, # D2 3.6TB 512GB
+   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d782d9a775866e6d2cc4a59f0eef4214f407ead
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for jQuery 3 - removeAttr('disabled') deprecated

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402162 )

Change subject: Fix for jQuery 3 - removeAttr('disabled') deprecated
..

Fix for jQuery 3 - removeAttr('disabled') deprecated

Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
---
M libs/PF_submit.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/62/402162/2

diff --git a/libs/PF_submit.js b/libs/PF_submit.js
index 3a2ccf4..598ef32 100644
--- a/libs/PF_submit.js
+++ b/libs/PF_submit.js
@@ -15,7 +15,7 @@
 
function setChanged( event ) {
sacButtons
-   .removeAttr( 'disabled' )
+   .prop( 'disabled', false )
.addClass( 'pf-save_and_continue-changed' );
 
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Update ve-wmf path

[jenkins-bot (Code Review)]

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

Change subject: Update ve-wmf path
..


Update ve-wmf path

Change-Id: Ica2d375fd06b54484e14ee60b9490df977bcfe0a
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 93c6f1c..8b52fbb 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2513,7 +2513,7 @@
 VisualEditor (WMF)
 id = ext-visualeditor-ve-wmf
 descmsg = visualeditor-desc
-file = VisualEditor/modules/ve-wmf/i18n/%CODE%.json
+file = VisualEditor/i18n/ve-wmf/%CODE%.json
 optional = visualeditor-help-link
 
 Vote NY

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undeploy EducationProgram from test2wiki

[jenkins-bot (Code Review)]

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

Change subject: Undeploy EducationProgram from test2wiki
..


Undeploy EducationProgram from test2wiki

Change-Id: Ice08fb61eb83a43a8fb7f5576f0ee9c0982c8004
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7aa293d..d42d744 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17411,7 +17411,6 @@
'ruwiki' => true, // T89588
'srwiki' => true, // T110619
'svwiki' => true, // T51009
-   'test2wiki' => true,
'ukwiki' => true, // T66143
 ],
 

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

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

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Safely handle incomplete clover.xml files

[jenkins-bot (Code Review)]

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

Change subject: Safely handle incomplete clover.xml files
..


Safely handle incomplete clover.xml files

The script to convert cobertura reports into clover format (863aceaf408)
doesn't include everything, so check that XML properties are isset()
before trying to read them.

Change-Id: I51a0e12dd7d3e9f88e59b0a6d5f7df0b92b85c16
---
M shared/CoveragePage.php
1 file changed, 18 insertions(+), 10 deletions(-)

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



diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index a48f996..cd67474 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -98,23 +98,31 @@
return false;
}
 
+   $types = [ 'methods', 'conditionals', 'statements', 'elements' 
];
+   $total = 0;
$xml = new SimpleXMLElement( $contents );
$metrics = $xml->project->metrics;
-   $total = (int)$metrics['methods'] +
-   (int)$metrics['conditionals'] +
-   (int)$metrics['statements'] +
-   (int)$metrics['elements'];
+   // A proper clover.xml file will have all of the four types, but
+   // we're also converting other types into clover.xml, that don't
+   // have all the keys we expect. Using isset() should make this 
safe.
+   foreach ( $types as $type ) {
+   if ( isset( $metrics[$type] ) ) {
+   $total += (int)$metrics[$type];
+   }
+   }
if ( $total === 0 ) {
// Avoid division by 0 warnings, and treat 0/0 as 100%
// to match the PHPUnit behavior
$percent = 1;
} else {
-   $percent = (
-   (int)$metrics['coveredmethods'] +
-   (int)$metrics['coveredconditionals'] +
-   (int)$metrics['coveredstatements'] +
-   (int)$metrics['coveredelements']
-   ) / $total;
+   $covered = 0;
+   foreach ( $types as $type ) {
+   if ( isset( $metrics["covered$type"] ) ) {
+   $covered += 
(int)$metrics["covered$type"];
+   }
+
+   }
+   $percent = $covered / $total;
}
// TODO: Figure out how to get a more friendly name
return [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51a0e12dd7d3e9f88e59b0a6d5f7df0b92b85c16
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Safely handle incomplete clover.xml files

[Legoktm (Code Review)]

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

Change subject: Safely handle incomplete clover.xml files
..

Safely handle incomplete clover.xml files

The script to convert cobertura reports into clover format (863aceaf408)
doesn't include everything, so check that XML properties are isset()
before trying to read them.

Change-Id: I51a0e12dd7d3e9f88e59b0a6d5f7df0b92b85c16
---
M shared/CoveragePage.php
1 file changed, 18 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/74/402174/1

diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index a48f996..cd67474 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -98,23 +98,31 @@
return false;
}
 
+   $types = [ 'methods', 'conditionals', 'statements', 'elements' 
];
+   $total = 0;
$xml = new SimpleXMLElement( $contents );
$metrics = $xml->project->metrics;
-   $total = (int)$metrics['methods'] +
-   (int)$metrics['conditionals'] +
-   (int)$metrics['statements'] +
-   (int)$metrics['elements'];
+   // A proper clover.xml file will have all of the four types, but
+   // we're also converting other types into clover.xml, that don't
+   // have all the keys we expect. Using isset() should make this 
safe.
+   foreach ( $types as $type ) {
+   if ( isset( $metrics[$type] ) ) {
+   $total += (int)$metrics[$type];
+   }
+   }
if ( $total === 0 ) {
// Avoid division by 0 warnings, and treat 0/0 as 100%
// to match the PHPUnit behavior
$percent = 1;
} else {
-   $percent = (
-   (int)$metrics['coveredmethods'] +
-   (int)$metrics['coveredconditionals'] +
-   (int)$metrics['coveredstatements'] +
-   (int)$metrics['coveredelements']
-   ) / $total;
+   $covered = 0;
+   foreach ( $types as $type ) {
+   if ( isset( $metrics["covered$type"] ) ) {
+   $covered += 
(int)$metrics["covered$type"];
+   }
+
+   }
+   $percent = $covered / $total;
}
// TODO: Figure out how to get a more friendly name
return [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51a0e12dd7d3e9f88e59b0a6d5f7df0b92b85c16
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: service::node: Fix RESTBase port

[jenkins-bot (Code Review)]

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

Change subject: service::node: Fix RESTBase port
..


service::node: Fix RESTBase port

Bug: T183854
Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
---
M puppet/modules/service/manifests/node.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/puppet/modules/service/manifests/node.pp 
b/puppet/modules/service/manifests/node.pp
index d7d80da..7c95493 100644
--- a/puppet/modules/service/manifests/node.pp
+++ b/puppet/modules/service/manifests/node.pp
@@ -96,9 +96,9 @@
 default => $log_level
 }
 # ensure the RB port is defined for the config
-$restbase_port = $::restbase::port ? {
-undef   => 7231,
-default => $::restbase::port
+$restbase_port = defined(Class['restbase']) ? {
+true=> $::restbase::port,
+default => 7231,
 }
 
 # the repo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mobrovac 
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]: Update nikic/php-parser to 3.1.3

[jenkins-bot (Code Review)]

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

Change subject: Update nikic/php-parser to 3.1.3
..


Update nikic/php-parser to 3.1.3

And fix the only incompatibility in findDeprecated.php. It's OK to throw
exceptions on invalid files since we lint all PHP files so there
should be no invalid ones.

Change-Id: Ie5913c2aae4b521a4b6f805e911e4e2764386b45
---
M RELEASE-NOTES-1.31
M composer.json
M maintenance/findDeprecated.php
3 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index d18c5cf..30a174a 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -44,6 +44,8 @@
 * Updated jquery.chosen from v0.9.14 to v1.8.2.
 * Updated composer/spdx-licenses from 1.1.4 to
   1.2.0 (development dependency).
+* Updated nikic/php-parser from 2.1.0 to 3.1.3
+  (development dependency).
 * …
 
  New external libraries 
diff --git a/composer.json b/composer.json
index 6b3e8f7..d92ffc9 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
"justinrainbow/json-schema": "~5.2",
"mediawiki/mediawiki-codesniffer": "15.0.0",
"monolog/monolog": "~1.22.1",
-   "nikic/php-parser": "2.1.0",
+   "nikic/php-parser": "3.1.3",
"nmred/kafka-php": "0.1.5",
"phpunit/phpunit": "4.8.36",
"psy/psysh": "0.8.11",
diff --git a/maintenance/findDeprecated.php b/maintenance/findDeprecated.php
index 6128d23..ec998da 100644
--- a/maintenance/findDeprecated.php
+++ b/maintenance/findDeprecated.php
@@ -132,6 +132,9 @@
$this->addDescription( 'Find deprecated interfaces' );
}
 
+   /**
+* @return SplFileInfo[]
+*/
public function getFiles() {
global $IP;
 
@@ -163,7 +166,7 @@
}
 
$finder->setCurrentFile( substr( $file->getPathname(), 
strlen( $IP ) + 1 ) );
-   $nodes = $parser->parse( $code, [ 'throwOnError' => 
false ] );
+   $nodes = $parser->parse( $code );
$traverser->traverse( $nodes );
 
if ( $i % $chunkSize === 0 ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5913c2aae4b521a4b6f805e911e4e2764386b45
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
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/puppet[production]: planet: switch from module apache to module httpd

[Dzahn (Code Review)]

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

Change subject: planet: switch from module apache to module httpd
..

planet: switch from module apache to module httpd

The new module httpd has been added I7d8bc4c6ed8105021
to replace the apache module.

This will be the first service using it and we can fix
style issues due to inclusion of apache classes.

Change-Id: I7ee1eabea3e6528fbe15ff4799e7cda9e1b81d54
---
M modules/planet/manifests/apachesite.pp
M modules/planet/manifests/index_site.pp
M modules/profile/manifests/planet/venus.pp
M modules/role/manifests/planet_server.pp
4 files changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/402165/1

diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index 939017e..0d7dc7f 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -7,7 +7,7 @@
 $priority = '50'
 }
 
-apache::site { "${title}.planet.${planet::planet_domain_name}":
+httpd::site { "${title}.planet.${planet::planet_domain_name}":
 content  => template('planet/apache/planet-language.erb'),
 priority => $priority,
 }
diff --git a/modules/planet/manifests/index_site.pp 
b/modules/planet/manifests/index_site.pp
index d0b08cb..5a14980 100644
--- a/modules/planet/manifests/index_site.pp
+++ b/modules/planet/manifests/index_site.pp
@@ -1,7 +1,7 @@
 # sets up the planet-venus index/portal site
 class planet::index_site {
 
-apache::site { "planet.${planet::planet_domain_name}":
+httpd::site { "planet.${planet::planet_domain_name}":
 content => template('planet/apache/planet.erb'),
 }
 
diff --git a/modules/profile/manifests/planet/venus.pp 
b/modules/profile/manifests/planet/venus.pp
index 4e2a6cf..058b953 100644
--- a/modules/profile/manifests/planet/venus.pp
+++ b/modules/profile/manifests/planet/venus.pp
@@ -190,6 +190,10 @@
 planet_http_proxy  => $planet_http_proxy,
 }
 
+class {'::httpd':
+modules => ['rewrite', 'headers'],
+}
+
 ferm::service { 'planet-http':
 proto  => 'tcp',
 port   => '80',
diff --git a/modules/role/manifests/planet_server.pp 
b/modules/role/manifests/planet_server.pp
index ecee04b..a5fc707 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -3,12 +3,6 @@
 
 include ::standard
 include ::profile::base::firewall
-
-class { '::apache': }
-class { '::apache::mod::rewrite': }
-# so we can vary on X-Forwarded-Proto when behind misc-web
-class { '::apache::mod::headers': }
-
 include ::profile::planet::venus
 
 system::role { 'planet_server':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Added FancyBox fix for jQuery 3

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402171 )

Change subject: Added FancyBox fix for jQuery 3
..


Added FancyBox fix for jQuery 3

Based on this fix: https://github.com/nvidoni/fancybox/issues/2

The FancyBox library used by PF still needs to be updated.

Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
---
M libs/jquery.fancybox.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/libs/jquery.fancybox.js b/libs/jquery.fancybox.js
index 68d2865..81f1406 100644
--- a/libs/jquery.fancybox.js
+++ b/libs/jquery.fancybox.js
@@ -577,8 +577,8 @@
 
_finish = function () {
if (!$.support.opacity) {
-   content.get(0).style.removeAttribute('filter');
-   wrap.get(0).style.removeAttribute('filter');
+   content.css('filter', 0);
+   wrap.css('filter', 0);
}
 
if (selectedOpts.autoDimensions) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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]: peopleweb: re-add ferm rule for http

[Dzahn (Code Review)]

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

Change subject: peopleweb: re-add ferm rule for http
..


peopleweb: re-add ferm rule for http

re-add the ferm rule for http that was removed
in I0e48f233d1c5ca but not re-added in Ife9544fdd63a3bb536a
as intended

Change-Id: I58c10e97e1c5f1e11e24fbb1706f38906ee9b0ad
---
M modules/profile/manifests/microsites/peopleweb.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
index bf40a6c..e06b638 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -1,6 +1,12 @@
 # let users publish their own HTML in their home dirs
 class profile::microsites::peopleweb {
 
+ferm::service { 'people-http':
+proto  => 'tcp',
+port   => '80',
+srange => '$CACHE_MISC',
+}
+
 class { '::httpd':
 modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
 }

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Generate clover.xml files for tox-py27-coverage-publish

[jenkins-bot (Code Review)]

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

Change subject: Generate clover.xml files for tox-py27-coverage-publish
..


Generate clover.xml files for tox-py27-coverage-publish

coverage.py can generate cobertura files, so we use a script to turn it
into
a clover.xml file, and publish that. Both the original cobertura XML
file and
the generated clover.xml file are kept as artifacts.

Bug: T179054
Change-Id: I697d130e8c27189636bf0783ce100a5c82c19359
---
M jjb/python-jobs.yaml
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 40b283b..66e377d 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -112,8 +112,11 @@
  rm -fR coverage log
  mkdir -p log
  set -o pipefail
- TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ | tee "log/tox-coverage.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ --cover-xml | tee "log/tox-coverage.log"
  set +o pipefail
+ mv coverage.xml log/coverage.xml
+ 
/srv/deployment/integration/slave-scripts/bin/cobertura-clover-transform.py 
log/coverage.xml -o log/clover.xml
+ cp log/clover.xml coverage/clover.xml
  - cover-publish:
 src: 'coverage'
 dest: '$DOC_PROJECT'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Turn PropGuard into a trait

[Legoktm (Code Review)]

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

Change subject: Turn PropGuard into a trait
..

Turn PropGuard into a trait

This makes it easier to use, as you don't need to copy the __set function
into every class to take advantage of it.

Change-Id: I8ab0f99d0149f3a04ada6564c3e871775590d722
---
M RemexHtml/PropGuard.php
M RemexHtml/Serializer/Serializer.php
M RemexHtml/Serializer/SerializerNode.php
M RemexHtml/Tokenizer/Attribute.php
M RemexHtml/Tokenizer/Tokenizer.php
M RemexHtml/TreeBuilder/Element.php
M RemexHtml/TreeBuilder/InsertionMode.php
M RemexHtml/TreeBuilder/Marker.php
M RemexHtml/TreeBuilder/TreeBuilder.php
9 files changed, 20 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/80/402180/1

diff --git a/RemexHtml/PropGuard.php b/RemexHtml/PropGuard.php
index 00c3c4d..111c09a 100644
--- a/RemexHtml/PropGuard.php
+++ b/RemexHtml/PropGuard.php
@@ -7,15 +7,15 @@
  * undeclared properties on objects. The point of it is to detect programmer
  * errors.
  */
-class PropGuard {
+trait PropGuard {
public static $armed = true;
 
-   public static function set( $obj, $name, $value ) {
+   public function __set( $name, $value ) {
if ( self::$armed ) {
-   throw new \Exception( "Property \"$name\" on object of 
class " . get_class( $obj ) .
+   throw new \Exception( "Property \"$name\" on object of 
class " . get_class( $this ) .
" is undeclared" );
} else {
-   $obj->$name = $value;
+   $this->$name = $value;
}
}
 }
diff --git a/RemexHtml/Serializer/Serializer.php 
b/RemexHtml/Serializer/Serializer.php
index 786c969..b46a18e 100644
--- a/RemexHtml/Serializer/Serializer.php
+++ b/RemexHtml/Serializer/Serializer.php
@@ -14,6 +14,8 @@
  * a DOM and then serializing it, even if you use DOMDocument::saveHTML().
  */
 class Serializer implements AbstractSerializer {
+   use PropGuard;
+
/**
 * A node corresponding to the Document
 * @var SerializerNode
@@ -67,10 +69,6 @@
public function __construct( Formatter $formatter, $errorCallback = 
null ) {
$this->formatter = $formatter;
$this->errorCallback = $errorCallback;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 
/**
diff --git a/RemexHtml/Serializer/SerializerNode.php 
b/RemexHtml/Serializer/SerializerNode.php
index 2944732..6739b27 100644
--- a/RemexHtml/Serializer/SerializerNode.php
+++ b/RemexHtml/Serializer/SerializerNode.php
@@ -4,6 +4,8 @@
 use RemexHtml\PropGuard;
 
 class SerializerNode {
+   use PropGuard;
+
public $id;
public $parentId;
public $namespace;
@@ -24,9 +26,5 @@
$this->name = $name;
$this->attrs = $attrs;
$this->void = $void;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 }
diff --git a/RemexHtml/Tokenizer/Attribute.php 
b/RemexHtml/Tokenizer/Attribute.php
index 293b075..9346783 100644
--- a/RemexHtml/Tokenizer/Attribute.php
+++ b/RemexHtml/Tokenizer/Attribute.php
@@ -7,6 +7,8 @@
  * A namespaced attribute, as returned by Attributes::getObjects()
  */
 class Attribute {
+   use PropGuard;
+
public $qualifiedName;
public $namespaceURI;
public $prefix;
@@ -19,9 +21,5 @@
$this->prefix = $prefix;
$this->localName = $localName;
$this->value = $value;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 }
diff --git a/RemexHtml/Tokenizer/Tokenizer.php 
b/RemexHtml/Tokenizer/Tokenizer.php
index 3567dab..b998f8b 100644
--- a/RemexHtml/Tokenizer/Tokenizer.php
+++ b/RemexHtml/Tokenizer/Tokenizer.php
@@ -11,6 +11,8 @@
  * https://www.w3.org/TR/2016/REC-html51-20161101/
  */
 class Tokenizer {
+   use PropGuard;
+
// States
const STATE_START = 1;
const STATE_DATA = 2;
@@ -111,10 +113,6 @@
$this->ignoreCharRefs = !empty( $options['ignoreCharRefs'] );
$this->ignoreNulls = !empty( $options['ignoreNulls'] );
$this->skipPreprocess = !empty( $options['skipPreprocess'] );
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 
public function setEnableCdataCallback( $cb ) {
diff --git a/RemexHtml/TreeBuilder/Element.php 
b/RemexHtml/TreeBuilder/Element.php
index 18e2166..59029eb 100644
--- a/RemexHtml/TreeBuilder/Element.php
+++ b/RemexHtml/TreeBuilder/Element.php
@@ -14,6 +14,8 @@
  * 

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Add tests for PropGuard

[Legoktm (Code Review)]

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

Change subject: Add tests for PropGuard
..

Add tests for PropGuard

Change-Id: Id7f711cc31ba4b4a455beb4e307b11995967ee0e
---
A tests/phpunit/PropGuardTest.php
1 file changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/81/402181/1

diff --git a/tests/phpunit/PropGuardTest.php b/tests/phpunit/PropGuardTest.php
new file mode 100644
index 000..a335624
--- /dev/null
+++ b/tests/phpunit/PropGuardTest.php
@@ -0,0 +1,35 @@
+real = true;
+   // Will throw
+   $this->setExpectedException( Exception::class );
+   $mock->fake = true;
+   }
+
+   public function testDisarmed() {
+   MockPropGuard::$armed = false;
+   $mock = new MockPropGuard();
+   $mock->fake = true;
+   $this->assertTrue( $mock->fake );
+   }
+
+}
+
+class MockPropGuard {
+   use PropGuard;
+
+   public $real;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7f711cc31ba4b4a455beb4e307b11995967ee0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Document PHP version requirement in composer.json

[Legoktm (Code Review)]

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

Change subject: Document PHP version requirement in composer.json
..

Document PHP version requirement in composer.json

Change-Id: I8fad61a3ef33fd4a0a66371f7967b9c395b13b00
---
M composer.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/79/402179/1

diff --git a/composer.json b/composer.json
index 3812cea..c8ae29a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
}
],
"require": {
+   "php": ">=5.5.9",
"ext-mbstring": "*",
"wikimedia/utfnormal": "1.1.0"
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fad61a3ef33fd4a0a66371f7967b9c395b13b00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1098:3317

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Depool db1098:3317
..

db-eqiad.php: Depool db1098:3317

Fixing data drifts

Bug: T163190
Change-Id: I40d471aa4c686a98bd4397836ec2bef3d4056506
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4fe5899..b2ad44c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -166,7 +166,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
# 'db1094' => 500, # D2 3.6TB 512GB # T174569
-   'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
+   # 'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7 
# T163190
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
@@ -455,23 +455,23 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'contributions' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'logpager' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1098:3317

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Depool db1098:3317
..


db-eqiad.php: Depool db1098:3317

Fixing data drifts

Bug: T163190
Change-Id: I40d471aa4c686a98bd4397836ec2bef3d4056506
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4fe5899..b2ad44c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -166,7 +166,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
# 'db1094' => 500, # D2 3.6TB 512GB # T174569
-   'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
+   # 'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7 
# T163190
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
@@ -455,23 +455,23 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'contributions' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'logpager' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40d471aa4c686a98bd4397836ec2bef3d4056506
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Update ve-wmf path

[Nikerabbit (Code Review)]

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

Change subject: Update ve-wmf path
..

Update ve-wmf path

Change-Id: Ica2d375fd06b54484e14ee60b9490df977bcfe0a
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/83/402183/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 93c6f1c..8b52fbb 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2513,7 +2513,7 @@
 VisualEditor (WMF)
 id = ext-visualeditor-ve-wmf
 descmsg = visualeditor-desc
-file = VisualEditor/modules/ve-wmf/i18n/%CODE%.json
+file = VisualEditor/i18n/ve-wmf/%CODE%.json
 optional = visualeditor-help-link
 
 Vote NY

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Prevent page scroll to top while clicking on language settin...

[jenkins-bot (Code Review)]

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

Change subject: Prevent page scroll to top while clicking on language settings 
icon
..


Prevent page scroll to top while clicking on language settings icon

If the language settings window is not visible, all calculations
will go wrong and page will scroll to 0 position.

So call scrollIntoView only when the element is visible.

The $.fn.scrollIntoView defined in jquery.uls core may be unnecessary
now since it is available natively on DOM elements.

Bug: T178188
Change-Id: I461fa9eb7c51cd277bebd3a04cfcc0eed9793c4e
---
M resources/js/ext.uls.languagesettings.js
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/resources/js/ext.uls.languagesettings.js 
b/resources/js/ext.uls.languagesettings.js
index e39f3a6..b806d19 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -149,7 +149,9 @@
var $this = $( this );
 
$this.data( 'module' ).render();
-   languageSettings.$window.scrollIntoView();
+   if ( languageSettings.$window.is( ':visible' ) 
) {
+   
languageSettings.$window.scrollIntoView();
+   }
$settingsMenuItems.find( '.menu-section' 
).removeClass( 'active' );
$this.addClass( 'active' );
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I461fa9eb7c51cd277bebd3a04cfcc0eed9793c4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
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]: Revert "db-eqiad.php: Depool db1094"

[Marostegui (Code Review)]

Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1094"
..

Revert "db-eqiad.php: Depool db1094"

This reverts commit c38fb887cdc53e195bf34bc8b93dace6e77b840f.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4fe5899..cf47536 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
+   'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f9a3fac145858f6b8c622046518c1828a787522
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Rename to cover-extensions/ to avoid issues with subdirectories

[jenkins-bot (Code Review)]

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

Change subject: Rename to cover-extensions/ to avoid issues with subdirectories
..


Rename to cover-extensions/ to avoid issues with subdirectories

Page is designed to work for top-level directories, subdirectories don't
really work. So just rename the directory to cover-extensions to make
the URL look like I want it, but work properly :)

Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
---
R org/wikimedia/doc/cover-extensions/dir.php
R org/wikimedia/doc/cover-extensions/index.php
M shared/CoveragePage.php
3 files changed, 3 insertions(+), 10 deletions(-)

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



diff --git a/org/wikimedia/doc/cover/extensions/dir.php 
b/org/wikimedia/doc/cover-extensions/dir.php
similarity index 90%
rename from org/wikimedia/doc/cover/extensions/dir.php
rename to org/wikimedia/doc/cover-extensions/dir.php
index f31f804..879af75 100644
--- a/org/wikimedia/doc/cover/extensions/dir.php
+++ b/org/wikimedia/doc/cover-extensions/dir.php
@@ -17,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once __DIR__ . '/../../../../../shared/DocPage.php';
+require_once __DIR__ . '/../../../../shared/DocPage.php';
 
 $p = DocPage::newDirIndex(
'MediaWiki extension test coverage: ',
Page::INDEX_PREFIX | Page::INDEX_ALLOW_SKIP
 );
 $p->setRootDir( dirname( __DIR__ ) );
-$p->setLibPath( __DIR__ . '/../../lib' );
 $p->handleDirIndex();
 $p->flush();
diff --git a/org/wikimedia/doc/cover/extensions/index.php 
b/org/wikimedia/doc/cover-extensions/index.php
similarity index 86%
rename from org/wikimedia/doc/cover/extensions/index.php
rename to org/wikimedia/doc/cover-extensions/index.php
index 1af3043..dec1f54 100644
--- a/org/wikimedia/doc/cover/extensions/index.php
+++ b/org/wikimedia/doc/cover-extensions/index.php
@@ -18,13 +18,11 @@
  *
  */
 
-require_once __DIR__ . '/../../../../../shared/CoveragePage.php';
+require_once __DIR__ . '/../../../../shared/CoveragePage.php';
 
 /** @var CoveragePage $p */
 $p = CoveragePage::newDirIndex( 'MediaWiki extension test coverage' );
 $p->setCoverageDir( __DIR__ );
-// XXX: Not sure if there's a better way to do this
-$p->setLibPath( '../../lib' );
 $p->handleCoverageIndex();
 $p->handleDirIndex();
 $p->flush();
diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index cd67474..01fad1d 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -157,11 +157,7 @@
$dirs = parent::getDirIndexDirectories();
$noClover = [];
foreach ( $dirs as $dir ) {
-   // Ignore "extensions" subdirectory, it is linked to
-   // separately
-   if ( !file_exists( "$dir/clover.xml" )
-   && basename( $dir ) !== 'extensions'
-   ) {
+   if ( !file_exists( "$dir/clover.xml" ) ) {
$noClover[] = $dir;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Rename to cover-extensions/ to avoid issues with subdirectories

[Legoktm (Code Review)]

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

Change subject: Rename to cover-extensions/ to avoid issues with subdirectories
..

Rename to cover-extensions/ to avoid issues with subdirectories

Page is designed to work for top-level directories, subdirectories don't
really work. So just rename the directory to cover-extensions to make
the URL look like I want it, but work properly :)

Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
---
R org/wikimedia/doc/cover-extensions/dir.php
R org/wikimedia/doc/cover-extensions/index.php
M shared/CoveragePage.php
3 files changed, 3 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/84/402184/1

diff --git a/org/wikimedia/doc/cover/extensions/dir.php 
b/org/wikimedia/doc/cover-extensions/dir.php
similarity index 90%
rename from org/wikimedia/doc/cover/extensions/dir.php
rename to org/wikimedia/doc/cover-extensions/dir.php
index f31f804..879af75 100644
--- a/org/wikimedia/doc/cover/extensions/dir.php
+++ b/org/wikimedia/doc/cover-extensions/dir.php
@@ -17,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once __DIR__ . '/../../../../../shared/DocPage.php';
+require_once __DIR__ . '/../../../../shared/DocPage.php';
 
 $p = DocPage::newDirIndex(
'MediaWiki extension test coverage: ',
Page::INDEX_PREFIX | Page::INDEX_ALLOW_SKIP
 );
 $p->setRootDir( dirname( __DIR__ ) );
-$p->setLibPath( __DIR__ . '/../../lib' );
 $p->handleDirIndex();
 $p->flush();
diff --git a/org/wikimedia/doc/cover/extensions/index.php 
b/org/wikimedia/doc/cover-extensions/index.php
similarity index 86%
rename from org/wikimedia/doc/cover/extensions/index.php
rename to org/wikimedia/doc/cover-extensions/index.php
index 1af3043..dec1f54 100644
--- a/org/wikimedia/doc/cover/extensions/index.php
+++ b/org/wikimedia/doc/cover-extensions/index.php
@@ -18,13 +18,11 @@
  *
  */
 
-require_once __DIR__ . '/../../../../../shared/CoveragePage.php';
+require_once __DIR__ . '/../../../../shared/CoveragePage.php';
 
 /** @var CoveragePage $p */
 $p = CoveragePage::newDirIndex( 'MediaWiki extension test coverage' );
 $p->setCoverageDir( __DIR__ );
-// XXX: Not sure if there's a better way to do this
-$p->setLibPath( '../../lib' );
 $p->handleCoverageIndex();
 $p->handleDirIndex();
 $p->flush();
diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index cd67474..01fad1d 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -157,11 +157,7 @@
$dirs = parent::getDirIndexDirectories();
$noClover = [];
foreach ( $dirs as $dir ) {
-   // Ignore "extensions" subdirectory, it is linked to
-   // separately
-   if ( !file_exists( "$dir/clover.xml" )
-   && basename( $dir ) !== 'extensions'
-   ) {
+   if ( !file_exists( "$dir/clover.xml" ) ) {
$noClover[] = $dir;
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1094

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Repool db1094
..

db-eqiad.php: Repool db1094

Alter table is finished

Bug: T174569
Change-Id: I43933728adab57850c8e41945ec85d5c99c76159
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index b2ad44c..6ef81cd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
+   'db1094' => 500, # D2 3.6TB 512GB
# 'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7 
# T163190
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Publish extension coverage to cover-extensions/

[Legoktm (Code Review)]

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

Change subject: Publish extension coverage to cover-extensions/
..

Publish extension coverage to cover-extensions/

Change-Id: I76b8c1aa98c9346837c1fd72d6f23bd4720d8ee6
---
M jjb/mediawiki-extensions.yaml
M jjb/publish.yaml
2 files changed, 22 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/86/402186/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index ed106aa..80d0e24 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -511,7 +511,7 @@
 cp log/clover.xml "$WORKSPACE/cover/clover.xml"
 fi
 
- - cover-publish:
+ - cover-extensions-publish:
  src: 'cover'
  dest: 'extensions/$DOC_BASENAME'
 publishers:
diff --git a/jjb/publish.yaml b/jjb/publish.yaml
index 4235c13..0d5ba64 100644
--- a/jjb/publish.yaml
+++ b/jjb/publish.yaml
@@ -54,6 +54,27 @@
WMF_CI_PUB_DEST=cover/{dest}
PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
 
+# Variant of cover-publish that publishes to cover-extensions/
+- builder:
+name: cover-extensions-publish
+builders:
+ # rsync folder to integration-publishing.eqiad.wmflabs
+ - shell: |
+ set -u
+ echo "Making sure that destination does not contain unset variables 
(like DOC_SUBPATH, see zuul/doc_functions.py): {dest}"
+ rsync --recursive "{src}/" 
"rsync://10.68.23.254/doc/$JOB_NAME-$BUILD_NUMBER"
+ echo
+ echo "Publishing to 
https://doc.wikimedia.org/cover-extensions/{dest}/;
+ - trigger-builds:
+   - project: publish-on-contint1001
+ block: true
+ current-parameters: true  # Pass Zuul parameters
+ predefined-parameters: |
+   WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+   WMF_CI_PUB_DEST=cover-extensions/{dest}
+   PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
+
+
 # rsync a directory from integration-publishing.eqiad.wmflabs to a website on
 # contint1001.wikimedia.org.
 #

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Publish extension coverage to cover-extensions/

[jenkins-bot (Code Review)]

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

Change subject: Publish extension coverage to cover-extensions/
..


Publish extension coverage to cover-extensions/

Change-Id: I76b8c1aa98c9346837c1fd72d6f23bd4720d8ee6
---
M jjb/mediawiki-extensions.yaml
M jjb/publish.yaml
2 files changed, 23 insertions(+), 2 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index ed106aa..396f266 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -511,9 +511,9 @@
 cp log/clover.xml "$WORKSPACE/cover/clover.xml"
 fi
 
- - cover-publish:
+ - cover-extensions-publish:
  src: 'cover'
- dest: 'extensions/$DOC_BASENAME'
+ dest: '$DOC_BASENAME'
 publishers:
  - archive:
  artifacts: 'log/*'
diff --git a/jjb/publish.yaml b/jjb/publish.yaml
index 4235c13..0d5ba64 100644
--- a/jjb/publish.yaml
+++ b/jjb/publish.yaml
@@ -54,6 +54,27 @@
WMF_CI_PUB_DEST=cover/{dest}
PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
 
+# Variant of cover-publish that publishes to cover-extensions/
+- builder:
+name: cover-extensions-publish
+builders:
+ # rsync folder to integration-publishing.eqiad.wmflabs
+ - shell: |
+ set -u
+ echo "Making sure that destination does not contain unset variables 
(like DOC_SUBPATH, see zuul/doc_functions.py): {dest}"
+ rsync --recursive "{src}/" 
"rsync://10.68.23.254/doc/$JOB_NAME-$BUILD_NUMBER"
+ echo
+ echo "Publishing to 
https://doc.wikimedia.org/cover-extensions/{dest}/;
+ - trigger-builds:
+   - project: publish-on-contint1001
+ block: true
+ current-parameters: true  # Pass Zuul parameters
+ predefined-parameters: |
+   WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+   WMF_CI_PUB_DEST=cover-extensions/{dest}
+   PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
+
+
 # rsync a directory from integration-publishing.eqiad.wmflabs to a website on
 # contint1001.wikimedia.org.
 #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76b8c1aa98c9346837c1fd72d6f23bd4720d8ee6
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ia62065c0353433ce1003167eca8d34ace2962f47
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index b82550c..a1c0915 100644
--- a/extension.json
+++ b/extension.json
@@ -11,7 +11,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:Babel;,
"descriptionmsg": "babel-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "parserhook",
"MessagesDirs": {
"Babel": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia62065c0353433ce1003167eca8d34ace2962f47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update nikic/php-parser to 3.1.3

[Legoktm (Code Review)]

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

Change subject: Update nikic/php-parser to 3.1.3
..

Update nikic/php-parser to 3.1.3

And fix the only incompatibility in findDeprecated.php. It's OK to throw
exceptions on invalid files since we lint all PHP files so there
should be no invalid ones.

Change-Id: Ie5913c2aae4b521a4b6f805e911e4e2764386b45
---
M RELEASE-NOTES-1.31
M composer.json
M maintenance/findDeprecated.php
3 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/401902/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 4eb4c01..3ca34b9 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -44,6 +44,8 @@
 * Updated jquery.chosen from v0.9.14 to v1.8.2.
 * Updated composer/spdx-licenses from 1.1.4 to
   1.2.0 (development dependency).
+* Updated nikic/php-parser from 2.1.0 to 3.1.3
+  (development dependency).
 * …
 
  New external libraries 
diff --git a/composer.json b/composer.json
index 6b3e8f7..d92ffc9 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
"justinrainbow/json-schema": "~5.2",
"mediawiki/mediawiki-codesniffer": "15.0.0",
"monolog/monolog": "~1.22.1",
-   "nikic/php-parser": "2.1.0",
+   "nikic/php-parser": "3.1.3",
"nmred/kafka-php": "0.1.5",
"phpunit/phpunit": "4.8.36",
"psy/psysh": "0.8.11",
diff --git a/maintenance/findDeprecated.php b/maintenance/findDeprecated.php
index 6128d23..ec998da 100644
--- a/maintenance/findDeprecated.php
+++ b/maintenance/findDeprecated.php
@@ -132,6 +132,9 @@
$this->addDescription( 'Find deprecated interfaces' );
}
 
+   /**
+* @return SplFileInfo[]
+*/
public function getFiles() {
global $IP;
 
@@ -163,7 +166,7 @@
}
 
$finder->setCurrentFile( substr( $file->getPathname(), 
strlen( $IP ) + 1 ) );
-   $nodes = $parser->parse( $code, [ 'throwOnError' => 
false ] );
+   $nodes = $parser->parse( $code );
$traverser->traverse( $nodes );
 
if ( $i % $chunkSize === 0 ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Iec3190d087b8d1154b9f9c519cc097cc47eb95da
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index ddd3003..5a226c0 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:AdvancedSearch;,
"descriptionmsg": "advancedsearch-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"requires": {
"MediaWiki": ">= 1.31.0"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec3190d087b8d1154b9f9c519cc097cc47eb95da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
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...BetaFeatures[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib8882f62a367fd998b1b4c2fb1d175e65269360d
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index dc15655..0c62221 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:BetaFeatures;,
"descriptionmsg": "betafeatures-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"config": {
"BetaFeaturesWhitelist": null,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8882f62a367fd998b1b4c2fb1d175e65269360d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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...BaseHooks[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I40e8647eac8bba2055ff8a634943bb8678357a65
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index c53f56a..d6ebc13 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:BaseHooks;,
"descriptionmsg": "basehooks-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"MessagesDirs": {
"BaseHooks": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40e8647eac8bba2055ff8a634943bb8678357a65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BaseHooks
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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...Awesomeness[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ie6867165fc05f4d7f23b03e5481de9524e742586
---
M Awesomeness.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Awesomeness.php b/Awesomeness.php
index 2680654..955ede0 100644
--- a/Awesomeness.php
+++ b/Awesomeness.php
@@ -40,7 +40,7 @@
),
'url' => 'https://www.mediawiki.org/wiki/Extension:Awesomeness',
'descriptionmsg' => 'awesomeness-desc',
-   'license-label' => 'GPL-2.0+'
+   'license-label' => 'GPL-2.0-or-later'
 );
 
 // Register extension messages and other localisation.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6867165fc05f4d7f23b03e5481de9524e742586
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Awesomeness
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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...BiblioPlus[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I25e0685910bbd16f055b6efeeb21913d3ab4418c
---
M BiblioPlus.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/BiblioPlus.php b/BiblioPlus.php
index ed491d1..71f7441 100644
--- a/BiblioPlus.php
+++ b/BiblioPlus.php
@@ -170,7 +170,7 @@
'version' => $wgBiblioPlusVersion,
'author' => array( 'Karen Eddy', 'Code from the Biblio extension by 
Martin Jambon' ),
'url' => 'https://www.mediawiki.org/wiki/Extension:BiblioPlus',
-   'license-name' => 'GPL-2.0+',
+   'license-name' => 'GPL-2.0-or-later',
 );
 
 $moduleTemplate = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25e0685910bbd16f055b6efeeb21913d3ab4418c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BiblioPlus
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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]: db-eqiad.php: Depool db1079

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Depool db1079
..

db-eqiad.php: Depool db1079

Bug: T163190
Change-Id: I38fb4506881368e5f7d5ca8175321e4cfb34efc1
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index dc651c4..1ea03ed 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
-   'db1086' => 500, # B3 3.6TB 512GB, api
+   # 'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3) # T163190
+   'db1086' => 300, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
# 'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8 # 
fixing inconsistencies
@@ -451,7 +451,7 @@
'db1069' => 1,
],
'api' => [
-   'db1079' => 100,
+   # 'db1079' => 100,
'db1086' => 1,
],
'watchlist' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AuthorProtect[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I6788479a938c6bd791d4cade85688aae8ff4341e
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 57a91a7..c5f1a4b 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:AuthorProtect;,
"descriptionmsg": "authorprotect-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"AutoloadClasses": {
"AuthorProtect": "AuthorProtect.hooks.php",
"AuthorProtectAction": "AuthorProtectAction.php"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6788479a938c6bd791d4cade85688aae8ff4341e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AuthorProtect
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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...ApprovedRevs[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I400ab367e3c45337aa525ec4f03cfb99344a11c3
---
M ApprovedRevs.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/ApprovedRevs.php b/ApprovedRevs.php
index 30e6316..a0a1725 100644
--- a/ApprovedRevs.php
+++ b/ApprovedRevs.php
@@ -33,7 +33,7 @@
'author'  => array( 'Yaron Koren', '...' ),
'url' => 
'https://www.mediawiki.org/wiki/Extension:Approved_Revs',
'descriptionmsg'  => 'approvedrevs-desc',
-   'license-name'=> 'GPL-2.0+'
+   'license-name'=> 'GPL-2.0-or-later'
 );
 
 // global variables
diff --git a/extension.json b/extension.json
index 432667c..2926463 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:Approved_Revs;,
"descriptionmsg": "approvedrevs-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "hook",
"requires": {
"MediaWiki": ">= 1.27.0"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I400ab367e3c45337aa525ec4f03cfb99344a11c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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...AbuseFilter[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib7a48d3a432f12ce1c27fe989e85a80335a25801
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index a652d05..f4f3c7c 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:AbuseFilter;,
"descriptionmsg": "abusefilter-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "antispam",
"requires": {
"MediaWiki": ">= 1.31.0"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7a48d3a432f12ce1c27fe989e85a80335a25801
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jackmcbarn 
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...AdminLinks[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I66ecea278aec764e9fa6b0ca91b227588ae2669c
---
M AdminLinks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/AdminLinks.php b/AdminLinks.php
index 8a63a5e..43add3b 100644
--- a/AdminLinks.php
+++ b/AdminLinks.php
@@ -14,7 +14,7 @@
'author' => 'Yaron Koren',
'url' => 'https://www.mediawiki.org/wiki/Extension:Admin_Links',
'descriptionmsg' => 'adminlinks-desc',
-   'license-name' => 'GPL-2.0+'
+   'license-name' => 'GPL-2.0-or-later'
);
 
$GLOBALS['wgAdminLinksIP'] = __DIR__ . '/';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66ecea278aec764e9fa6b0ca91b227588ae2669c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdminLinks
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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...Translate[master]: Remove or regenerate PNG files for Translate

[jenkins-bot (Code Review)]

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

Change subject: Remove or regenerate PNG files for Translate
..


Remove or regenerate PNG files for Translate

Bug: T178484
Change-Id: I989adbcba8183dc6d18b066da9a03f6cd8b9a0ac
---
M resources/css/ext.translate.editor.css
M resources/css/ext.translate.groupselector.less
M resources/css/ext.translate.messagetable.less
M resources/css/ext.translate.navitoggle.css
M resources/css/ext.translate.pagemode.css
M resources/css/ext.translate.proofread.css
M resources/css/ext.translate.special.aggregategroups.css
M resources/css/ext.translate.special.pagemigration.css
M resources/css/ext.translate.workflowselector.css
D resources/images/action-edit.png
D resources/images/add.png
D resources/images/check-small.png
D resources/images/check-sprite-ltr.png
D resources/images/check-sprite-rtl.png
D resources/images/close.png
D resources/images/contract-ltr.png
D resources/images/contract-rtl.png
D resources/images/edit-mark.png
D resources/images/expand-ltr.png
D resources/images/expand-rtl.png
D resources/images/label-clock.png
D resources/images/label-flag.png
D resources/images/label-pen.png
D resources/images/label-tick.png
D resources/images/outdated-ltr.png
D resources/images/outdated-rtl.png
D resources/images/paste.png
D resources/images/plus_darkgray.png
D resources/images/project.png
D resources/images/remove.png
M resources/images/search.png
D resources/images/switch.png
D resources/images/translate-ltr.png
D resources/images/translate-rtl.png
D resources/images/trash_darkgray.png
D resources/images/user-small.png
D resources/images/view-list-hi.png
D resources/images/view-list.png
D resources/images/view-page-hi.png
D resources/images/view-page.png
D resources/images/view-proofread-hi.png
D resources/images/view-proofread.png
42 files changed, 42 insertions(+), 56 deletions(-)

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



diff --git a/resources/css/ext.translate.editor.css 
b/resources/css/ext.translate.editor.css
index 982499c..4ca4737 100644
--- a/resources/css/ext.translate.editor.css
+++ b/resources/css/ext.translate.editor.css
@@ -7,7 +7,7 @@
 }
 
 .grid .tux-message-editor .close {
-   background: url( ../images/close.png ) no-repeat center center;
+   background: no-repeat center center;
/* @embed */
background-image: linear-gradient( transparent, transparent ), url( 
../images/close.svg );
padding: 16px;
@@ -23,13 +23,13 @@
 }
 
 .tux-message-editor .editor-contract {
-   background: url( ../images/contract-ltr.png ) no-repeat center center;
+   background: no-repeat center center;
/* @embed */
background-image: linear-gradient( transparent, transparent ), url( 
../images/contract-ltr.svg );
 }
 
 .tux-message-editor .editor-expand {
-   background: url( ../images/expand-ltr.png ) no-repeat center center;
+   background: no-repeat center center;
/* @embed */
background-image: linear-gradient( transparent, transparent ), url( 
../images/expand-ltr.svg );
 }
@@ -226,9 +226,8 @@
 }
 
 .message-desc-edit {
-   background: url( ../images/action-edit.png ) left center no-repeat;
-   /* @embed */
-   background-image: linear-gradient( transparent, transparent ), url( 
../images/action-edit.svg );
+   background: left center no-repeat;
+   background-image: /* @embed */ linear-gradient( transparent, 
transparent ), url( ../images/action-edit.svg );
background-size: 18px 18px;
padding-left: 19px;
 }
@@ -314,15 +313,11 @@
 }
 
 .tux-warning-message.validation {
-   background-image: url( ../images/label-flag.png );
-   /* @embed */
-   background-image: linear-gradient( transparent, transparent ), url( 
../images/label-flag.svg );
+   background-image: /* @embed */ linear-gradient( transparent, 
transparent ), url( ../images/label-flag.svg );
 }
 
 .tux-warning-message.diff {
-   background-image: url( ../images/label-clock.png );
-   /* @embed */
-   background-image: linear-gradient( transparent, transparent ), url( 
../images/label-clock.svg );
+   background-image: /* @embed */ linear-gradient( transparent, 
transparent ), url( ../images/label-clock.svg );
 }
 
 .tux-warning-message .show-diff-link {
@@ -388,7 +383,7 @@
 }
 
 .tux-editor-insert-buttons .tux-editor-paste-original-button {
-   background: #fbfbfb url( ../images/paste.png ) left center no-repeat;
+   background: #fbfbfb left center no-repeat;
/* @embed */
background-image: linear-gradient( transparent, transparent ), url( 
../images/paste.svg );
background-size: 16px 16px;
@@ -426,7 +421,7 @@
 }
 
 .tux-message-tools-menu li.selected {
-   background: url( ../images/label-tick.png ) right no-repeat;
+   background: right no-repeat;
/* @embed */
  

[MediaWiki-commits] [Gerrit] integration/jenkins[master]: Add script to convert cobertura reports to clover

[Legoktm (Code Review)]

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

Change subject: Add script to convert cobertura reports to clover
..

Add script to convert cobertura reports to clover

coverage.py can only generate cobertura reports, but we've standardized on
clover, so use a script (really an XSLT) to convert into that format.

These files were copied from
 https://github.com/cwacek/cobertura-clover-transform
and slightly modified to run standalone, without any package installation.

Bug: T179054
Change-Id: Iba70f023779282627e82a2dff4d367a30e9c8f5a
---
A bin/cobertura-clover-transform.py
A bin/cobertura-clover-transform.xslt
2 files changed, 172 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/31/401931/1

diff --git a/bin/cobertura-clover-transform.py 
b/bin/cobertura-clover-transform.py
new file mode 100755
index 000..35095db
--- /dev/null
+++ b/bin/cobertura-clover-transform.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+"""
+https://github.com/cwacek/cobertura-clover-transform
+
+Copyright (c) 2014 Chris W
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from __future__ import print_function
+
+import lxml.etree as ET
+import argparse
+import os
+
+
+def convert(inxml):
+dom = ET.parse(inxml)
+xslt = ET.parse(os.path.join(os.path.dirname(__file__),
+ 'cobertura-clover-transform.xslt'))
+
+transform = ET.XSLT(xslt)
+newdom = transform(dom)
+return ET.tostring(newdom, pretty_print=True)
+
+
+def main():
+parser = argparse.ArgumentParser()
+parser.add_argument('coverage_xml')
+parser.add_argument('-o', '--output', required=False)
+args = parser.parse_args()
+
+converted = convert(args.coverage_xml)
+
+if args.output:
+with open(args.output, 'w') as out:
+out.write(converted.decode())
+else:
+print(converted)
+
+
+if __name__ == '__main__':
+main()
diff --git a/bin/cobertura-clover-transform.xslt 
b/bin/cobertura-clover-transform.xslt
new file mode 100644
index 000..dda6ace
--- /dev/null
+++ b/bin/cobertura-clover-transform.xslt
@@ -0,0 +1,112 @@
+
+http://www.w3.org/1999/XSL/Transform;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba70f023779282627e82a2dff4d367a30e9c8f5a
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I97547c37f31cb15dc62af45e28714a881f980113
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 58239ff..63ec8e8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceExtendedSearch",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"author": [
"Robert Vogel"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97547c37f31cb15dc62af45e28714a881f980113
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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...BlueSpiceExtendedFilelist[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I4e7aa494034bbad12f5872f3eab433f25887bcc1
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index e546393..d6f5a53 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "BlueSpiceExtendedFilelist",
"version": "3.0.0-alpha",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"url": "https://help.bluespice.com;,
"author": [
"Dejan Savuljesku"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e7aa494034bbad12f5872f3eab433f25887bcc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedFilelist
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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]: Revert "db-eqiad.php: Depool db1079"

[Marostegui (Code Review)]

Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1079"
..

Revert "db-eqiad.php: Depool db1079"

This reverts commit f417a00b1645b34aa0a0a52afc067773f222a46c.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1ea03ed..dc651c4 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   # 'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3) # T163190
-   'db1086' => 300, # B3 3.6TB 512GB, api
+   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
+   'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
# 'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8 # 
fixing inconsistencies
@@ -451,7 +451,7 @@
'db1069' => 1,
],
'api' => [
-   # 'db1079' => 100,
+   'db1079' => 100,
'db1086' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I750c2a2d73cc975286649764e8c65b39d83da82c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertTemplate[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I67967bc2b46001ddbd352272110da37cd65a3619
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 75290cc..7fc4903 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "BlueSpiceInsertTemplate",
"version": "3.0.0-alpha",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"url": 
"https://www.mediawiki.org/wiki/Extension:BlueSpiceInsertTemplate;,
"author": [
"Josef Konrad",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67967bc2b46001ddbd352272110da37cd65a3619
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertTemplate
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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...BlueSpiceFoundation[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib0cb154dc94b86cea0295ab8077191f38b263692
---
M THIRD_PARTY_LICENSES.md
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
index 5370240..30f58d7 100644
--- a/THIRD_PARTY_LICENSES.md
+++ b/THIRD_PARTY_LICENSES.md
@@ -30,7 +30,7 @@
 | Font | Author | Version | License |
 |:|:---|:|:---|
 | [FontAwesome](http://fontawesome.io) | Dave Gandy | 3.0 | [SIL 
1.1](http://fontawesome.io/license) |
-| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.txt) |
+| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0-only](https://www.gnu.org/licenses/gpl-3.0.txt) |
 
 License texts
 =
diff --git a/extension.json b/extension.json
index d1d1ed8..46871b6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceFoundation",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"author": [
"[http://www.hallowelt.com Hallo Welt! GmbH]"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0cb154dc94b86cea0295ab8077191f38b263692
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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...RevisionSlider[master]: Use SPDX 3.0 license identifier

[WMDE-Fisch (Code Review)]

WMDE-Fisch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401933 )

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I66f232a6a0fd03ff51cc0b4c87ee7b6f50edf439
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index 0fbf0db..cb430b1 100644
--- a/extension.json
+++ b/extension.json
@@ -12,7 +12,7 @@
"url": "https://www.mediawiki.org/wiki/Extension:RevisionSlider;,
"namemsg": "revisionslider",
"descriptionmsg": "revisionslider-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"manifest_version": 1,
"requires": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66f232a6a0fd03ff51cc0b4c87ee7b6f50edf439
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated back-compat HtmlFormatter class

[Legoktm (Code Review)]

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

Change subject: Remove deprecated back-compat HtmlFormatter class
..

Remove deprecated back-compat HtmlFormatter class

Change-Id: I9325ae046997812c607e93896e108053edca76d5
---
M RELEASE-NOTES-1.31
M autoload.php
D includes/HtmlFormatter.php
3 files changed, 2 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/401903/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 4eb4c01..d18c5cf 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -161,6 +161,8 @@
 * The $statementsOnOwnLine parameter of JavaScriptMinifier::minify was removed.
   The corresponding configuration variable 
($wgResourceLoaderMinifierStatementsOnOwnLine)
   has been deprecated since 1.27 and was removed as well.
+* The HtmlFormatter class was removed (deprecated in 1.27). The namespaced
+  HtmlFormatter\HtmlFormatter class should be used instead.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/autoload.php b/autoload.php
index af0b200..351136d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -606,7 +606,6 @@
'Hooks' => __DIR__ . '/includes/Hooks.php',
'Html' => __DIR__ . '/includes/Html.php',
'HtmlArmor' => __DIR__ . '/includes/libs/HtmlArmor.php',
-   'HtmlFormatter' => __DIR__ . '/includes/HtmlFormatter.php',
'Http' => __DIR__ . '/includes/http/Http.php',
'HttpError' => __DIR__ . '/includes/exception/HttpError.php',
'HttpStatus' => __DIR__ . '/includes/libs/HttpStatus.php',
diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
deleted file mode 100644
index 9bae8b5..000
--- a/includes/HtmlFormatter.php
+++ /dev/null
@@ -1,25 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @deprecated since 1.27, use HtmlFormatter\HtmlFormatter
- */
-class HtmlFormatter extends HtmlFormatter\HtmlFormatter {
-}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Don't use deprecated wfGlobalCacheKey()

[Legoktm (Code Review)]

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

Change subject: Don't use deprecated wfGlobalCacheKey()
..

Don't use deprecated wfGlobalCacheKey()

Change-Id: If4f6f58fbcb9fafe35ceaa9990a11b15116421e0
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 1c4d254..880239f 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -37,8 +37,8 @@
$contents = file_get_contents( $filePath );
 
// Try minified from cache
-   $key = wfGlobalCacheKey( 'centralauth', 'minify-js', md5( 
$contents ) );
$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING 
);
+   $key = $cache->makeGlobalKey( 'centralauth', 'minify-js', md5( 
$contents ) );
$cacheEntry = $cache->get( $key );
if ( is_string( $cacheEntry ) ) {
return $cacheEntry;

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::analytics_cluster::coordinator: fix system::role

[Elukey (Code Review)]

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

Change subject: role::analytics_cluster::coordinator: fix system::role
..

role::analytics_cluster::coordinator: fix system::role

Bug: T167790
Change-Id: I2055b24fb45f7da146ecf97702d5f1b6c6aabe5a
---
M modules/role/manifests/analytics_cluster/coordinator.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/401907/1

diff --git a/modules/role/manifests/analytics_cluster/coordinator.pp 
b/modules/role/manifests/analytics_cluster/coordinator.pp
index e0ff78a..6dbecaf 100644
--- a/modules/role/manifests/analytics_cluster/coordinator.pp
+++ b/modules/role/manifests/analytics_cluster/coordinator.pp
@@ -19,7 +19,7 @@
 class role::analytics_cluster::coordinator {
 
 system::role { 'analytics_cluster::coordinator':
-description => 'Analytics Cluster running various Hadoop services 
(Hive, Camus, Oozie, ..)'
+description => 'Analytics Cluster host running various Hadoop services 
(Hive, Camus, Oozie, ..) and maintenance scripts'
 }
 
 include ::role::analytics_cluster::client

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2055b24fb45f7da146ecf97702d5f1b6c6aabe5a
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] pywikibot/core[master]: Remove pydocstyle version restriction

[Dalba (Code Review)]

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

Change subject: Remove pydocstyle version restriction
..

Remove pydocstyle version restriction

Ignore the newly added error D999 for __all__ in pywikibot/__init__.py.[1]

[1]: https://gitlab.com/pycqa/flake8-docstrings/merge_requests/12/diffs

Bug: T178138
Change-Id: I3a6807e0419786e16b7281f9d19bd15fa780c6e2
---
M tox.ini
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/08/401908/1

diff --git a/tox.ini b/tox.ini
index 47a294e..30fbffe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,7 +60,7 @@
 basepython = python2.7
 deps = flake8
pyflakes >= 1.1
-   pydocstyle == 2.0.0
+   pydocstyle
hacking
flake8-docstrings>=1.1.0
flake8-per-file-ignores
@@ -200,6 +200,8 @@
 scripts/makecat.py : D103
 scripts/interwiki.py : P102
 pywikibot/__init__.py : P103
+# pydocstyle cannot handle multiple __all__ variables
+pywikibot/__init__.py : D999
 # valid N805 naming convention exceptions
 pywikibot/userinterfaces/terminal_interface.py : N814
 # invalidly detected as {} format string:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a6807e0419786e16b7281f9d19bd15fa780c6e2
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::analytics_cluster::coordinator: fix system::role

[Elukey (Code Review)]

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

Change subject: role::analytics_cluster::coordinator: fix system::role
..


role::analytics_cluster::coordinator: fix system::role

Bug: T167790
Change-Id: I2055b24fb45f7da146ecf97702d5f1b6c6aabe5a
---
M modules/role/manifests/analytics_cluster/coordinator.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/analytics_cluster/coordinator.pp 
b/modules/role/manifests/analytics_cluster/coordinator.pp
index e0ff78a..6dbecaf 100644
--- a/modules/role/manifests/analytics_cluster/coordinator.pp
+++ b/modules/role/manifests/analytics_cluster/coordinator.pp
@@ -19,7 +19,7 @@
 class role::analytics_cluster::coordinator {
 
 system::role { 'analytics_cluster::coordinator':
-description => 'Analytics Cluster running various Hadoop services 
(Hive, Camus, Oozie, ..)'
+description => 'Analytics Cluster host running various Hadoop services 
(Hive, Camus, Oozie, ..) and maintenance scripts'
 }
 
 include ::role::analytics_cluster::client

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2055b24fb45f7da146ecf97702d5f1b6c6aabe5a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
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]: Revert "db-eqiad.php: Depool db1079"

[jenkins-bot (Code Review)]

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

Change subject: Revert "db-eqiad.php: Depool db1079"
..


Revert "db-eqiad.php: Depool db1079"

This reverts commit 4823d0685972ab2a36ddf6260c06d208736f3d92.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index dcf3aaa..cf47536 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   # 'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3) # T174569
-   'db1086' => 300, # B3 3.6TB 512GB, api
+   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
+   'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -451,7 +451,7 @@
'db1069' => 1,
],
'api' => [
-   # 'db1079' => 100,
+   'db1079' => 100,
'db1086' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ae1b86acad8c717e5e34cd70c3c9165fb841d0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: bastionhost: add role for caching PoPs

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401548 )

Change subject: bastionhost: add role for caching PoPs
..


bastionhost: add role for caching PoPs

This is a role for bastionhosts in our caching PoPs, where they also
host the installserver tftp, the prometheus collector and the ipmi
management tools.

This patch adds role::ipmi::mgmt to the esams bastion for uniformity.

Change-Id: I8504878d64cb7612abcdf01b6f92539f3693ae3f
---
A hieradata/role/common/bastionhost/pop.yaml
M manifests/site.pp
A modules/role/manifests/bastionhost/pop.pp
3 files changed, 23 insertions(+), 11 deletions(-)

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



diff --git a/hieradata/role/common/bastionhost/pop.yaml 
b/hieradata/role/common/bastionhost/pop.yaml
new file mode 100644
index 000..3f8f20e
--- /dev/null
+++ b/hieradata/role/common/bastionhost/pop.yaml
@@ -0,0 +1,10 @@
+cluster: misc
+profile::base::domain_search:
+  - wikimedia.org
+  - eqiad.wmnet
+  - codfw.wmnet
+  - esams.wmnet
+  - ulsfo.wmnet
+  - eqsin.wmnet
+admin::groups:
+  - all-users
diff --git a/manifests/site.pp b/manifests/site.pp
index 1215fdb..7cd34b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -94,28 +94,20 @@
 
 # Bastion in the Netherlands (replaced bast3001)
 node 'bast3002.wikimedia.org' {
-role(bastionhost::general,
-installserver::tftp,
-prometheus::ops)
+role(bastionhost::pop)
 
 interface::add_ip6_mapped { 'main': }
 }
 
 # Bastion in California
 node 'bast4001.wikimedia.org' {
-role(bastionhost::general,
-ipmi::mgmt,
-installserver::tftp,
-prometheus::ops)
+role(bastionhost::pop)
 
 interface::add_ip6_mapped { 'main': }
 }
 
 node 'bast4002.wikimedia.org' {
-role(bastionhost::general,
-ipmi::mgmt,
-installserver::tftp,
-prometheus::ops)
+role(bastionhost::pop)
 
 interface::add_ip6_mapped { 'main': }
 }
diff --git a/modules/role/manifests/bastionhost/pop.pp 
b/modules/role/manifests/bastionhost/pop.pp
new file mode 100644
index 000..ade59e5
--- /dev/null
+++ b/modules/role/manifests/bastionhost/pop.pp
@@ -0,0 +1,10 @@
+# bastion host for all users in a caching PoP
+class role::bastionhost::pop {
+system::role { 'bastionhost::pop':
+description => 'Bastion host for all shell users in a caching Pop',
+}
+require ::role::bastionhost::general
+require ::role::installserver::tftp
+require ::role::prometheus::ops
+require ::role::ipmi::mgmt
+}

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Remove pydocstyle version restriction

[jenkins-bot (Code Review)]

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

Change subject: Remove pydocstyle version restriction
..


Remove pydocstyle version restriction

Ignore the newly added error D999 for __all__ in pywikibot/__init__.py.[1]
This patch also fixes the current flake8 InvocationError.

[1]: https://gitlab.com/pycqa/flake8-docstrings/merge_requests/12/diffs

Bug: T178138
Bug: T184164
Change-Id: I3a6807e0419786e16b7281f9d19bd15fa780c6e2
---
M tox.ini
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/tox.ini b/tox.ini
index 47a294e..30fbffe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,7 +60,7 @@
 basepython = python2.7
 deps = flake8
pyflakes >= 1.1
-   pydocstyle == 2.0.0
+   pydocstyle
hacking
flake8-docstrings>=1.1.0
flake8-per-file-ignores
@@ -200,6 +200,8 @@
 scripts/makecat.py : D103
 scripts/interwiki.py : P102
 pywikibot/__init__.py : P103
+# pydocstyle cannot handle multiple __all__ variables
+pywikibot/__init__.py : D999
 # valid N805 naming convention exceptions
 pywikibot/userinterfaces/terminal_interface.py : N814
 # invalidly detected as {} format string:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a6807e0419786e16b7281f9d19bd15fa780c6e2
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Use SPDX 3.0 license identifier

[jenkins-bot (Code Review)]

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ie32002ea43e8fbc4df7e4d7862bee0b82124b14c
---
M extension.json
M includes/BaseTemplateToolboxHookHandler.php
M includes/ItemNotabilityFilter.php
M package.json
M tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
M tests/phpunit/includes/ItemNotabilityFilterTest.php
M 
tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
M 
tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
8 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/extension.json b/extension.json
index fee1f7f..4c91dac 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
"url": "https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
"descriptionmsg": "articleplaceholder-desc",
"type": "other",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"requires": {
"MediaWiki": ">= 1.31.0"
},
diff --git a/includes/BaseTemplateToolboxHookHandler.php 
b/includes/BaseTemplateToolboxHookHandler.php
index cfc1c30..986ff2c 100644
--- a/includes/BaseTemplateToolboxHookHandler.php
+++ b/includes/BaseTemplateToolboxHookHandler.php
@@ -16,7 +16,7 @@
 /**
  * Add Wikibase item link in toolbox for placeholders: Handler for the 
"BaseTemplateToolbox" hook.
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Marius Hoch < h...@online.de >
  */
 class BaseTemplateToolboxHookHandler {
diff --git a/includes/ItemNotabilityFilter.php 
b/includes/ItemNotabilityFilter.php
index 548665d..3974a62 100644
--- a/includes/ItemNotabilityFilter.php
+++ b/includes/ItemNotabilityFilter.php
@@ -15,7 +15,7 @@
  * @author Lucie-Aimée Kaffee
  * @author Marius Hoch
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  */
 class ItemNotabilityFilter {
 
diff --git a/package.json b/package.json
index faf5b41..8bc479c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
"name": "articleplaceholder",
-   "license": "GPL-2.0+",
+   "license": "GPL-2.0-or-later",
"version": "0.0.1",
"repository": {
"type": "git",
diff --git a/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php 
b/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
index 5b97348..f5822f2 100644
--- a/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
+++ b/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
@@ -19,7 +19,7 @@
  *
  * @covers ArticlePlaceholder\BaseTemplateToolboxHookHandler
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Marius Hoch < h...@online.de >
  */
 class BaseTemplateToolboxHookHandlerTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/ItemNotabilityFilterTest.php 
b/tests/phpunit/includes/ItemNotabilityFilterTest.php
index a5bd277..c927acf 100644
--- a/tests/phpunit/includes/ItemNotabilityFilterTest.php
+++ b/tests/phpunit/includes/ItemNotabilityFilterTest.php
@@ -23,7 +23,7 @@
  *
  * @covers ArticlePlaceholder\ItemNotabilityFilter
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Marius Hoch
  * @author Lucie-Aimée Kaffee
  */
diff --git 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
index a593c91..372f1be 100644
--- 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
+++ 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
@@ -1,5 +1,5 @@
 /**
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Jonas Kress
  */
 ( function ( $, QUnit, sinon, mw ) {
diff --git 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
index 40496d9..5218dbe 100644
--- 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
+++ 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
@@ -1,5 +1,5 @@
 /**
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Jonas Kress
  */
 ( function ( $, QUnit, 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4

[Mobrovac (Code Review)]

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

Change subject: Update mathoid to bad5ec8d4
..


Update mathoid to bad5ec8d4

List of changes:
xxx Update node module dependencies

Change-Id: I8f8a682834a1dc0026f671736f3b5eca7c90f247
---
A node_modules/.bin/texvcinfo
M node_modules/.bin/texvcjs
M node_modules/commander/package.json
M node_modules/kad/package.json
R node_modules/mathoid-texvcjs/.istanbul.yml
R node_modules/mathoid-texvcjs/.jshintignore
R node_modules/mathoid-texvcjs/.jshintrc
R node_modules/mathoid-texvcjs/.npmignore
R node_modules/mathoid-texvcjs/.travis.yml
R node_modules/mathoid-texvcjs/bin/texvcjs
R node_modules/mathoid-texvcjs/lib/ast.js
R node_modules/mathoid-texvcjs/lib/astutil.js
R node_modules/mathoid-texvcjs/lib/build-parser.js
R node_modules/mathoid-texvcjs/lib/index.js
R node_modules/mathoid-texvcjs/lib/parser.js
R node_modules/mathoid-texvcjs/lib/parser.pegjs
R node_modules/mathoid-texvcjs/lib/render.js
R node_modules/mathoid-texvcjs/lib/texutil.js
R node_modules/mathoid-texvcjs/package.json
R node_modules/mathoid-texvcjs/test/all.js
R node_modules/mathoid-texvcjs/test/api.js
R node_modules/mathoid-texvcjs/test/ast.js
R node_modules/mathoid-texvcjs/test/chem-regression.js
R node_modules/mathoid-texvcjs/test/chem-regression.json
R node_modules/mathoid-texvcjs/test/chemtest.tex
R node_modules/mathoid-texvcjs/test/contains.js
R node_modules/mathoid-texvcjs/test/en-wiki-formulae.js
R node_modules/mathoid-texvcjs/test/en-wiki-formulae.json
R node_modules/mathoid-texvcjs/test/mathjax-texvc.js
R node_modules/mathoid-texvcjs/test/mathjax-texvc.json
R node_modules/mathoid-texvcjs/test/mocha.opts
R node_modules/mathoid-texvcjs/test/parser.js
R node_modules/mathoid-texvcjs/test/render.js
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/.codeclimate.yml
M node_modules/texvcinfo/.eslintignore
M node_modules/texvcinfo/.eslintrc
M node_modules/texvcinfo/.jshintignore
M node_modules/texvcinfo/.jshintrc
M node_modules/texvcinfo/.npmignore
M node_modules/texvcinfo/.travis.yml
M node_modules/texvcinfo/doc/commands.tex
M node_modules/texvcinfo/doc/literals.tex
M node_modules/texvcinfo/doc/main.pdf
M node_modules/texvcinfo/doc/main.tex
M node_modules/texvcinfo/lib/arrayTree.js
M node_modules/texvcinfo/lib/d3json.js
M node_modules/texvcinfo/lib/extractors/mods.js
M node_modules/texvcinfo/lib/extractors/subscripts.js
M node_modules/texvcinfo/lib/feedback.js
M node_modules/texvcinfo/lib/flatList.js
M node_modules/texvcinfo/lib/identifier.js
M node_modules/texvcinfo/lib/index.js
M node_modules/texvcinfo/lib/letterMods.json
M node_modules/texvcinfo/lib/literals.json
M node_modules/texvcinfo/lib/tokenTypes.js
D node_modules/texvcinfo/node_modules/.bin/texvcjs
M node_modules/texvcinfo/package.json
M node_modules/texvcinfo/test/feedback.js
M node_modules/texvcinfo/test/gold.js
M node_modules/texvcinfo/test/goldData.js
M node_modules/texvcinfo/test/identifier.js
M node_modules/texvcinfo/test/index.js
M node_modules/texvcinfo/test/mocha.opts
M node_modules/texvcinfo/test/tokenizer.js
M node_modules/texvcinfo/test/tree2d3json.js
M node_modules/texvcinfo/test/treeWriter.js
M node_modules/texvcinfo/utils/createDoc.js
M node_modules/texvcinfo/vis/index.html
69 files changed, 106 insertions(+), 95 deletions(-)

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



diff --git a/node_modules/.bin/texvcinfo b/node_modules/.bin/texvcinfo
new file mode 12
index 000..c04501a
--- /dev/null
+++ b/node_modules/.bin/texvcinfo
@@ -0,0 +1 @@
+../texvcinfo/bin/texvcinfo
\ No newline at end of file
diff --git a/node_modules/.bin/texvcjs b/node_modules/.bin/texvcjs
index c04501a..5f7e9a4 12
--- a/node_modules/.bin/texvcjs
+++ b/node_modules/.bin/texvcjs
@@ -1 +1 @@
-../texvcinfo/bin/texvcinfo
\ No newline at end of file
+../mathoid-texvcjs/bin/texvcjs
\ No newline at end of file
diff --git a/node_modules/commander/package.json 
b/node_modules/commander/package.json
index 24a31d7..9d7038b 100644
--- a/node_modules/commander/package.json
+++ b/node_modules/commander/package.json
@@ -39,9 +39,9 @@
   },
   "_requiredBy": [
 "#DEV:/",
+"/mathoid-texvcjs",
 "/speech-rule-engine",
-"/texvcinfo",
-"/texvcinfo/mathoid-texvcjs"
+"/texvcinfo"
   ],
   "_resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz;,
   "_shasum": "0f5946c427ed9ec0d91a46bb9def53e54650e555",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 5d8d870..e07d9da 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "6def549a4e39b5cbb43e008cf91234548769407f",
+  "_shasum": "cffb35582d9f2ce2d2bc4fac01dd14e94361da98",
   "_shrinkwrap": null,
   "_spec":