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

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I6bbe8421f04e404e26b21db04c54c671ed841a7f
---
M Hooks.php
M composer.json
M includes/Model/AbstractRevision.php
M includes/Model/UUID.php
M phpcs.xml
5 files changed, 10 insertions(+), 12 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index 262a676..309e27c 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -481,7 +481,7 @@
$rc = $block[0];
 
// quit if non-flow
-   if ( !FlowHooks::isFlow( $rc ) ) {
+   if ( !self::isFlow( $rc ) ) {
return true;
}
 
@@ -540,7 +540,7 @@
 
private static function modifyChangesListLine( $changesList, &$data, 
$rc, &$classes ) {
// quit if non-flow
-   if ( !FlowHooks::isFlow( $rc ) ) {
+   if ( !self::isFlow( $rc ) ) {
return true;
}
 
@@ -1546,7 +1546,7 @@
public static function onArticleConfirmDelete( $article, $output, 
&$reason ) {
$title = $article->getTitle();
if ( $title->inNamespace( NS_TOPIC ) ) {
-   $output->addHTML( FlowHooks::getTopicDeletionError( 
$title ) );
+   $output->addHTML( self::getTopicDeletionError( $title ) 
);
return false;
}
 
@@ -1566,7 +1566,7 @@
public static function onArticleDelete( WikiPage &$article, User 
&$user, &$reason, &$error ) {
$title = $article->getTitle();
if ( $title->inNamespace( NS_TOPIC ) ) {
-   $error = FlowHooks::getTopicDeletionError( $title );
+   $error = self::getTopicDeletionError( $title );
return false;
}
 
diff --git a/composer.json b/composer.json
index 216884b..d8f2b6a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
"symfony/css-selector": "~2.5",
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/Model/AbstractRevision.php 
b/includes/Model/AbstractRevision.php
index 990a226..8a44ad2 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -186,8 +186,8 @@
 
// BC: 'suppress' used to be called 'censor' & 'lock' was 
'close'
$bc = [
-   'censor' => AbstractRevision::MODERATED_SUPPRESSED,
-   'close' => AbstractRevision::MODERATED_LOCKED,
+   'censor' => self::MODERATED_SUPPRESSED,
+   'close' => self::MODERATED_LOCKED,
];
$obj->moderationState = str_replace( array_keys( $bc ), 
array_values( $bc ), $obj->moderationState );
 
diff --git a/includes/Model/UUID.php b/includes/Model/UUID.php
index 32c2fde..f4bef47 100644
--- a/includes/Model/UUID.php
+++ b/includes/Model/UUID.php
@@ -349,7 +349,7 @@
if ( $value instanceof UUIDBlob ) {
// database encoded binary value
if ( $format === 'alphadecimal' ) {
-   $array[$key] = UUID::create( 
$value->fetch() )->getAlphadecimal();
+   $array[$key] = self::create( 
$value->fetch() )->getAlphadecimal();
}
} elseif ( $value instanceof UUID ) {
if ( $format === 'binary' ) {
@@ -361,13 +361,13 @@
// things that look like uuids
$len = strlen( $value );
if ( $format === 'alphadecimal' && $len === 
self::BIN_LEN ) {
-   $array[$key] = UUID::create( $value 
)->getAlphadecimal();
+   $array[$key] = self::create( $value 
)->getAlphadecimal();
} elseif ( $format === 'binary' && (
( $len >= self::MIN_ALNUM_LEN && $len 
<= self::ALNUM_LEN )
||
$len === self::HEX_LEN
) ) {
-   $array[$key] = UUID::create( $value 
)->getBinary();
+   

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Auto add label variable when datatype of used property wik...

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368001 )

Change subject: Auto add label variable when  datatype  of used property 
wikibase-item
..

Auto add label variable when  datatype  of used property wikibase-item

This automatically adds a label column to columns containing a wikibase
item.

Change-Id: I6017ddb5eec84bf199de67a1bfde621185ff75c2
---
M wikibase/queryService/api/Wikibase.js
M wikibase/queryService/ui/queryHelper/QueryHelper.js
2 files changed, 59 insertions(+), 24 deletions(-)


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

diff --git a/wikibase/queryService/api/Wikibase.js 
b/wikibase/queryService/api/Wikibase.js
index 4a9dac9..3c0b3e4 100644
--- a/wikibase/queryService/api/Wikibase.js
+++ b/wikibase/queryService/api/Wikibase.js
@@ -14,21 +14,24 @@
continue: 0,
languages: LANGUAGE,
uselang: LANGUAGE
-   };
-
-   var QUERY_LANGUGES = {
+   },
+   QUERY_LANGUGES = {
action: 'query',
meta: 'siteinfo',
format: 'json',
siprop: 'languages'
-   };
-
-   var QUERY_LABELS = {
+   },
+   QUERY_LABELS = {
action: 'wbgetentities',
props: 'labels',
format: 'json',
languages: LANGUAGE,
languagefallback: '1'
+   },
+   QUERY_DATATYPE = {
+   action: 'wbgetentities',
+   props: 'datatype',
+   format: 'json'
};
 
/**
@@ -101,6 +104,7 @@
/**
 * Get labels for given entities
 *
+* @param {string|string[]} ids entity ids
 * @return {jQuery.Promise}
 */
SELF.prototype.getLabels = function( ids ) {
@@ -120,6 +124,29 @@
};
 
/**
+* Get datatype of property
+*
+* @param {string|} id property id
+* @return {jQuery.Promise}
+*/
+   SELF.prototype.getDataType = function( id ) {
+   var query = QUERY_DATATYPE,
+   deferred = $.Deferred();
+
+   query.ids = id;
+
+   this._query( query ).done( function( data ) {
+   if ( data.entities && data.entities[id]  &&  
data.entities[id].datatype ) {
+   deferred.resolve(  data.entities[id].datatype );
+   }
+   deferred.reject();
+
+   } ).fail( deferred.reject );
+
+   return deferred.promise();
+   };
+
+   /**
 * @private
 */
SELF.prototype._query = function( query ) {
diff --git a/wikibase/queryService/ui/queryHelper/QueryHelper.js 
b/wikibase/queryService/ui/queryHelper/QueryHelper.js
index 3647ef4..823785b 100644
--- a/wikibase/queryService/ui/queryHelper/QueryHelper.js
+++ b/wikibase/queryService/ui/queryHelper/QueryHelper.js
@@ -315,6 +315,12 @@
self._query.addVariable( variable );
}
 
+   self._api.getDataType( prop.split( '/' ).pop() ).done( 
function ( type ) {
+   if ( type === 'wikibase-item' ) {
+   self._addLabelVariable( triple );
+   }
+   } );
+
$table.append( self._getTripleHtml( triple ) );
 
if ( self._changeListener ) {
@@ -348,6 +354,12 @@
 
var triple = self._query.addTriple( subject, prop, 
variable2, true );
self._query.addVariable( variable2 );
+
+   self._api.getDataType( prop.split( '/' ).pop() ).done( 
function ( type ) {
+   if ( type === 'wikibase-item' ) {
+   self._addLabelVariable( triple );
+   }
+   } );
 
$table.append( self._getTripleHtml( triple ) );
 
@@ -450,25 +462,21 @@
title: self._i18n( 'remove-row-title' )
} );
 
-   var $label = $( '' ).addClass( 'fa fa-tag' ).click( 
function () {
-   if ( triple.triple.object.startsWith( '?' ) ) {
-   self._query
-   .addVariable( 
triple.triple.object +
-   'Label' );
-   } else {
-   self._query
-   .addVariable( 
triple.triple.subject +
-   'Label' );
-   }
-   if ( self._changeListener ) {
- 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix misc bash oddities in the CI scripts

[jenkins-bot (Code Review)]

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

Change subject: Fix misc bash oddities in the CI scripts
..


Fix misc bash oddities in the CI scripts

I have passed "shellcheck -x" and addressed all the tiny issues in the
CI shell scripts.  That makes them slightly more robust.

Change-Id: I0bc1627752533f58bf4fa69cefbf99a68ebd0638
---
M bin/ci-create-dbs.sh
M bin/ci-drop-dbs.sh
M bin/ci-populate-dbs.sh
M bin/drupal-install.sh
4 files changed, 14 insertions(+), 11 deletions(-)

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



diff --git a/bin/ci-create-dbs.sh b/bin/ci-create-dbs.sh
index 1ed07ca..bac6a3c 100755
--- a/bin/ci-create-dbs.sh
+++ b/bin/ci-create-dbs.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -eu
 
-BASEDIR=$(dirname $0)
+BASEDIR=$(dirname "$0")
+# shellcheck source=ci-settings.sh
 . $BASEDIR/ci-settings.sh
 
 echo "Creating databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'"
diff --git a/bin/ci-drop-dbs.sh b/bin/ci-drop-dbs.sh
index 4925a9c..b5cfb1a 100755
--- a/bin/ci-drop-dbs.sh
+++ b/bin/ci-drop-dbs.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -eu
 
-BASEDIR=$(dirname $0)
+BASEDIR=$(dirname "$0")
+# shellcheck source=ci-settings.sh
 . $BASEDIR/ci-settings.sh
 
 echo "Dropping databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'"
diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh
index ea31286..e8ab288 100755
--- a/bin/ci-populate-dbs.sh
+++ b/bin/ci-populate-dbs.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -eu
 
-BASEDIR=$(dirname $0)
+BASEDIR=$(dirname "$0")
+# shellcheck source=ci-settings.sh
 . $BASEDIR/ci-settings.sh
 
 echo "Populating databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'"
@@ -11,15 +12,15 @@
 
 #FIXME: --web-root="$WORKSPACE/src/crm"
 
-$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin/civi-download-tools
+"$WORKSPACE"/src/wikimedia/fundraising/civicrm-buildkit/bin/civi-download-tools
 
-$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin/amp config:set \
+"$WORKSPACE"/src/wikimedia/fundraising/civicrm-buildkit/bin/amp config:set \
--db_type=mysql_precreated \
--httpd_type=none \
--perm_type=none
 
-rm -rf $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/build/wmff
-mkdir -p $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/build
-ln -s $WORKSPACE/src/wikimedia/fundraising/crm 
$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/build/wmff
+rm -rf "$WORKSPACE"/src/wikimedia/fundraising/civicrm-buildkit/build/wmff
+mkdir -p "$WORKSPACE"/src/wikimedia/fundraising/civicrm-buildkit/build
+ln -s "$WORKSPACE"/src/wikimedia/fundraising/crm 
"$WORKSPACE"/src/wikimedia/fundraising/civicrm-buildkit/build/wmff
 
-$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin/civibuild reinstall 
wmff
+"$WORKSPACE"/src/wikimedia/fundraising/civicrm-buildkit/bin/civibuild 
reinstall wmff
diff --git a/bin/drupal-install.sh b/bin/drupal-install.sh
index ea4ff27..9183b58 100755
--- a/bin/drupal-install.sh
+++ b/bin/drupal-install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -eu
 
 if [ $# -ne 3 ]; then
-   app_name=`basename $0`
+   app_name=$(basename "$0")
cat <<-EOS
Usage: $app_name DB_URL SITE_NAME ADMIN_PASSWORD
 
@@ -16,7 +16,7 @@
 ADMIN_PASSWORD=$3
 
 drush \
-   --root=`dirname $0`/../drupal \
+   --root="$(dirname "$0")"/../drupal \
 site-install standard \
 --db-url="$DB_URL" \
 --site-name="$SITE_NAME" \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bc1627752533f58bf4fa69cefbf99a68ebd0638
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Jgreen 
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...EducationProgram[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: Ibc12768d9f9cd173b91089bd3bea850db98ba494
---
M EducationProgram.hooks.php
M composer.json
M includes/ArticleAdder.php
M includes/ArticleStore.php
M includes/CourseUndeletionHelper.php
M includes/Events/Event.php
M includes/Events/EventStore.php
M includes/OrgDeletionHelper.php
M includes/RevisionAction.php
M includes/RevisionDiff.php
M includes/RoleObject.php
M includes/UserRolesMessage.php
M includes/Utils.php
M includes/actions/DeleteAction.php
M includes/actions/DeleteOrgAction.php
M includes/actions/EditAction.php
M includes/actions/RestoreAction.php
M includes/actions/UndeleteAction.php
M includes/actions/UndoAction.php
M includes/actions/ViewAction.php
M includes/api/ApiDeleteEducation.php
M includes/api/ApiEnlist.php
M includes/notifications/CampusAddNotification.php
M includes/notifications/CourseTalkNotification.php
M includes/notifications/InstructorAddNotification.php
M includes/notifications/NotificationsManager.php
M includes/notifications/OnlineAddNotification.php
M includes/notifications/StudentAddNotification.php
M includes/pagers/EPPager.php
M includes/rows/Course.php
M includes/rows/EPArticle.php
M includes/rows/EPRevision.php
M includes/rows/Org.php
M includes/rows/PageObject.php
M includes/rows/RevisionedObject.php
M includes/specials/SpecialAmbassadorProfile.php
M includes/specials/SpecialEducationProgram.php
M includes/specials/SpecialEnroll.php
M includes/specials/VerySpecialPage.php
M includes/tables/Orgs.php
M includes/tables/PageTable.php
M phpcs.xml
42 files changed, 74 insertions(+), 75 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/93/367993/1

diff --git a/EducationProgram.hooks.php b/EducationProgram.hooks.php
index ae98a26..3d2ea69 100755
--- a/EducationProgram.hooks.php
+++ b/EducationProgram.hooks.php
@@ -405,7 +405,7 @@
 * @param string $error
 * @param string $reason
 *
-* @return boolean
+* @return bool
 */
public static function onAbortMove(
Title $oldTitle, Title $newTitle, User $user, &$error, $reason
diff --git a/composer.json b/composer.json
index 579fe1f..91c6304 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/ArticleAdder.php b/includes/ArticleAdder.php
index 52edb51..8c569a5 100644
--- a/includes/ArticleAdder.php
+++ b/includes/ArticleAdder.php
@@ -59,7 +59,7 @@
 * @param string $pageTitle
 * @param int[] $reviewers Ids of the users that are reviewers for this 
article
 *
-* @return boolean Indicates if the article was actually added. False 
means it already existed.
+* @return bool Indicates if the article was actually added. False 
means it already existed.
 */
public function addArticle(
$actionUser, $courseId, $userId, $pageId, $pageTitle, 
$reviewers = []
diff --git a/includes/ArticleStore.php b/includes/ArticleStore.php
index 4d0c526..3eb1312 100644
--- a/includes/ArticleStore.php
+++ b/includes/ArticleStore.php
@@ -63,7 +63,7 @@
 *
 * @param int|null $articleId
 *
-* @return boolean
+* @return bool
 */
public function hasArticle( $articleId ) {
if ( is_null( $articleId ) ) {
@@ -135,7 +135,7 @@
 *
 * @param EPArticle $article
 *
-* @return boolean
+* @return bool
 * @throws InvalidArgumentException
 */
public function updateArticle( EPArticle $article ) {
@@ -237,7 +237,7 @@
 *
 * @param int $articleId
 *
-* @return boolean Success indicator
+* @return bool Success indicator
 */
public function deleteArticle( $articleId ) {
return $this->getWriteConnection()->delete(
@@ -258,7 +258,7 @@
 * @param int $userId
 * @param int $pageId
 *
-* @return boolean
+* @return bool
 */
public function hasArticleWith( $courseId, $userId, $pageId ) {
return $this->getReadConnection()->selectRow(
@@ -281,7 +281,7 @@
 * @param int[]|int $courseIds
 * @param int[]|int $userIds
 *
-* @return boolean
+* @return bool
 * @throws InvalidArgumentException
 */
public function 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update electron-render-service to f3978ab

[Mobrovac (Code Review)]

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

Change subject: Update electron-render-service to f3978ab
..


Update electron-render-service to f3978ab

List of changes:
f3978ab Switch to Node v6.11
xxx Update node module dependencies

Change-Id: If525d070b0e75521b8c0006f19b4edd30a3ec1a0
---
A node_modules/@types/bluebird/LICENSE
M node_modules/@types/bluebird/index.d.ts
M node_modules/@types/bluebird/package.json
D node_modules/@types/bluebird/types-metadata.json
A node_modules/@types/express-serve-static-core/LICENSE
M node_modules/@types/express-serve-static-core/index.d.ts
M node_modules/@types/express-serve-static-core/package.json
A node_modules/@types/express/LICENSE
M node_modules/@types/express/index.d.ts
M node_modules/@types/express/package.json
D node_modules/@types/express/types-metadata.json
A node_modules/@types/mime/LICENSE
M node_modules/@types/mime/index.d.ts
M node_modules/@types/mime/package.json
D node_modules/@types/mime/types-metadata.json
A node_modules/@types/node/LICENSE
M node_modules/@types/node/index.d.ts
M node_modules/@types/node/package.json
M node_modules/ajv/dist/ajv.bundle.js
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/lib/compile/formats.js
M node_modules/ajv/lib/dot/custom.jst
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/anyOf.js
M node_modules/ajv/lib/dotjs/constant.js
M node_modules/ajv/lib/dotjs/custom.js
M node_modules/ajv/lib/dotjs/dependencies.js
M node_modules/ajv/lib/dotjs/enum.js
M node_modules/ajv/lib/dotjs/format.js
M node_modules/ajv/lib/dotjs/items.js
M node_modules/ajv/lib/dotjs/multipleOf.js
M node_modules/ajv/lib/dotjs/not.js
M node_modules/ajv/lib/dotjs/oneOf.js
M node_modules/ajv/lib/dotjs/pattern.js
M node_modules/ajv/lib/dotjs/patternRequired.js
M node_modules/ajv/lib/dotjs/properties.js
M node_modules/ajv/lib/dotjs/ref.js
M node_modules/ajv/lib/dotjs/required.js
M node_modules/ajv/lib/dotjs/switch.js
M node_modules/ajv/lib/dotjs/uniqueItems.js
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/ajv/scripts/compile-dots.js
M node_modules/ajv/scripts/travis-gh-pages
M node_modules/async/apply.js
M node_modules/async/applyEach.js
M node_modules/async/applyEachSeries.js
M node_modules/async/asyncify.js
M node_modules/async/auto.js
M node_modules/async/autoInject.js
M node_modules/async/cargo.js
M node_modules/async/compose.js
M node_modules/async/concat.js
A node_modules/async/concatLimit.js
M node_modules/async/concatSeries.js
M node_modules/async/constant.js
M node_modules/async/detect.js
M node_modules/async/detectLimit.js
M node_modules/async/detectSeries.js
M node_modules/async/dir.js
M node_modules/async/dist/async.js
M node_modules/async/dist/async.min.js
M node_modules/async/doDuring.js
M node_modules/async/doUntil.js
M node_modules/async/doWhilst.js
M node_modules/async/during.js
M node_modules/async/each.js
M node_modules/async/eachLimit.js
M node_modules/async/eachOf.js
M node_modules/async/eachOfLimit.js
M node_modules/async/eachOfSeries.js
M node_modules/async/eachSeries.js
M node_modules/async/ensureAsync.js
M node_modules/async/every.js
M node_modules/async/everyLimit.js
M node_modules/async/everySeries.js
M node_modules/async/forever.js
A node_modules/async/groupBy.js
A node_modules/async/groupByLimit.js
A node_modules/async/groupBySeries.js
M node_modules/async/index.js
M node_modules/async/internal/DoublyLinkedList.js
M node_modules/async/internal/applyEach.js
D node_modules/async/internal/concat.js
M node_modules/async/internal/consoleFunc.js
M node_modules/async/internal/doParallel.js
M node_modules/async/internal/doParallelLimit.js
D node_modules/async/internal/doSeries.js
M node_modules/async/internal/filter.js
M node_modules/async/internal/initialParams.js
M node_modules/async/internal/map.js
M node_modules/async/internal/parallel.js
M node_modules/async/internal/queue.js
D node_modules/async/internal/rest.js
M node_modules/async/internal/setImmediate.js
A node_modules/async/internal/slice.js
A node_modules/async/internal/wrapAsync.js
M node_modules/async/log.js
M node_modules/async/map.js
M node_modules/async/mapLimit.js
M node_modules/async/mapSeries.js
M node_modules/async/mapValues.js
M node_modules/async/mapValuesLimit.js
M node_modules/async/mapValuesSeries.js
M node_modules/async/memoize.js
M node_modules/async/package.json
M node_modules/async/parallel.js
M node_modules/async/parallelLimit.js
M node_modules/async/priorityQueue.js
M node_modules/async/queue.js
M node_modules/async/race.js
M node_modules/async/reduce.js
M node_modules/async/reduceRight.js
M node_modules/async/reflect.js
M node_modules/async/reflectAll.js
M node_modules/async/reject.js
M 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Move injection of RC records to a separate job.

[jenkins-bot (Code Review)]

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

Change subject: Move injection of RC records to a separate job.
..


Move injection of RC records to a separate job.

This should also fix the nested transaction issue introduced by If195a35e9c.

Bug: T107722
Bug: T171370
Change-Id: I9100c174537c56527c2dcec38a69234b7ebe80c9
---
M client/WikibaseClient.php
A client/includes/Changes/InjectRCRecordsJob.php
M client/includes/Changes/WikiPageUpdater.php
M client/includes/WikibaseClient.php
A client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php
M client/tests/phpunit/includes/Changes/WikiPageUpdaterTest.php
6 files changed, 590 insertions(+), 100 deletions(-)

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



diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index fd0fe88..012905d 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -182,6 +182,24 @@
// job classes
$wgJobClasses['wikibase-addUsagesForPage'] = 
Wikibase\Client\Store\AddUsagesForPageJob::class;
$wgJobClasses['ChangeNotification'] = 
Wikibase\Client\ChangeNotificationJob::class;
+   $wgJobClasses['wikibase-InjectRCRecords'] = function ( Title $unused, 
array $params ) {
+   $mwServices = MediaWiki\MediaWikiServices::getInstance();
+   $wbServices = 
Wikibase\Client\WikibaseClient::getDefaultInstance();
+
+   $job = new Wikibase\Client\Changes\InjectRCRecordsJob(
+   $mwServices->getDBLoadBalancerFactory(),
+   $wbServices->getStore()->getEntityChangeLookup(),
+   $wbServices->getRecentChangeFactory(),
+   $params
+   );
+
+   $job->setRecentChangesDuplicateDetector( 
$wbServices->getStore()->getRecentChangesDuplicateDetector() );
+
+   $job->setLogger( MediaWiki\Logger\LoggerFactory::getInstance( 
'wikibase.client.pageupdates' ) );
+   $job->setStats( $mwServices->getStatsdDataFactory() );
+
+   return $job;
+   };
 
// api modules
$wgAPIMetaModules['wikibase'] = array(
@@ -226,8 +244,8 @@
$wgAPIPropModules['wbentityusage'] = [
'class' => Wikibase\Client\Api\ApiPropsEntityUsage::class,
'factory' => function ( ApiQuery $query, $moduleName ) {
-   $repoLinker = 
\Wikibase\Client\WikibaseClient::getDefaultInstance()->newRepoLinker();
-   return new \Wikibase\Client\Api\ApiPropsEntityUsage(
+   $repoLinker = 
Wikibase\Client\WikibaseClient::getDefaultInstance()->newRepoLinker();
+   return new Wikibase\Client\Api\ApiPropsEntityUsage(
$query,
$moduleName,
$repoLinker
diff --git a/client/includes/Changes/InjectRCRecordsJob.php 
b/client/includes/Changes/InjectRCRecordsJob.php
new file mode 100644
index 000..54c4781
--- /dev/null
+++ b/client/includes/Changes/InjectRCRecordsJob.php
@@ -0,0 +1,272 @@
+getArticleId();
+   $pages[$id] = [ $t->getNamespace(), $t->getDBkey() ];
+   }
+
+   $params = [
+   'change' => $change->getId(),
+   'pages' => $pages
+   ];
+
+   return new JobSpecification(
+   'wikibase-InjectRCRecords',
+   $params
+   );
+
+   }
+
+   /**
+* Constructs an InjectRCRecordsJob for injecting a change into the 
recentchanges feed
+* for the given pages.
+*
+* @param LBFactory $lbFactory
+* @param EntityChangeLookup $changeLookup
+* @param RecentChangeFactory $rcFactory
+* @param array $params Needs to have two keys: "change": the id of the 
change,
+* "pages": array of pages, represented as $pageId => [ $namespace, 
$dbKey ].
+*/
+   public function __construct(
+   LBFactory $lbFactory,
+   EntityChangeLookup $changeLookup,
+   RecentChangeFactory $rcFactory,
+   array $params
+   ) {
+   $title = Title::makeTitle( NS_SPECIAL, 'Badtitle/' . __CLASS__ 
);
+   parent::__construct( 'wikibase-InjectRCRecords', $title, 
$params );
+
+   Assert::parameter(
+   isset( $params['change'] ),
+   '$params',
+   '$params[\'change\'] not set.'
+   );
+   Assert::parameter(
+   isset( $params['pages'] ),
+   '$params',
+   '$params[\'pages\'] not set.'
+   );
+   

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to fab5c3998

[Mobrovac (Code Review)]

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

Change subject: Update mathoid to fab5c3998
..


Update mathoid to fab5c3998

List of changes:
8ccdd2abe Add the Dockerfile to be used in Kubernetes
de37e2184 Update readme node version, de-mention phantomjs
99f0a6bfa Add node version requirement >= 4
fab5c3998 Switch to Node v6.11; release v0.6.5
xxx Update node module dependencies

Change-Id: I9a936977846cb9adea54e422c35ff73bd9624198
---
M node_modules/ajv/dist/ajv.bundle.js
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/lib/compile/formats.js
M node_modules/ajv/lib/dot/custom.jst
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/anyOf.js
M node_modules/ajv/lib/dotjs/constant.js
M node_modules/ajv/lib/dotjs/custom.js
M node_modules/ajv/lib/dotjs/dependencies.js
M node_modules/ajv/lib/dotjs/enum.js
M node_modules/ajv/lib/dotjs/format.js
M node_modules/ajv/lib/dotjs/items.js
M node_modules/ajv/lib/dotjs/multipleOf.js
M node_modules/ajv/lib/dotjs/not.js
M node_modules/ajv/lib/dotjs/oneOf.js
M node_modules/ajv/lib/dotjs/pattern.js
M node_modules/ajv/lib/dotjs/patternRequired.js
M node_modules/ajv/lib/dotjs/properties.js
M node_modules/ajv/lib/dotjs/ref.js
M node_modules/ajv/lib/dotjs/required.js
M node_modules/ajv/lib/dotjs/switch.js
M node_modules/ajv/lib/dotjs/uniqueItems.js
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/ajv/scripts/compile-dots.js
M node_modules/ajv/scripts/travis-gh-pages
M node_modules/asap/package.json
M node_modules/balanced-match/index.js
M node_modules/balanced-match/package.json
M node_modules/bl/bl.js
M node_modules/bl/package.json
M node_modules/bl/test/test.js
M node_modules/body-parser/lib/read.js
M node_modules/body-parser/package.json
M node_modules/brace-expansion/index.js
M node_modules/brace-expansion/package.json
D node_modules/buffer-shims/index.js
D node_modules/buffer-shims/package.json
M node_modules/bunyan/bin/bunyan
M node_modules/bunyan/lib/bunyan.js
M node_modules/bunyan/package.json
M node_modules/clap/index.js
M node_modules/clap/package.json
A node_modules/coa/.nyc_output/1f2a0db5a6d6559149db56d397f47cfc.json
A node_modules/coa/.nyc_output/75b82d38f2186df930141082076e11c6.json
A node_modules/coa/coverage/base.css
A node_modules/coa/coverage/coa/index.html
A node_modules/coa/coverage/coa/index.js.html
A node_modules/coa/coverage/coa/lib/arg.js.html
A node_modules/coa/coverage/coa/lib/cmd.js.html
A node_modules/coa/coverage/coa/lib/coaobject.js.html
A node_modules/coa/coverage/coa/lib/coaparam.js.html
A node_modules/coa/coverage/coa/lib/color.js.html
A node_modules/coa/coverage/coa/lib/completion.js.html
A node_modules/coa/coverage/coa/lib/index.html
A node_modules/coa/coverage/coa/lib/index.js.html
A node_modules/coa/coverage/coa/lib/opt.js.html
A node_modules/coa/coverage/coa/lib/shell.js.html
A node_modules/coa/coverage/index.html
A node_modules/coa/coverage/prettify.css
A node_modules/coa/coverage/prettify.js
A node_modules/coa/coverage/sort-arrow-sprite.png
A node_modules/coa/coverage/sorter.js
M node_modules/coa/package.json
A node_modules/coa/qq.js
M node_modules/commander/index.js
M node_modules/commander/package.json
M node_modules/compressible/package.json
M node_modules/compression/index.js
M node_modules/compression/node_modules/bytes/index.js
M node_modules/compression/node_modules/bytes/package.json
R node_modules/compression/node_modules/debug/.coveralls.yml
R node_modules/compression/node_modules/debug/.eslintrc
D node_modules/compression/node_modules/debug/.jshintrc
M node_modules/compression/node_modules/debug/.npmignore
R node_modules/compression/node_modules/debug/.travis.yml
R node_modules/compression/node_modules/debug/LICENSE
M node_modules/compression/node_modules/debug/Makefile
D node_modules/compression/node_modules/debug/bower.json
D node_modules/compression/node_modules/debug/browser.js
M node_modules/compression/node_modules/debug/component.json
D node_modules/compression/node_modules/debug/debug.js
R node_modules/compression/node_modules/debug/karma.conf.js
M node_modules/compression/node_modules/debug/node.js
M node_modules/compression/node_modules/debug/package.json
R node_modules/compression/node_modules/debug/src/browser.js
R node_modules/compression/node_modules/debug/src/debug.js
R node_modules/compression/node_modules/debug/src/index.js
R node_modules/compression/node_modules/debug/src/node.js
D node_modules/compression/node_modules/ms/.npmignore
D node_modules/compression/node_modules/ms/LICENSE
D node_modules/compression/node_modules/ms/index.js
D node_modules/compression/node_modules/ms/package.json
M node_modules/compression/package.json
M node_modules/debug/.npmignore
D 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update recommendation-api to 95c9bd1

[Mobrovac (Code Review)]

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

Change subject: Update recommendation-api to 95c9bd1
..


Update recommendation-api to 95c9bd1

List of changes:
865e64d Fix split call
95c9bd1 Switch to Node v6.11
xxx Update node module dependencies

Change-Id: Ie6c94064db211359d513eba24fa60258e28b9448
---
M node_modules/bl/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/kad/package.json
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/index.js
M node_modules/mime-types/package.json
M node_modules/msgpack5/.travis.yml
M node_modules/msgpack5/example.js
M node_modules/msgpack5/index.js
M node_modules/msgpack5/lib/encoder.js
M node_modules/msgpack5/lib/streams.js
M node_modules/msgpack5/package.json
M node_modules/msgpack5/test/1-byte-length-buffers.js
M node_modules/msgpack5/test/1-byte-length-exts.js
M node_modules/msgpack5/test/1-byte-length-strings.js
M node_modules/msgpack5/test/15-elements-arrays.js
M node_modules/msgpack5/test/15-elements-maps.js
M node_modules/msgpack5/test/16-bits-signed-integers.js
M node_modules/msgpack5/test/16-bits-unsigned-integers.js
M node_modules/msgpack5/test/2-bytes-length-arrays.js
M node_modules/msgpack5/test/2-bytes-length-buffers.js
M node_modules/msgpack5/test/2-bytes-length-exts.js
M node_modules/msgpack5/test/2-bytes-length-maps.js
M node_modules/msgpack5/test/2-bytes-length-strings.js
M node_modules/msgpack5/test/31-chars-strings.js
M node_modules/msgpack5/test/32-bits-signed-integers.js
M node_modules/msgpack5/test/32-bits-unsigned-integers.js
M node_modules/msgpack5/test/32-bytes-strings.js
M node_modules/msgpack5/test/4-bytes-length-arrays.js
M node_modules/msgpack5/test/4-bytes-length-buffers.js
M node_modules/msgpack5/test/4-bytes-length-exts.js
M node_modules/msgpack5/test/4-bytes-length-strings.js
M node_modules/msgpack5/test/5-bits-negative-integers.js
M node_modules/msgpack5/test/64-bits-signed-integers.js
M node_modules/msgpack5/test/64-bits-unsigned-integers.js
M node_modules/msgpack5/test/7-bits-positive-integers.js
M node_modules/msgpack5/test/8-bits-positive-integers.js
M node_modules/msgpack5/test/8-bits-signed-integers.js
M node_modules/msgpack5/test/booleans.js
M node_modules/msgpack5/test/doubles.js
M node_modules/msgpack5/test/ext-custom-encode-check.js
M node_modules/msgpack5/test/fixexts.js
M node_modules/msgpack5/test/floats.js
M node_modules/msgpack5/test/null.js
M node_modules/msgpack5/test/object-with-buffers.js
M node_modules/msgpack5/test/streams.js
M node_modules/safe-buffer/package.json
M node_modules/semver/package.json
M node_modules/semver/semver.js
M node_modules/swagger-ui/package.json
M src
55 files changed, 525 insertions(+), 300 deletions(-)

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



diff --git a/node_modules/bl/package.json b/node_modules/bl/package.json
index 3741bf2..fac8bc9 100644
--- a/node_modules/bl/package.json
+++ b/node_modules/bl/package.json
@@ -2,18 +2,18 @@
   "_args": [
 [
   {
-"raw": "bl@^1.0.0",
+"raw": "bl@^1.2.1",
 "scope": null,
 "escapedName": "bl",
 "name": "bl",
-"rawSpec": "^1.0.0",
-"spec": ">=1.0.0 <2.0.0",
+"rawSpec": "^1.2.1",
+"spec": ">=1.2.1 <2.0.0",
 "type": "range"
   },
   "/opt/service/node_modules/msgpack5"
 ]
   ],
-  "_from": "bl@>=1.0.0 <2.0.0",
+  "_from": "bl@>=1.2.1 <2.0.0",
   "_id": "bl@1.2.1",
   "_inCache": true,
   "_location": "/bl",
@@ -29,12 +29,12 @@
   "_npmVersion": "3.10.10",
   "_phantomChildren": {},
   "_requested": {
-"raw": "bl@^1.0.0",
+"raw": "bl@^1.2.1",
 "scope": null,
 "escapedName": "bl",
 "name": "bl",
-"rawSpec": "^1.0.0",
-"spec": ">=1.0.0 <2.0.0",
+"rawSpec": "^1.2.1",
+"spec": ">=1.2.1 <2.0.0",
 "type": "range"
   },
   "_requiredBy": [
@@ -43,7 +43,7 @@
   "_resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz;,
   "_shasum": "cac328f7bee45730d404b692203fcb590e172d5e",
   "_shrinkwrap": null,
-  "_spec": "bl@^1.0.0",
+  "_spec": "bl@^1.2.1",
   "_where": "/opt/service/node_modules/msgpack5",
   "authors": [
 "Rod Vagg  (https://github.com/rvagg)",
diff --git a/node_modules/heapdump/build/Makefile 
b/node_modules/heapdump/build/Makefile
index 80ab260..6197a30 100644
--- a/node_modules/heapdump/build/Makefile
+++ b/node_modules/heapdump/build/Makefile
@@ -308,8 +308,8 @@
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment "--toplevel-dir=." 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update eventstreams to 29abd70

[Mobrovac (Code Review)]

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

Change subject: Update eventstreams to 29abd70
..


Update eventstreams to 29abd70

List of changes:
29abd70 Switch to Node v6.11
xxx Update node module dependencies

Change-Id: I6223885415704286051f162b6ebcd834de30ea17
---
M node_modules/ajv/dist/ajv.bundle.js
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/lib/compile/formats.js
M node_modules/ajv/lib/dot/custom.jst
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/anyOf.js
M node_modules/ajv/lib/dotjs/constant.js
M node_modules/ajv/lib/dotjs/custom.js
M node_modules/ajv/lib/dotjs/dependencies.js
M node_modules/ajv/lib/dotjs/enum.js
M node_modules/ajv/lib/dotjs/format.js
M node_modules/ajv/lib/dotjs/items.js
M node_modules/ajv/lib/dotjs/multipleOf.js
M node_modules/ajv/lib/dotjs/not.js
M node_modules/ajv/lib/dotjs/oneOf.js
M node_modules/ajv/lib/dotjs/pattern.js
M node_modules/ajv/lib/dotjs/patternRequired.js
M node_modules/ajv/lib/dotjs/properties.js
M node_modules/ajv/lib/dotjs/ref.js
M node_modules/ajv/lib/dotjs/required.js
M node_modules/ajv/lib/dotjs/switch.js
M node_modules/ajv/lib/dotjs/uniqueItems.js
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/ajv/scripts/compile-dots.js
M node_modules/ajv/scripts/travis-gh-pages
M node_modules/asap/package.json
M node_modules/balanced-match/index.js
M node_modules/balanced-match/package.json
M node_modules/bindings/bindings.js
M node_modules/bindings/package.json
M node_modules/bl/bl.js
M node_modules/bl/package.json
M node_modules/bl/test/test.js
M node_modules/body-parser/lib/read.js
M node_modules/body-parser/package.json
M node_modules/brace-expansion/index.js
M node_modules/brace-expansion/package.json
D node_modules/buffer-shims/index.js
D node_modules/buffer-shims/package.json
M node_modules/bunyan/bin/bunyan
M node_modules/bunyan/lib/bunyan.js
M node_modules/bunyan/package.json
M node_modules/commander/index.js
M node_modules/commander/package.json
M node_modules/debug/.npmignore
D node_modules/debug/bower.json
M node_modules/debug/component.json
M node_modules/debug/package.json
M node_modules/debug/src/browser.js
M node_modules/debug/src/debug.js
M node_modules/debug/src/node.js
M node_modules/dtrace-provider/libusdt/Makefile
M node_modules/dtrace-provider/package.json
M node_modules/dtrace-provider/scripts/install.js
M node_modules/esprima/ChangeLog
M node_modules/esprima/bin/esvalidate.js
M node_modules/esprima/dist/esprima.js
M node_modules/esprima/package.json
M node_modules/express/lib/application.js
M node_modules/express/lib/middleware/init.js
M node_modules/express/lib/response.js
M node_modules/express/package.json
M node_modules/extend/.eslintrc
M node_modules/extend/.jscs.json
M node_modules/extend/.travis.yml
M node_modules/extend/index.js
M node_modules/extend/package.json
D node_modules/finalhandler/node_modules/debug/.coveralls.yml
D node_modules/finalhandler/node_modules/debug/.eslintrc
D node_modules/finalhandler/node_modules/debug/.npmignore
D node_modules/finalhandler/node_modules/debug/.travis.yml
D node_modules/finalhandler/node_modules/debug/LICENSE
D node_modules/finalhandler/node_modules/debug/Makefile
D node_modules/finalhandler/node_modules/debug/bower.json
D node_modules/finalhandler/node_modules/debug/component.json
D node_modules/finalhandler/node_modules/debug/karma.conf.js
D node_modules/finalhandler/node_modules/debug/node.js
D node_modules/finalhandler/node_modules/debug/package.json
D node_modules/finalhandler/node_modules/debug/src/browser.js
D node_modules/finalhandler/node_modules/debug/src/debug.js
D node_modules/finalhandler/node_modules/debug/src/index.js
D node_modules/finalhandler/node_modules/debug/src/node.js
M node_modules/finalhandler/package.json
M node_modules/form-data/lib/form_data.js
M node_modules/form-data/package.json
M node_modules/getpass/package.json
D node_modules/graceful-readlink/.npmignore
D node_modules/graceful-readlink/.travis.yml
D node_modules/graceful-readlink/LICENSE
D node_modules/graceful-readlink/index.js
D node_modules/graceful-readlink/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/hosted-git-info/index.js
M node_modules/hosted-git-info/package.json
M node_modules/hot-shots/lib/statsd.js
M node_modules/hot-shots/package.json
D node_modules/jodid25519/.npmignore
D node_modules/jodid25519/.travis.yml
D node_modules/jodid25519/LICENSE
D node_modules/jodid25519/almond.0
D node_modules/jodid25519/almond.1
D node_modules/jodid25519/index.js
D 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to 713323e

[Mobrovac (Code Review)]

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

Change subject: Update trending-edits to 713323e
..


Update trending-edits to 713323e

List of changes:
713323e Switch to Node v6.11
xxx Update node module dependencies

Change-Id: Iadd5e08c1aca707cc90a166c905af6539eb1c172
---
M node_modules/asap/package.json
M node_modules/balanced-match/index.js
M node_modules/balanced-match/package.json
M node_modules/bindings/bindings.js
M node_modules/bindings/package.json
M node_modules/bl/package.json
M node_modules/brace-expansion/package.json
M node_modules/compressible/package.json
M node_modules/compression/index.js
M node_modules/compression/node_modules/bytes/index.js
M node_modules/compression/node_modules/bytes/package.json
A node_modules/compression/node_modules/debug/.coveralls.yml
A node_modules/compression/node_modules/debug/.eslintrc
D node_modules/compression/node_modules/debug/.jshintrc
M node_modules/compression/node_modules/debug/.npmignore
A node_modules/compression/node_modules/debug/.travis.yml
A node_modules/compression/node_modules/debug/LICENSE
M node_modules/compression/node_modules/debug/Makefile
D node_modules/compression/node_modules/debug/bower.json
M node_modules/compression/node_modules/debug/component.json
A node_modules/compression/node_modules/debug/karma.conf.js
M node_modules/compression/node_modules/debug/node.js
M node_modules/compression/node_modules/debug/package.json
R node_modules/compression/node_modules/debug/src/browser.js
R node_modules/compression/node_modules/debug/src/debug.js
A node_modules/compression/node_modules/debug/src/index.js
A node_modules/compression/node_modules/debug/src/node.js
D node_modules/compression/node_modules/ms/.npmignore
D node_modules/compression/node_modules/ms/LICENSE
D node_modules/compression/node_modules/ms/index.js
D node_modules/compression/node_modules/ms/package.json
M node_modules/compression/package.json
M node_modules/dtrace-provider/package.json
M node_modules/dtrace-provider/scripts/install.js
M node_modules/esprima/ChangeLog
M node_modules/esprima/bin/esvalidate.js
M node_modules/esprima/dist/esprima.js
M node_modules/esprima/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/hosted-git-info/index.js
M node_modules/hosted-git-info/package.json
D node_modules/jodid25519/.npmignore
D node_modules/jodid25519/.travis.yml
D node_modules/jodid25519/LICENSE
D node_modules/jodid25519/almond.0
D node_modules/jodid25519/almond.1
D node_modules/jodid25519/index.js
D node_modules/jodid25519/jsdoc.json
D node_modules/jodid25519/lib/core.js
D node_modules/jodid25519/lib/curve255.js
D node_modules/jodid25519/lib/dh.js
D node_modules/jodid25519/lib/eddsa.js
D node_modules/jodid25519/lib/utils.js
D node_modules/jodid25519/package.json
M node_modules/js-yaml/dist/js-yaml.js
M node_modules/js-yaml/dist/js-yaml.min.js
M node_modules/js-yaml/lib/js-yaml/dumper.js
M node_modules/js-yaml/lib/js-yaml/loader.js
M node_modules/js-yaml/package.json
M node_modules/jsbn/package.json
M node_modules/kad/package.json
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/index.js
M node_modules/mime-types/package.json
M node_modules/ms/package.json
M node_modules/msgpack5/.travis.yml
M node_modules/msgpack5/example.js
M node_modules/msgpack5/index.js
M node_modules/msgpack5/lib/encoder.js
M node_modules/msgpack5/lib/streams.js
M node_modules/msgpack5/package.json
M node_modules/msgpack5/test/1-byte-length-buffers.js
M node_modules/msgpack5/test/1-byte-length-exts.js
M node_modules/msgpack5/test/1-byte-length-strings.js
M node_modules/msgpack5/test/15-elements-arrays.js
M node_modules/msgpack5/test/15-elements-maps.js
M node_modules/msgpack5/test/16-bits-signed-integers.js
M node_modules/msgpack5/test/16-bits-unsigned-integers.js
M node_modules/msgpack5/test/2-bytes-length-arrays.js
M node_modules/msgpack5/test/2-bytes-length-buffers.js
M node_modules/msgpack5/test/2-bytes-length-exts.js
M node_modules/msgpack5/test/2-bytes-length-maps.js
M node_modules/msgpack5/test/2-bytes-length-strings.js
M node_modules/msgpack5/test/31-chars-strings.js
M node_modules/msgpack5/test/32-bits-signed-integers.js
M node_modules/msgpack5/test/32-bits-unsigned-integers.js
M node_modules/msgpack5/test/32-bytes-strings.js
M node_modules/msgpack5/test/4-bytes-length-arrays.js
M node_modules/msgpack5/test/4-bytes-length-buffers.js
M node_modules/msgpack5/test/4-bytes-length-exts.js
M node_modules/msgpack5/test/4-bytes-length-strings.js
M node_modules/msgpack5/test/5-bits-negative-integers.js
M node_modules/msgpack5/test/64-bits-signed-integers.js
M node_modules/msgpack5/test/64-bits-unsigned-integers.js
M 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update service-mobileapp-node to e19ed25

[Mobrovac (Code Review)]

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

Change subject: Update service-mobileapp-node to e19ed25
..


Update service-mobileapp-node to e19ed25

List of changes:
e19ed25 Switch to Node v6.11
xxx Update node module dependencies

Change-Id: Iba961baebbf4213b8c665cc18de55ddf17a151d7
---
M node_modules/cryptiles/.npmignore
M node_modules/cryptiles/.travis.yml
M node_modules/esprima/dist/esprima.js
M node_modules/hawk/.npmignore
M node_modules/hawk/.travis.yml
M node_modules/hawk/bower.json
M node_modules/hawk/component.json
M node_modules/hawk/dist/client.js
M node_modules/hawk/example/usage.js
M node_modules/hawk/lib/browser.js
M node_modules/hawk/lib/client.js
M node_modules/hawk/lib/crypto.js
M node_modules/hawk/lib/index.js
M node_modules/hawk/lib/server.js
M node_modules/hawk/lib/utils.js
M node_modules/hawk/test/browser.js
M node_modules/hawk/test/client.js
M node_modules/hawk/test/crypto.js
M node_modules/hawk/test/index.js
M node_modules/hawk/test/readme.js
M node_modules/hawk/test/server.js
M node_modules/hawk/test/uri.js
M node_modules/hawk/test/utils.js
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/json-schema/draft-00/hyper-schema
M node_modules/json-schema/draft-00/json-ref
M node_modules/json-schema/draft-00/links
M node_modules/json-schema/draft-00/schema
M node_modules/json-schema/draft-01/hyper-schema
M node_modules/json-schema/draft-01/json-ref
M node_modules/json-schema/draft-01/links
M node_modules/json-schema/draft-01/schema
M node_modules/json-schema/draft-02/hyper-schema
M node_modules/json-schema/draft-02/json-ref
M node_modules/json-schema/draft-02/links
M node_modules/json-schema/draft-02/schema
M node_modules/json-schema/draft-03/examples/address
M node_modules/json-schema/draft-03/examples/calendar
M node_modules/json-schema/draft-03/examples/card
M node_modules/json-schema/draft-03/examples/geo
M node_modules/json-schema/draft-03/examples/interfaces
M node_modules/json-schema/draft-03/hyper-schema
M node_modules/json-schema/draft-03/json-ref
M node_modules/json-schema/draft-03/links
M node_modules/json-schema/draft-03/schema
M node_modules/json-schema/draft-04/hyper-schema
M node_modules/json-schema/draft-04/links
M node_modules/json-schema/draft-04/schema
M node_modules/json-schema/draft-zyp-json-schema-03.xml
M node_modules/json-schema/draft-zyp-json-schema-04.xml
M node_modules/json-schema/lib/links.js
M node_modules/json-schema/lib/validate.js
M node_modules/json-schema/test/tests.js
M node_modules/kad/package.json
M node_modules/long/.npmignore
M node_modules/long/.travis.yml
M node_modules/long/LICENSE
M node_modules/long/bower.json
M node_modules/long/dist/Long.js
M node_modules/long/externs/Long.js
M node_modules/long/index.js
M node_modules/long/jsdoc.json
M node_modules/long/scripts/build.js
M node_modules/long/src/Long.js
M node_modules/long/src/bower.json
M node_modules/long/src/wrap.js
M node_modules/long/tests/goog.math.long.js
M node_modules/long/tests/suite.js
M node_modules/merge/LICENSE
M node_modules/merge/merge.js
M node_modules/merge/merge.min.js
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/index.js
M node_modules/mime-types/package.json
M src
79 files changed, 22,107 insertions(+), 22,023 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba961baebbf4213b8c665cc18de55ddf17a151d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mholloway 
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] wikimedia...crm[master]: Make CI scripts more stricts

[jenkins-bot (Code Review)]

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

Change subject: Make CI scripts more stricts
..


Make CI scripts more stricts

Set in bash:

-e  Exit immediately if a command exits with a non-zero status.
-u  Treat unset variables as an error when substituting.

-e would cause the script to abort immediately whenever a command fail
which is quite useful.

-u is the same, but for unset variables. Adjust ci-settings.sh to
provide a default value to BUILD_TAG which can be unset.

Bug: T171724
Change-Id: I0b0ce689fd22c3765accc16b91a04297d68f5e46
---
M bin/ci-create-dbs.sh
M bin/ci-drop-dbs.sh
M bin/ci-populate-dbs.sh
M bin/ci-settings.sh
M bin/drupal-install.sh
5 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/bin/ci-create-dbs.sh b/bin/ci-create-dbs.sh
index 924ee43..1ed07ca 100755
--- a/bin/ci-create-dbs.sh
+++ b/bin/ci-create-dbs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 BASEDIR=$(dirname $0)
 . $BASEDIR/ci-settings.sh
diff --git a/bin/ci-drop-dbs.sh b/bin/ci-drop-dbs.sh
index ad1966b..4925a9c 100755
--- a/bin/ci-drop-dbs.sh
+++ b/bin/ci-drop-dbs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 BASEDIR=$(dirname $0)
 . $BASEDIR/ci-settings.sh
diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh
index 9e37dd0..ea31286 100755
--- a/bin/ci-populate-dbs.sh
+++ b/bin/ci-populate-dbs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 BASEDIR=$(dirname $0)
 . $BASEDIR/ci-settings.sh
diff --git a/bin/ci-settings.sh b/bin/ci-settings.sh
index d8df87d..41f5e2d 100644
--- a/bin/ci-settings.sh
+++ b/bin/ci-settings.sh
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/bash -eu
 
-if [ -z "$BUILD_TAG" ]; then
+if [ -z "${BUILD_TAG:-}" ]; then
echo "BUILD_TAG environment variable was not set, exiting."
exit 1
 fi
diff --git a/bin/drupal-install.sh b/bin/drupal-install.sh
index 1d5bd7d..ea4ff27 100755
--- a/bin/drupal-install.sh
+++ b/bin/drupal-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 if [ $# -ne 3 ]; then
app_name=`basename $0`

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b0ce689fd22c3765accc16b91a04297d68f5e46
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Jgreen 
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 graphoid to 85a5861

[Mobrovac (Code Review)]

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

Change subject: Update graphoid to 85a5861
..


Update graphoid to 85a5861

List of changes:
85a5861 Switch to Node v6.11
xxx Update node module dependencies

Change-Id: Ida3682687af719fb88e3b58b4403895a7529ad49
---
D node_modules/acorn/.editorconfig
M node_modules/acorn/.npmignore
D node_modules/acorn/.tern-project
D node_modules/acorn/.travis.yml
M node_modules/acorn/AUTHORS
M node_modules/acorn/LICENSE
M node_modules/acorn/bin/acorn
D node_modules/acorn/bin/build-acorn.js
D node_modules/acorn/bin/generate-identifier-regex.js
D node_modules/acorn/bin/prepublish.sh
D node_modules/acorn/bin/update_authors.sh
D node_modules/acorn/bin/without_eval
A node_modules/acorn/dist/acorn.es.js
M node_modules/acorn/dist/acorn.js
D node_modules/acorn/dist/acorn_csp.js
A node_modules/acorn/dist/acorn_loose.es.js
M node_modules/acorn/dist/acorn_loose.js
A node_modules/acorn/dist/walk.es.js
M node_modules/acorn/dist/walk.js
M node_modules/acorn/package.json
D node_modules/acorn/src/expression.js
D node_modules/acorn/src/identifier.js
D node_modules/acorn/src/index.js
D node_modules/acorn/src/location.js
D node_modules/acorn/src/loose/acorn_loose.js
D node_modules/acorn/src/loose/expression.js
D node_modules/acorn/src/loose/index.js
D node_modules/acorn/src/loose/parseutil.js
D node_modules/acorn/src/loose/state.js
D node_modules/acorn/src/loose/statement.js
D node_modules/acorn/src/loose/tokenize.js
D node_modules/acorn/src/lval.js
D node_modules/acorn/src/node.js
D node_modules/acorn/src/options.js
D node_modules/acorn/src/parseutil.js
D node_modules/acorn/src/state.js
D node_modules/acorn/src/statement.js
D node_modules/acorn/src/tokencontext.js
D node_modules/acorn/src/tokenize.js
D node_modules/acorn/src/tokentype.js
D node_modules/acorn/src/util.js
D node_modules/acorn/src/walk/index.js
D node_modules/acorn/src/whitespace.js
M node_modules/ajv/dist/ajv.bundle.js
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/asap/package.json
M node_modules/balanced-match/index.js
M node_modules/balanced-match/package.json
M node_modules/bl/bl.js
M node_modules/bl/package.json
M node_modules/bl/test/test.js
M node_modules/body-parser/lib/read.js
M node_modules/body-parser/package.json
M node_modules/brace-expansion/package.json
D node_modules/buffer-shims/index.js
D node_modules/buffer-shims/package.json
M node_modules/canvas/build/Makefile
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/Canvas.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/CanvasGradient.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/CanvasPattern.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/CanvasRenderingContext2d.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/FontFace.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/Image.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/ImageData.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/color.o.d
M node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/init.o.d
M node_modules/canvas/build/canvas.target.mk
M node_modules/canvas/build/config.gypi
M node_modules/compressible/package.json
M node_modules/compression/index.js
M node_modules/compression/node_modules/bytes/index.js
M node_modules/compression/node_modules/bytes/package.json
R node_modules/compression/node_modules/debug/.coveralls.yml
R node_modules/compression/node_modules/debug/.eslintrc
D node_modules/compression/node_modules/debug/.jshintrc
M node_modules/compression/node_modules/debug/.npmignore
R node_modules/compression/node_modules/debug/.travis.yml
R node_modules/compression/node_modules/debug/LICENSE
M node_modules/compression/node_modules/debug/Makefile
D node_modules/compression/node_modules/debug/bower.json
D node_modules/compression/node_modules/debug/browser.js
M node_modules/compression/node_modules/debug/component.json
D node_modules/compression/node_modules/debug/debug.js
R node_modules/compression/node_modules/debug/karma.conf.js
M node_modules/compression/node_modules/debug/node.js
M node_modules/compression/node_modules/debug/package.json
R node_modules/compression/node_modules/debug/src/browser.js
R node_modules/compression/node_modules/debug/src/debug.js
R node_modules/compression/node_modules/debug/src/index.js
R node_modules/compression/node_modules/debug/src/node.js
D node_modules/compression/node_modules/ms/.npmignore
D node_modules/compression/node_modules/ms/LICENSE
D node_modules/compression/node_modules/ms/index.js
D node_modules/compression/node_modules/ms/package.json
M 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update citoid to 7ae3c7e

[Mobrovac (Code Review)]

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

Change subject: Update citoid to 7ae3c7e
..


Update citoid to 7ae3c7e

List of changes:
762e219 Try to improve performance with pubmed
7ae3c7e Switch to Node v6.11; release v0.5.3
xxx Update node module dependencies

Change-Id: I58483b3b66229833f91fe3c641e4fc764a4337f9
---
M node_modules/asap/package.json
M node_modules/balanced-match/index.js
M node_modules/balanced-match/package.json
M node_modules/bl/package.json
M node_modules/brace-expansion/package.json
D node_modules/buffer-shims/index.js
D node_modules/buffer-shims/package.json
M node_modules/dtrace-provider/libusdt/Makefile
M node_modules/dtrace-provider/package.json
M node_modules/dtrace-provider/scripts/install.js
M node_modules/es5-ext/.lint
M node_modules/es5-ext/array/#/@@iterator/implement.js
M node_modules/es5-ext/array/#/@@iterator/index.js
M node_modules/es5-ext/array/#/@@iterator/is-implemented.js
M node_modules/es5-ext/array/#/@@iterator/shim.js
M node_modules/es5-ext/array/#/_compare-by-length.js
M node_modules/es5-ext/array/#/binary-search.js
M node_modules/es5-ext/array/#/clear.js
M node_modules/es5-ext/array/#/compact.js
M node_modules/es5-ext/array/#/concat/implement.js
M node_modules/es5-ext/array/#/concat/index.js
M node_modules/es5-ext/array/#/concat/is-implemented.js
M node_modules/es5-ext/array/#/concat/shim.js
M node_modules/es5-ext/array/#/contains.js
M node_modules/es5-ext/array/#/copy-within/implement.js
M node_modules/es5-ext/array/#/copy-within/index.js
M node_modules/es5-ext/array/#/copy-within/is-implemented.js
M node_modules/es5-ext/array/#/copy-within/shim.js
M node_modules/es5-ext/array/#/diff.js
M node_modules/es5-ext/array/#/e-index-of.js
M node_modules/es5-ext/array/#/e-last-index-of.js
M node_modules/es5-ext/array/#/entries/implement.js
M node_modules/es5-ext/array/#/entries/index.js
M node_modules/es5-ext/array/#/entries/is-implemented.js
M node_modules/es5-ext/array/#/entries/shim.js
M node_modules/es5-ext/array/#/exclusion.js
M node_modules/es5-ext/array/#/fill/implement.js
M node_modules/es5-ext/array/#/fill/index.js
M node_modules/es5-ext/array/#/fill/is-implemented.js
M node_modules/es5-ext/array/#/fill/shim.js
M node_modules/es5-ext/array/#/filter/implement.js
M node_modules/es5-ext/array/#/filter/index.js
M node_modules/es5-ext/array/#/filter/is-implemented.js
M node_modules/es5-ext/array/#/filter/shim.js
M node_modules/es5-ext/array/#/find-index/implement.js
M node_modules/es5-ext/array/#/find-index/index.js
M node_modules/es5-ext/array/#/find-index/is-implemented.js
M node_modules/es5-ext/array/#/find-index/shim.js
M node_modules/es5-ext/array/#/find/implement.js
M node_modules/es5-ext/array/#/find/index.js
M node_modules/es5-ext/array/#/find/is-implemented.js
M node_modules/es5-ext/array/#/find/shim.js
M node_modules/es5-ext/array/#/first-index.js
M node_modules/es5-ext/array/#/first.js
M node_modules/es5-ext/array/#/flatten.js
M node_modules/es5-ext/array/#/for-each-right.js
M node_modules/es5-ext/array/#/group.js
M node_modules/es5-ext/array/#/index.js
M node_modules/es5-ext/array/#/indexes-of.js
M node_modules/es5-ext/array/#/intersection.js
M node_modules/es5-ext/array/#/is-copy.js
M node_modules/es5-ext/array/#/is-uniq.js
M node_modules/es5-ext/array/#/keys/implement.js
M node_modules/es5-ext/array/#/keys/index.js
M node_modules/es5-ext/array/#/keys/is-implemented.js
M node_modules/es5-ext/array/#/keys/shim.js
M node_modules/es5-ext/array/#/last-index.js
M node_modules/es5-ext/array/#/last.js
M node_modules/es5-ext/array/#/map/implement.js
M node_modules/es5-ext/array/#/map/index.js
M node_modules/es5-ext/array/#/map/is-implemented.js
M node_modules/es5-ext/array/#/map/shim.js
M node_modules/es5-ext/array/#/remove.js
M node_modules/es5-ext/array/#/separate.js
M node_modules/es5-ext/array/#/slice/implement.js
M node_modules/es5-ext/array/#/slice/index.js
M node_modules/es5-ext/array/#/slice/is-implemented.js
M node_modules/es5-ext/array/#/slice/shim.js
M node_modules/es5-ext/array/#/some-right.js
M node_modules/es5-ext/array/#/splice/implement.js
M node_modules/es5-ext/array/#/splice/index.js
M node_modules/es5-ext/array/#/splice/is-implemented.js
M node_modules/es5-ext/array/#/splice/shim.js
M node_modules/es5-ext/array/#/uniq.js
M node_modules/es5-ext/array/#/values/implement.js
M node_modules/es5-ext/array/#/values/index.js
M node_modules/es5-ext/array/#/values/is-implemented.js
M node_modules/es5-ext/array/#/values/shim.js
M node_modules/es5-ext/array/_is-extensible.js
M node_modules/es5-ext/array/_sub-array-dummy-safe.js
M node_modules/es5-ext/array/_sub-array-dummy.js
M node_modules/es5-ext/array/from/implement.js
M node_modules/es5-ext/array/from/index.js
M node_modules/es5-ext/array/from/is-implemented.js
M node_modules/es5-ext/array/from/shim.js
M node_modules/es5-ext/array/generate.js
M 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: Enable prometheus jmx exporter in dev environment

[Dzahn (Code Review)]

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

Change subject: restbase: Enable prometheus jmx exporter in dev environment
..


restbase: Enable prometheus jmx exporter in dev environment

Bug: T171772
Change-Id: I7079f7e960d09cb1bfef537aba55b98f03d931ec
---
M hieradata/role/common/restbase/dev_cluster.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/restbase/dev_cluster.yaml 
b/hieradata/role/common/restbase/dev_cluster.yaml
index 6a9d7c6..d14a4ff 100644
--- a/hieradata/role/common/restbase/dev_cluster.yaml
+++ b/hieradata/role/common/restbase/dev_cluster.yaml
@@ -86,33 +86,39 @@
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 b:
   listen_address: 10.64.0.168
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
   "restbase-dev1005.eqiad.wmnet":
 a:
   listen_address: 10.64.16.97
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 b:
   listen_address: 10.64.16.98
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
   "restbase-dev1006.eqiad.wmnet":
 a:
   listen_address: 10.64.48.168
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 b:
   listen_address: 10.64.48.169
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 
 profile::cassandra::settings:
   start_rpc: 'true'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7079f7e960d09cb1bfef537aba55b98f03d931ec
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Eevans 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Filippo Giunchedi 
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...deploy[master]: Update cxserver to 8278e44

[Mobrovac (Code Review)]

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

Change subject: Update cxserver to 8278e44
..


Update cxserver to 8278e44

List of changes:
8278e44 Switch to Node v6.11
xxx Update node module dependencies

Change-Id: If08ed41648559eb0e23a867d2099905eda66dd2e
---
M node_modules/ajv/dist/ajv.bundle.js
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/lib/compile/formats.js
M node_modules/ajv/lib/dot/custom.jst
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/anyOf.js
M node_modules/ajv/lib/dotjs/constant.js
M node_modules/ajv/lib/dotjs/custom.js
M node_modules/ajv/lib/dotjs/dependencies.js
M node_modules/ajv/lib/dotjs/enum.js
M node_modules/ajv/lib/dotjs/format.js
M node_modules/ajv/lib/dotjs/items.js
M node_modules/ajv/lib/dotjs/multipleOf.js
M node_modules/ajv/lib/dotjs/not.js
M node_modules/ajv/lib/dotjs/oneOf.js
M node_modules/ajv/lib/dotjs/pattern.js
M node_modules/ajv/lib/dotjs/patternRequired.js
M node_modules/ajv/lib/dotjs/properties.js
M node_modules/ajv/lib/dotjs/ref.js
M node_modules/ajv/lib/dotjs/required.js
M node_modules/ajv/lib/dotjs/switch.js
M node_modules/ajv/lib/dotjs/uniqueItems.js
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/ajv/scripts/compile-dots.js
M node_modules/ajv/scripts/travis-gh-pages
M node_modules/asap/package.json
M node_modules/balanced-match/index.js
M node_modules/balanced-match/package.json
M node_modules/bl/bl.js
M node_modules/bl/package.json
M node_modules/bl/test/test.js
M node_modules/body-parser/lib/read.js
M node_modules/body-parser/package.json
M node_modules/brace-expansion/index.js
M node_modules/brace-expansion/package.json
D node_modules/buffer-shims/index.js
D node_modules/buffer-shims/package.json
M node_modules/bunyan/bin/bunyan
M node_modules/bunyan/lib/bunyan.js
M node_modules/bunyan/package.json
M node_modules/compressible/package.json
M node_modules/compression/index.js
M node_modules/compression/node_modules/bytes/index.js
M node_modules/compression/node_modules/bytes/package.json
R node_modules/compression/node_modules/debug/.coveralls.yml
R node_modules/compression/node_modules/debug/.eslintrc
D node_modules/compression/node_modules/debug/.jshintrc
M node_modules/compression/node_modules/debug/.npmignore
R node_modules/compression/node_modules/debug/.travis.yml
R node_modules/compression/node_modules/debug/LICENSE
M node_modules/compression/node_modules/debug/Makefile
D node_modules/compression/node_modules/debug/bower.json
D node_modules/compression/node_modules/debug/browser.js
M node_modules/compression/node_modules/debug/component.json
D node_modules/compression/node_modules/debug/debug.js
R node_modules/compression/node_modules/debug/karma.conf.js
M node_modules/compression/node_modules/debug/node.js
M node_modules/compression/node_modules/debug/package.json
R node_modules/compression/node_modules/debug/src/browser.js
R node_modules/compression/node_modules/debug/src/debug.js
R node_modules/compression/node_modules/debug/src/index.js
R node_modules/compression/node_modules/debug/src/node.js
D node_modules/compression/node_modules/ms/.npmignore
D node_modules/compression/node_modules/ms/LICENSE
D node_modules/compression/node_modules/ms/index.js
D node_modules/compression/node_modules/ms/package.json
M node_modules/compression/package.json
M node_modules/debug/.npmignore
D node_modules/debug/bower.json
M node_modules/debug/component.json
M node_modules/debug/package.json
M node_modules/debug/src/browser.js
M node_modules/debug/src/debug.js
M node_modules/debug/src/node.js
M node_modules/dtrace-provider/libusdt/Makefile
M node_modules/dtrace-provider/package.json
M node_modules/dtrace-provider/scripts/install.js
M node_modules/esprima/ChangeLog
M node_modules/esprima/bin/esvalidate.js
M node_modules/esprima/dist/esprima.js
M node_modules/esprima/package.json
M node_modules/express/lib/application.js
M node_modules/express/lib/middleware/init.js
M node_modules/express/lib/response.js
M node_modules/express/package.json
M node_modules/extend/.eslintrc
M node_modules/extend/.jscs.json
M node_modules/extend/.travis.yml
M node_modules/extend/index.js
M node_modules/extend/package.json
D node_modules/finalhandler/node_modules/debug/.npmignore
D node_modules/finalhandler/node_modules/debug/Makefile
D node_modules/finalhandler/node_modules/debug/bower.json
D node_modules/finalhandler/node_modules/debug/component.json
D node_modules/finalhandler/node_modules/debug/node.js
D node_modules/finalhandler/node_modules/debug/package.json
M node_modules/finalhandler/package.json
M node_modules/form-data/lib/form_data.js
M node_modules/form-data/package.json
M node_modules/getpass/package.json
M 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: chmod a-x resources/*/*.{less, svg}

[Fomafix (Code Review)]

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

Change subject: chmod a-x resources/*/*.{less,svg}
..

chmod a-x resources/*/*.{less,svg}

Change-Id: Ic4a2c91c8282a30ae069cc33deffada1df66ff22
---
M resources/skins.minerva.userpage.styles/userpage.less
M resources/skins.minerva.userpage.styles/userpage.svg
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/56/367956/1

diff --git a/resources/skins.minerva.userpage.styles/userpage.less 
b/resources/skins.minerva.userpage.styles/userpage.less
old mode 100755
new mode 100644
diff --git a/resources/skins.minerva.userpage.styles/userpage.svg 
b/resources/skins.minerva.userpage.styles/userpage.svg
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4a2c91c8282a30ae069cc33deffada1df66ff22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fixes for SmashPig update

[Ejegg (Code Review)]

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

Change subject: Fixes for SmashPig update
..

Fixes for SmashPig update

Missed a couple of obsolete config usages for audit, replaced with
QueueWrapper. Also remove some no-longer-used use statements

Change-Id: I48238b777e78c310b1f1a1959af643a86e7ffb98
TODO: audit tests should look at queue messages
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
M sites/all/modules/queue2civicrm/banner_history/banner_history.module
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
M sites/all/modules/queue2civicrm/queue2civicrm.module
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
M sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
M sites/all/modules/wmf_audit/ingenico/orphan_rectify.drush.inc
M sites/all/modules/wmf_audit/wmf_audit.module
10 files changed, 9 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/53/367953/1

diff --git 
a/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc 
b/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
index 3deb547..6f4a654 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
@@ -7,9 +7,6 @@
  * @TODO print some useful info to STDOUT
  */
 
-use SmashPig\Core\Context;
-use SmashPig\Core\Configuration;
-
 /**
  * Implementation of hook_drush_command()
  */
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module 
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index d0bdcde..4563706 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -1,5 +1,5 @@
 object( $configKey, 
false );
-   $newQueue->push( $body );
+QueueWrapper::push( $queueId, $body );
 }
 
 /**
diff --git 
a/sites/all/modules/queue2civicrm/banner_history/banner_history.module 
b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
index 9f0255c..468ca0b 100644
--- a/sites/all/modules/queue2civicrm/banner_history/banner_history.module
+++ b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
@@ -1,8 +1,6 @@
  'data-store/donations',
-'negative' => 'data-store/refund',
-'recurring' => 'data-store/recurring',
+  $queueNames = array(
+'main' => 'donations',
+'negative' => 'refund',
+'recurring' => 'recurring',
   );
 
-  if (!array_key_exists($type, $configKeys)) {
+  if (!array_key_exists($type, $queueNames)) {
 throw new Exception(__FUNCTION__ . ": Unhandled message type '$type'");
   }
 
   wmf_common_set_message_source($body, 'audit', 
wmf_audit_runtime_options('submod_prefix') . ' Recon Auditor');
-  $newQueue = Configuration::getDefaultConfig()->object(
-$configKeys[$type]
-  );
-  $newQueue->push( $body );
+  QueueWrapper::push( $queueNames[$type], $body );
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor (get rid of php54 polyfill includes)

[jenkins-bot (Code Review)]

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

Change subject: Update vendor (get rid of php54 polyfill includes)
..


Update vendor (get rid of php54 polyfill includes)

Change-Id: I8891e4a1ec237798c1b0db89e7d906a56080de18
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index 5449ec1..0e1e603 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 5449ec1076ea3a6fd42e376fe7bc8b13b885ad2b
+Subproject commit 0e1e6032f2385632ba86658ba9cc916de470d50e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8891e4a1ec237798c1b0db89e7d906a56080de18
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: hack out php54 polyfill stuff

[jenkins-bot (Code Review)]

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

Change subject: hack out php54 polyfill stuff
..


hack out php54 polyfill stuff

Change-Id: I07eb7af41752ffdab1321965ef975451a4b82fc4
---
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_psr4.php
M composer/autoload_static.php
4 files changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index 1d0f519..50a225a 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -26,7 +26,6 @@
 'AstroPayStatusQuery' => $vendorDir . 
'/wikimedia/donation-interface/astropay_gateway/scripts/status.php',
 'BannerHistoryLogIdProcessor' => $vendorDir . 
'/wikimedia/donation-interface/extras/banner_history/BannerHistoryLogIdProcessor.php',
 'BlankAddressFields' => $vendorDir . 
'/wikimedia/donation-interface/adyen_gateway/BlankAddressFields.php',
-'CallbackFilterIterator' => $vendorDir . 
'/symfony/polyfill-php54/Resources/stubs/CallbackFilterIterator.php',
 'CleanupRecurringLength' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/CleanupRecurringLength.php',
 'ClientSideValidationHelper' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ClientSideValidationHelper.php',
 'ContributionTrackingPlusUnique' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ContributionTrackingPlusUnique.php',
@@ -103,13 +102,11 @@
 'PaypalLegacyAdapter' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/legacy/paypal_legacy.adapter.php',
 'PaypalLegacyGateway' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/legacy/paypal_legacy_gateway.body.php',
 'PaypalLegacyLocale' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/legacy/PaypalLegacyLocale.php',
-'RecursiveCallbackFilterIterator' => $vendorDir . 
'/symfony/polyfill-php54/Resources/stubs/RecursiveCallbackFilterIterator.php',
 'ResponseCodes' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ResponseCodes.php',
 'ResponseProcessingException' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ResponseProcessingException.php',
 'ResultPages' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ResultPages.php',
 'RiskScore' => $vendorDir . 
'/wikimedia/donation-interface/adyen_gateway/RiskScore.php',
 'SMTP' => $vendorDir . '/phpmailer/phpmailer/class.smtp.php',
-'SessionHandlerInterface' => $vendorDir . 
'/symfony/polyfill-php54/Resources/stubs/SessionHandlerInterface.php',
 'StagingHelper' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/StagingHelper.php',
 'StreetAddress' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/StreetAddress.php',
 'Subdivisions' => $vendorDir . 
'/wikimedia/donation-interface/gateway_forms/includes/Subdivisions.php',
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
index 439db46..96d963b 100644
--- a/composer/autoload_files.php
+++ b/composer/autoload_files.php
@@ -13,7 +13,6 @@
 '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . 
'/symfony/polyfill-mbstring/bootstrap.php',
 '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . 
'/guzzlehttp/guzzle/src/functions_include.php',
 'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . 
'/phpseclib/phpseclib/phpseclib/bootstrap.php',
-'3e2471375464aac821502deb0ac64275' => $vendorDir . 
'/symfony/polyfill-php54/bootstrap.php',
 '5255c38a0faeba867671b61dfda6d864' => $vendorDir . 
'/paragonie/random_compat/lib/random.php',
 'bf34263f834e2781b79cae4d55a1d350' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/WmfFramework.php',
 );
diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
index 5b7a33f..58eb314 100644
--- a/composer/autoload_psr4.php
+++ b/composer/autoload_psr4.php
@@ -9,7 +9,6 @@
 'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
 'Wikimedia\\Composer\\' => array($vendorDir . 
'/wikimedia/composer-merge-plugin/src'),
 'Symfony\\Polyfill\\Php55\\' => array($vendorDir . 
'/symfony/polyfill-php55'),
-'Symfony\\Polyfill\\Php54\\' => array($vendorDir . 
'/symfony/polyfill-php54'),
 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . 
'/symfony/polyfill-mbstring'),
 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . 
'/symfony/http-foundation'),
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index e061c4e..13d56c9 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -14,7 +14,6 @@
 '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . 
'/symfony/polyfill-mbstring/bootstrap.php',

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add urdu logo to mobile site

[Code Review]

محمد شعیب has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367946 )

Change subject: Add urdu logo to mobile site
..

Add urdu logo to mobile site

Bug: T171769
Change-Id: I4c5bdd7c64c627f0599d751bcffd636943d8e671
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/46/367946/2

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 34d2c5c..c97548e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15383,7 +15383,8 @@
'cywiki' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-cy.svg',
'copyright-width' => 116,
-   'copyright-height' => 18,
+   
+  'copyright-height' => 18,
],
'frwiki' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-fr.svg',
@@ -15392,7 +15393,8 @@
],
'jawiki' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-ja.svg',
-   'copyright-width' => 116,
+   
+  'copyright-width' => 116,
'copyright-height' => 18,
],
'ruwiki' => [
@@ -15425,6 +15427,12 @@
'copyright-width' => 122,
'copyright-height' => 22,
],
+
+   'urwiki' => [
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-ur.svg',
+   'copyright-width' => 79,
+   'copyright-height' => 22,
+   ],
'wikivoyage' => [
'copyright' => 
'/static/images/mobile/copyright/wikivoyage-wordmark-en.svg',
'copyright-width' => 96,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c5bdd7c64c627f0599d751bcffd636943d8e671
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: محمد شعیب 
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]: Enable prometheus jmx exporter in dev environment

[Eevans (Code Review)]

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

Change subject: Enable prometheus jmx exporter in dev environment
..

Enable prometheus jmx exporter in dev environment

Bug: T171772
Change-Id: I7079f7e960d09cb1bfef537aba55b98f03d931ec
---
M hieradata/role/common/restbase/dev_cluster.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/367952/1

diff --git a/hieradata/role/common/restbase/dev_cluster.yaml 
b/hieradata/role/common/restbase/dev_cluster.yaml
index 6a9d7c6..d14a4ff 100644
--- a/hieradata/role/common/restbase/dev_cluster.yaml
+++ b/hieradata/role/common/restbase/dev_cluster.yaml
@@ -86,33 +86,39 @@
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 b:
   listen_address: 10.64.0.168
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
   "restbase-dev1005.eqiad.wmnet":
 a:
   listen_address: 10.64.16.97
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 b:
   listen_address: 10.64.16.98
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
   "restbase-dev1006.eqiad.wmnet":
 a:
   listen_address: 10.64.48.168
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 b:
   listen_address: 10.64.48.169
   data_file_directories:
 - data_0
 - data_1
+  jmx_exporter_enabled: true
 
 profile::cassandra::settings:
   start_rpc: 'true'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CategoryTree[master]: Fix sidebar tree support

[Dolfinus (Code Review)]

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

Change subject: Fix sidebar tree support
..

Fix sidebar tree support

Change-Id: I2a2498d2129e8bed03340cfb00f65281f7aa3d35
---
M modules/ext.categoryTree.js
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree 
refs/changes/51/367951/1

diff --git a/modules/ext.categoryTree.js b/modules/ext.categoryTree.js
index fa3c4b6..169eb27 100644
--- a/modules/ext.categoryTree.js
+++ b/modules/ext.categoryTree.js
@@ -12,13 +12,13 @@
 
 ( function ( $, mw ) {
 
-   mw.hook( 'wikipage.content' ).add( function ( $content ) {
+   $( function () {
 
/**
 * Sets display inline to tree toggle
 */
function showToggles() {
-   $content.find( 'span.CategoryTreeToggle' ).css( 
'display', 'inline' );
+   $('span.CategoryTreeToggle' ).css( 'display', 'inline' 
);
}
 
/**
@@ -168,7 +168,7 @@
}
 
// Register click events and show toggle buttons
-   $content.find( '.CategoryTreeToggle' ).click( handleNode );
+   $('.CategoryTreeToggle' ).click( handleNode );
showToggles();
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a2498d2129e8bed03340cfb00f65281f7aa3d35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Dolfinus 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor (get rid of php54 polyfill includes)

[Ejegg (Code Review)]

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

Change subject: Update vendor (get rid of php54 polyfill includes)
..

Update vendor (get rid of php54 polyfill includes)

Change-Id: I8891e4a1ec237798c1b0db89e7d906a56080de18
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/50/367950/1

diff --git a/vendor b/vendor
index 5449ec1..0e1e603 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 5449ec1076ea3a6fd42e376fe7bc8b13b885ad2b
+Subproject commit 0e1e6032f2385632ba86658ba9cc916de470d50e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8891e4a1ec237798c1b0db89e7d906a56080de18
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: hack out php54 polyfill stuff

[Ejegg (Code Review)]

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

Change subject: hack out php54 polyfill stuff
..

hack out php54 polyfill stuff

Change-Id: I07eb7af41752ffdab1321965ef975451a4b82fc4
---
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_psr4.php
M composer/autoload_static.php
4 files changed, 0 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/48/367948/1

diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index 1d0f519..50a225a 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -26,7 +26,6 @@
 'AstroPayStatusQuery' => $vendorDir . 
'/wikimedia/donation-interface/astropay_gateway/scripts/status.php',
 'BannerHistoryLogIdProcessor' => $vendorDir . 
'/wikimedia/donation-interface/extras/banner_history/BannerHistoryLogIdProcessor.php',
 'BlankAddressFields' => $vendorDir . 
'/wikimedia/donation-interface/adyen_gateway/BlankAddressFields.php',
-'CallbackFilterIterator' => $vendorDir . 
'/symfony/polyfill-php54/Resources/stubs/CallbackFilterIterator.php',
 'CleanupRecurringLength' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/CleanupRecurringLength.php',
 'ClientSideValidationHelper' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ClientSideValidationHelper.php',
 'ContributionTrackingPlusUnique' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ContributionTrackingPlusUnique.php',
@@ -103,13 +102,11 @@
 'PaypalLegacyAdapter' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/legacy/paypal_legacy.adapter.php',
 'PaypalLegacyGateway' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/legacy/paypal_legacy_gateway.body.php',
 'PaypalLegacyLocale' => $vendorDir . 
'/wikimedia/donation-interface/paypal_gateway/legacy/PaypalLegacyLocale.php',
-'RecursiveCallbackFilterIterator' => $vendorDir . 
'/symfony/polyfill-php54/Resources/stubs/RecursiveCallbackFilterIterator.php',
 'ResponseCodes' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ResponseCodes.php',
 'ResponseProcessingException' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ResponseProcessingException.php',
 'ResultPages' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/ResultPages.php',
 'RiskScore' => $vendorDir . 
'/wikimedia/donation-interface/adyen_gateway/RiskScore.php',
 'SMTP' => $vendorDir . '/phpmailer/phpmailer/class.smtp.php',
-'SessionHandlerInterface' => $vendorDir . 
'/symfony/polyfill-php54/Resources/stubs/SessionHandlerInterface.php',
 'StagingHelper' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/StagingHelper.php',
 'StreetAddress' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/StreetAddress.php',
 'Subdivisions' => $vendorDir . 
'/wikimedia/donation-interface/gateway_forms/includes/Subdivisions.php',
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
index 439db46..96d963b 100644
--- a/composer/autoload_files.php
+++ b/composer/autoload_files.php
@@ -13,7 +13,6 @@
 '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . 
'/symfony/polyfill-mbstring/bootstrap.php',
 '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . 
'/guzzlehttp/guzzle/src/functions_include.php',
 'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . 
'/phpseclib/phpseclib/phpseclib/bootstrap.php',
-'3e2471375464aac821502deb0ac64275' => $vendorDir . 
'/symfony/polyfill-php54/bootstrap.php',
 '5255c38a0faeba867671b61dfda6d864' => $vendorDir . 
'/paragonie/random_compat/lib/random.php',
 'bf34263f834e2781b79cae4d55a1d350' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/WmfFramework.php',
 );
diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
index 5b7a33f..58eb314 100644
--- a/composer/autoload_psr4.php
+++ b/composer/autoload_psr4.php
@@ -9,7 +9,6 @@
 'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
 'Wikimedia\\Composer\\' => array($vendorDir . 
'/wikimedia/composer-merge-plugin/src'),
 'Symfony\\Polyfill\\Php55\\' => array($vendorDir . 
'/symfony/polyfill-php55'),
-'Symfony\\Polyfill\\Php54\\' => array($vendorDir . 
'/symfony/polyfill-php54'),
 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . 
'/symfony/polyfill-mbstring'),
 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . 
'/symfony/http-foundation'),
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index e061c4e..13d56c9 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -14,7 +14,6 @@
 '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . 

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

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I2326cf81e907f2a02615f96f922b66fd2806defd
---
M composer.json
M includes/AttributeManager.php
M includes/ContainmentSet.php
M includes/NotifUser.php
M includes/controller/NotificationController.php
M includes/formatters/PresentationModelSectionTrait.php
M includes/gateway/UserNotificationGateway.php
M includes/mapper/NotificationMapper.php
M includes/mapper/TargetPageMapper.php
M includes/model/Event.php
M phpcs.xml
11 files changed, 20 insertions(+), 21 deletions(-)


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

diff --git a/composer.json b/composer.json
index 49c2a1c..55507be 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
-   "phpcs -p"
+   "phpcs -p -s"
],
"fix": [
"phpcbf"
diff --git a/includes/AttributeManager.php b/includes/AttributeManager.php
index 8d30bda..7c9fb4c 100644
--- a/includes/AttributeManager.php
+++ b/includes/AttributeManager.php
@@ -227,7 +227,7 @@
 *
 * @param User
 * @param string A notification category defined in 
$wgEchoNotificationCategories
-* @return boolean
+* @return bool
 */
public function getCategoryEligibility( $user, $category ) {
$usersGroups = $user->getGroups();
@@ -245,7 +245,7 @@
 * Get the priority for a specific notification type
 *
 * @param string A notification type defined in $wgEchoNotifications
-* @return integer From 1 to 10 (10 is default)
+* @return int From 1 to 10 (10 is default)
 */
public function getNotificationPriority( $notificationType ) {
$category = $this->getNotificationCategory( $notificationType );
@@ -257,7 +257,7 @@
 * Get the priority for a notification category
 *
 * @param string A notification category defined in 
$wgEchoNotificationCategories
-* @return integer From 1 to 10 (10 is default)
+* @return int From 1 to 10 (10 is default)
 */
public function getCategoryPriority( $category ) {
if ( isset( $this->categories[$category]['priority'] ) ) {
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index 6bde088..70f2ef0 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -107,7 +107,7 @@
 * Test the wrapped lists for existence of $value
 *
 * @param $value mixed The value to look for
-* @return boolean True when the set contains the provided value
+* @return bool True when the set contains the provided value
 */
public function contains( $value ) {
foreach ( $this->lists as $list ) {
diff --git a/includes/NotifUser.php b/includes/NotifUser.php
index 751263f..72a13e5 100644
--- a/includes/NotifUser.php
+++ b/includes/NotifUser.php
@@ -232,7 +232,7 @@
$eventTypesToLoad = 
$attributeManager->getUserEnabledEventsbySections( $this->mUser, 'web', [ 
$section ] );
}
 
-   $count = 
(int)$this->userNotifGateway->getCappedNotificationCount( $dbSource, 
$eventTypesToLoad, MWEchoNotifUser::MAX_BADGE_COUNT + 1 );
+   $count = 
(int)$this->userNotifGateway->getCappedNotificationCount( $dbSource, 
$eventTypesToLoad, self::MAX_BADGE_COUNT + 1 );
 
if ( $global ) {
$count = self::capNotificationCount( $count + 
$this->getForeignCount( $section ) );
@@ -349,7 +349,7 @@
/**
 * Mark one or more notifications read for a user.
 * @param $eventIds Array of event IDs to mark read
-* @return boolean
+* @return bool
 */
public function markRead( $eventIds ) {
$eventIds = array_filter( (array)$eventIds, 'is_numeric' );
@@ -381,7 +381,7 @@
/**
 * Mark one or more notifications unread for a user.
 * @param $eventIds Array of event IDs to mark unread
-* @return boolean
+* @return bool
 */
public function markUnRead( $eventIds ) {
$eventIds = array_filter( (array)$eventIds, 'is_numeric' );
@@ -418,7 +418,7 @@
 * across multiple 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Populate remote compilations with response from CompilationC...

[jenkins-bot (Code Review)]

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

Change subject: Populate remote compilations with response from 
CompilationClient.
..


Populate remote compilations with response from CompilationClient.

Upon receiving the payload from CompilationClient, this also updates the
user's local compilations with any updated metadata from the remote
compilations (matched on the file name of each compilation).

Bug: T163588
Bug: T163590
Change-Id: I77bc69be5e80b39939b34c41d8dc184ab07f8e39
---
M app/src/main/java/org/wikipedia/offline/CompilationClient.java
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/OfflineManager.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
M app/src/main/res/layout/fragment_remote_compilations.xml
5 files changed, 239 insertions(+), 11 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/offline/CompilationClient.java 
b/app/src/main/java/org/wikipedia/offline/CompilationClient.java
index 395d3db..54c0868 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationClient.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationClient.java
@@ -1,6 +1,5 @@
 package org.wikipedia.offline;
 
-
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
diff --git 
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index d243061..ca13c34 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -95,6 +95,12 @@
 }
 
 @Override
+public void onResume() {
+adapter.notifyDataSetChanged();
+super.onResume();
+}
+
+@Override
 public void onDestroyView() {
 recyclerView.setAdapter(null);
 unbinder.unbind();
@@ -207,7 +213,7 @@
 getView().setItem(compilation);
 getView().setTitle(compilation.name());
 getView().setDescription(compilation.description());
-//TODO: getView().setImageUrl( ... );
+getView().setImageUrl(compilation.thumbUri() == null ? null : 
compilation.thumbUri().toString());
 getView().setActionIcon(R.drawable.ic_more_vert_white_24dp);
 
getView().setActionHint(R.string.abc_action_menu_overflow_description);
 }
diff --git a/app/src/main/java/org/wikipedia/offline/OfflineManager.java 
b/app/src/main/java/org/wikipedia/offline/OfflineManager.java
index f352a5b..aeba0a7 100644
--- a/app/src/main/java/org/wikipedia/offline/OfflineManager.java
+++ b/app/src/main/java/org/wikipedia/offline/OfflineManager.java
@@ -79,6 +79,18 @@
 searchTask.execute();
 }
 
+void updateFromRemoteMetadata(@NonNull List 
remoteCompilations) {
+for (Compilation remoteCompilation : remoteCompilations) {
+for (Compilation localCompilation : compilations) {
+if (remoteCompilation.uri() != null
+&& new 
File(localCompilation.path()).getName().equals(remoteCompilation.uri().getLastPathSegment()))
 {
+localCompilation.copyMetadataFrom(remoteCompilation);
+}
+}
+}
+Prefs.setCompilationCache(compilations);
+}
+
 public boolean titleExists(@NonNull String title) {
 for (Compilation c : compilations) {
 if (c.titleExists(title)) {
diff --git 
a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
index 682f280..60120aa 100644
--- a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
@@ -4,20 +4,35 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.view.ActionMode;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;
 
 import org.wikipedia.R;
+import org.wikipedia.WikipediaApp;
+import 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group1 to wmf.11

[jenkins-bot (Code Review)]

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

Change subject: Group1 to wmf.11
..


Group1 to wmf.11

Change-Id: Id83abca71e2140ad78c55fd342f9255140729522
---
M php
M wikiversions.json
2 files changed, 599 insertions(+), 599 deletions(-)

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



diff --git a/php b/php
index 982b19c..f095a8a 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.10
\ No newline at end of file
+php-1.30.0-wmf.11
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 8a2b049..6a8248d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.10",
-"aawikibooks": "php-1.30.0-wmf.10",
-"aawiktionary": "php-1.30.0-wmf.10",
+"aawikibooks": "php-1.30.0-wmf.11",
+"aawiktionary": "php-1.30.0-wmf.11",
 "abwiki": "php-1.30.0-wmf.10",
-"abwiktionary": "php-1.30.0-wmf.10",
+"abwiktionary": "php-1.30.0-wmf.11",
 "acewiki": "php-1.30.0-wmf.10",
-"advisorywiki": "php-1.30.0-wmf.10",
+"advisorywiki": "php-1.30.0-wmf.11",
 "adywiki": "php-1.30.0-wmf.10",
 "afwiki": "php-1.30.0-wmf.10",
-"afwikibooks": "php-1.30.0-wmf.10",
-"afwikiquote": "php-1.30.0-wmf.10",
-"afwiktionary": "php-1.30.0-wmf.10",
+"afwikibooks": "php-1.30.0-wmf.11",
+"afwikiquote": "php-1.30.0-wmf.11",
+"afwiktionary": "php-1.30.0-wmf.11",
 "akwiki": "php-1.30.0-wmf.10",
-"akwikibooks": "php-1.30.0-wmf.10",
-"akwiktionary": "php-1.30.0-wmf.10",
+"akwikibooks": "php-1.30.0-wmf.11",
+"akwiktionary": "php-1.30.0-wmf.11",
 "alswiki": "php-1.30.0-wmf.10",
-"alswikibooks": "php-1.30.0-wmf.10",
-"alswikiquote": "php-1.30.0-wmf.10",
-"alswiktionary": "php-1.30.0-wmf.10",
+"alswikibooks": "php-1.30.0-wmf.11",
+"alswikiquote": "php-1.30.0-wmf.11",
+"alswiktionary": "php-1.30.0-wmf.11",
 "amwiki": "php-1.30.0-wmf.10",
-"amwikiquote": "php-1.30.0-wmf.10",
-"amwiktionary": "php-1.30.0-wmf.10",
+"amwikiquote": "php-1.30.0-wmf.11",
+"amwiktionary": "php-1.30.0-wmf.11",
 "angwiki": "php-1.30.0-wmf.10",
-"angwikibooks": "php-1.30.0-wmf.10",
-"angwikiquote": "php-1.30.0-wmf.10",
-"angwikisource": "php-1.30.0-wmf.10",
-"angwiktionary": "php-1.30.0-wmf.10",
+"angwikibooks": "php-1.30.0-wmf.11",
+"angwikiquote": "php-1.30.0-wmf.11",
+"angwikisource": "php-1.30.0-wmf.11",
+"angwiktionary": "php-1.30.0-wmf.11",
 "anwiki": "php-1.30.0-wmf.10",
-"anwiktionary": "php-1.30.0-wmf.10",
+"anwiktionary": "php-1.30.0-wmf.11",
 "arbcom_cswiki": "php-1.30.0-wmf.10",
 "arbcom_dewiki": "php-1.30.0-wmf.10",
 "arbcom_enwiki": "php-1.30.0-wmf.10",
@@ -35,727 +35,727 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.10",
 "arcwiki": "php-1.30.0-wmf.10",
 "arwiki": "php-1.30.0-wmf.10",
-"arwikibooks": "php-1.30.0-wmf.10",
-"arwikimedia": "php-1.30.0-wmf.10",
-"arwikinews": "php-1.30.0-wmf.10",
-"arwikiquote": "php-1.30.0-wmf.10",
-"arwikisource": "php-1.30.0-wmf.10",
-"arwikiversity": "php-1.30.0-wmf.10",
-"arwiktionary": "php-1.30.0-wmf.10",
+"arwikibooks": "php-1.30.0-wmf.11",
+"arwikimedia": "php-1.30.0-wmf.11",
+"arwikinews": "php-1.30.0-wmf.11",
+"arwikiquote": "php-1.30.0-wmf.11",
+"arwikisource": "php-1.30.0-wmf.11",
+"arwikiversity": "php-1.30.0-wmf.11",
+"arwiktionary": "php-1.30.0-wmf.11",
 "arzwiki": "php-1.30.0-wmf.10",
 "astwiki": "php-1.30.0-wmf.10",
-"astwikibooks": "php-1.30.0-wmf.10",
-"astwikiquote": "php-1.30.0-wmf.10",
-"astwiktionary": "php-1.30.0-wmf.10",
+"astwikibooks": "php-1.30.0-wmf.11",
+"astwikiquote": "php-1.30.0-wmf.11",
+"astwiktionary": "php-1.30.0-wmf.11",
 "aswiki": "php-1.30.0-wmf.10",
-"aswikibooks": "php-1.30.0-wmf.10",
-"aswikisource": "php-1.30.0-wmf.10",
-"aswiktionary": "php-1.30.0-wmf.10",
+"aswikibooks": "php-1.30.0-wmf.11",
+"aswikisource": "php-1.30.0-wmf.11",
+"aswiktionary": "php-1.30.0-wmf.11",
 "atjwiki": "php-1.30.0-wmf.10",
-"auditcomwiki": "php-1.30.0-wmf.10",
+"auditcomwiki": "php-1.30.0-wmf.11",
 "avwiki": "php-1.30.0-wmf.10",
-"avwiktionary": "php-1.30.0-wmf.10",
+"avwiktionary": "php-1.30.0-wmf.11",
 "aywiki": "php-1.30.0-wmf.10",
-"aywikibooks": "php-1.30.0-wmf.10",
-"aywiktionary": "php-1.30.0-wmf.10",
+"aywikibooks": "php-1.30.0-wmf.11",
+"aywiktionary": "php-1.30.0-wmf.11",
 "azbwiki": "php-1.30.0-wmf.10",
 "azwiki": "php-1.30.0-wmf.10",
-"azwikibooks": "php-1.30.0-wmf.10",
-"azwikiquote": "php-1.30.0-wmf.10",
-"azwikisource": "php-1.30.0-wmf.10",
-"azwiktionary": "php-1.30.0-wmf.10",
+"azwikibooks": "php-1.30.0-wmf.11",
+"azwikiquote": "php-1.30.0-wmf.11",
+"azwikisource": "php-1.30.0-wmf.11",
+

[MediaWiki-commits] [Gerrit] mediawiki...CategoryTree[master]: Add MobileFrontend support

[Dolfinus (Code Review)]

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

Change subject: Add MobileFrontend support
..

Add MobileFrontend support

Change-Id: I302876cd8fee451ad75e3e84a4d951edd324ff28
---
M CategoryTree.hooks.php
M extension.json
2 files changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/CategoryTree.hooks.php b/CategoryTree.hooks.php
index 074965d..dc3f892 100644
--- a/CategoryTree.hooks.php
+++ b/CategoryTree.hooks.php
@@ -65,6 +65,7 @@
 
if ( $wgCategoryTreeForceHeaders ) {
$wgHooks['BeforePageDisplay'][] = 
'CategoryTreeHooks::addHeaders';
+   $wgHooks['BeforePageDisplayMobile'][] = 
'CategoryTreeHooks::addHeaders';
} else {
$wgHooks['OutputPageParserOutput'][] = 
'CategoryTreeHooks::parserOutput';
}
@@ -194,7 +195,7 @@
 * @param $skin Skin
 * @return bool
 */
-   public static function addHeaders( OutputPage $out, Skin $skin ) {
+   public static function addHeaders( OutputPage $out)  {
CategoryTree::setHeaders( $out );
return true;
}
diff --git a/extension.json b/extension.json
index e56aafc..5d690a4 100644
--- a/extension.json
+++ b/extension.json
@@ -39,6 +39,11 @@
"ResourceModules": {
"ext.categoryTree": {
"scripts": "ext.categoryTree.js",
+   "position": "top",
+   "targets" : [
+"desktop",
+"mobile"
+  ],
"messages": [
"categorytree-collapse",
"categorytree-expand",
@@ -59,6 +64,10 @@
},
"ext.categoryTree.css": {
"position": "top",
+   "targets" : [
+"desktop",
+"mobile"
+  ],
"styles": "ext.categoryTree.css"
}
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I302876cd8fee451ad75e3e84a4d951edd324ff28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Dolfinus 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor submodule

8c89e7bf9 Add tests & finalise unsubscribe process
edefb82ab Update SmashPig and DonationInterface
a2bf76aa4 Fix typo causing enotice & suppressed not to populate

Change-Id: I3190ba4a900e178865a2c443a6f64a7ef2c852ec
---
D sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RefundQueueTest.php
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
D sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceFactoryTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M vendor
11 files changed, 1 insertion(+), 1,590 deletions(-)

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



diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
deleted file mode 100644
index d376c2f..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<<< HEAD   (461900 Merge "Merge branch 'master' of 
https://gerrit.wikimedia.org)
-===
-consumer = new AntifraudQueueConsumer(
-   'payments-antifraud'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message['contribution_tracking_id'] = $ctId;
-   $message['order_id'] = $oId;
-   $this->consumer->processMessage( $message );
-
-   $this->compareMessageWithDb( $message, 
$message['score_breakdown'] );
-   }
-
-   /**
-* The first message for a ct_id / order_id pair needs to be complete
-*
-* @expectedException FredgeDataValidationException
-*/
-   public function testIncompleteMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   unset( $message['user_ip'] );
-   $this->consumer->processMessage( $message );
-   }
-
-   public function testCombinedMessage() {
-   $message1 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $message2 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message1['contribution_tracking_id'] = $ctId;
-   $message2['contribution_tracking_id'] = $ctId;
-   $message1['order_id'] = $oId;
-   $message2['order_id'] = $oId;
-   $message1['score_breakdown'] = array_slice(
-   $message1['score_breakdown'], 0, 4
-   );
-   $message2['score_breakdown'] = array_slice(
-   $message2['score_breakdown'], 4, 4
-   );
-   $this->consumer->processMessage( $message1 );
-
-   $dbEntries = $this->getDbEntries( $ctId, $oId );
-   $this->assertEquals( 4, count( $dbEntries ) );
-
-   $this->consumer->processMessage( $message2 );
-
-   $breakdown = array_merge(
-   $message1['score_breakdown'], 
$message2['score_breakdown']
-   );
-
-   $this->compareMessageWithDb( $message1, $breakdown );
-   }
-
-   protected function compareMessageWithDb( $common, $breakdown ) {
-   $dbEntries = $this->getDbEntries(
-   $common['contribution_tracking_id'], $common['order_id']
-   );
-   $this->assertEquals( 8, count( $dbEntries ) );
-   $fields = array(
-   'gateway',  'validation_action', 'payment_method',
-   'risk_score', 'server'
-   );
-   foreach ( $fields as $field ) {
-   $this->assertEquals( 

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update SmashPig, DonationInterface, and dependencies

[jenkins-bot (Code Review)]

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

Change subject: Update SmashPig, DonationInterface, and dependencies
..


Update SmashPig, DonationInterface, and dependencies

Change-Id: I1c13901a2f33ba67db26bf5053b7abab9aee9323
---
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
A corneltek/getoptionkit/.gitignore
A corneltek/getoptionkit/.travis.yml
A corneltek/getoptionkit/CHANGELOG.md
A corneltek/getoptionkit/CONTRIBUTORS.txt
A corneltek/getoptionkit/LICENSE
A corneltek/getoptionkit/README.md
A corneltek/getoptionkit/build.xml
A corneltek/getoptionkit/composer.json
A corneltek/getoptionkit/composer.lock
A corneltek/getoptionkit/examples/demo.php
A corneltek/getoptionkit/package.ini
A corneltek/getoptionkit/phpdox.xml
A corneltek/getoptionkit/phprelease.ini
A corneltek/getoptionkit/phpunit-ci.xml
A corneltek/getoptionkit/phpunit.xml.dist
A corneltek/getoptionkit/src/Argument.php
A corneltek/getoptionkit/src/ContinuousOptionParser.php
A corneltek/getoptionkit/src/Exception/InvalidOptionException.php
A corneltek/getoptionkit/src/Exception/InvalidOptionValueException.php
A corneltek/getoptionkit/src/Exception/NonNumericException.php
A corneltek/getoptionkit/src/Exception/OptionConflictException.php
A corneltek/getoptionkit/src/Exception/RequireValueException.php
A corneltek/getoptionkit/src/Option.php
A corneltek/getoptionkit/src/OptionCollection.php
A corneltek/getoptionkit/src/OptionParser.php
A corneltek/getoptionkit/src/OptionPrinter/ConsoleOptionPrinter.php
A corneltek/getoptionkit/src/OptionPrinter/OptionPrinter.php
A corneltek/getoptionkit/src/OptionResult.php
A corneltek/getoptionkit/src/ValueType/BaseType.php
A corneltek/getoptionkit/src/ValueType/BoolType.php
A corneltek/getoptionkit/src/ValueType/BooleanType.php
A corneltek/getoptionkit/src/ValueType/DateTimeType.php
A corneltek/getoptionkit/src/ValueType/DateType.php
A corneltek/getoptionkit/src/ValueType/DirType.php
A corneltek/getoptionkit/src/ValueType/EmailType.php
A corneltek/getoptionkit/src/ValueType/FileType.php
A corneltek/getoptionkit/src/ValueType/IpType.php
A corneltek/getoptionkit/src/ValueType/Ipv4Type.php
A corneltek/getoptionkit/src/ValueType/Ipv6Type.php
A corneltek/getoptionkit/src/ValueType/NumberType.php
A corneltek/getoptionkit/src/ValueType/PathType.php
A corneltek/getoptionkit/src/ValueType/RegexType.php
A corneltek/getoptionkit/src/ValueType/StringType.php
A corneltek/getoptionkit/src/ValueType/UrlType.php
A corneltek/getoptionkit/tests/ArgumentTest.php
A corneltek/getoptionkit/tests/ContinuousOptionParserTest.php
A corneltek/getoptionkit/tests/OptionCollectionTest.php
A corneltek/getoptionkit/tests/OptionParserTest.php
A corneltek/getoptionkit/tests/OptionPrinter/ConsoleOptionPrinterTest.php
A corneltek/getoptionkit/tests/OptionResultTest.php
A corneltek/getoptionkit/tests/OptionTest.php
A corneltek/getoptionkit/tests/RegexValueTypeTest.php
A corneltek/getoptionkit/tests/ValueTypeTest.php
A wikimedia/donation-interface/.stylelintrc
M wikimedia/donation-interface/DonationInterface.alias.php
M wikimedia/donation-interface/DonationInterface.class.php
M wikimedia/donation-interface/DonationInterfaceFormSettings.php
M wikimedia/donation-interface/Gruntfile.js
M wikimedia/donation-interface/README.txt
M wikimedia/donation-interface/adyen_gateway/AmountInMinorUnits.php
M wikimedia/donation-interface/adyen_gateway/BlankAddressFields.php
M wikimedia/donation-interface/adyen_gateway/adyen.adapter.php
M wikimedia/donation-interface/adyen_gateway/config/country_fields.yaml
M wikimedia/donation-interface/adyen_gateway/config/var_map.yaml
M wikimedia/donation-interface/amazon_gateway/amazon.adapter.php
M wikimedia/donation-interface/amazon_gateway/amazon.api.php
M wikimedia/donation-interface/amazon_gateway/amazon.js
M wikimedia/donation-interface/amazon_gateway/amazon_gateway.body.php
M wikimedia/donation-interface/amazon_gateway/i18n/en.json
M wikimedia/donation-interface/amazon_gateway/i18n/fr.json
M wikimedia/donation-interface/amazon_gateway/i18n/qqq.json
M wikimedia/donation-interface/amazon_gateway/i18n/ru.json
M wikimedia/donation-interface/amazon_gateway/i18n/uk.json
M wikimedia/donation-interface/astropay_gateway/AstroPaySignature.php
M wikimedia/donation-interface/astropay_gateway/astropay.adapter.php
M wikimedia/donation-interface/astropay_gateway/config/var_map.yaml
M wikimedia/donation-interface/astropay_gateway/scripts/status.php
M wikimedia/donation-interface/composer.json
M wikimedia/donation-interface/composer.lock
M wikimedia/donation-interface/extension.json
M wikimedia/donation-interface/extras/FraudFilter.php
M 
wikimedia/donation-interface/extras/banner_history/BannerHistoryLogIdProcessor.php
M 
wikimedia/donation-interface/extras/custom_filters/filters/minfraud/minfraud.body.php
M 

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

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I9b1a15b882925a572d2365d2cd442673d5a58cb5
---
M composer.json
M includes/Maintenance/Maintenance.php
M includes/OtherIndexes.php
M phpcs.xml
4 files changed, 7 insertions(+), 10 deletions(-)


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

diff --git a/composer.json b/composer.json
index c3e7bb5..b6cd741 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/Maintenance/Maintenance.php 
b/includes/Maintenance/Maintenance.php
index 4ffd692..894049a 100644
--- a/includes/Maintenance/Maintenance.php
+++ b/includes/Maintenance/Maintenance.php
@@ -148,12 +148,12 @@
 */
public function loadSpecialVars() {
parent::loadSpecialVars();
-   if ( Maintenance::$indent === null ) {
+   if ( self::$indent === null ) {
// First script gets no indentation
-   Maintenance::$indent = '';
+   self::$indent = '';
} else {
// Others get one tab beyond the last
-   Maintenance::$indent = Maintenance::$indent . "\t";
+   self::$indent = self::$indent . "\t";
}
}
 
@@ -162,7 +162,7 @@
 * the next one gets the right indentation.
 */
public function done() {
-   Maintenance::$indent = substr( Maintenance::$indent, 1 );
+   self::$indent = substr( self::$indent, 1 );
}
 
/**
@@ -174,7 +174,7 @@
}
 
public function outputIndented( $message ) {
-   $this->output( Maintenance::$indent . $message );
+   $this->output( self::$indent . $message );
}
 
/**
diff --git a/includes/OtherIndexes.php b/includes/OtherIndexes.php
index a0a1617..075af0c 100644
--- a/includes/OtherIndexes.php
+++ b/includes/OtherIndexes.php
@@ -87,7 +87,7 @@
$findIdsMultiSearch = new MultiSearch( 
$this->connection->getClient() );
$findIdsClosures = [];
foreach ( $titles as $title ) {
-   foreach ( OtherIndexes::getExternalIndexes( $title ) as 
$otherIndex ) {
+   foreach ( self::getExternalIndexes( $title ) as 
$otherIndex ) {
if ( $otherIndex === null ) {
continue;
}
diff --git a/phpcs.xml b/phpcs.xml
index 631fadf..29d2435 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,6 @@



-   



@@ -29,7 +28,5 @@
.


-   vendor
-   node_modules
tests/phan
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor submodule

8c89e7bf9 Add tests & finalise unsubscribe process
edefb82ab Update SmashPig and DonationInterface
a2bf76aa4 Fix typo causing enotice & suppressed not to populate

Change-Id: I3190ba4a900e178865a2c443a6f64a7ef2c852ec
---
D sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RefundQueueTest.php
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
D sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceFactoryTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M vendor
11 files changed, 1 insertion(+), 1,590 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/44/367944/1

diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
deleted file mode 100644
index d376c2f..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<<< HEAD   (461900 Merge "Merge branch 'master' of 
https://gerrit.wikimedia.org)
-===
-consumer = new AntifraudQueueConsumer(
-   'payments-antifraud'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message['contribution_tracking_id'] = $ctId;
-   $message['order_id'] = $oId;
-   $this->consumer->processMessage( $message );
-
-   $this->compareMessageWithDb( $message, 
$message['score_breakdown'] );
-   }
-
-   /**
-* The first message for a ct_id / order_id pair needs to be complete
-*
-* @expectedException FredgeDataValidationException
-*/
-   public function testIncompleteMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   unset( $message['user_ip'] );
-   $this->consumer->processMessage( $message );
-   }
-
-   public function testCombinedMessage() {
-   $message1 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $message2 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message1['contribution_tracking_id'] = $ctId;
-   $message2['contribution_tracking_id'] = $ctId;
-   $message1['order_id'] = $oId;
-   $message2['order_id'] = $oId;
-   $message1['score_breakdown'] = array_slice(
-   $message1['score_breakdown'], 0, 4
-   );
-   $message2['score_breakdown'] = array_slice(
-   $message2['score_breakdown'], 4, 4
-   );
-   $this->consumer->processMessage( $message1 );
-
-   $dbEntries = $this->getDbEntries( $ctId, $oId );
-   $this->assertEquals( 4, count( $dbEntries ) );
-
-   $this->consumer->processMessage( $message2 );
-
-   $breakdown = array_merge(
-   $message1['score_breakdown'], 
$message2['score_breakdown']
-   );
-
-   $this->compareMessageWithDb( $message1, $breakdown );
-   }
-
-   protected function compareMessageWithDb( $common, $breakdown ) {
-   $dbEntries = $this->getDbEntries(
-   $common['contribution_tracking_id'], $common['order_id']
-   );
-   $this->assertEquals( 8, count( $dbEntries ) );
-   $fields = array(
-   'gateway',  'validation_action', 'payment_method',
-   'risk_score', 'server'
-   );
-   foreach ( $fields as $field ) {
-   

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Adjust button dimensions on login and create account screen

[jenkins-bot (Code Review)]

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

Change subject: Adjust button dimensions on login and create account screen
..


Adjust button dimensions on login and create account screen

This task fixes buttons dimensions on login/create account, to have the same 
width as the form fields.

Bug: T170757
Change-Id: Ie725017030bba5058068b20fa8013f9224f8fa6a
---
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/group_captcha.xml
3 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/app/src/main/res/layout/activity_create_account.xml 
b/app/src/main/res/layout/activity_create_account.xml
index 9411108..fd65885 100644
--- a/app/src/main/res/layout/activity_create_account.xml
+++ b/app/src/main/res/layout/activity_create_account.xml
@@ -77,8 +77,9 @@
 android:layout_width="match_parent"
 android:text="@string/create_account_next"
 style="@style/App.Button.Blue"
-android:layout_gravity="center_horizontal"
-android:enabled="false" />
+android:enabled="false"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"/>
 
 
+android:text="@string/menu_login"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"/>
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie725017030bba5058068b20fa8013f9224f8fa6a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update SmashPig, DonationInterface, and dependencies

[Ejegg (Code Review)]

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

Change subject: Update SmashPig, DonationInterface, and dependencies
..

Update SmashPig, DonationInterface, and dependencies

Change-Id: I1c13901a2f33ba67db26bf5053b7abab9aee9323
---
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
A corneltek/getoptionkit/.gitignore
A corneltek/getoptionkit/.travis.yml
A corneltek/getoptionkit/CHANGELOG.md
A corneltek/getoptionkit/CONTRIBUTORS.txt
A corneltek/getoptionkit/LICENSE
A corneltek/getoptionkit/README.md
A corneltek/getoptionkit/build.xml
A corneltek/getoptionkit/composer.json
A corneltek/getoptionkit/composer.lock
A corneltek/getoptionkit/examples/demo.php
A corneltek/getoptionkit/package.ini
A corneltek/getoptionkit/phpdox.xml
A corneltek/getoptionkit/phprelease.ini
A corneltek/getoptionkit/phpunit-ci.xml
A corneltek/getoptionkit/phpunit.xml.dist
A corneltek/getoptionkit/src/Argument.php
A corneltek/getoptionkit/src/ContinuousOptionParser.php
A corneltek/getoptionkit/src/Exception/InvalidOptionException.php
A corneltek/getoptionkit/src/Exception/InvalidOptionValueException.php
A corneltek/getoptionkit/src/Exception/NonNumericException.php
A corneltek/getoptionkit/src/Exception/OptionConflictException.php
A corneltek/getoptionkit/src/Exception/RequireValueException.php
A corneltek/getoptionkit/src/Option.php
A corneltek/getoptionkit/src/OptionCollection.php
A corneltek/getoptionkit/src/OptionParser.php
A corneltek/getoptionkit/src/OptionPrinter/ConsoleOptionPrinter.php
A corneltek/getoptionkit/src/OptionPrinter/OptionPrinter.php
A corneltek/getoptionkit/src/OptionResult.php
A corneltek/getoptionkit/src/ValueType/BaseType.php
A corneltek/getoptionkit/src/ValueType/BoolType.php
A corneltek/getoptionkit/src/ValueType/BooleanType.php
A corneltek/getoptionkit/src/ValueType/DateTimeType.php
A corneltek/getoptionkit/src/ValueType/DateType.php
A corneltek/getoptionkit/src/ValueType/DirType.php
A corneltek/getoptionkit/src/ValueType/EmailType.php
A corneltek/getoptionkit/src/ValueType/FileType.php
A corneltek/getoptionkit/src/ValueType/IpType.php
A corneltek/getoptionkit/src/ValueType/Ipv4Type.php
A corneltek/getoptionkit/src/ValueType/Ipv6Type.php
A corneltek/getoptionkit/src/ValueType/NumberType.php
A corneltek/getoptionkit/src/ValueType/PathType.php
A corneltek/getoptionkit/src/ValueType/RegexType.php
A corneltek/getoptionkit/src/ValueType/StringType.php
A corneltek/getoptionkit/src/ValueType/UrlType.php
A corneltek/getoptionkit/tests/ArgumentTest.php
A corneltek/getoptionkit/tests/ContinuousOptionParserTest.php
A corneltek/getoptionkit/tests/OptionCollectionTest.php
A corneltek/getoptionkit/tests/OptionParserTest.php
A corneltek/getoptionkit/tests/OptionPrinter/ConsoleOptionPrinterTest.php
A corneltek/getoptionkit/tests/OptionResultTest.php
A corneltek/getoptionkit/tests/OptionTest.php
A corneltek/getoptionkit/tests/RegexValueTypeTest.php
A corneltek/getoptionkit/tests/ValueTypeTest.php
A wikimedia/donation-interface/.stylelintrc
M wikimedia/donation-interface/DonationInterface.alias.php
M wikimedia/donation-interface/DonationInterface.class.php
M wikimedia/donation-interface/DonationInterfaceFormSettings.php
M wikimedia/donation-interface/Gruntfile.js
M wikimedia/donation-interface/README.txt
M wikimedia/donation-interface/adyen_gateway/AmountInMinorUnits.php
M wikimedia/donation-interface/adyen_gateway/BlankAddressFields.php
M wikimedia/donation-interface/adyen_gateway/adyen.adapter.php
M wikimedia/donation-interface/adyen_gateway/config/country_fields.yaml
M wikimedia/donation-interface/adyen_gateway/config/var_map.yaml
M wikimedia/donation-interface/amazon_gateway/amazon.adapter.php
M wikimedia/donation-interface/amazon_gateway/amazon.api.php
M wikimedia/donation-interface/amazon_gateway/amazon.js
M wikimedia/donation-interface/amazon_gateway/amazon_gateway.body.php
M wikimedia/donation-interface/amazon_gateway/i18n/en.json
M wikimedia/donation-interface/amazon_gateway/i18n/fr.json
M wikimedia/donation-interface/amazon_gateway/i18n/qqq.json
M wikimedia/donation-interface/amazon_gateway/i18n/ru.json
M wikimedia/donation-interface/amazon_gateway/i18n/uk.json
M wikimedia/donation-interface/astropay_gateway/AstroPaySignature.php
M wikimedia/donation-interface/astropay_gateway/astropay.adapter.php
M wikimedia/donation-interface/astropay_gateway/config/var_map.yaml
M wikimedia/donation-interface/astropay_gateway/scripts/status.php
M wikimedia/donation-interface/composer.json
M wikimedia/donation-interface/composer.lock
M wikimedia/donation-interface/extension.json
M wikimedia/donation-interface/extras/FraudFilter.php
M 
wikimedia/donation-interface/extras/banner_history/BannerHistoryLogIdProcessor.php
M 
wikimedia/donation-interface/extras/custom_filters/filters/minfraud/minfraud.body.php
M 

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

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I36ab81e99ef5d3e01ffa045d47d95cc9c4ab50f6
---
M composer.json
M includes/CentralAuthUser.php
M includes/CentralAuthUtils.php
M phpcs.xml
4 files changed, 11 insertions(+), 13 deletions(-)


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

diff --git a/composer.json b/composer.json
index 4f55859..bf202bf 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index a09380b..d752899 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -279,7 +279,7 @@
);
 
if ( $name !== false ) {
-   return CentralAuthUser::getInstanceByName( $name );
+   return self::getInstanceByName( $name );
} else {
return false;
}
@@ -300,7 +300,7 @@
);
 
if ( $name !== false ) {
-   return CentralAuthUser::getMasterInstanceByName( $name 
);
+   return self::getMasterInstanceByName( $name );
} else {
return false;
}
diff --git a/includes/CentralAuthUtils.php b/includes/CentralAuthUtils.php
index 57bc6d1..b4d8100 100644
--- a/includes/CentralAuthUtils.php
+++ b/includes/CentralAuthUtils.php
@@ -178,9 +178,9 @@
 * @return array
 */
public static function getCentralSessionById( $id ) {
-   $key = CentralAuthUtils::memcKey( 'session', $id );
+   $key = self::memcKey( 'session', $id );
$stime = microtime( true );
-   $data = CentralAuthUtils::getSessionCache()->get( $key ) ?: [];
+   $data = self::getSessionCache()->get( $key ) ?: [];
$real = microtime( true ) - $stime;
MediaWikiServices::getInstance()
->getStatsdDataFactory()->timing( 
'centralauth.session.read', $real );
@@ -206,10 +206,10 @@
$id = is_string( $reset ) ? $reset : 
MWCryptRand::generateHex( 32 );
}
$data['sessionId'] = $id;
-   $key = CentralAuthUtils::memcKey( 'session', $id );
+   $key = self::memcKey( 'session', $id );
 
// Copy certain keys from the existing session, if any (T124821)
-   $existing = CentralAuthUtils::getSessionCache()->get( $key );
+   $existing = self::getSessionCache()->get( $key );
if ( is_array( $existing ) ) {
$data += array_intersect_key( $existing, $keepKeys );
}
@@ -217,7 +217,7 @@
if ( $data !== $existing || !isset( $data['expiry'] ) || 
$data['expiry'] < time() + 32100 ) {
$data['expiry'] = time() + 86400;
$stime = microtime( true );
-   CentralAuthUtils::getSessionCache()->set( $key, $data, 
86400 );
+   self::getSessionCache()->set( $key, $data, 86400 );
$real = microtime( true ) - $stime;
MediaWikiServices::getInstance()
->getStatsdDataFactory()->timing( 
'centralauth.session.write', $real );
@@ -241,9 +241,9 @@
$id = $session->get( 'CentralAuth::centralSessionId' );
 
if ( $id !== null ) {
-   $key = CentralAuthUtils::memcKey( 'session', $id );
+   $key = self::memcKey( 'session', $id );
$stime = microtime( true );
-   CentralAuthUtils::getSessionCache()->delete( $key );
+   self::getSessionCache()->delete( $key );
$real = microtime( true ) - $stime;
MediaWikiServices::getInstance()
->getStatsdDataFactory()->timing( 
"centralauth.session.delete", $real );
diff --git a/phpcs.xml b/phpcs.xml
index 25af500..457f48b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,7 @@



-   CentralAuth.*alias.php
+   CentralAuth\.*alias\.php



@@ -16,6 +16,4 @@
.


-   vendor
-   

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

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I7c8dd29e9a683d932c93f1345d7e0c31e8695990
---
M composer.json
M phpcs.xml
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/41/367941/1

diff --git a/composer.json b/composer.json
index 1366381..55507be 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index 4852d8c..4c94302 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,6 +8,5 @@
.


-   ReCaptcha/recaptchalib.php
-   vendor
+   ReCaptcha/recaptchalib\.php
 

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

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

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Add tagging as part of webrequest refine process

[Nuria (Code Review)]

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

Change subject: Add tagging as part of webrequest refine process
..

Add tagging as part of webrequest refine process

Bug: T171760
Change-Id: Iacb94f0fa66c682fd1da77a7141ff9055f980517
---
M oozie/webrequest/load/bundle.properties
M oozie/webrequest/load/refine_webrequest.hql
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/40/367940/1

diff --git a/oozie/webrequest/load/bundle.properties 
b/oozie/webrequest/load/bundle.properties
index d0fed7c..3593204 100644
--- a/oozie/webrequest/load/bundle.properties
+++ b/oozie/webrequest/load/bundle.properties
@@ -57,7 +57,7 @@
 webrequest_table  = wmf.webrequest
 
 # Version of Hive UDF jar to import
-refinery_jar_version  = 0.0.46
+refinery_jar_version  = 0.0.49
 
 # Record version to keep track of changes
 record_version= 0.0.18
diff --git a/oozie/webrequest/load/refine_webrequest.hql 
b/oozie/webrequest/load/refine_webrequest.hql
index 9c1de55..fe95609 100644
--- a/oozie/webrequest/load/refine_webrequest.hql
+++ b/oozie/webrequest/load/refine_webrequest.hql
@@ -56,6 +56,7 @@
 CREATE TEMPORARY FUNCTION referer_classify AS 
'org.wikimedia.analytics.refinery.hive.SmartReferrerClassifierUDF';
 CREATE TEMPORARY FUNCTION get_pageview_info AS 
'org.wikimedia.analytics.refinery.hive.GetPageviewInfoUDF';
 CREATE TEMPORARY FUNCTION normalize_host AS 
'org.wikimedia.analytics.refinery.hive.HostNormalizerUDF';
+CREATE TEMPORARY FUNCTION get_tags AS 
'org.wikimedia.analytics.refinery.hive.GetWebrequestTagsUDF';
 
 
 INSERT OVERWRITE TABLE ${destination_table}
@@ -86,6 +87,7 @@
 geocoded_data(ip) as geocoded_data,
 x_cache,
 ua_parser(user_agent) as user_agent_map,
+get_tags(uri_host, uri_path, uri_query, http_status, content_type, 
user_agent, x_analytics) as tags,
 CASE COALESCE(x_analytics, '-')
   WHEN '-' THEN NULL
   ELSE str_to_map(x_analytics, '\;', '=')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacb94f0fa66c682fd1da77a7141ff9055f980517
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Nuria 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: HTMLForm: Show more options when incorrect displayFormat is set

[jenkins-bot (Code Review)]

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

Change subject: HTMLForm: Show more options when incorrect displayFormat is set
..


HTMLForm: Show more options when incorrect displayFormat is set

Change-Id: I47a4684f01f5e30629e819403d7445479c4607da
---
M includes/htmlform/HTMLForm.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 61d0d89..d4351e0 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -400,7 +400,13 @@
 
if ( !in_array( $format, $this->availableDisplayFormats, true ) 
) {
throw new MWException( 'Display format must be one of ' 
.
-   print_r( $this->availableDisplayFormats, true ) 
);
+   print_r(
+   array_merge(
+   $this->availableDisplayFormats,
+   
$this->availableSubclassDisplayFormats
+   ),
+   true
+   ) );
}
 
// Evil hack for mobile :(

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

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

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

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

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I6fe747ee1b2b778b7df188f97e226742bb0bcec1
---
M BounceHandlerHooks.php
M composer.json
M phpcs.xml
3 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler 
refs/changes/39/367939/1

diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php
index 5ccc1f2..1ea01b6 100644
--- a/BounceHandlerHooks.php
+++ b/BounceHandlerHooks.php
@@ -68,7 +68,7 @@
 *
 * @param array &$files
 *
-* @return boolean
+* @return bool
 */
public static function registerUnitTests( array &$files ) {
// @codeCoverageIgnoreStart
diff --git a/composer.json b/composer.json
index 4f55859..bf202bf 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 2a192d9..79abcb0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -13,6 +13,4 @@
.


-   vendor
-   node_modules
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Drop MFAllowNonJavaScriptEditing and Special:Mobile...

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Drop MFAllowNonJavaScriptEditing and 
Special:MobileEditor
..


Hygiene: Drop MFAllowNonJavaScriptEditing and Special:MobileEditor

Depends-On: Ifc0efcb87605e5cd678343d1ac91a2ce53b33664
Bug: T125174
Change-Id: I33c990e8399174a59ab022e6ed770f8592680f71
---
M MobileFrontend.alias.php
M README.md
M extension.json
M includes/MobileFrontend.hooks.php
D includes/specials/SpecialMobileEditor.php
5 files changed, 1 insertion(+), 141 deletions(-)

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



diff --git a/MobileFrontend.alias.php b/MobileFrontend.alias.php
index d393cd7..02850bc 100644
--- a/MobileFrontend.alias.php
+++ b/MobileFrontend.alias.php
@@ -15,7 +15,6 @@
'MobileOptions' => [ 'MobileOptions' ],
'Uploads' => [ 'Uploads' ],
'MobileDiff' => [ 'MobileDiff' ],
-   'MobileEditor' => [ 'MobileEditor' ],
'MobileMenu' => [ 'MobileMenu' ],
'MobileLanguages' => [ 'MobileLanguages' ],
'Nearby' => [ 'Nearby' ],
@@ -34,7 +33,6 @@
'MobileOptions' => [ 'خيارات_المحمول' ],
'Uploads' => [ 'مرفوعات' ],
'MobileDiff' => [ 'فرق_المحمول' ],
-   'MobileEditor' => [ 'محرر_المحمول' ],
'MobileMenu' => [ 'قائمة_المحمول' ],
'MobileLanguages' => [ 'لغات_المحمول' ],
'Nearby' => [ 'قريب' ],
@@ -46,7 +44,6 @@
'MobileOptions' => [ 'خيارات_الموبايل' ],
'Uploads' => [ 'مرفوعات' ],
'MobileDiff' => [ 'فرق_الموبايل' ],
-   'MobileEditor' => [ 'محرر_الموبايل' ],
'MobileMenu' => [ 'قايمه_الموبايل' ],
'MobileLanguages' => [ 'لغات_الموبايل' ],
'Nearby' => [ 'قريب' ],
@@ -79,7 +76,6 @@
'MobileOptions' => [ 'موبایل_ئی_تنزیمان' ],
'Uploads' => [ 'بُرز_بوته_ئینان' ],
'MobileDiff' => [ 'موبایل_ئی_پرک' ],
-   'MobileEditor' => [ 'موبایل_ئی_دستکار' ],
'MobileMenu' => [ 'موبایل_ئی_مینو' ],
'MobileLanguages' => [ 'موبایل_ئی_زبانان' ],
'Nearby' => [ 'بئ_نزینکی_ئا' ],
@@ -92,7 +88,6 @@
'MobileOptions' => [ 'মোবাইল_বিকল্প' ],
'Uploads' => [ 'আপলোডসমূহ' ],
'MobileDiff' => [ 'মোবাইল_পার্থক্য' ],
-   'MobileEditor' => [ 'মোবাইল_সম্পাদক' ],
'MobileMenu' => [ 'মোবাইল_মেনু' ],
'MobileLanguages' => [ 'মোবাইল_ভাষাসমূহ' ],
'Nearby' => [ 'কাছাকাছি' ],
@@ -119,7 +114,6 @@
'MobileOptions' => [ 'Mobilní_nastavení' ],
'Uploads' => [ 'Vaše_soubory' ],
'MobileDiff' => [ 'Mobilní_rozdíl' ],
-   'MobileEditor' => [ 'Mobilní_editor' ],
'MobileMenu' => [ 'Mobilní_menu' ],
'MobileLanguages' => [ 'Mobilní_jazyky' ],
'Nearby' => [ 'Poblíž' ],
@@ -131,7 +125,6 @@
'MobileOptions' => [ 'Mobile_Optionen' ],
'Uploads' => [ 'Hochgeladene_Dateien' ],
'MobileDiff' => [ 'Mobiler_Unterschied' ],
-   'MobileEditor' => [ 'Mobiler_Editor' ],
'MobileMenu' => [ 'Mobiles_Menü' ],
'MobileLanguages' => [ 'Mobile_Sprachen' ],
'Nearby' => [ 'In_der_Nähe' ],
@@ -143,7 +136,6 @@
'MobileOptions' => [ 'MobilWeçenegi' ],
'Uploads' => [ 'Barkerdışi' ],
'MobileDiff' => [ 'MobilVer' ],
-   'MobileEditor' => [ 'MobilVurnayoğ' ],
'MobileMenu' => [ 'MıobilMenu' ],
'MobileLanguages' => [ 'MobilZıwani' ],
'Nearby' => [ 'Nezdıra' ],
@@ -170,7 +162,6 @@
'MobileOptions' => [ 'Mobiili_suvandid' ],
'Uploads' => [ 'Üleslaaditud_failid' ],
'MobileDiff' => [ 'Mobiilierinevus' ],
-   'MobileEditor' => [ 'Mobiiliredaktor' ],
'MobileMenu' => [ 'Mobiili_menüü' ],
'MobileLanguages' => [ 'Mobiilikeeled' ],
'Nearby' => [ 'Lähikond' ],
@@ -182,7 +173,6 @@
'MobileOptions' => [ 'گزینه‌های_گوشی_همراه' ],
'Uploads' => [ 'بارگذاری‌ها' ],
'MobileDiff' => [ 'تفاوت_گوشی_همراه' ],
-   'MobileEditor' => [ 'ویرایشگر_گوشی_همراه' ],
'MobileMenu' => [ 'گزینگان_گوشی_همراه' ],
'MobileLanguages' => [ 'زبان‌های_گوشی_همراه' ],
'Nearby' => [ 'درنزدیکی', 'در_نزدیکی' ],
@@ -200,7 +190,6 @@
'MobileOptions' => [ 'הגדרות_נייד', 'הגדרות_פלאפון', 'הגדרות_סלולרי' ],
'Uploads' => [ 'העלאות' ],
'MobileDiff' => [ 'השוואה_ניידת' ],
-   'MobileEditor' => [ 'עריכה_ניידת' ],
'MobileMenu' => [ 'תפריט_נייד' ],
'MobileLanguages' => [ 'שפות_בנייד' ],
'Nearby' => [ 'בסביבה', 'קרוב' ],
@@ -210,7 +199,6 @@
 $specialPageAliases['hi'] = [
'History' => [ 'इतिहास' ],
'MobileOptions' => [ 'मोबाइल_विकल्प' ],
-   'MobileEditor' => [ 'मोबाइल_सम्पादक' ],
'MobileLanguages' => [ 'मोबाइल_भाषा' ],
'Nearby' => [ 'आस-पास' ],
 ];
@@ -221,7 +209,6 @@
'MobileOptions' => [ 'Mobilne_opcije' ],

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Flush feature file before calling xgboost to dump

[DCausse (Code Review)]

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

Change subject: Flush feature file before calling xgboost to dump
..


Flush feature file before calling xgboost to dump

Change-Id: Ife4ce20ab3fbfe7826531139e45145a8d50f336d
---
M mjolnir/training/xgboost.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/mjolnir/training/xgboost.py b/mjolnir/training/xgboost.py
index 5b699c8..1c8e632 100644
--- a/mjolnir/training/xgboost.py
+++ b/mjolnir/training/xgboost.py
@@ -263,6 +263,7 @@
 else:
 fmap_f = tempfile.NamedTemporaryFile()
 fmap_f.write(feature_map)
+fmap_f.flush()
 fmap_path = fmap_f.name
 # returns an Array[String] from scala, where each element of the array
 # is a json string representing a single tree.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife4ce20ab3fbfe7826531139e45145a8d50f336d
Gerrit-PatchSet: 1
Gerrit-Project: search/MjoLniR
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: DCausse 

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Train multiple cross validations in parallel

[DCausse (Code Review)]

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

Change subject: Train multiple cross validations in parallel
..


Train multiple cross validations in parallel

Change-Id: I727ecab95110bb578f40acf10f202d5be2d7f8bd
---
M bootstrap-vm.sh
M mjolnir/cli/training_pipeline.py
M mjolnir/training/hyperopt.py
M mjolnir/training/tuning.py
4 files changed, 96 insertions(+), 10 deletions(-)

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



diff --git a/bootstrap-vm.sh b/bootstrap-vm.sh
index 160717e..826d057 100644
--- a/bootstrap-vm.sh
+++ b/bootstrap-vm.sh
@@ -26,6 +26,9 @@
 gfortran \
 zip
 
+# xgboost master requires cmake > 3.2, so we need it from jessie-backports
+apt-get -t jessie-backports install cmake cmake-data
+
 
 # While we only asked for java 8, 7 was installed as well. switch over the
 # alternative. TODO: Do we need anything else?
@@ -117,6 +120,12 @@
 if [ ! -f 
/srv/xgboost/jvm-packages/xgboost4j-spark/target/xgboost4j-spark-0.7.jar ]; then
 git checkout 197a9eac
 git submodule update --init --recursive
+# TODO: We also need the patch that fixes parallel-CV. XGBoost has a race 
condition
+# triggered when running many models in parallel, but the current fix is 
more of
+# a hack and wont be merged upstream.
+git remote add ebernhardson https://github.com/ebernhardson/xgboost
+git fetch ebernhardson
+git cherry-pick ebernhardson/booster_to_bytes
 cd jvm-packages
 # The test suite requires 4 cores or it gets stuck. Not ideal but skip 
them for
 # now. It also needs a bit more than the default heap allocation.
diff --git a/mjolnir/cli/training_pipeline.py b/mjolnir/cli/training_pipeline.py
index fc08b8d..934ccb7 100644
--- a/mjolnir/cli/training_pipeline.py
+++ b/mjolnir/cli/training_pipeline.py
@@ -121,8 +121,9 @@
  + 'of executors required is workers * cv-jobs. (Default: 10)')
 parser.add_argument(
 '-c', '--cv-jobs', dest='num_cv_jobs', default=None, type=int,
-help='Number of cross validations to perform in parallel. Defaults to 
number '
- + 'of folds, to run all in parallel.')
+help='Number of cross validation folds to perform in parallel. 
Defaults to number '
+ + 'of folds, to run all in parallel. If this is a multiple of the 
number '
+ + 'of folds multiple cross validations will run in parallel.')
 parser.add_argument(
 '-f', '--folds', dest='num_folds', default=5, type=int,
 help='Number of cross validation folds to use. (Default: 5)')
diff --git a/mjolnir/training/hyperopt.py b/mjolnir/training/hyperopt.py
index b15be07..bd587ff 100644
--- a/mjolnir/training/hyperopt.py
+++ b/mjolnir/training/hyperopt.py
@@ -4,10 +4,83 @@
 from __future__ import absolute_import
 import hyperopt
 import hyperopt.pyll.base
+from hyperopt.utils import coarse_utcnow
 import itertools
 import math
 import mjolnir.training.tuning
+from multiprocessing.dummy import Pool
 import numpy as np
+import pyspark
+
+
+# FMinIter, when used async, puts the domain into attachments. Unfortunately
+# this domain isn't picklable in our use case. We don't actually need it
+# to be picklable, but FMinIter pickles it anways. Hax around it by setting
+# async after FMinIter.__init__ runs and providing domain manually.
+if not hasattr(hyperopt.FMinIter, '_mjolnir_hack'):
+# Alternatively, could inherit from FMinIter, then replace?
+hyperopt.FMinIter._mjolnir_hack = True
+fminiter_orig_init = hyperopt.FMinIter.__init__
+
+def _new_fminiter_init(self, *args, **kwargs):
+fminiter_orig_init(self, *args, **kwargs)
+if type(self.trials) == ThreadingTrials:
+# We have to set this here, rather than letting it
+# autodetect from self.trials.async, because then
+# it will try, and fail, to pickle the domain object
+self.async = True
+# Since domain wasn't pickled and provided we have
+# to do it manually
+self.trials.attachments['domain'] = self.domain
+hyperopt.FMinIter.__init__ = _new_fminiter_init
+
+
+class ThreadingTrials(hyperopt.Trials):
+def __init__(self, pool_size):
+super(ThreadingTrials, self).__init__()
+self.pool = Pool(pool_size)
+
+def _evaluate_one(self, trial):
+if trial['state'] != hyperopt.JOB_STATE_NEW:
+return
+trial['state'] = hyperopt.JOB_STATE_RUNNING
+now = coarse_utcnow()
+trial['book_time'] = now
+trial['refresh_time'] = now
+spec = hyperopt.base.spec_from_misc(trial['misc'])
+ctrl = hyperopt.base.Ctrl(self, current_trial=trial)
+try:
+result = self.attachments['domain'].evaluate(spec, ctrl)
+except Exception as e:
+trial['state'] = hyperopt.JOB_STATE_ERROR
+trial['misc']['error'] = 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Hygiene: Drop MFAllowNonJavaScriptEditing and Special:Mobile...

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Drop MFAllowNonJavaScriptEditing and 
Special:MobileEditor
..


Hygiene: Drop MFAllowNonJavaScriptEditing and Special:MobileEditor

Bug: T125174
Change-Id: Ifc0efcb87605e5cd678343d1ac91a2ce53b33664
---
M includes/skins/SkinMinerva.php
1 file changed, 5 insertions(+), 12 deletions(-)

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

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



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 85ed2de..849497f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -223,10 +223,7 @@
 * @return string
 */
public function doEditSectionLink( Title $nt, $section, $tooltip = 
null, $lang = false ) {
-   $noJsEdit = $this->getConfig()->get( 
'MFAllowNonJavaScriptEditing' );
-
if ( $this->isAllowedPageAction( 'edit' ) ) {
-   $additionalClass = $noJsEdit ? ' nojs-edit': '';
$lang = wfGetLangObj( $lang );
$message = $this->msg( 'mobile-frontend-editor-edit' 
)->inLanguage( $lang )->text();
$html = Html::openElement( 'span' );
@@ -236,7 +233,7 @@
'data-section' => $section,
// Note visibility of the edit section link 
button is controlled by .edit-page in ui.less so
// we default to enabled even though this may 
not be true.
-   'class' => MobileUI::iconClass( 'edit-enabled', 
'element', 'edit-page' . $additionalClass ),
+   'class' => MobileUI::iconClass( 'edit-enabled', 
'element', 'edit-page' ),
], $message );
$html .= Html::closeElement( 'span' );
return $html;
@@ -665,7 +662,6 @@
 */
protected function insertLogInOutMenuItem( MenuBuilder $menu ) {
$query = [];
-   $canEdit = $this->getConfig()->get( 
'MFAllowNonJavaScriptEditing' );
if ( !$this->getRequest()->wasPosted() ) {
$returntoquery = $this->getRequest()->getValues();
unset( $returntoquery['title'] );
@@ -686,7 +682,7 @@
$url = SpecialPage::getTitleFor( 'Userlogout' 
)->getLocalURL( $query );
$username = $user->getName();
 
-   $menu->insert( 'auth', $isJSOnly = !$canEdit )
+   $menu->insert( 'auth', false )
->addComponent(
$username,
Title::newFromText( $username, NS_USER 
)->getLocalUrl(),
@@ -708,7 +704,7 @@
unset( $returntoquery['campaign'] );
$query[ 'returntoquery' ] = wfArrayToCgi( 
$returntoquery );
$url = $this->getLoginUrl( $query );
-   $menu->insert( 'auth', $isJSOnly = !$canEdit )
+   $menu->insert( 'auth', false )
->addComponent(
$this->msg( 
'mobile-frontend-main-menu-login' )->escaped(),
$url,
@@ -1053,20 +1049,17 @@
 * @return array A map compatible with BaseTemplate#makeListItem
 */
protected function createEditPageAction() {
-   $noJsEdit = $this->getConfig()->get( 
'MFAllowNonJavaScriptEditing' );
-   $additionalClass = $noJsEdit ? ' nojs-edit' : '';
-
return [
'id' => 'ca-edit',
'text' => '',
'itemtitle' => $this->msg( 
'mobile-frontend-pageaction-edit-tooltip' ),
-   'class' => MobileUI::iconClass( 'edit-enabled', 
'element' . $additionalClass ),
+   'class' => MobileUI::iconClass( 'edit-enabled', 
'element' ),
'links' => [
'edit' => [
'href' => 
$this->getTitle()->getLocalURL( [ 'action' => 'edit', 'section' => 0 ] )
],
],
-   'is_js_only' => !$noJsEdit
+   'is_js_only' => false
];
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc0efcb87605e5cd678343d1ac91a2ce53b33664
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.11]: RCFilters: Followup I78e23f85c3: Don't disable RCFilters sys...

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Followup I78e23f85c3: Don't disable RCFilters system 
when fetching results
..


RCFilters: Followup I78e23f85c3: Don't disable RCFilters system when fetching 
results

We disable and hide it only on first page load while we create the
system, but should not hide and disable the actual filter area
system.

Bug: T165286
Bug: T171671
Change-Id: Ifc9d3c02c0c118d48634b8df846e14bfa6ea294a
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
3 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 4263c51..e758f26 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -36,6 +36,7 @@
 
$( '.rcfilters-container' ).append( 
filtersWidget.$element );
$( 'body' ).append( $overlay );
+   $( '.rcfilters-head' ).addClass( 
'mw-rcfilters-ui-ready' );
 
$( 'a.mw-helplink' ).attr(
'href',
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 37dda4d..c2533df 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -76,7 +76,6 @@
 * Respond to changes list model invalidate
 */
mw.rcfilters.ui.ChangesListWrapperWidget.prototype.onModelInvalidate = 
function () {
-   $( '.rcfilters-head' ).removeClass( 'mw-rcfilters-ui-ready' );
$( '.rcfilters-spinner' ).removeClass( 'mw-rcfilters-ui-ready' 
);
this.$element.removeClass( 'mw-rcfilters-ui-ready' );
};
@@ -138,7 +137,6 @@
}
}
 
-   $( '.rcfilters-head' ).addClass( 'mw-rcfilters-ui-ready' );
$( '.rcfilters-spinner' ).addClass( 'mw-rcfilters-ui-ready' );
this.$element.addClass( 'mw-rcfilters-ui-ready' );
};
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
index 04ccaf6..ee8e0bc 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -87,6 +87,7 @@
 */
mw.rcfilters.ui.FormWrapperWidget.prototype.onChangesModelInvalidate = 
function () {
this.$submitButton.prop( 'disabled', true );
+   this.$element.removeClass( 'mw-rcfilters-ui-ready' );
};
 
/**
@@ -99,6 +100,7 @@
 */
mw.rcfilters.ui.FormWrapperWidget.prototype.onChangesModelUpdate = 
function ( $changesList, $fieldset, isInitialDOM ) {
this.$submitButton.prop( 'disabled', false );
+   this.$element.removeClass( 'mw-rcfilters-ui-ready' );
 
// Replace the entire fieldset
this.$element.empty().append( $fieldset.contents() );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc9d3c02c0c118d48634b8df846e14bfa6ea294a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update several Wikipedia projects to existing wordmarks

[Jdlrobson (Code Review)]

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

Change subject: Update several Wikipedia projects to existing wordmarks
..

Update several Wikipedia projects to existing wordmarks

Bug: T171556
Change-Id: I20711163d03c8bbb7bacca9ffafed79c13ddffad
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 16 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d913d60..8099153 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -174,7 +174,9 @@
foreach ( [ 'private', 'fishbowl', 'special', 'closed', 'flow', 
'flaggedrevs', 'small', 'medium',
'large', 'wikimania', 'wikidata', 'wikidataclient', 
'visualeditor-nondefault',
'commonsuploads', 'nonbetafeatures', 'group0', 
'group1', 'group2', 'wikipedia', 'nonglobal',
-   'wikitech', 'nonecho', 'mobilemainpagelegacy', 
'compact-language-links', 'nowikidatadescriptiontaglines',
+   'wikitech', 'nonecho', 'mobilemainpagelegacy', 
'compact-language-links',
+   'wikipedia-cyrillic', 'wikipedia-e-acute', 
'wikipedia-devanagari',
+   'nowikidatadescriptiontaglines',
'related-articles-footer-blacklisted-skins',
'top6-wikipedia'
] as $tag ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 34d2c5c..0a6135e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15375,7 +15375,17 @@
'copyright-width' => 79,
'copyright-height' => 22,
],
+   'arzwiki' => [
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-ar.svg',
+   'copyright-width' => 79,
+   'copyright-height' => 22,
+   ],
'bnwiki' => [
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-bn.svg',
+   'copyright-width' => 92,
+   'copyright-height' => 21,
+   ],
+   'bpywiki' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-bn.svg',
'copyright-width' => 92,
'copyright-height' => 21,
@@ -15385,7 +15395,7 @@
'copyright-width' => 116,
'copyright-height' => 18,
],
-   'frwiki' => [
+   'wikipedia-e-acute' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-fr.svg',
'copyright-width' => 116,
'copyright-height' => 18,
@@ -15395,7 +15405,7 @@
'copyright-width' => 116,
'copyright-height' => 18,
],
-   'ruwiki' => [
+   'wikipedia-cyrillic' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-ru.svg',
'copyright-width' => 126,
'copyright-height' => 20,
@@ -15405,7 +15415,7 @@
'copyright-width' => 95,
'copyright-height' => 18,
],
-   'hiwiki' => [
+   'wikipedia-devanagari' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-hi.svg',
'copyright-width' => 78,
'copyright-height' => 18,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.11]: RCFilters UI: Unbreak limit and days widgets in non-experime...

[jenkins-bot (Code Review)]

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

Change subject: RCFilters UI: Unbreak limit and days widgets in 
non-experimental mode
..


RCFilters UI: Unbreak limit and days widgets in non-experimental mode

Don't treat all views as experimental, only the namespace and tag ones.

Change-Id: I1ec014314217b52cdfd71ccfcf10d549bea55f6c
(cherry picked from commit b9a71fb0e3b75244ed132c27734f2dc86973e6fe)
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 5 insertions(+), 9 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index a602c32..3281735 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -324,17 +324,12 @@
} );
 
// Collect views
-   allViews = {
+   allViews = $.extend( true, {
'default': {
title: mw.msg( 'rcfilters-filterlist-title' ),
groups: filterGroups
}
-   };
-
-   if ( views && mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
-   // If we have extended views, add them in
-   $.extend( true, allViews, views );
-   }
+   }, views );
 
// Go over all views
$.each( allViews, function ( viewName, viewData ) {
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 5ebec27..3b8ebbd 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -35,6 +35,7 @@
items = [],
uri = new mw.Uri(),
$changesList = $( '.mw-changeslist' 
).first().contents(),
+   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ),
createFilterDataFromNumber = function ( num, 
convertedNumForLabel ) {
return {
name: String( num ),
@@ -43,7 +44,7 @@
};
 
// Prepare views
-   if ( namespaceStructure ) {
+   if ( namespaceStructure && experimentalViews ) {
items = [];
$.each( namespaceStructure, function ( namespaceID, 
label ) {
// Build and clean up the individual namespace 
items definition
@@ -74,7 +75,7 @@
} ]
};
}
-   if ( tagList ) {
+   if ( tagList && experimentalViews ) {
views.tags = {
title: mw.msg( 'rcfilters-view-tags' ),
trigger: '#',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ec014314217b52cdfd71ccfcf10d549bea55f6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Use makeListItem() for menu items rather than building HTML ...

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367937 )

Change subject: Use makeListItem() for menu items rather than building HTML by 
hand
..

Use makeListItem() for menu items rather than building HTML by hand

This affects the four tabs menus (namespaces, variants, views, actions).
Other menus (personal menu and sidebar) have already been using it.

We need some minor overrides to get the same results as the hand-built
HTML, but I think this still makes the code a lot nicer.

The output is the same as before, except for unimportant whitespace
differences and the order of some tag attributes.

I tested this with several extensions and configuration options that
mess with the tabs:
* $wgUsePigLatinVariant = true
* FileAnnotations extension
* FileExporter extension
* Viewing the page as administrator

Change-Id: I2d1255442abf5fa4bac2de1b084d0bcacbba7d0f
---
M VectorTemplate.php
1 file changed, 57 insertions(+), 97 deletions(-)


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

diff --git a/VectorTemplate.php b/VectorTemplate.php
index 6ae80e5..25c9671 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -33,50 +33,22 @@
 * Outputs the entire contents of the (X)HTML page
 */
public function execute() {
-   // Build additional attributes for navigation urls
-   $nav = $this->data['content_navigation'];
+   $this->data['namespace_urls'] = 
$this->data['content_navigation']['namespaces'];
+   $this->data['view_urls'] = 
$this->data['content_navigation']['views'];
+   $this->data['action_urls'] = 
$this->data['content_navigation']['actions'];
+   $this->data['variant_urls'] = 
$this->data['content_navigation']['variants'];
 
+   // Move the watch/unwatch star outside of the collapsed 
"actions" menu to the main "views" menu
if ( $this->config->get( 'VectorUseIconWatch' ) ) {
$mode = $this->getSkin()->getUser()->isWatched( 
$this->getSkin()->getRelevantTitle() )
? 'unwatch'
: 'watch';
 
-   if ( isset( $nav['actions'][$mode] ) ) {
-   $nav['views'][$mode] = $nav['actions'][$mode];
-   $nav['views'][$mode]['class'] = rtrim( 'icon ' 
. $nav['views'][$mode]['class'], ' ' );
-   $nav['views'][$mode]['primary'] = true;
-   unset( $nav['actions'][$mode] );
+   if ( isset( $this->data['action_urls'][$mode] ) ) {
+   $this->data['view_urls'][$mode] = 
$this->data['action_urls'][$mode];
+   unset( $this->data['action_urls'][$mode] );
}
}
-
-   $xmlID = '';
-   foreach ( $nav as $section => $links ) {
-   foreach ( $links as $key => $link ) {
-   if ( $section == 'views' && !( isset( 
$link['primary'] ) && $link['primary'] ) ) {
-   $link['class'] = rtrim( 'collapsible ' 
. $link['class'], ' ' );
-   }
-
-   $xmlID = isset( $link['id'] ) ? $link['id'] : 
'ca-' . $xmlID;
-   $nav[$section][$key]['attributes'] =
-   ' id="' . Sanitizer::escapeId( $xmlID ) 
. '"';
-   if ( $link['class'] ) {
-   $nav[$section][$key]['attributes'] .=
-   ' class="' . htmlspecialchars( 
$link['class'] ) . '"';
-   unset( $nav[$section][$key]['class'] );
-   }
-   if ( isset( $link['tooltiponly'] ) && 
$link['tooltiponly'] ) {
-   $nav[$section][$key]['key'] =
-   Linker::tooltip( $xmlID );
-   } else {
-   $nav[$section][$key]['key'] =
-   Xml::expandAttributes( 
Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
-   }
-   }
-   }
-   $this->data['namespace_urls'] = $nav['namespaces'];
-   $this->data['view_urls'] = $nav['views'];
-   $this->data['action_urls'] = $nav['actions'];
-   $this->data['variant_urls'] = $nav['variants'];
 
// Reverse horizontally rendered navigation elements
if ( $this->data['rtl'] ) {
@@ -361,19 +333,10 @@
msg( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update SmashPig and DonationInterface

[jenkins-bot (Code Review)]

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

Change subject: Update SmashPig and DonationInterface
..


Update SmashPig and DonationInterface

Use all-purpose testing configurations and QueueWrapper, getting rid of
some boilerplate.

Update DonationInterface usage for new standardized field names.

Still need to determine if we want to initialize SmashPig for all requests,
or only where needed.

Would be cool if we could get https://gerrit.wikimedia.org/r/355453 merged
and we could get rid of the extra DonationInterface queue settings in Civi.

Change-Id: I26d89875f7fbd1adf9d2c51de973f99761200032
---
M composer.lock
M sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
M sites/all/modules/queue2civicrm/banner_history/banner_history.module
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
M sites/all/modules/queue2civicrm/queue2civicrm.module
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
M sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/RefundQueueTest.php
M sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
M sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
M sites/all/modules/wmf_audit/ingenico/orphan_rectify.drush.inc
M sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
M sites/all/modules/wmf_audit/wmf_audit.module
M sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceFactoryTest.php
M sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M sites/all/modules/wmf_common/wmf_common.module
22 files changed, 108 insertions(+), 91 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index b89b1ac..eb004f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -88,7 +88,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17T00:44:20+00:00"
 },
 {
 "name": "clio/clio",
@@ -198,7 +198,7 @@
 "queue",
 "transaction"
 ],
-"time": "2017-04-17 14:11:55"
+"time": "2017-04-17T14:11:55+00:00"
 },
 {
 "name": "cogpowered/finediff",
@@ -250,6 +250,48 @@
 "text"
 ],
 "time": "2014-05-19T10:25:02+00:00"
+},
+{
+"name": "corneltek/getoptionkit",
+"version": "2.6.0",
+"source": {
+"type": "git",
+"url": "https://github.com/c9s/GetOptionKit.git;,
+"reference": "995607ddf4fc90ebdb4a7d58fe972d581ad8495f"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/c9s/GetOptionKit/zipball/995607ddf4fc90ebdb4a7d58fe972d581ad8495f;,
+"reference": "995607ddf4fc90ebdb4a7d58fe972d581ad8495f",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.0"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "2.6.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"GetOptionKit\\": "src/"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Yo-An Lin",
+"email": "yoanli...@gmail.com"
+}
+],
+"description": "Powerful command-line option toolkit",
+"homepage": "http://github.com/c9s/GetOptionKit;,
+"time": "2017-06-30T14:54:48+00:00"
 },
 {
 "name": "guzzlehttp/guzzle",
@@ -691,7 +733,7 @@
 "keywords": [
 "Silverpop"
 ],
-"time": "2017-07-24 07:31:30"
+"time": "2017-07-06T03:06:53+00:00"
 },
 {
 "name": "neitanod/forceutf8",
@@ -797,7 +839,7 @@
 "sendgrid",
 "sendinblue"
 ],
-"time": "2017-05-15 13:50:56"
+"time": "2017-05-15T13:50:56+00:00"
 },
 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.11]: RCFilters: Improve loading animation

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Improve loading animation
..


RCFilters: Improve loading animation

Bug: T165286
Bug: T171671
Change-Id: I78e23f85c3ba06cb32355859d426e9c19d69499c
(cherry picked from commit dc9519393c8bf661915c979e7a6b9f68a172f628)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
4 files changed, 27 insertions(+), 22 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 9da3f8c..4263c51 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -37,10 +37,6 @@
$( '.rcfilters-container' ).append( 
filtersWidget.$element );
$( 'body' ).append( $overlay );
 
-   // Set as ready
-   $( '.rcfilters-head' ).addClass( 
'mw-rcfilters-ui-ready' );
-   $( '.rcfilters-spinner' ).detach();
-
$( 'a.mw-helplink' ).attr(
'href',

'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:New_filters_for_edit_review'
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 305f3f9..9f3b809 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -15,6 +15,10 @@
&:not( .mw-rcfilters-ui-ready ) {
opacity: 0.5;
pointer-events: none;
+
+   .rcoptions {
+   display: none;
+   }
}
}
 
@@ -23,20 +27,30 @@
margin: 0;
}
 
-   .mw-changeslist-empty {
-   // Hide the 'empty' message when we load rcfilters
-   // since we replace it anyways with a specific
-   // message of our own
-   display: none;
+   .mw-changeslist {
+   &-empty {
+   // Hide the 'empty' message when we load rcfilters
+   // since we replace it anyways with a specific
+   // message of our own
+   display: none;
+   }
+
+   &:not( .mw-rcfilters-ui-ready ) {
+   opacity: 0.5;
+   }
}
 
.rcfilters-spinner {
margin: -2em auto 0;
width: 70px;
opacity: 0.8;
-   display: block;
+   display: none;
white-space: nowrap;
 
+   &:not( .mw-rcfilters-ui-ready ) {
+   display: block;
+   }
+
& .rcfilters-spinner-bounce,
&:before,
&:after {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 0e9e843..37dda4d 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -3,7 +3,6 @@
 * List of changes
 *
 * @extends OO.ui.Widget
-* @mixins OO.ui.mixin.PendingElement
 *
 * @constructor
 * @param {mw.rcfilters.dm.FiltersViewModel} filtersViewModel View model
@@ -23,8 +22,6 @@
 
// Parent
mw.rcfilters.ui.ChangesListWrapperWidget.parent.call( this, 
config );
-   // Mixin constructors
-   OO.ui.mixin.PendingElement.call( this, config );
 
this.filtersViewModel = filtersViewModel;
this.changesListViewModel = changesListViewModel;
@@ -51,7 +48,6 @@
/* Initialization */
 
OO.inheritClass( mw.rcfilters.ui.ChangesListWrapperWidget, OO.ui.Widget 
);
-   OO.mixinClass( mw.rcfilters.ui.ChangesListWrapperWidget, 
OO.ui.mixin.PendingElement );
 
/**
 * Respond to the highlight feature being toggled on and off
@@ -80,7 +76,9 @@
 * Respond to changes list model invalidate
 */
mw.rcfilters.ui.ChangesListWrapperWidget.prototype.onModelInvalidate = 
function () {
-   this.pushPending();
+   $( '.rcfilters-head' ).removeClass( 'mw-rcfilters-ui-ready' );

[MediaWiki-commits] [Gerrit] wikibase/wikiba.se[master]: Load font-awesome internally

[Ladsgroup (Code Review)]

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

Change subject: Load font-awesome internally
..

Load font-awesome internally

This is a serious privacy issue

Bug: T171656
Change-Id: I1aaf11098c570ee307a8c29d3473611d00ac4d50
---
M composer.json
M source/_views/default.html
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikibase/wikiba.se 
refs/changes/36/367936/1

diff --git a/composer.json b/composer.json
index 8f55d63..36179cd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
"require": {
+   "components/font-awesome": "~4.7",
"sculpin/sculpin": "~2.1",
"worldskills/bootstrap": "~3.2",
"dflydev/embedded-composer": "^1.0@dev"
diff --git a/source/_views/default.html b/source/_views/default.html
index 89e4ebc..1c15954 100644
--- a/source/_views/default.html
+++ b/source/_views/default.html
@@ -5,7 +5,7 @@



-   
+   


 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aaf11098c570ee307a8c29d3473611d00ac4d50
Gerrit-PatchSet: 1
Gerrit-Project: wikibase/wikiba.se
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[master]: Catch Lua errors at PHP→Lua call boundaries

[Anomie (Code Review)]

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

Change subject: Catch Lua errors at PHP→Lua call boundaries
..

Catch Lua errors at PHP→Lua call boundaries

I081a05daa tried to avoid memory errors in unprotected code by allowing
unprotected code to allocate a bit beyond the normal memory limit.

But it turns out that's not sufficient, since in a Lua→PHP→Lua call the
setup for the second Lua bit should also be considered "unprotected",
but at that point it's easy enough for the data being passed from PHP to
Lua to exceed the "slop" space.

But even that too wouldn't be sufficient, because Lua errors other than
memory errors should also not be thrown across that boundary. Attempting
to do so results in HHVM catching it and reporting an "unknown
exception" fatal error, and in Zend PHP5 tends to result in a segfault
(in limited testing PHP7 seems find, although I have no idea why).

So, to really fix this, we need to catch these Lua errors at each
PHP→Lua call boundary. Lua provides a lua_cpcall() method for this
purpose, although actually making use of it is a bit of a pain as it
requires a callback function and passing any necessary parameters
(including the tsrm_ls parameter hidden behind the TSRMLS_* macros) to
it via a struct that's sent as a light userdata on the Lua stack.

Reviewing the methods provided by this extension, the following don't
make calls into Lua and so are safe:
* All the exception classes
* LuaSandbox::getVersionInfo()
* LuaSandbox::setMemoryLimit()
* LuaSandbox::getMemoryUsage()
* LuaSandbox::getPeakMemoryUsage()
* LuaSandbox::setCPULimit()
* LuaSandbox::getCPUUsage()
* LuaSandbox::pauseUsageTimer()
* LuaSandbox::unpauseUsageTimer()
* LuaSandbox::enableProfiler()
* LuaSandbox::disableProfiler()
* LuaSandbox::getProfilerFunctionReport()
* LuaSandboxFunction::__construct()

The following all needed protection added:
* LuaSandbox::loadString()
* LuaSandbox::loadBinary()
* LuaSandbox::callFunction()
* LuaSandbox::wrapPhpFunction()
* LuaSandbox::registerLibrary()
* LuaSandboxFunction::call()
* LuaSandboxFunction::dump()

Since the allocator code from I081a05daa isn't serving the purpose, I'm
removing it in this patch. I'm also fixing a minor bug in the allocator
in that calls with nsize < osize (i.e. reducing memory usage) should
always be allowed regardless of the memory usage status, so that if Lua
tries to clean up after memory usage is exceeded it can actually do so.

Bug: T171392
Change-Id: Iaa88053183d51a698750c6df4b40ba7afe00c913
---
M alloc.c
M data_conversion.c
M luasandbox.c
A tests/errors-at-call-boundaries.phpt
M tests/reentrant.phpt
5 files changed, 496 insertions(+), 137 deletions(-)


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

diff --git a/alloc.c b/alloc.c
index 5585c5d..2f2a321 100644
--- a/alloc.c
+++ b/alloc.c
@@ -17,7 +17,7 @@
 #endif
 
 static inline int luasandbox_update_memory_accounting(php_luasandbox_alloc * 
obj,
-   size_t osize, size_t nsize, int in_lua);
+   size_t osize, size_t nsize);
 #ifdef LUASANDBOX_LJ_64
 static void *luasandbox_passthru_alloc(void *ud, void *ptr, size_t osize, 
size_t nsize);
 #else
@@ -60,14 +60,10 @@
  * Returns 1 if the allocation should be allowed, 0 if it should fail.
  */
 static inline int luasandbox_update_memory_accounting(php_luasandbox_alloc * 
alloc,
-   size_t osize, size_t nsize, int in_lua)
+   size_t osize, size_t nsize)
 {
-   // Allow some extra memory overhead for non-in_lua allocations to avoid
-   // getting into luasandbox_panic due to allocation failures.
-   size_t slop = in_lua ? 0 : 1024*1024;
-
-   if (nsize > alloc->memory_limit
-   || alloc->memory_usage > alloc->memory_limit + slop - nsize)
+   if (nsize > osize && (nsize > alloc->memory_limit
+   || alloc->memory_usage + nsize > alloc->memory_limit))
{
// Memory limit exceeded
return 0;
@@ -98,7 +94,7 @@
php_luasandbox_obj * obj = (php_luasandbox_obj*)ud;
void * nptr;
obj->in_php ++;
-   if (!luasandbox_update_memory_accounting(>alloc, osize, nsize, 
obj->in_lua)) {
+   if (!luasandbox_update_memory_accounting(>alloc, osize, nsize)) {
obj->in_php --;
return NULL;
}
@@ -130,7 +126,7 @@
 static void *luasandbox_passthru_alloc(void *ud, void *ptr, size_t osize, 
size_t nsize)
 {
php_luasandbox_obj * obj = (php_luasandbox_obj*)ud;
-   if (!luasandbox_update_memory_accounting(>alloc, osize, nsize, 
obj->in_lua)) {
+   if (!luasandbox_update_memory_accounting(>alloc, osize, nsize)) {
return NULL;
}
return obj->alloc.old_alloc(obj->alloc.old_alloc_ud, ptr, osize, nsize);
diff --git a/data_conversion.c b/data_conversion.c
index 9256ec3..9315edd 100644
--- a/data_conversion.c
+++ 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix typo causing enotice & suppressed not to populate

[jenkins-bot (Code Review)]

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

Change subject: Fix typo causing enotice & suppressed not to populate
..


Fix typo causing enotice & suppressed not to populate

Bug: T161758

Change-Id: Iead0de6e676da57d3e1aba7f3bc87ae679d29def
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
index aac82ae..44550ab 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
@@ -93,7 +93,7 @@
   'opened_total' => $mailing['number_opened_total'],
   'opened_unique' => $mailing['number_opened_unique'],
   'unsubscribed' => $mailing['number_unsubscribed'],
-  'suppressed' => $mailing['number_unsuppressed'],
+  'suppressed' => $mailing['number_suppressed'],
   // 'forwarded'
   'blocked' => $mailing['number_blocked'],
   // 'clicked_total' => $stats['NumGrossClick'],

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Fix Compilation test constructor

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Fix Compilation test constructor
..


Hygiene: Fix Compilation test constructor

Change-Id: I3766a2efbfe65d6618b19206f662113e6951a9ce
---
M app/src/main/java/org/wikipedia/offline/Compilation.java
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/src/main/java/org/wikipedia/offline/Compilation.java 
b/app/src/main/java/org/wikipedia/offline/Compilation.java
index 0c6c4e2..874383b 100644
--- a/app/src/main/java/org/wikipedia/offline/Compilation.java
+++ b/app/src/main/java/org/wikipedia/offline/Compilation.java
@@ -60,7 +60,7 @@
 @SuppressWarnings("checkstyle:parameternumber")
 Compilation(@NonNull String name, @NonNull Uri uri, @Nullable List 
langCodes,
 @Nullable String summary, @Nullable String description, 
@Nullable MediaContent media,
-@Nullable Uri thumbUrl, @Nullable Uri imageUrl, int count, 
long size, long timestamp) {
+@Nullable Uri thumbUri, @Nullable Uri imageUri, int count, 
long size, long timestamp) {
 this.name = name;
 this.uri = uri;
 this.langCodes = langCodes;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3766a2efbfe65d6618b19206f662113e6951a9ce
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
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]: Create 'rollbacker' user group in frwiki

[jenkins-bot (Code Review)]

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

Change subject: Create 'rollbacker' user group in frwiki
..


Create 'rollbacker' user group in frwiki

Rights assigned to 'rollbacker' user group: rollback

Users can be assigned to this group by sysops and bureaucrats and can be 
reomved by both.

Bug: T170780
Change-Id: Ib9e126216f93b2346c358e9e0b5150993a2b17aa
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Niharika29: Looks good to me, approved
  Luke081515: Looks good to me, but someone else must approve
  Thibaut120094: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7c2485e..34d2c5c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8440,6 +8440,7 @@
'changetags' => true, // T98629
'editextendedsemiprotected' => true // T131109
],
+   'rollbacker' => [ 'rollback' => true ], // T170780
'checkuser' => [ 'browsearchive' => true, 'deletedhistory' => 
true, 'deletedtext' => true ], // T23044
'sysop' => [ 'editextendedsemiprotected' => true ], // T131109
],
@@ -9895,7 +9896,8 @@
'bureaucrat' => [ 'import', 'transwiki', 'inactive', 
'petitiondata' ],
],
'+frwiki' => [
-   'bureaucrat' => [ 'abusefilter', 'accountcreator' ],
+   'sysop' => [ 'rollbacker' ], // T170780
+   'bureaucrat' => [ 'abusefilter', 'accountcreator', 'rollbacker' 
],
],
'+frwikibooks' => [
'bureaucrat' => [ 'abusefilter' ],
@@ -10637,7 +10639,8 @@
'bureaucrat' => [ 'sysop', 'bureaucrat', 'import', 'transwiki', 
'inactive', 'confirmed', 'petitiondata' ],
],
'+frwiki' => [
-   'bureaucrat' => [ 'abusefilter', 'sysop', 'accountcreator' ],
+   'sysop' => [ 'rollbacker' ], // T170780
+   'bureaucrat' => [ 'abusefilter', 'sysop', 'accountcreator', 
'rollbacker' ],
],
'+frwikibooks' => [
'bureaucrat' => [ 'abusefilter' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9e126216f93b2346c358e9e0b5150993a2b17aa
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Framawiki 
Gerrit-Reviewer: 0x010C 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Thibaut120094 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Fix Compilation test constructor

[Mholloway (Code Review)]

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

Change subject: Hygiene: Fix Compilation test constructor
..

Hygiene: Fix Compilation test constructor

Change-Id: I3766a2efbfe65d6618b19206f662113e6951a9ce
---
M app/src/main/java/org/wikipedia/offline/Compilation.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/src/main/java/org/wikipedia/offline/Compilation.java 
b/app/src/main/java/org/wikipedia/offline/Compilation.java
index 0c6c4e2..874383b 100644
--- a/app/src/main/java/org/wikipedia/offline/Compilation.java
+++ b/app/src/main/java/org/wikipedia/offline/Compilation.java
@@ -60,7 +60,7 @@
 @SuppressWarnings("checkstyle:parameternumber")
 Compilation(@NonNull String name, @NonNull Uri uri, @Nullable List 
langCodes,
 @Nullable String summary, @Nullable String description, 
@Nullable MediaContent media,
-@Nullable Uri thumbUrl, @Nullable Uri imageUrl, int count, 
long size, long timestamp) {
+@Nullable Uri thumbUri, @Nullable Uri imageUri, int count, 
long size, long timestamp) {
 this.name = name;
 this.uri = uri;
 this.langCodes = langCodes;

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Assign internal IPs to pfw3-codfw<->pfw3-eqiad ipsec link

[Ayounsi (Code Review)]

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

Change subject: Assign internal IPs to pfw3-codfw<->pfw3-eqiad ipsec link
..

Assign internal IPs to pfw3-codfw<->pfw3-eqiad ipsec link

Bug: T169643
Change-Id: Ia79c30eb14f4d746f767ed7532a5e4114214b1ca
---
M templates/10.in-addr.arpa
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/33/367933/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index cab24b3..533b31e 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -4627,6 +4627,13 @@
 111 1H IN PTR  betelgeuse.mgmt.frack.codfw.wmnet.
 112 1H IN PTR  frbackup2001.mgmt.frack.codfw.wmnet.
 
+; 10.195.0.248/29 - reserved for frack infra
+
+; 10.195.0.248/31 (pfw3-eqiad:st0 <--> pfw3-codfw:st0)
+248 1H  IN PTR  st0.pfw3-codfw.frack.codfw.wmnet.
+249 1H  IN PTR  st0.pfw3-codfw.frack.codfw.wmnet.
+
+
 ; codfw labs realm
 
 ; 10.196.0.0/24 - labs-instances1-a-codfw

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Test: Update build tools to 26.0.0 (again)

[Mholloway (Code Review)]

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

Change subject: Test: Update build tools to 26.0.0 (again)
..

Test: Update build tools to 26.0.0 (again)

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


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

diff --git a/app/build.gradle b/app/build.gradle
index 9565622..f8e8d0c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,7 @@
 android {
 // Keep version in sync with /project.properties
 compileSdkVersion 25
-buildToolsVersion '25.0.3'
+buildToolsVersion '26.0.0'
 
 compileOptions {
 sourceCompatibility = JAVA_VERSION

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: statistics::discovery: Reconfigure for Golden data retrieval

[Bearloga (Code Review)]

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

Change subject: statistics::discovery: Reconfigure for Golden data retrieval
..

statistics::discovery: Reconfigure for Golden data retrieval

- Uses wikimedia/discovery/golden codebase of Discovery metrics
  calculation
- Re-adds statistics::discovery to statistics::compute

Bug: T170494
Change-Id: I6c5996c7ea0c616560ae77dc797f9435828a2c5c
---
M modules/statistics/manifests/compute.pp
M modules/statistics/manifests/discovery.pp
2 files changed, 70 insertions(+), 72 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/367930/1

diff --git a/modules/statistics/manifests/compute.pp 
b/modules/statistics/manifests/compute.pp
index 4f5aa60..6a5f029 100644
--- a/modules/statistics/manifests/compute.pp
+++ b/modules/statistics/manifests/compute.pp
@@ -7,6 +7,7 @@
 
 include ::statistics::dataset_mount
 include ::statistics::packages
+include ::statistics::discovery
 
 $working_path = $::statistics::working_path
 $published_datasets_path = "${working_path}/published-datasets"
@@ -37,7 +38,7 @@
 command => "/usr/bin/rsync -rtL --delete ${published_datasets_path}/ 
thorium.eqiad.wmnet::srv/published-datasets-rsynced/${::hostname}/",
 require => File[$published_datasets_path],
 user=> 'root',
-minute  => '*/30',
+minute  => '*/15',
 }
 
 file { "${::statistics::working_path}/mediawiki":
diff --git a/modules/statistics/manifests/discovery.pp 
b/modules/statistics/manifests/discovery.pp
index ccfce93..e1c1386 100644
--- a/modules/statistics/manifests/discovery.pp
+++ b/modules/statistics/manifests/discovery.pp
@@ -1,83 +1,80 @@
-
+# = Class: statistics::discovery
 class statistics::discovery {
-  Class['::statistics'] -> Class['::statistics::discovery']
+Class['::statistics'] -> Class['::statistics::discovery']
 
-  include ::passwords::mysql::research
+include ::passwords::mysql::research
 
-  $statistics_working_path = $::statistics::working_path
-  $dir = "${statistics_working_path}/discovery-stats"
-  $user = 'discovery-stats'
+$working_path = $::statistics::working_path
+# Homedir for everything Wikimedia Discovery Analytics related
+$dir = "${working_path}/discovery"
+# Path in which daily runs will log to
+$log_dir = "${dir}/log"
+# Path in which the R library will reside
+$rlib_dir = "${dir}/r-library"
 
-  group { $user:
-ensure => present,
-  }
+$user = 'discovery-stats'
+# Setting group to 'wikidev' so that Discovery's Analysts (as members of 
wikidev) have some privileges
+$group ='wikidev'
+group { $group:
+ensure => present,
+}
+user { $user:
+ensure => present,
+home   => $dir,
+shell  => '/bin/bash',
+managehome => false,
+system => true,
+groups => $group,
+}
 
-  user { $user:
-ensure => present,
-home   => $dir,
-shell  => '/bin/bash',
-managehome => false,
-system => true,
-  }
+# This file will render at
+# /etc/mysql/conf.d/discovery-stats-client.cnf.
+::mysql::config::client { 'discovery-stats':
+user  => $::passwords::mysql::research::user,
+pass  => $::passwords::mysql::research::pass,
+group => $group,
+mode  => '0440',
+}
 
-  ::mysql::config::client { 'discovery-stats':
-user=> $::passwords::mysql::research::user,
-pass=> $::passwords::mysql::research::pass,
-group   => $user,
-mode=> '0440',
-require => User[$user],
-  }
+$directories = [
+$dir,
+$log_dir,
+$rlib_dir
+]
 
-  # Path in which all crons will log to
-  $log_dir = "${dir}/log"
+file { $directories:
+ensure => 'directory',
+owner  => $user,
+group  => $group,
+mode   => '0775', # so Discovery's Analysts (as members of wikidev 
group) can read, write, execute
+}
 
-  $scripts_dir = "${dir}/scripts"
+git::clone { 'wikimedia/discovery/golden':
+ensure => 'latest',
+branch => 'master',
+recurse_submodules => true,
+directory  => "${dir}/golden",
+owner  => $user,
+group  => $group,
+require=> File[$dir],
+}
 
-  require_package(
-'php5',
-'php5-cli',
-  )
+logrotate::conf { 'wikimedia-discovery-stats':
+ensure  => present,
+content => template('statistics/discovery-stats.logrotate.erb'),
+require => File[$log_dir],
+}
 
-  $directories = [
-$dir,
-$log_dir,
-  ]
+cron { 'wikimedia-discovery-golden':
+command => "sh ${dir}/golden/main.sh >> ${log_dir}/golden-daily.log 
2>&1",
+hour=> '5',
+minute  => '0',
+require => [
+ 

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Compatibility with Puppetized runs

[Bearloga (Code Review)]

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

Change subject: Compatibility with Puppetized runs
..

Compatibility with Puppetized runs

Bug: T170494
Depends-On: I6c5996c7ea0c616560ae77dc797f9435828a2c5c
Change-Id: I25573e2d552ef7388c83fbbefca6ceab94adacc8
---
M README.md
M main.sh
M modules/metrics/maps/config.yaml
M modules/metrics/portal/config.yaml
M modules/metrics/search/config.yaml
M test.R
6 files changed, 18 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/31/367931/1

diff --git a/README.md b/README.md
index 89ad0b0..5aeabd4 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,8 @@
 
 ## Table of Contents
 
-- [Setup](#setup)
-- [Dependencies](#dependencies)
-- [Usage](#usage)
-- [Production](#production)
-- [Testing](#testing)
+- [Setup](#setup-and-usage)
+- [Dependencies](#dependencies)
 - [Modules](#modules)
 - [Adding New Metrics Modules](#adding-new-metrics-modules)
 - [MySQL](#mysql)
@@ -26,23 +23,11 @@
 - [Adding New Forecasting Modules](#adding-new-forecasting-modules)
 - [Additional Information](#additional-information)
 
-## Setup
+## Setup and Usage
 
-On [stat1002](https://wikitech.wikimedia.org/wiki/Stat1002):
+As of [T170494](https://phabricator.wikimedia.org/T170494), the setup and 
daily runs are Puppetized on 
[stat1005](https://wikitech.wikimedia.org/wiki/Stat1005) via the 
[statistics::discovery](https://phabricator.wikimedia.org/diffusion/OPUP/browse/production/modules/statistics/manifests/discovery.pp)
 module (also mirrored on 
[GitHub](https://github.com/wikimedia/operations-puppet/blob/production/modules/statistics/manifests/discovery.pp)).
 
-```bash
-cd /a/discovery/
-git clone --recursive https://gerrit.wikimedia.org/r/wikimedia/discovery/golden
-cd golden
-
-# If already cloned without --recursive:
-git submodule update --init --recursive
-
-# Add execution permission to scripts:
-chmod -R +x modules/
-```
-
-### Dependencies
+## Dependencies
 
 ```bash
 pip install -r reportupdater/requirements.txt
@@ -56,7 +41,7 @@
 Sys.setenv("https_proxy" = "http://webproxy.eqiad.wmnet:8080;)
 
 # Set path for packages:
-.libPaths("/a/discovery/r-library")
+.libPaths("/srv/discovery/r-library")
 
 # Essentials:
 install.packages(
@@ -93,37 +78,9 @@
 
 Don't forget to add packages to [test.R](test.R) because that script checks 
that all packages are installed before performing a test run of the reports.
 
-**Note**: we have had problems installing R package 
[bsts](https://cran.r-project.org/package=bsts) and its dependencies 
[Boom](https://cran.r-project.org/package=Boom) and 
[BoomSpikeSlab](https://cran.r-project.org/package=BoomSpikeSlab) on stat1002 
(but not stat1003). Fortunately, [Andrew 
Otto](https://meta.wikimedia.org/wiki/User:Ottomata) has figured out what to 
put in 
[~/.R/Makevars](https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Using-Makevars)
 to make those packages compile. From 
[T147682#2837271](https://phabricator.wikimedia.org/T147682#2837271):
-
-```
-CXX=g++-4.8
-CXX1X=g++-4.8
-CXX1XFLAGS=-std=c++11 -g -O2 -fstack-protector --param=ssp-buffer-size=4 
-Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -g
-CXX1XPICFLAGS=-fPIC
-SHLIB_CXX1XLD=g++-4.8
-SHLIB_CXX1XLDFLAGS=-std=c++11 -shared
-LDFLAGS=-L/usr/lib/R/lib -Wl,-Bsymbolic-functions -Wl,-z,relro
-```
-
 To **update packages**, run `Rscript test.R --update_packages` which will 
update all the dependencies listed in **test.R**
 
-## Usage
-
-**Note**: You don't need to use the `--config-path` argument if your config 
file is inside the query folder and is named **config.yaml**, that is the 
default.
-
-### Production
-
-To use in production, add **main.sh** to `crontab`:
-
-```
-$ crontab -e
-
-12 20 * * * cd /a/discovery/golden/ && sh main.sh
-```
-
-**main.sh** executes **reportupdater/update_reports.py** on each module and 
writes data to the respective files in **/a/aggregate-datasets/discovery/**
-
-### Testing
+## Testing
 
 If you wish to run all the modules without writing data to files or checking 
for missingness, use:
 
diff --git a/main.sh b/main.sh
index ca5d4e8..c350a55 100644
--- a/main.sh
+++ b/main.sh
@@ -1,24 +1,18 @@
 #!/bin/bash
 
-# Check if Reportupdater git submodule is set up
-if [ ! -f reportupdater/update_reports.py ]; then
-  echo "Warning: Reportupdater needs to be initialized and updated..."
-  git submodule init && git submodule update
-fi
-
 # Sync README
-rsync -c docs/README.md /a/published-datasets/discovery/README.md
+rsync -c docs/README.md /srv/published-datasets/discovery/README.md
 
 # Metrics
 for module in "external_traffic" "wdqs" "maps" "search" "portal"
 do
  echo "Running Reportupdater on ${module} metrics..."
- nice ionice reportupdater/update_reports.py "modules/metrics/${module}" 
"/a/published-datasets/discovery/metrics/${module}"
+ nice ionice 

[MediaWiki-commits] [Gerrit] mediawiki...UserFunctions[master]: Remove I18n php shim and bump version

[jenkins-bot (Code Review)]

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

Change subject: Remove I18n php shim and bump version
..


Remove I18n php shim and bump version

Note: This is breaking for MW 1.22.x and earlier.

Bug:T168353
Change-Id: I87660ba80f0c5fedd8bafd6b5d517707de1a7efa
---
D UserFunctions.i18n.php
M UserFunctions.php
2 files changed, 7 insertions(+), 40 deletions(-)

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



diff --git a/UserFunctions.i18n.php b/UserFunctions.i18n.php
deleted file mode 100644
index 44e62bc..000
--- a/UserFunctions.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimf1b8d49fc546afa0' ) ) {
-   function wfJsonI18nShimf1b8d49fc546afa0( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimf1b8d49fc546afa0';
-}
diff --git a/UserFunctions.php b/UserFunctions.php
index c157cfb..ea64443 100644
--- a/UserFunctions.php
+++ b/UserFunctions.php
@@ -1,9 +1,11 @@
 http://www.mediawiki.org/wiki/Extension:UserFunctions Documentation
+ * @link https://www.mediawiki.org/wiki/Extension:UserFunctions Documentation
+ * @link https://www.mediawiki.org/wiki/Extension_talk:UserFunctions Support
+ * @link https://phabricator.wikimedia.org/diffusion/EUFU/ Source code
  *
  * @file UserFunctions.php
  * @ingroup Extensions
@@ -16,9 +18,10 @@
  * @author Toniher
  * @author Uckelman
  * @copyright (C) 2006 Algorithm
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
+// Ensure that the script cannot be executed outside of MediaWiki.
 if ( !defined( 'MEDIAWIKI' ) ) {
die( 'This file is a MediaWiki extension, it is not a valid entry 
point' );
 }
@@ -46,7 +49,7 @@
$GLOBALS['wgExtensionCredits']['parserhook'][] = array(
'path' => __FILE__,
'name' => 'UserFunctions',
-   'version' => '2.6.1',
+   'version' => '2.7.0',
'url' => 
'https://www.mediawiki.org/wiki/Extension:UserFunctions',
'author' => array(
'Ross McClure',
@@ -59,7 +62,6 @@
 
$GLOBALS['wgAutoloadClasses']['ExtUserFunctions'] = __DIR__ 
.'/UserFunctions_body.php';
$GLOBALS['wgMessagesDirs']['UserFunctions'] = __DIR__ . '/i18n';
-   $GLOBALS['wgExtensionMessagesFiles']['UserFunctions'] = __DIR__ . 
'/UserFunctions.i18n.php';
$GLOBALS['wgExtensionMessagesFiles']['UserFunctionsMagic'] = __DIR__ . 
'/UserFunctions.i18n.magic.php';
 
$GLOBALS['wgHooks']['ParserFirstCallInit'][] = 
'wfRegisterUserFunctions';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87660ba80f0c5fedd8bafd6b5d517707de1a7efa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserFunctions
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Kghbln 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Toniher 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___

[MediaWiki-commits] [Gerrit] mediawiki...Sudo[master]: Remove I18n php shim and bump version

[jenkins-bot (Code Review)]

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

Change subject: Remove I18n php shim and bump version
..


Remove I18n php shim and bump version

Note: This is breaking for MW 1.22.x and earlier.

Bug:T168353
Change-Id: I882ef17d375355aec2729e9ffe4f9026fb3e852e
---
D Sudo.i18n.php
M Sudo.php
2 files changed, 8 insertions(+), 42 deletions(-)

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



diff --git a/Sudo.i18n.php b/Sudo.i18n.php
deleted file mode 100644
index 34c79a3..000
--- a/Sudo.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim490afb0e136088e5' ) ) {
-   function wfJsonI18nShim490afb0e136088e5( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim490afb0e136088e5';
-}
diff --git a/Sudo.php b/Sudo.php
index 52aa26d..97f30aa 100644
--- a/Sudo.php
+++ b/Sudo.php
@@ -9,17 +9,18 @@
  * @link https://www.mediawiki.org/wiki/Extension:Sudo Documentation
  */
 
+// Ensure that the script cannot be executed outside of MediaWiki.
 if( !defined( 'MEDIAWIKI' ) ) {
die( 'This is an extension to the MediaWiki package and cannot be run 
standalone.' );
 }
 
-// Extension credits that will show up on Special:Version
+// Display extension properties on MediaWiki.
 $wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'Sudo',
-   'version' => '0.4.0',
+   'version' => '0.5.0',
'author' => array(
-   '[http://danf.ca/mw/ Daniel Friesen]',
+   '[https://www.mediawiki.org/wiki/User:Dantman Daniel Friesen]',
'...'
),
'descriptionmsg' => 'sudo-desc',
@@ -27,12 +28,11 @@
'license-name' => 'GPL-2.0+',
 );
 
-// Set up i18n
+// Register extension messages and other localisation.
 $wgMessagesDirs['Sudo'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Sudo'] = __DIR__ . '/Sudo.i18n.php';
 $wgExtensionMessagesFiles['SudoAlias'] = __DIR__ . '/Sudo.alias.php';
 
-// New sepecial page
+// Provide new sepecial page
 $wgAutoloadClasses['SpecialSudo'] = __DIR__ . '/SpecialSudo.php';
 $wgSpecialPages['Sudo'] = 'SpecialSudo';
 
@@ -45,10 +45,11 @@
 $wgLogHeaders['sudo'] = 'sudo-logpagetext';
 $wgLogActions['sudo/sudo'] = 'sudo-logentry';
 
-// Hooked functions
+// Register extension hooks.
 $wgHooks['UserLogoutComplete'][] = 'wfSudoLogout';
 $wgHooks['PersonalUrls'][] = 'wfSudoPersonalUrls';
 
+// Do the extension's action.
 function wfSudoLogout( &$user, &$inject_html ) {
// Unset wsSudoId when we logout.
// We don't want to be in a sudo login while logged out.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I882ef17d375355aec2729e9ffe4f9026fb3e852e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Sudo
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Special404[master]: Remove I18n php shim

[jenkins-bot (Code Review)]

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

Change subject: Remove I18n php shim
..


Remove I18n php shim

Also consistently use __DIR__

Note: This is breaking for MW 1.22.x and earlier.

Bug:T168353
Change-Id: I47531fb5390c1794cec236a24c74e56b22c9840d
---
D Special404.i18n.php
M Special404.php
2 files changed, 11 insertions(+), 44 deletions(-)

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



diff --git a/Special404.i18n.php b/Special404.i18n.php
deleted file mode 100644
index 56812f7..000
--- a/Special404.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShima751b65fda5f7636' ) ) {
-   function wfJsonI18nShima751b65fda5f7636( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShima751b65fda5f7636';
-}
diff --git a/Special404.php b/Special404.php
index aa27a64..4093780 100644
--- a/Special404.php
+++ b/Special404.php
@@ -5,16 +5,16 @@
  * @file
  * @ingroup Extensions
  * @author Daniel Friesen
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link http://www.mediawiki.org/wiki/Extension:Special404 Documentation
+ * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ * @link https://www.mediawiki.org/wiki/Extension:Special404 Documentation
  */
 
-# Not a valid entry point, skip unless MEDIAWIKI is defined
+// Ensure that the script cannot be executed outside of MediaWiki.
 if ( !defined( 'MEDIAWIKI' ) ) {
-   echo "Special404 extension";
-   exit( 1 );
+die( 'This is an extension to MediaWiki and cannot be run standalone.' );
 }
 
+// Display extension properties on MediaWiki.
 $wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'author' => 'Daniel Friesen',
@@ -24,13 +24,15 @@
'license-name' => 'GPL-2.0+',
 );
 
-$dir = dirname( __FILE__ );
+// Register extension messages and other localisation.
 $wgMessagesDirs['Special404'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Special404'] = $dir . '/Special404.i18n.php';
-$wgExtensionMessagesFiles['Special404Alias'] = $dir . '/Special404.alias.php';
+$wgExtensionMessagesFiles['Special404Alias'] = __DIR__ . 
'/Special404.alias.php';
 
+// Register special page with MediaWiki.
 $wgSpecialPages['Error404'] = 'Special404';
-$wgAutoloadClasses['Special404'] = $dir . '/Special404_body.php';
+
+// Load extension's classes.
+$wgAutoloadClasses['Special404'] = __DIR__ . '/Special404_body.php';
 
 // Enable this to force an automatic 301 Moved Permanently redirect if a 
matching title exists
 // This might be useful if you used to use root /Article urls and moved to 
something else

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47531fb5390c1794cec236a24c74e56b22c9840d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Special404
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Add simple clenaup script for old minerva preferences

[Chad (Code Review)]

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

Change subject: Add simple clenaup script for old minerva preferences
..

Add simple clenaup script for old minerva preferences

Based on my other work in core

Bug: T171644
Change-Id: Ibca378b9b137dd9af980a87c747de96aa326cfa5
---
A maintenance/cleanupOldPrefs.php
1 file changed, 94 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/29/367929/1

diff --git a/maintenance/cleanupOldPrefs.php b/maintenance/cleanupOldPrefs.php
new file mode 100644
index 000..010e403
--- /dev/null
+++ b/maintenance/cleanupOldPrefs.php
@@ -0,0 +1,94 @@
+http://www.gnu.org/copyleft/gpl.html
+ */
+
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+   $IP = __DIR__ . '/../../..';
+}
+require_once "$IP/maintenance/Maintenance.php";
+require_once __DIR__ . '/../includes/Maintenance/Maintenance.php';
+
+class CleanupMinervaPrefs extends Maintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->mDescription = 'Clean up old minerva preferences';
+   $this->setBatchSize( 50 );
+   $this->addOption( 'dry-run', 'Print debug info instead of 
actually deleting' );
+   }
+
+   public function execute() {
+$dbw = $this->getDB( DB_MASTER );
+   $this->output( "Cleanup up old Minerva prefs...\n" );
+   $total = 0;
+
+   while ( true ) {
+   $res = $dbw->select(
+   'user_properties',
+   '*', // The table lacks a primary key, so 
select the whole row
+   [
+  'up_property' => 'skin',
+  'up_value'=> ['minerva', 'minerva-neue'],
+],
+   __METHOD__,
+   [ 'LIMIT' => $this->mBatchSize ]
+   );
+
+   $numRows = $res->numRows();
+   $total += $numRows;
+   if ( $res->numRows() <= 0 ) {
+   // All done!
+   $this->output( "DONE! (handled $total 
entries)\n" );
+   break;
+   }
+
+   // Progress or something
+   $this->output( "..doing $numRows entries\n" );
+
+   // Delete our batch, then wait
+   foreach( $res as $row ) {
+   if ( $this->hasOption( 'dry-run' ) ) {
+   $this->output(
+   "DRY RUN, would fix: " .
+   "[up_user] => '{$row->up_user}' 
" .
+   "[up_property] => 
'{$row->up_property}' " .
+   "[up_value] => 
'{$row->up_value}'\n"
+   );
+   continue;
+   }
+   $this->beginTransaction( $dbw, __METHOD__ );
+   $dbw->update(
+   'user_properties',
+  [ 'up_value' => 'minerva-neue' ],
+   [
+   'up_user' => $row->up_user,
+   'up_property' => 
$row->up_property,
+   'up_value'=> $row->up_value,
+   ],
+   __METHOD__
+   );
+   $this->commitTransaction( $dbw, __METHOD__ );
+   }
+   }
+   }
+}
+
+$maintClass = 'CleanupPreferences'; // Tells it to run the class
+require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibca378b9b137dd9af980a87c747de96aa326cfa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add pfw3-codfw loopback and uplinks IPs to DNS

[Ayounsi (Code Review)]

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

Change subject: Add pfw3-codfw loopback and uplinks IPs to DNS
..


Add pfw3-codfw loopback and uplinks IPs to DNS

Bug: T169643
Change-Id: Ia2bbf516f3368593f21b355eab43003dcf55c20f
---
M templates/153.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index 856bee5..c489910 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -95,11 +95,19 @@
 194 1H  IN PTR  pim-rp.wikimedia.org.
 195 1H  IN PTR  pfw-codfw.wikimedia.org.
 196 1H  IN PTR  mr1-codfw.wikimedia.org.
-
+197 1H  IN PTR  pfw3-codfw.wikimedia.org.
 198 1H  IN PTR  cr1-eqdfw.wikimedia.org.
 
 ; neighbor blocks
 
+; 208.80.153.200/31 (cr1-codfw <--> pfw3-codfw)
+200 1H  IN PTR  xe-5-1-1.cr1-codfw.wikimedia.org.
+201 1H  IN PTR  xe-0-0-16.pfw3-codfw.wikimedia.org.
+
+; 208.80.153.202/31 (cr2-codfw <--> pfw3-codfw)
+202 1H  IN PTR  xe-5-1-1.cr2-codfw.wikimedia.org.
+203 1H  IN PTR  xe-7-0-16.pfw3-codfw.wikimedia.org.
+
 ; 208.80.153.204/31 (cr2-codfw <--> cr2-eqiad)
 204 1H  IN PTR  xe-5-0-1.cr2-codfw.wikimedia.org.
 205 1H  IN PTR  xe-3-2-3.cr2-eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1e048e5..9cc233d 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -453,6 +453,8 @@
 pfw1-codfw  1H  IN CNAME pfw-codfw
 pfw2-codfw  1H  IN CNAME pfw-codfw
 
+pfw3-codfw   1H  IN A208.80.153.197
+
 ; Cams
 
 ; Service aliases (alphabetical order)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2bbf516f3368593f21b355eab43003dcf55c20f
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Faidon Liambotis 
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]: Fake out Explore toolbar overlap as one single bar.

[Dbrant (Code Review)]

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

Change subject: Fake out Explore toolbar overlap as one single bar.
..

Fake out Explore toolbar overlap as one single bar.

This will dynamically set or remove the elevation on the Toolbar in the
Feed, based on the scroll state of the feed contents (the scroll state is
borrowed from whether the Search icon is currently shown), thereby making
it look like one continuous app bar when scrolled to the top.

The alternative (using a CollapsingToolbarLayout with AppBarLayout with
SwipeRefreshLayout with custom Toolbar with custom overlapping scroll
behavior) is significantly more complex.

Bug: T170831
Change-Id: I73390ba0dd41690c1289ae76388a2717ebc5d30a
---
M app/src/main/java/org/wikipedia/activity/SingleFragmentToolbarActivity.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/main/MainActivity.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/res/values/dimens.xml
5 files changed, 54 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/activity/SingleFragmentToolbarActivity.java 
b/app/src/main/java/org/wikipedia/activity/SingleFragmentToolbarActivity.java
index 483a0b5..6068706 100644
--- 
a/app/src/main/java/org/wikipedia/activity/SingleFragmentToolbarActivity.java
+++ 
b/app/src/main/java/org/wikipedia/activity/SingleFragmentToolbarActivity.java
@@ -1,5 +1,6 @@
 package org.wikipedia.activity;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.v4.app.Fragment;
@@ -7,6 +8,7 @@
 import android.view.View;
 
 import org.wikipedia.R;
+import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.ResourceUtil;
 
 /**
@@ -42,4 +44,17 @@
 protected View getToolbarWordmark() {
 return findViewById(R.id.single_fragment_toolbar_wordmark);
 }
+
+protected void setToolbarElevationDefault() {
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+getToolbar().setElevation(DimenUtil
+
.dpToPx(DimenUtil.getDimension(R.dimen.toolbar_default_elevation)));
+}
+}
+
+protected void clearToolbarElevation() {
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+getToolbar().setElevation(0f);
+}
+}
 }
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 315c86e..28b2841 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -74,6 +74,7 @@
 void onFeaturedImageSelected(FeaturedImageCard card);
 void onLoginRequested();
 @NonNull View getOverflowMenuAnchor();
+void updateToolbarElevation(boolean elevate);
 }
 
 @NonNull public static FeedFragment newInstance() {
@@ -140,6 +141,11 @@
 }
 });
 
+
feedHeader.setBackgroundColor(ResourceUtil.getThemedColor(getContext(), 
R.attr.main_toolbar_color));
+if (getCallback() != null) {
+getCallback().updateToolbarElevation(shouldElevateToolbar());
+}
+
 return view;
 }
 
@@ -147,6 +153,10 @@
 if (feedAdapter != null && feedAdapter.getItemPosition(card) > -1) {
 feedAdapter.notifyItemChanged(feedAdapter.getItemPosition(card));
 }
+}
+
+public boolean shouldElevateToolbar() {
+return searchIconVisible;
 }
 
 @Override
@@ -426,6 +436,9 @@
 if (shouldShowSearchIcon != searchIconVisible) {
 searchIconVisible = shouldShowSearchIcon;
 getActivity().supportInvalidateOptionsMenu();
+if (getCallback() != null) {
+
getCallback().updateToolbarElevation(shouldElevateToolbar());
+}
 }
 }
 }
diff --git a/app/src/main/java/org/wikipedia/main/MainActivity.java 
b/app/src/main/java/org/wikipedia/main/MainActivity.java
index c9403e7..9921171 100644
--- a/app/src/main/java/org/wikipedia/main/MainActivity.java
+++ b/app/src/main/java/org/wikipedia/main/MainActivity.java
@@ -48,6 +48,7 @@
 getToolbarWordmark().setVisibility(View.GONE);
 getSupportActionBar().setTitle(tab.text());
 }
+getFragment().requestUpdateToolbarElevation();
 }
 
 @Override
@@ -85,6 +86,15 @@
 }
 
 @Override
+public void updateToolbarElevation(boolean elevate) {
+if (elevate) {
+setToolbarElevationDefault();
+} else {
+clearToolbarElevation();
+}
+}
+
+@Override
 protected void onNewIntent(Intent intent) {
 super.onNewIntent(intent);
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: recdns: do not use self in local resolv.conf

[BBlack (Code Review)]

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

Change subject: recdns: do not use self in local resolv.conf
..

recdns: do not use self in local resolv.conf

Bug: T104442
Change-Id: I1d2483e21d9b89c4059056f03137be65270e0196
---
M manifests/site.pp
1 file changed, 23 insertions(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index a6bb769..6c2ab9c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -12,8 +12,20 @@
 
 # Node definitions (alphabetic order)
 
-node /^(acamar|achernar)\.wikimedia\.org$/ {
+node 'acamar.wikimedia.org' {
 role(dnsrecursor, ntp)
+
+# use achernar (directly) + eqiad LVS (avoid self-dep)
+$nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
+
+interface::add_ip6_mapped { 'main': }
+}
+
+node 'achernar.wikimedia.org' {
+role(dnsrecursor, ntp)
+
+# use acamar (directly) + eqiad LVS (avoid self-dep)
+$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
 
 interface::add_ip6_mapped { 'main': }
 }
@@ -202,6 +214,9 @@
 # DNS recursor
 node 'chromium.wikimedia.org' {
 role(dnsrecursor, ntp)
+
+# use hydrogen (directly) + codfw LVS (avoid self-dep)
+$nameservers_override = [ '208.80.154.50', '208.80.153.254' ]
 
 interface::add_ip6_mapped { 'main': }
 }
@@ -767,6 +782,10 @@
 
 node 'eeden.wikimedia.org' {
 role(authdns::server)
+
+# use eqiad LVS + codfw LVS (avoid self-dep)
+$nameservers_override = [ '208.80.154.254', '208.80.153.254' ]
+
 interface::add_ip6_mapped { 'main': }
 }
 
@@ -956,6 +975,9 @@
 node 'hydrogen.wikimedia.org' {
 role(dnsrecursor, ntp)
 
+# use chromium (directly) + codfw LVS (avoid self-dep)
+$nameservers_override = [ '208.80.154.157', '208.80.153.254' ]
+
 interface::add_ip6_mapped { 'main': }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: VCL: mobile_redirect: unconditional https

[BBlack (Code Review)]

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

Change subject: VCL: mobile_redirect: unconditional https
..

VCL: mobile_redirect: unconditional https

This is basically dead code elimination of cruft from back when
HTTPS was optional.  Our https redirect code happens before the
mobile redirect code and has already switched protocols to HTTPS
before a request gets here in the first place.

Change-Id: Ifcdae1801147a8925e80f3c49ddb0f6d4541b58f
---
M modules/varnish/templates/text-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/modules/varnish/templates/text-frontend.inc.vcl.erb 
b/modules/varnish/templates/text-frontend.inc.vcl.erb
index 613faad..7f104d5 100644
--- a/modules/varnish/templates/text-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/text-frontend.inc.vcl.erb
@@ -37,11 +37,7 @@
set req.http.MobileHost = regsub(req.http.MobileHost, 
"^((?!commons|meta|nostalgia|quote|quality|sep11|sources|species|textbook|m\b)[-\w]+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.",
 "\1.m.\2.");
 
if (req.http.Host != req.http.MobileHost) {
-   if (req.http.X-Forwarded-Proto) {
-   set req.http.Location = 
req.http.X-Forwarded-Proto + "://" + req.http.MobileHost + req.url;
-   } else {
-   set req.http.Location = "http://; + 
req.http.MobileHost + req.url;
-   }
+   set req.http.Location = "https://; + 
req.http.MobileHost + req.url;
return (synth(302, "Mobile Redirect"));
}
unset req.http.MobileHost;

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

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

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

[MediaWiki-commits] [Gerrit] operations...pybal[1.13]: Add support for One-packet scheduling (OPS)

[Ema (Code Review)]

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

Change subject: Add support for One-packet scheduling (OPS)
..


Add support for One-packet scheduling (OPS)

Add a new boolean service configuration parameter, `ops`, defaulting to
False. The parameter can only be True for UDP services, and enables
One-packet scheduling. With OPS, a new scheduling decision is made for
every packet, hopefully avoiding the issues LVS has when tracking "UDP
connections".

Ref: http://www.austintek.com/LVS/LVS-HOWTO/HOWTO/LVS-HOWTO.UDP.html
Change-Id: If643710b99b2eadd1874c4e125f354e3773bed0d
(cherry-picked from commit 8afd834653b8fe16d7e7d20bac166da660c7e9dd)
---
M pybal/ipvs.py
M pybal/pybal.py
M pybal/test/test_ipvs.py
3 files changed, 34 insertions(+), 8 deletions(-)

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



diff --git a/pybal/ipvs.py b/pybal/ipvs.py
index 4429f65..47c808a 100644
--- a/pybal/ipvs.py
+++ b/pybal/ipvs.py
@@ -99,6 +99,10 @@
 if len(service) > 3:
 cmd += ' -s ' + service[3]
 
+# One-packet scheduling
+if len(service) > 4 and service[4]:
+cmd += ' -o'
+
 return cmd
 
 @classmethod
@@ -161,7 +165,7 @@
 SVC_SCHEDULERS = ('rr', 'wrr', 'lc', 'wlc', 'lblc', 'lblcr', 'dh', 'sh',
   'sed', 'nq')
 
-def __init__(self, name, (protocol, ip, port, scheduler), configuration):
+def __init__(self, name, (protocol, ip, port, scheduler, ops), 
configuration):
 """Constructor"""
 
 self.name = name
@@ -171,10 +175,16 @@
 scheduler not in self.SVC_SCHEDULERS):
 raise ValueError('Invalid protocol or scheduler')
 
+if protocol == 'tcp' and ops:
+raise ValueError(
+'OPS can only be used with UDP virtual services')
+
 self.protocol = protocol
 self.ip = ip
 self.port = port
 self.scheduler = scheduler
+# Boolean to toggle "One-packet scheduling"
+self.ops = ops
 
 self.configuration = configuration
 
@@ -189,10 +199,10 @@
 self.createService()
 
 def service(self):
-"""Returns a tuple (protocol, ip, port, scheduler) that
+"""Returns a tuple (protocol, ip, port, scheduler, ops) that
 describes this LVS instance."""
 
-return (self.protocol, self.ip, self.port, self.scheduler)
+return (self.protocol, self.ip, self.port, self.scheduler, self.ops)
 
 def createService(self):
 """Initializes this LVS instance in LVS."""
diff --git a/pybal/pybal.py b/pybal/pybal.py
index ca094fc..e8dccea 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -9,7 +9,7 @@
 
 from __future__ import absolute_import
 
-from ConfigParser import SafeConfigParser
+from ConfigParser import SafeConfigParser, NoOptionError
 
 import os, sys, signal, socket, random
 import logging
@@ -594,11 +594,16 @@
 
 for section in config.sections():
 if section != 'global':
+try:
+ops = config.getboolean(section, 'ops')
+except NoOptionError:
+ops = False
 cfgtuple = (
 config.get(section, 'protocol'),
 config.get(section, 'ip'),
 config.getint(section, 'port'),
-config.get(section, 'scheduler'))
+config.get(section, 'scheduler'),
+ops)
 
 # Read the custom configuration options of the LVS section
 configdict = util.ConfigDict(config.items(section))
diff --git a/pybal/test/test_ipvs.py b/pybal/test/test_ipvs.py
index f636c30..b191cee 100644
--- a/pybal/test/test_ipvs.py
+++ b/pybal/test/test_ipvs.py
@@ -104,7 +104,7 @@
 def setUp(self):
 super(LVSServiceTestCase, self).setUp()
 self.config['dryrun'] = 'true'
-self.service = ('tcp', '127.0.0.1', 80, 'rr')
+self.service = ('tcp', '127.0.0.1', 80, 'rr', False)
 pybal.pybal.BGPFailover.prefixes.clear()
 
 def stubbedModifyState(cls, cmdList):
@@ -120,12 +120,16 @@
 def testConstructor(self):
 """Test `LVSService.__init__`."""
 with self.assertRaises(ValueError):
-service = ('invalid-protocol', '127.0.0.1', 80, 'rr')
+service = ('invalid-protocol', '127.0.0.1', 80, 'rr', False)
 pybal.ipvs.LVSService('invalid-protocol', service, self.config)
 
 with self.assertRaises(ValueError):
-service = ('tcp', '127.0.0.1', 80, 'invalid-scheduler')
+service = ('tcp', '127.0.0.1', 80, 'invalid-scheduler', False)
 pybal.ipvs.LVSService('invalid-scheduler', service, self.config)
+
+with self.assertRaises(ValueError):
+service = ('tcp', '127.0.0.1', 80, 'rr', True)
+

[MediaWiki-commits] [Gerrit] operations...pybal[1.13]: 1.13.10: Add support for One-packet scheduling (OPS)

[Ema (Code Review)]

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

Change subject: 1.13.10: Add support for One-packet scheduling (OPS)
..

1.13.10: Add support for One-packet scheduling (OPS)

pybal (1.13.10) jessie-wikimedia; urgency=medium

  * Add support for One-packet scheduling (OPS) (Bug: #T104442)

 -- Emanuele Rocca   Wed, 26 Jul 2017 19:26:13 +0200

Bug: T104442
Change-Id: I1cdab18a73a54c758e04dcd7d431ce8cb20e9041
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/25/367925/1

diff --git a/debian/changelog b/debian/changelog
index 3e338f9..c0d3bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pybal (1.13.10) jessie-wikimedia; urgency=medium
+
+  * Add support for One-packet scheduling (OPS) (Bug: #T104442)
+
+ -- Emanuele Rocca   Wed, 26 Jul 2017 19:26:13 +0200
+
 pybal (1.13.9) jessie-wikimedia; urgency=medium
 
   * Reset waitIndex when connection is lost in a unclean way (Bug: #T169893)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cdab18a73a54c758e04dcd7d431ce8cb20e9041
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: 1.13
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] operations...pybal[master]: 1.13.10: Add support for One-packet scheduling (OPS)

[Ema (Code Review)]

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

Change subject: 1.13.10: Add support for One-packet scheduling (OPS)
..

1.13.10: Add support for One-packet scheduling (OPS)

pybal (1.13.10) jessie-wikimedia; urgency=medium

  * Add support for One-packet scheduling (OPS) (Bug: #T104442)

 -- Emanuele Rocca   Wed, 26 Jul 2017 19:26:13 +0200

Change-Id: I1cdab18a73a54c758e04dcd7d431ce8cb20e9041
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/24/367924/1

diff --git a/debian/changelog b/debian/changelog
index 3e338f9..c0d3bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pybal (1.13.10) jessie-wikimedia; urgency=medium
+
+  * Add support for One-packet scheduling (OPS) (Bug: #T104442)
+
+ -- Emanuele Rocca   Wed, 26 Jul 2017 19:26:13 +0200
+
 pybal (1.13.9) jessie-wikimedia; urgency=medium
 
   * Reset waitIndex when connection is lost in a unclean way (Bug: #T169893)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cdab18a73a54c758e04dcd7d431ce8cb20e9041
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Remove mgmt DNS entries for subra and suhail

[RobH (Code Review)]

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

Change subject: DNS: Remove mgmt DNS entries for subra and suhail
..


DNS: Remove mgmt DNS entries for subra and suhail

Bug:T169506
Change-Id: Ib41bc42c3a46843682fef095ed77157271d2d95c
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 87687b2..cab24b3 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -4331,10 +4331,7 @@
 161 1H IN PTR  wmf6273.mgmt.codfw.wmnet.
 162 1H IN PTR  rdb2004.mgmt.codfw.wmnet.
 162 1H IN PTR  wmf6274.mgmt.codfw.wmnet.
-163 1H IN PTR  subra.mgmt.codfw.wmnet.
-163 1H IN PTR  wmf5816.mgmt.codfw.wmnet.
-164 1H IN PTR  suhail.mgmt.codfw.wmnet.
-164 1H IN PTR  wmf5817.mgmt.codfw.wmnet.
+
 165 1H IN PTR  ganeti2001.mgmt.codfw.wmnet.
 165 1H IN PTR  wmf6295.mgmt.codfw.wmnet.
 166 1H IN PTR  ganeti2002.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 9bd1e99..0127d07 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3735,8 +3735,6 @@
 scb2005 1H  IN A10.193.1.149
 scb2006 1H  IN A10.193.1.151
 stat20011H  IN A10.193.2.13
-subra   1H  IN A10.193.2.163
-suhail  1H  IN A10.193.2.164
 tegmen  1H  IN A10.193.1.27
 tempdb2001  1H  IN A10.193.2.254
 thumbor2001 1H  IN A10.193.2.48
@@ -3819,8 +3817,6 @@
 wmf5725 1H  IN A10.193.1.80
 wmf5755 1H  IN A10.193.1.81
 wmf5815 1H  IN A10.192.1.10
-wmf5816 1H  IN A10.193.2.163
-wmf5817 1H  IN A10.193.2.164
 wmf5819 1H  IN A10.193.1.31
 wmf5820 1H  IN A10.193.1.32
 wmf5821 1H  IN A10.192.1.11

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib41bc42c3a46843682fef095ed77157271d2d95c
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Papaul 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...pybal[1.13]: Add support for One-packet scheduling (OPS)

[Ema (Code Review)]

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

Change subject: Add support for One-packet scheduling (OPS)
..

Add support for One-packet scheduling (OPS)

Add a new boolean service configuration parameter, `ops`, defaulting to
False. The parameter can only be True for UDP services, and enables
One-packet scheduling. With OPS, a new scheduling decision is made for
every packet, hopefully avoiding the issues LVS has when tracking "UDP
connections".

Ref: http://www.austintek.com/LVS/LVS-HOWTO/HOWTO/LVS-HOWTO.UDP.html
Change-Id: If643710b99b2eadd1874c4e125f354e3773bed0d
(cherry-picked from commit 8afd834653b8fe16d7e7d20bac166da660c7e9dd)
---
M pybal/ipvs.py
M pybal/pybal.py
M pybal/test/test_ipvs.py
3 files changed, 34 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/23/367923/1

diff --git a/pybal/ipvs.py b/pybal/ipvs.py
index 4429f65..47c808a 100644
--- a/pybal/ipvs.py
+++ b/pybal/ipvs.py
@@ -99,6 +99,10 @@
 if len(service) > 3:
 cmd += ' -s ' + service[3]
 
+# One-packet scheduling
+if len(service) > 4 and service[4]:
+cmd += ' -o'
+
 return cmd
 
 @classmethod
@@ -161,7 +165,7 @@
 SVC_SCHEDULERS = ('rr', 'wrr', 'lc', 'wlc', 'lblc', 'lblcr', 'dh', 'sh',
   'sed', 'nq')
 
-def __init__(self, name, (protocol, ip, port, scheduler), configuration):
+def __init__(self, name, (protocol, ip, port, scheduler, ops), 
configuration):
 """Constructor"""
 
 self.name = name
@@ -171,10 +175,16 @@
 scheduler not in self.SVC_SCHEDULERS):
 raise ValueError('Invalid protocol or scheduler')
 
+if protocol == 'tcp' and ops:
+raise ValueError(
+'OPS can only be used with UDP virtual services')
+
 self.protocol = protocol
 self.ip = ip
 self.port = port
 self.scheduler = scheduler
+# Boolean to toggle "One-packet scheduling"
+self.ops = ops
 
 self.configuration = configuration
 
@@ -189,10 +199,10 @@
 self.createService()
 
 def service(self):
-"""Returns a tuple (protocol, ip, port, scheduler) that
+"""Returns a tuple (protocol, ip, port, scheduler, ops) that
 describes this LVS instance."""
 
-return (self.protocol, self.ip, self.port, self.scheduler)
+return (self.protocol, self.ip, self.port, self.scheduler, self.ops)
 
 def createService(self):
 """Initializes this LVS instance in LVS."""
diff --git a/pybal/pybal.py b/pybal/pybal.py
index ca094fc..e8dccea 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -9,7 +9,7 @@
 
 from __future__ import absolute_import
 
-from ConfigParser import SafeConfigParser
+from ConfigParser import SafeConfigParser, NoOptionError
 
 import os, sys, signal, socket, random
 import logging
@@ -594,11 +594,16 @@
 
 for section in config.sections():
 if section != 'global':
+try:
+ops = config.getboolean(section, 'ops')
+except NoOptionError:
+ops = False
 cfgtuple = (
 config.get(section, 'protocol'),
 config.get(section, 'ip'),
 config.getint(section, 'port'),
-config.get(section, 'scheduler'))
+config.get(section, 'scheduler'),
+ops)
 
 # Read the custom configuration options of the LVS section
 configdict = util.ConfigDict(config.items(section))
diff --git a/pybal/test/test_ipvs.py b/pybal/test/test_ipvs.py
index f636c30..b191cee 100644
--- a/pybal/test/test_ipvs.py
+++ b/pybal/test/test_ipvs.py
@@ -104,7 +104,7 @@
 def setUp(self):
 super(LVSServiceTestCase, self).setUp()
 self.config['dryrun'] = 'true'
-self.service = ('tcp', '127.0.0.1', 80, 'rr')
+self.service = ('tcp', '127.0.0.1', 80, 'rr', False)
 pybal.pybal.BGPFailover.prefixes.clear()
 
 def stubbedModifyState(cls, cmdList):
@@ -120,12 +120,16 @@
 def testConstructor(self):
 """Test `LVSService.__init__`."""
 with self.assertRaises(ValueError):
-service = ('invalid-protocol', '127.0.0.1', 80, 'rr')
+service = ('invalid-protocol', '127.0.0.1', 80, 'rr', False)
 pybal.ipvs.LVSService('invalid-protocol', service, self.config)
 
 with self.assertRaises(ValueError):
-service = ('tcp', '127.0.0.1', 80, 'invalid-scheduler')
+service = ('tcp', '127.0.0.1', 80, 'invalid-scheduler', False)
 pybal.ipvs.LVSService('invalid-scheduler', service, self.config)
+
+with self.assertRaises(ValueError):
+service = ('tcp', '127.0.0.1', 80, 'rr', True)
+

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Compare template names when diffing, not just type

[Esanders (Code Review)]

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

Change subject: Compare template names when diffing, not just type
..

Compare template names when diffing, not just type

As type is always 'mwTransclusionInline/Block'.

Bug: T166801
Change-Id: I76cdf0add780d556206c439797cfcca19133d94d
Depends-On: I0f24d9d81b5491a8f09bc59e5f544f99751fd506
---
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index cdb1d0d..64995e5 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -67,6 +67,17 @@
};
 };
 
+ve.dm.MWTransclusionNode.static.isDiffComparable = function ( element, other ) 
{
+   function getTemplateNames( parts ) {
+   return parts.map( function ( part ) {
+   return part.template ? part.template.target.wt : '';
+   } ).join( '|' );
+   }
+
+   return element.type === other.type &&
+   getTemplateNames( element.attributes.mw.parts ) === 
getTemplateNames( other.attributes.mw.parts );
+};
+
 /**
  * Node type to use when the transclusion is inline
  *

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Abstract definition of type equality when comparing inline n...

[Esanders (Code Review)]

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

Change subject: Abstract definition of type equality when comparing inline nodes
..

Abstract definition of type equality when comparing inline nodes

Bug: T166801
Change-Id: I0f24d9d81b5491a8f09bc59e5f544f99751fd506
---
M src/dm/ve.dm.Model.js
M src/dm/ve.dm.VisualDiff.js
M src/ve.DiffMatchPatch.js
M tests/ui/ve.ui.DiffElement.test.js
4 files changed, 67 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/21/367921/1

diff --git a/src/dm/ve.dm.Model.js b/src/dm/ve.dm.Model.js
index 007e3ba..399f5c0 100644
--- a/src/dm/ve.dm.Model.js
+++ b/src/dm/ve.dm.Model.js
@@ -280,6 +280,20 @@
}
 };
 
+/**
+ * Check if this element is of the same type as another element for the 
purposes of diffing.
+ *
+ * Elements which aren't of the same type will always be shown as removal and 
an insertion,
+ * whereas comarable elements will be shown as an attribute change.
+ *
+ * @param {Object} element This element
+ * @param {Object} other Another element
+ * @return {boolean} Elements are of a comparable type
+ */
+ve.dm.Model.static.isDiffComparable = function ( element, other ) {
+   return element.type === other.type;
+};
+
 /* Methods */
 
 /**
@@ -417,3 +431,7 @@
 ve.dm.Model.prototype.getHashObject = function () {
return this.constructor.static.getHashObject( this.element );
 };
+
+ve.dm.Model.prototype.isDiffComparable = function ( other ) {
+   return this.constructor.static.isDiffComparable( this.element, 
other.element );
+};
diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index c6e2806..8104d02 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -163,7 +163,7 @@
 ve.dm.VisualDiff.prototype.compareDocChildren = function ( oldDocChild, 
newDocChild ) {
var i, ilen, oldData, newData, oldStore, newStore;
 
-   if ( oldDocChild.length !== newDocChild.length || oldDocChild.type !== 
newDocChild.type ) {
+   if ( oldDocChild.length !== newDocChild.length || 
!oldDocChild.isDiffComparable( newDocChild ) ) {
return false;
}
 
@@ -327,7 +327,7 @@
if ( !oldNode.canContainContent() && 
!newNode.canContainContent() ) {
 
// There is no content change
-   replacement = oldNode.type !== newNode.type;
+   replacement = !oldNode.isDiffComparable( 
newNode );
diffInfo[ i ] = {
linearDiff: null,
replacement: replacement,
@@ -362,7 +362,7 @@
 
// If we got this far, they are both CBNs
} else {
-   replacement = oldNode.type !== newNode.type;
+   replacement = !oldNode.isDiffComparable( 
newNode );
 
if ( !replacement && new Date().getTime() < 
this.endTime ) {
linearDiff = 
this.linearDiffer.getCleanDiff(
diff --git a/src/ve.DiffMatchPatch.js b/src/ve.DiffMatchPatch.js
index 85339aa..1e67a97 100644
--- a/src/ve.DiffMatchPatch.js
+++ b/src/ve.DiffMatchPatch.js
@@ -141,12 +141,20 @@
remove = [],
insert = [];
 
-   function equalUnannotated( element, index, other ) {
+   function equalUnannotated( other, element, index ) {
return 
ve.dm.ElementLinearData.static.compareElementsUnannotated( element, other[ 
index ] );
}
 
-   function equalElements( element, index, other ) {
-   return element.type && other[ index ].type && 
element.type === other[ index ].type;
+   function equalElements( other, element, index ) {
+   if ( !( element.type && other[ index ].type && 
element.type === other[ index ].type ) ) {
+   return false;
+   }
+   if ( ve.dm.LinearData.static.isOpenElementData( element 
) ) {
+   // Elements have equal types, do a comparison
+   return ve.dm.modelRegistry.lookup( element.type 
).static.isDiffComparable( element, other[ index ] );
+   } else {
+   return true;
+   }
}
 
function isWhitespace( element ) {
@@ -294,7 +302,7 @@
aData.length === bData.length &&
( ( aAction === DIFF_DELETE && bAction === 
DIFF_INSERT ) || ( aAction === DIFF_INSERT && bAction === DIFF_DELETE ) )
) {
-   if ( 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Adjust button dimensions on login and create account screen

[Jcasariego (Code Review)]

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

Change subject: Adjust button dimensions on login and create account screen
..

Adjust button dimensions on login and create account screen

This task fixes buttons dimensions on login/create account, to have the same 
width as the form fields.

Bug: T170757
Change-Id: Ie725017030bba5058068b20fa8013f9224f8fa6a
---
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/group_captcha.xml
3 files changed, 8 insertions(+), 4 deletions(-)


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

diff --git a/app/src/main/res/layout/activity_create_account.xml 
b/app/src/main/res/layout/activity_create_account.xml
index 9411108..fd65885 100644
--- a/app/src/main/res/layout/activity_create_account.xml
+++ b/app/src/main/res/layout/activity_create_account.xml
@@ -77,8 +77,9 @@
 android:layout_width="match_parent"
 android:text="@string/create_account_next"
 style="@style/App.Button.Blue"
-android:layout_gravity="center_horizontal"
-android:enabled="false" />
+android:enabled="false"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"/>
 
 
+android:text="@string/menu_login"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"/>
 
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Remove mgmt DNS entries for subra and suhail

[Papaul (Code Review)]

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

Change subject: DNS: Remove mgmt DNS entries for subra and suhail
..

DNS: Remove mgmt DNS entries for subra and suhail

Bug:T169506
Change-Id: Ib41bc42c3a46843682fef095ed77157271d2d95c
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/19/367919/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index d66b448..a276e20 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -4314,10 +4314,7 @@
 161 1H IN PTR  wmf6273.mgmt.codfw.wmnet.
 162 1H IN PTR  rdb2004.mgmt.codfw.wmnet.
 162 1H IN PTR  wmf6274.mgmt.codfw.wmnet.
-163 1H IN PTR  subra.mgmt.codfw.wmnet.
-163 1H IN PTR  wmf5816.mgmt.codfw.wmnet.
-164 1H IN PTR  suhail.mgmt.codfw.wmnet.
-164 1H IN PTR  wmf5817.mgmt.codfw.wmnet.
+
 165 1H IN PTR  ganeti2001.mgmt.codfw.wmnet.
 165 1H IN PTR  wmf6295.mgmt.codfw.wmnet.
 166 1H IN PTR  ganeti2002.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 33d533e..bf5aac3 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3725,8 +3725,6 @@
 scb2005 1H  IN A10.193.1.149
 scb2006 1H  IN A10.193.1.151
 stat20011H  IN A10.193.2.13
-subra   1H  IN A10.193.2.163
-suhail  1H  IN A10.193.2.164
 tegmen  1H  IN A10.193.1.27
 tempdb2001  1H  IN A10.193.2.254
 thumbor2001 1H  IN A10.193.2.48
@@ -3809,8 +3807,6 @@
 wmf5725 1H  IN A10.193.1.80
 wmf5755 1H  IN A10.193.1.81
 wmf5815 1H  IN A10.192.1.10
-wmf5816 1H  IN A10.193.2.163
-wmf5817 1H  IN A10.193.2.164
 wmf5819 1H  IN A10.193.1.31
 wmf5820 1H  IN A10.193.1.32
 wmf5821 1H  IN A10.192.1.11

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Add target support for view_urls

[jenkins-bot (Code Review)]

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

Change subject: Add target support for view_urls
..


Add target support for view_urls

Bug: T160676
Change-Id: I07890d17fdf86ece3e01cd8fa0c0e572a4d988c5
---
M VectorTemplate.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/VectorTemplate.php b/VectorTemplate.php
index 234e015..52c3c22 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -444,6 +444,9 @@

if ( isset ( $link['rel'] ) ) {

echo ' rel="' . htmlspecialchars( $link['rel'] ) . '"';

}
+   
if ( isset ( $link['target'] ) ) {
+   
echo ' target="' . htmlspecialchars( $link['target'] ) . '"';
+   
}

?>>https://gerrit.wikimedia.org/r/362366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I07890d17fdf86ece3e01cd8fa0c0e572a4d988c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Thiemo Mättig (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] operations/mediawiki-config[master]: Group1 to wmf.11

[Chad (Code Review)]

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

Change subject: Group1 to wmf.11
..

Group1 to wmf.11

Change-Id: Id83abca71e2140ad78c55fd342f9255140729522
---
M php
M wikiversions.json
2 files changed, 600 insertions(+), 600 deletions(-)


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

diff --git a/php b/php
index 982b19c..f095a8a 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.10
\ No newline at end of file
+php-1.30.0-wmf.11
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 8a2b049..a34345e 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.10",
-"aawikibooks": "php-1.30.0-wmf.10",
-"aawiktionary": "php-1.30.0-wmf.10",
+"aawikibooks": "php-1.30.0-wmf.11",
+"aawiktionary": "php-1.30.0-wmf.11",
 "abwiki": "php-1.30.0-wmf.10",
-"abwiktionary": "php-1.30.0-wmf.10",
+"abwiktionary": "php-1.30.0-wmf.11",
 "acewiki": "php-1.30.0-wmf.10",
-"advisorywiki": "php-1.30.0-wmf.10",
+"advisorywiki": "php-1.30.0-wmf.11",
 "adywiki": "php-1.30.0-wmf.10",
 "afwiki": "php-1.30.0-wmf.10",
-"afwikibooks": "php-1.30.0-wmf.10",
-"afwikiquote": "php-1.30.0-wmf.10",
-"afwiktionary": "php-1.30.0-wmf.10",
+"afwikibooks": "php-1.30.0-wmf.11",
+"afwikiquote": "php-1.30.0-wmf.11",
+"afwiktionary": "php-1.30.0-wmf.11",
 "akwiki": "php-1.30.0-wmf.10",
-"akwikibooks": "php-1.30.0-wmf.10",
-"akwiktionary": "php-1.30.0-wmf.10",
+"akwikibooks": "php-1.30.0-wmf.11",
+"akwiktionary": "php-1.30.0-wmf.11",
 "alswiki": "php-1.30.0-wmf.10",
-"alswikibooks": "php-1.30.0-wmf.10",
-"alswikiquote": "php-1.30.0-wmf.10",
-"alswiktionary": "php-1.30.0-wmf.10",
+"alswikibooks": "php-1.30.0-wmf.11",
+"alswikiquote": "php-1.30.0-wmf.11",
+"alswiktionary": "php-1.30.0-wmf.11",
 "amwiki": "php-1.30.0-wmf.10",
-"amwikiquote": "php-1.30.0-wmf.10",
-"amwiktionary": "php-1.30.0-wmf.10",
+"amwikiquote": "php-1.30.0-wmf.11",
+"amwiktionary": "php-1.30.0-wmf.11",
 "angwiki": "php-1.30.0-wmf.10",
-"angwikibooks": "php-1.30.0-wmf.10",
-"angwikiquote": "php-1.30.0-wmf.10",
-"angwikisource": "php-1.30.0-wmf.10",
-"angwiktionary": "php-1.30.0-wmf.10",
+"angwikibooks": "php-1.30.0-wmf.11",
+"angwikiquote": "php-1.30.0-wmf.11",
+"angwikisource": "php-1.30.0-wmf.11",
+"angwiktionary": "php-1.30.0-wmf.11",
 "anwiki": "php-1.30.0-wmf.10",
-"anwiktionary": "php-1.30.0-wmf.10",
+"anwiktionary": "php-1.30.0-wmf.11",
 "arbcom_cswiki": "php-1.30.0-wmf.10",
 "arbcom_dewiki": "php-1.30.0-wmf.10",
 "arbcom_enwiki": "php-1.30.0-wmf.10",
@@ -35,727 +35,727 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.10",
 "arcwiki": "php-1.30.0-wmf.10",
 "arwiki": "php-1.30.0-wmf.10",
-"arwikibooks": "php-1.30.0-wmf.10",
-"arwikimedia": "php-1.30.0-wmf.10",
-"arwikinews": "php-1.30.0-wmf.10",
-"arwikiquote": "php-1.30.0-wmf.10",
-"arwikisource": "php-1.30.0-wmf.10",
-"arwikiversity": "php-1.30.0-wmf.10",
-"arwiktionary": "php-1.30.0-wmf.10",
+"arwikibooks": "php-1.30.0-wmf.11",
+"arwikimedia": "php-1.30.0-wmf.11",
+"arwikinews": "php-1.30.0-wmf.11",
+"arwikiquote": "php-1.30.0-wmf.11",
+"arwikisource": "php-1.30.0-wmf.11",
+"arwikiversity": "php-1.30.0-wmf.11",
+"arwiktionary": "php-1.30.0-wmf.11",
 "arzwiki": "php-1.30.0-wmf.10",
 "astwiki": "php-1.30.0-wmf.10",
-"astwikibooks": "php-1.30.0-wmf.10",
-"astwikiquote": "php-1.30.0-wmf.10",
-"astwiktionary": "php-1.30.0-wmf.10",
+"astwikibooks": "php-1.30.0-wmf.11",
+"astwikiquote": "php-1.30.0-wmf.11",
+"astwiktionary": "php-1.30.0-wmf.11",
 "aswiki": "php-1.30.0-wmf.10",
-"aswikibooks": "php-1.30.0-wmf.10",
-"aswikisource": "php-1.30.0-wmf.10",
-"aswiktionary": "php-1.30.0-wmf.10",
+"aswikibooks": "php-1.30.0-wmf.11",
+"aswikisource": "php-1.30.0-wmf.11",
+"aswiktionary": "php-1.30.0-wmf.11",
 "atjwiki": "php-1.30.0-wmf.10",
-"auditcomwiki": "php-1.30.0-wmf.10",
+"auditcomwiki": "php-1.30.0-wmf.11",
 "avwiki": "php-1.30.0-wmf.10",
-"avwiktionary": "php-1.30.0-wmf.10",
+"avwiktionary": "php-1.30.0-wmf.11",
 "aywiki": "php-1.30.0-wmf.10",
-"aywikibooks": "php-1.30.0-wmf.10",
-"aywiktionary": "php-1.30.0-wmf.10",
+"aywikibooks": "php-1.30.0-wmf.11",
+"aywiktionary": "php-1.30.0-wmf.11",
 "azbwiki": "php-1.30.0-wmf.10",
 "azwiki": "php-1.30.0-wmf.10",
-"azwikibooks": "php-1.30.0-wmf.10",
-"azwikiquote": "php-1.30.0-wmf.10",
-"azwikisource": "php-1.30.0-wmf.10",
-"azwiktionary": "php-1.30.0-wmf.10",
+"azwikibooks": "php-1.30.0-wmf.11",
+"azwikiquote": "php-1.30.0-wmf.11",
+"azwikisource": "php-1.30.0-wmf.11",

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Compilation detail view: add download control widget

[Mholloway (Code Review)]

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

Change subject: Compilation detail view: add download control widget
..

Compilation detail view: add download control widget

Bug: T163594
Change-Id: I112d34e07aa83c979a9d89c4bbfa8b505d1c01f8
---
M app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
A app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
A app/src/main/res/drawable/ic_clear_white_24px.xml
A app/src/main/res/drawable/ic_pause_white_24px.xml
A app/src/main/res/drawable/ic_play_arrow_white_24px.xml
M app/src/main/res/layout/fragment_compilation_detail.xml
A app/src/main/res/layout/view_compilation_download_widget.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/test/java/org/wikipedia/language/TranslationTests.java
10 files changed, 230 insertions(+), 13 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java 
b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
index 4e54a1b..181b9d0 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
@@ -39,6 +39,7 @@
 @BindView(R.id.view_compilation_info_summary) TextView summaryView;
 @BindView(R.id.view_compilation_info_description) TextView descriptionView;
 @BindView(R.id.button_compilation_detail_download) TextView downloadButton;
+@BindView(R.id.view_compilation_detail_download_control) 
CompilationDownloadControlView controls;
 
 private Unbinder unbinder;
 
@@ -82,6 +83,7 @@
 descriptionView.setText(comp.description());
 
downloadButton.setText(String.format(getString(R.string.offline_compilation_detail_button_download),
 bytesToGB(comp.size(;
+controls.setCompilation(comp);
 
 return view;
 }
diff --git 
a/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java 
b/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
new file mode 100644
index 000..9a764b9
--- /dev/null
+++ 
b/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
@@ -0,0 +1,111 @@
+package org.wikipedia.offline;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import org.wikipedia.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+import static org.wikipedia.util.FileUtil.bytesToGB;
+
+public class CompilationDownloadControlView extends LinearLayout {
+@BindView(R.id.compilation_download_widget_progress_text) TextView 
progressText;
+@BindView(R.id.compilation_download_widget_progress_time_remaining) 
TextView timeRemainingText;
+@BindView(R.id.compilation_download_progress) ProgressBar progressBar;
+@BindView(R.id.compilation_download_widget_button_pause_resume) ImageView 
pauseResumeButton;
+
+private Compilation comp;
+private boolean downloading;
+
+public CompilationDownloadControlView(Context context) {
+super(context);
+init();
+}
+
+public CompilationDownloadControlView(Context context, @Nullable 
AttributeSet attrs) {
+super(context, attrs);
+init();
+}
+
+public CompilationDownloadControlView(Context context, @Nullable 
AttributeSet attrs, int defStyleAttr) {
+super(context, attrs, defStyleAttr);
+init();
+}
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+public CompilationDownloadControlView(Context context, AttributeSet attrs, 
int defStyleAttr, int defStyleRes) {
+super(context, attrs, defStyleAttr, defStyleRes);
+init();
+}
+
+void setCompilation(@NonNull Compilation comp) {
+this.comp = comp;
+updateViews(0f, 0);
+}
+
+private void updateViews(float amtDownloaded, int minsRemaining) {
+
progressText.setText(getString(R.string.offline_compilation_download_progress_text,
+amtDownloaded, bytesToGB(comp.size(;
+
timeRemainingText.setText(getQuantityString(R.plurals.offline_compilation_download_time_remaining,
+minsRemaining, minsRemaining));
+}
+
+@OnClick(R.id.compilation_download_widget_button_pause_resume)
+void onPlayPauseToggleClicked() {
+togglePlayPause();
+}
+
+

[MediaWiki-commits] [Gerrit] operations...pybal[master]: Add support for One-packet scheduling (OPS)

[Ema (Code Review)]

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

Change subject: Add support for One-packet scheduling (OPS)
..


Add support for One-packet scheduling (OPS)

Add a new boolean service configuration parameter, `ops`, defaulting to
False. The parameter can only be True for UDP services, and enables
One-packet scheduling. With OPS, a new scheduling decision is made for
every packet, hopefully avoiding the issues LVS has when tracking "UDP
connections".

Ref: http://www.austintek.com/LVS/LVS-HOWTO/HOWTO/LVS-HOWTO.UDP.html
Change-Id: If643710b99b2eadd1874c4e125f354e3773bed0d
---
M pybal/ipvs.py
M pybal/main.py
M pybal/test/test_ipvs.py
3 files changed, 34 insertions(+), 8 deletions(-)

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



diff --git a/pybal/ipvs.py b/pybal/ipvs.py
index eda6474..8365e50 100644
--- a/pybal/ipvs.py
+++ b/pybal/ipvs.py
@@ -100,6 +100,10 @@
 if len(service) > 3:
 cmd += ' -s ' + service[3]
 
+# One-packet scheduling
+if len(service) > 4 and service[4]:
+cmd += ' -o'
+
 return cmd
 
 @classmethod
@@ -162,7 +166,7 @@
 SVC_SCHEDULERS = ('rr', 'wrr', 'lc', 'wlc', 'lblc', 'lblcr', 'dh', 'sh',
   'sed', 'nq')
 
-def __init__(self, name, (protocol, ip, port, scheduler), configuration):
+def __init__(self, name, (protocol, ip, port, scheduler, ops), 
configuration):
 """Constructor"""
 
 self.name = name
@@ -172,10 +176,16 @@
 scheduler not in self.SVC_SCHEDULERS):
 raise ValueError('Invalid protocol or scheduler')
 
+if protocol == 'tcp' and ops:
+raise ValueError(
+'OPS can only be used with UDP virtual services')
+
 self.protocol = protocol
 self.ip = ip
 self.port = port
 self.scheduler = scheduler
+# Boolean to toggle "One-packet scheduling"
+self.ops = ops
 
 self.configuration = configuration
 
@@ -189,10 +199,10 @@
 self.createService()
 
 def service(self):
-"""Returns a tuple (protocol, ip, port, scheduler) that
+"""Returns a tuple (protocol, ip, port, scheduler, ops) that
 describes this LVS instance."""
 
-return (self.protocol, self.ip, self.port, self.scheduler)
+return (self.protocol, self.ip, self.port, self.scheduler, self.ops)
 
 def createService(self):
 """Initializes this LVS instance in LVS."""
diff --git a/pybal/main.py b/pybal/main.py
index b0184a9..65b38e1 100755
--- a/pybal/main.py
+++ b/pybal/main.py
@@ -13,7 +13,7 @@
 import logging
 import signal
 
-from ConfigParser import SafeConfigParser
+from ConfigParser import SafeConfigParser, NoOptionError
 
 from twisted.internet import reactor
 
@@ -85,11 +85,16 @@
 
 for section in config.sections():
 if section != 'global':
+try:
+ops = config.getboolean(section, 'ops')
+except NoOptionError:
+ops = False
 cfgtuple = (
 config.get(section, 'protocol'),
 config.get(section, 'ip'),
 config.getint(section, 'port'),
-config.get(section, 'scheduler'))
+config.get(section, 'scheduler'),
+ops)
 
 # Read the custom configuration options of the LVS section
 configdict = util.ConfigDict(config.items(section))
diff --git a/pybal/test/test_ipvs.py b/pybal/test/test_ipvs.py
index 45da486..c53ff21 100644
--- a/pybal/test/test_ipvs.py
+++ b/pybal/test/test_ipvs.py
@@ -104,7 +104,7 @@
 def setUp(self):
 super(LVSServiceTestCase, self).setUp()
 self.config['dryrun'] = 'true'
-self.service = ('tcp', '127.0.0.1', 80, 'rr')
+self.service = ('tcp', '127.0.0.1', 80, 'rr', False)
 pybal.bgpfailover.BGPFailover.prefixes.clear()
 
 def stubbedModifyState(cls, cmdList):
@@ -120,12 +120,16 @@
 def testConstructor(self):
 """Test `LVSService.__init__`."""
 with self.assertRaises(ValueError):
-service = ('invalid-protocol', '127.0.0.1', 80, 'rr')
+service = ('invalid-protocol', '127.0.0.1', 80, 'rr', False)
 pybal.ipvs.LVSService('invalid-protocol', service, self.config)
 
 with self.assertRaises(ValueError):
-service = ('tcp', '127.0.0.1', 80, 'invalid-scheduler')
+service = ('tcp', '127.0.0.1', 80, 'invalid-scheduler', False)
 pybal.ipvs.LVSService('invalid-scheduler', service, self.config)
+
+with self.assertRaises(ValueError):
+service = ('tcp', '127.0.0.1', 80, 'rr', True)
+pybal.ipvs.LVSService('ops-with-tcp', service, 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Cache compilations when finished detecting them.

[jenkins-bot (Code Review)]

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

Change subject: Cache compilations when finished detecting them.
..


Cache compilations when finished detecting them.

This saves a cache of the compilations that were found while searching the
filesystem, so that subsequent launches of the app will be immediately
aware of which compilations are available.

Change-Id: Id54afe67b2da816a148c63fa9a73f46cd72d56e2
---
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/OfflineManager.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/values/preference_keys.xml
M app/src/test/java/org/wikipedia/offline/OfflineManagerTest.java
6 files changed, 62 insertions(+), 25 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index b1cc77b..d243061 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -145,7 +145,7 @@
 if (callback() != null) {
 callback().onRequestUpdateCompilations();
 }
-updateEmptyState(currentSearchQuery);
+update();
 }
 
 private void update() {
@@ -185,19 +185,13 @@
 return;
 }
 errorView.setVisibility(View.GONE);
-if (updating) {
-progressBar.setVisibility(View.VISIBLE);
+progressBar.setVisibility(updating ? View.VISIBLE : View.GONE);
+if (TextUtils.isEmpty(searchQuery)) {
 searchEmptyView.setVisibility(View.GONE);
-listContainer.setVisibility(View.GONE);
+listContainer.setVisibility(View.VISIBLE);
 } else {
-progressBar.setVisibility(View.GONE);
-if (TextUtils.isEmpty(searchQuery)) {
-searchEmptyView.setVisibility(View.GONE);
-listContainer.setVisibility(View.VISIBLE);
-} else {
-listContainer.setVisibility(displayedItems.isEmpty() ? 
View.GONE : View.VISIBLE);
-searchEmptyView.setVisibility(displayedItems.isEmpty() ? 
View.VISIBLE : View.GONE);
-}
+listContainer.setVisibility(displayedItems.isEmpty() ? View.GONE : 
View.VISIBLE);
+searchEmptyView.setVisibility(displayedItems.isEmpty() ? 
View.VISIBLE : View.GONE);
 }
 }
 
diff --git a/app/src/main/java/org/wikipedia/offline/OfflineManager.java 
b/app/src/main/java/org/wikipedia/offline/OfflineManager.java
index dbe6f21..f352a5b 100644
--- a/app/src/main/java/org/wikipedia/offline/OfflineManager.java
+++ b/app/src/main/java/org/wikipedia/offline/OfflineManager.java
@@ -4,9 +4,11 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 
+import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.log.L;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +16,7 @@
 import java.util.concurrent.TimeUnit;
 
 public final class OfflineManager {
-private static OfflineManager INSTANCE = new OfflineManager();
+private static OfflineManager INSTANCE;
 @Nullable private CompilationSearchTask searchTask;
 private long lastSearchTime;
 @NonNull private List compilations = new ArrayList<>();
@@ -25,6 +27,10 @@
 }
 
 public static OfflineManager instance() {
+if (INSTANCE == null) {
+INSTANCE = new OfflineManager();
+INSTANCE.restoreFromCache();
+}
 return INSTANCE;
 }
 
@@ -61,6 +67,7 @@
 }
 compilations.clear();
 compilations.addAll(results);
+Prefs.setCompilationCache(compilations);
 callback.onCompilationsFound(results);
 }
 
@@ -158,6 +165,27 @@
 }
 }
 
+private void restoreFromCache() {
+for (Compilation cached : Prefs.getCompilationCache()) {
+try {
+Compilation c = new Compilation(new File(cached.path()));
+c.copyMetadataFrom(cached);
+L.d("Restoring compilation from cache: " + c.path());
+compilations.add(c);
+} catch (IOException e) {
+L.w("Cached compilation no longer available: " + 
cached.path(), e);
+}
+}
+}
+
+@VisibleForTesting
+static OfflineManager instanceNoCache() {
+if (INSTANCE == null) {
+INSTANCE = new OfflineManager();
+}
+return INSTANCE;
+}
+
 

[MediaWiki-commits] [Gerrit] analytics...source[master]: Bump changelog version to 0.0.49

[Mforns (Code Review)]

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

Change subject: Bump changelog version to 0.0.49
..


Bump changelog version to 0.0.49

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

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



diff --git a/changelog.md b/changelog.md
index ad67e55..73822f2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+## v0.0.49
+* Add webrequest tagging (UDF to tag requests) 
https://phabricator.wikimedia.org/T164021
+  * Tagger can return several tags (same task as above)
+  * Correct null pointer exception (same task as above)
+* Add webrequest tagger for Wikidata Query Service 
https://phabricator.wikimedia.org/T169798
+
 ## v0.0.48
 * Update mediawiki_history job with JDBC compliant timestamps and per-user and 
per-page
   new fields (revision-count and time-from-previous-revision)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic812aced62157946247e6fe51dca05ca4bb151bf
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Mforns 
Gerrit-Reviewer: Mforns 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update reference screenshots

[jenkins-bot (Code Review)]

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

Change subject: Update reference screenshots
..


Update reference screenshots

Change-Id: Ie847c4c70a082d035d0f06b171f4bbd48957735d
---
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-dark.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testTheme-480dp-en-ltr-font1.0x-dark.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testTheme-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-720dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testLayoutDirection-120dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testLayoutDirection-120dp-en-rtl-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testTheme-480dp-en-ltr-font1.0x-dark.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testTheme-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-120dp-en-ltr-font1.0x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-120dp-en-ltr-font1.0x-light-short_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-120dp-en-ltr-font1.5x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-120dp-en-ltr-font1.5x-light-short_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-240dp-en-ltr-font1.0x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-240dp-en-ltr-font1.0x-light-short_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-240dp-en-ltr-font1.5x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-240dp-en-ltr-font1.5x-light-short_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-320dp-en-ltr-font1.0x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-320dp-en-ltr-font1.0x-light-short_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-320dp-en-ltr-font1.5x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-320dp-en-ltr-font1.5x-light-short_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-720dp-en-ltr-font1.0x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-720dp-en-ltr-font1.0x-light-short_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-720dp-en-ltr-font1.5x-light-long_text.png
M 
app/screenshots-ref/org.wikipedia.views.AppTextViewWithImagesTest.testWidth-720dp-en-ltr-font1.5x-light-short_text.png
30 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-dark.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-dark.png
index 3f943e7..ba8d525 100644
--- 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-dark.png
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-dark.png
Binary files differ
diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-light.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-light.png
index f00def4..d2a90d2 100644
--- 

[MediaWiki-commits] [Gerrit] analytics...source[master]: Bump changelog version to 0.0.49

[Mforns (Code Review)]

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

Change subject: Bump changelog version to 0.0.49
..

Bump changelog version to 0.0.49

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


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/16/367916/1

diff --git a/changelog.md b/changelog.md
index ad67e55..73822f2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+## v0.0.49
+* Add webrequest tagging (UDF to tag requests) 
https://phabricator.wikimedia.org/T164021
+  * Tagger can return several tags (same task as above)
+  * Correct null pointer exception (same task as above)
+* Add webrequest tagger for Wikidata Query Service 
https://phabricator.wikimedia.org/T169798
+
 ## v0.0.48
 * Update mediawiki_history job with JDBC compliant timestamps and per-user and 
per-page
   new fields (revision-count and time-from-previous-revision)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic812aced62157946247e6fe51dca05ca4bb151bf
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Mforns 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Config for MLEB 2017.07

[jenkins-bot (Code Review)]

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

Change subject: Config for MLEB 2017.07
..


Config for MLEB 2017.07

Bug: T171034
Change-Id: Icbbac02b9bcb5de74244468110f1f0672c90f916
---
M melange/config.ini
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/melange/config.ini b/melange/config.ini
index 441b628..badbd6d 100644
--- a/melange/config.ini
+++ b/melange/config.ini
@@ -2,8 +2,8 @@
 mediawikirepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/core.git
 extensionrepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/extensions/
 branches=origin/master origin/REL1_21 origin/REL1_20
-releasever=2017.04
-releasever-prev=2017.01
+releasever=2017.07
+releasever-prev=2017.04
 bundlename=MediaWiki language extension bundle
 downloadurl=https://translatewiki.net/mleb
 hasher=sha256sum

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbbac02b9bcb5de74244468110f1f0672c90f916
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: KartikMistry 
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...StalkerLog[master]: Remove I18n php shim and bump version

[jenkins-bot (Code Review)]

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

Change subject: Remove I18n php shim and bump version
..


Remove I18n php shim and bump version

Also add in entry point security

Note: This is breaking for MW 1.22.x and earlier.

Bug:T168353
Change-Id: Ided923a33630cb91fe4cd16bae555884c883f8a8
---
D StalkerLog.i18n.php
M StalkerLog.php
2 files changed, 14 insertions(+), 44 deletions(-)

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



diff --git a/StalkerLog.i18n.php b/StalkerLog.i18n.php
deleted file mode 100644
index 6396005..000
--- a/StalkerLog.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim4d4bbb4593873b16' ) ) {
-   function wfJsonI18nShim4d4bbb4593873b16( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim4d4bbb4593873b16';
-}
diff --git a/StalkerLog.php b/StalkerLog.php
index 6329ba1..a5d3371 100644
--- a/StalkerLog.php
+++ b/StalkerLog.php
@@ -12,25 +12,30 @@
  * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
+// Ensure that the script cannot be executed outside of MediaWiki.
+if ( !defined( 'MEDIAWIKI' ) ) {
+die( 'This is an extension to MediaWiki and cannot be run standalone.' );
+}
+
+// Display extension properties on MediaWiki.
 $wgExtensionCredits['specialpage'][] = array(
-   'path'   => __FILE__,
-   'name'   => 'StalkerLog',
-   'version'=> '0.7.0',
-   'url'=> 
'https://www.mediawiki.org/wiki/Extension:StalkerLog',
-   'author' => '[mailto:innocentkil...@gmail.com Chad Horohoe]',
+   'path' => __FILE__,
+   'name' => 'StalkerLog',
+   'version' => '0.8.0',
+   'url' => 'https://www.mediawiki.org/wiki/Extension:StalkerLog',
+   'author' => '[mailto:innocentkil...@gmail.com Chad Horohoe]',
'descriptionmsg' => 'stalkerlog-desc',
-   'license-name'   => 'GPL-2.0+'
+   'license-name' => 'GPL-2.0+'
 );
 
-# Basic setup
+// Basic setup
 $wgMessagesDirs['StalkerLog'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['StalkerLog'] = __DIR__ . '/StalkerLog.i18n.php';
 $wgAvailableRights[] = 'stalkerlog-view-log';
 $wgGroupPermissions['*']['stalkerlog-view-log'] = true;
 $wgHooks['UserLoginComplete'][] = 'wfStalkerLogin';
 $wgHooks['UserLogoutComplete'][] = 'wfStalkerLogout';
 
-# Log setup
+// Log setup
 $wgLogTypes[] = 'stalkerlog';
 $wgLogHeaders['stalkerlog'] = 'stalkerlog-log-text';
 $wgLogNames['stalkerlog'] = 'stalkerlog-log-type';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ided923a33630cb91fe4cd16bae555884c883f8a8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/StalkerLog
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "mariadb: Depool db2070 for maintenance"

[jenkins-bot (Code Review)]

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

Change subject: Revert "mariadb: Depool db2070 for maintenance"
..


Revert "mariadb: Depool db2070 for maintenance"

This reverts commit 2056e89f81e0d6ac55596a56c832bcb734d79d44.

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

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index abb5910..6fdb30e 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow, api
'db2062' => 50,  # B5 3.3TB 160GB, api # mariadb 10.1
'db2069' => 50,  # D6 3.3TB 160GB, api
-   # 'db2070' => 400, # C5 3.3TB 160GB
+   'db2070' => 400, # C5 3.3TB 160GB
'db2071' => 50,  # A6 3.6TB 512GB, api
'db2072' => 500, # B6 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Fix classes without namespace

[jenkins-bot (Code Review)]

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

Change subject: Fix classes without namespace
..


Fix classes without namespace

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

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

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

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

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



diff --git a/WikibaseQualityConstraintsHooks.php 
b/WikibaseQualityConstraintsHooks.php
index 1137f70..6d87b57 100644
--- a/WikibaseQualityConstraintsHooks.php
+++ b/WikibaseQualityConstraintsHooks.php
@@ -1,6 +1,12 @@
 
 
-   
-   
-   
-   
+   
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6301ec265b9816ded9ce89456ca8806cb978149c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "mariadb: Depool db2070 for maintenance"

[Jcrespo (Code Review)]

Hello Florianschmidtwelzow, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "mariadb: Depool db2070 for maintenance"
..

Revert "mariadb: Depool db2070 for maintenance"

This reverts commit 2056e89f81e0d6ac55596a56c832bcb734d79d44.

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index abb5910..6fdb30e 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow, api
'db2062' => 50,  # B5 3.3TB 160GB, api # mariadb 10.1
'db2069' => 50,  # D6 3.3TB 160GB, api
-   # 'db2070' => 400, # C5 3.3TB 160GB
+   'db2070' => 400, # C5 3.3TB 160GB
'db2071' => 50,  # A6 3.6TB 512GB, api
'db2072' => 500, # B6 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Log 'WikibaseQualityConstraints'

[Lucas Werkmeister (WMDE) (Code Review)]

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

Change subject: Log 'WikibaseQualityConstraints'
..

Log 'WikibaseQualityConstraints'

This channel is used by the WikibaseQualityConstraints extension,
deployed on Wikidata. See I2002e3aa72 and Icec9925453 for two uses of
the logging channel.

Bug: T171281
Change-Id: I574750f274cb86762ca209b074649aaa6b35317a
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7c2485e..cf19a21 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5166,6 +5166,7 @@
'wbq_evaluation' => 'debug', // WikibaseQualityConstraints 
evaluation logs
'wfLogDBError' => 'debug', // Former $wgDBerrorLog
'wikibase-debug' => 'debug',
+   'WikibaseQualityConstraints' => 'debug',
'WMDE' => 'debug', // addshore 30/06/2017 Deploy:T168631 
Undeploy:T168635
'xenon' => 'debug',
'XMP' => 'warning', // T89532

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I574750f274cb86762ca209b074649aaa6b35317a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db2070 socket location to the default after re...

[Jcrespo (Code Review)]

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

Change subject: mariadb: Move db2070 socket location to the default after reboot
..


mariadb: Move db2070 socket location to the default after reboot

Bug: T148507
Change-Id: I3bd6b263bcfe3ad8d20f18bce5e0129f2397e311
---
M hieradata/hosts/db2070.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db2070.yaml b/hieradata/hosts/db2070.yaml
index b1bf6dc..e60febc 100644
--- a/hieradata/hosts/db2070.yaml
+++ b/hieradata/hosts/db2070.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's1'
-mariadb::socket: '/tmp/mysql.sock'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Hygiene: Dependency Injection for Popups

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Dependency Injection for Popups
..


Hygiene: Dependency Injection for Popups

Changes:
 - removed ugly PopupsContext::getInstance
 - removed ugly PopupsContextTestWrapper helper
 - defined all services inside ServiceWirings
 - fixed unit tests to test classes directly or use MediawikiServices

Change-Id: Ie27e28bb07aebe01014848c290369b1b1f098e9b
---
M extension.json
M includes/PopupsContext.php
M includes/PopupsHooks.php
A includes/ServiceWirings.php
M includes/UserPreferencesChangeHandler.php
M tests/phpunit/PopupsContextTest.php
M tests/phpunit/PopupsHooksTest.php
M tests/phpunit/UserPreferencesChangeHandlerTest.php
8 files changed, 118 insertions(+), 155 deletions(-)

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



diff --git a/extension.json b/extension.json
index 9629dc4..33a60ce 100644
--- a/extension.json
+++ b/extension.json
@@ -132,5 +132,8 @@
"localBasePath": "",
"remoteExtPath": "Popups"
},
+   "ServiceWiringFiles": [
+   "includes/ServiceWirings.php"
+   ],
"manifest_version": 1
 }
diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php
index 56bec98..7d86120 100644
--- a/includes/PopupsContext.php
+++ b/includes/PopupsContext.php
@@ -20,14 +20,10 @@
  */
 namespace Popups;
 
-use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use ExtensionRegistry;
 use Config;
 use Popups\EventLogging\EventLogger;
-use Popups\EventLogging\EventLoggerFactory;
-use Popups\EventLogging\MWEventLogger;
-use Popups\EventLogging\NullLogger;
 
 /**
  * Popups Module
@@ -89,35 +85,13 @@
 * @param EventLogger $eventLogger A logger capable of logging 
EventLogging
 *  events
 */
-   protected function __construct( Config $config, ExtensionRegistry 
$extensionRegistry,
+   public function __construct( Config $config, ExtensionRegistry 
$extensionRegistry,
PopupsGadgetsIntegration $gadgetsIntegration, EventLogger 
$eventLogger ) {
-   /** @todo Use MediaWikiServices Service Locator when it's ready 
*/
$this->extensionRegistry = $extensionRegistry;
$this->gadgetsIntegration = $gadgetsIntegration;
$this->eventLogger = $eventLogger;
 
$this->config = $config;
-   }
-
-   /**
-* Get a PopupsContext instance
-*
-* @return PopupsContext
-*/
-   public static function getInstance() {
-   if ( !self::$instance ) {
-   /** @todo Use MediaWikiServices Service Locator when 
it's ready */
-
-   $registry = ExtensionRegistry::getInstance();
-   $config = 
MediaWikiServices::getInstance()->getConfigFactory()
-   ->makeConfig( self::EXTENSION_NAME );
-   $gadgetsIntegration = new PopupsGadgetsIntegration( 
$config, $registry );
-   $eventLoggerFactory = new EventLoggerFactory( $config, 
$registry );
-
-   self::$instance = new PopupsContext( $config, $registry,
-   $gadgetsIntegration, $eventLoggerFactory->get() 
);
-   }
-   return self::$instance;
}
 
/**
@@ -188,16 +162,7 @@
 * @return \Psr\Log\LoggerInterface
 */
public function getLogger() {
-   return LoggerFactory::getInstance( self::LOGGER_CHANNEL );
-   }
-
-   /**
-* Get Module config
-*
-* @return \Config
-*/
-   public function getConfig() {
-   return $this->config;
+   return MediaWikiServices::getInstance()->getService( 
'Popups.Logger' );
}
 
/**
diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index 9a7807e..2f0cb65 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -20,6 +20,7 @@
  */
 namespace Popups;
 
+use MediaWiki\MediaWikiServices;
 use User;
 use OutputPage;
 use Skin;
@@ -40,7 +41,9 @@
 */
static function onGetBetaPreferences( User $user, array &$prefs ) {
global $wgExtensionAssetsPath;
-   if ( PopupsContext::getInstance()->isBetaFeatureEnabled() !== 
true ) {
+   /** @var PopupsContext $context */
+   $context = MediaWikiServices::getInstance()->getService( 
'Popups.Context' );
+   if ( $context->isBetaFeatureEnabled() !== true ) {
return;
}
$prefs[PopupsContext::PREVIEWS_BETA_PREFERENCE_NAME] = [
@@ -65,7 +68,7 @@
 * @param array &$prefs Preferences description array, to be fed to a 
HTMLForm object
 */
static function onGetPreferences( 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove wbq_evaluation logging

[Lucas Werkmeister (WMDE) (Code Review)]

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

Change subject: Remove wbq_evaluation logging
..

Remove wbq_evaluation logging

The job that used this log channel was already removed in I5f572c6ff2.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7c2485e..21f40a7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5163,7 +5163,6 @@
'UpdateRepo' => 'debug',
'updateTranstagOnNullRevisions' => 'debug',
'upload' => 'debug',
-   'wbq_evaluation' => 'debug', // WikibaseQualityConstraints 
evaluation logs
'wfLogDBError' => 'debug', // Former $wgDBerrorLog
'wikibase-debug' => 'debug',
'WMDE' => 'debug', // addshore 30/06/2017 Deploy:T168631 
Undeploy:T168635

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic41d27f857e792d0f72cf3d4a71b5ba04a0acb61
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db2070 for maintenance

[jenkins-bot (Code Review)]

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

Change subject: mariadb: Depool db2070 for maintenance
..


mariadb: Depool db2070 for maintenance

It will be upgraded and rebooted.

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

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 6fdb30e..abb5910 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow, api
'db2062' => 50,  # B5 3.3TB 160GB, api # mariadb 10.1
'db2069' => 50,  # D6 3.3TB 160GB, api
-   'db2070' => 400, # C5 3.3TB 160GB
+   # 'db2070' => 400, # C5 3.3TB 160GB
'db2071' => 50,  # A6 3.6TB 512GB, api
'db2072' => 500, # B6 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "mariadb: Depool db2069 for maintenance"

[jenkins-bot (Code Review)]

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

Change subject: Revert "mariadb: Depool db2069 for maintenance"
..


Revert "mariadb: Depool db2069 for maintenance"

This reverts commit 0ef03170a9ca936eac68c2a4fb24d40cd483d6ae.

Change-Id: If05a384b92b654f4a57392b45c59033036ca8e2f
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 643a21a..6fdb30e 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -99,7 +99,7 @@
'db2048' => 400, # C6 2.9TB 160GB,
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow, api
'db2062' => 50,  # B5 3.3TB 160GB, api # mariadb 10.1
-   # 'db2069' => 50,  # D6 3.3TB 160GB, api
+   'db2069' => 50,  # D6 3.3TB 160GB, api
'db2070' => 400, # C5 3.3TB 160GB
'db2071' => 50,  # A6 3.6TB 512GB, api
'db2072' => 500, # B6 3.6TB 512GB
@@ -255,7 +255,7 @@
'api' => [
'db2055' => 1,
'db2062' => 1,
-   # 'db2069' => 1,
+   'db2069' => 1,
'db2071' => 5,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db2070 socket location to the default after re...

[Jcrespo (Code Review)]

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

Change subject: mariadb: Move db2070 socket location to the default after reboot
..

mariadb: Move db2070 socket location to the default after reboot

Bug: T148507
Change-Id: I3bd6b263bcfe3ad8d20f18bce5e0129f2397e311
---
M hieradata/hosts/db2070.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/367912/1

diff --git a/hieradata/hosts/db2070.yaml b/hieradata/hosts/db2070.yaml
index b1bf6dc..e60febc 100644
--- a/hieradata/hosts/db2070.yaml
+++ b/hieradata/hosts/db2070.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's1'
-mariadb::socket: '/tmp/mysql.sock'

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db2070 for maintenance

[Jcrespo (Code Review)]

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

Change subject: mariadb: Depool db2070 for maintenance
..

mariadb: Depool db2070 for maintenance

It will be upgraded and rebooted.

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 6fdb30e..abb5910 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow, api
'db2062' => 50,  # B5 3.3TB 160GB, api # mariadb 10.1
'db2069' => 50,  # D6 3.3TB 160GB, api
-   'db2070' => 400, # C5 3.3TB 160GB
+   # 'db2070' => 400, # C5 3.3TB 160GB
'db2071' => 50,  # A6 3.6TB 512GB, api
'db2072' => 500, # B6 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Flush feature file before calling xgboost to dump

[EBernhardson (Code Review)]

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

Change subject: Flush feature file before calling xgboost to dump
..

Flush feature file before calling xgboost to dump

Change-Id: Ife4ce20ab3fbfe7826531139e45145a8d50f336d
---
M mjolnir/training/xgboost.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/10/367910/1

diff --git a/mjolnir/training/xgboost.py b/mjolnir/training/xgboost.py
index 5b699c8..1c8e632 100644
--- a/mjolnir/training/xgboost.py
+++ b/mjolnir/training/xgboost.py
@@ -263,6 +263,7 @@
 else:
 fmap_f = tempfile.NamedTemporaryFile()
 fmap_f.write(feature_map)
+fmap_f.flush()
 fmap_path = fmap_f.name
 # returns an Array[String] from scala, where each element of the array
 # is a json string representing a single tree.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife4ce20ab3fbfe7826531139e45145a8d50f336d
Gerrit-PatchSet: 1
Gerrit-Project: search/MjoLniR
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

___
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 "mariadb: Depool db2069 for maintenance"

[Jcrespo (Code Review)]

Hello Florianschmidtwelzow, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "mariadb: Depool db2069 for maintenance"
..

Revert "mariadb: Depool db2069 for maintenance"

This reverts commit 0ef03170a9ca936eac68c2a4fb24d40cd483d6ae.

Change-Id: If05a384b92b654f4a57392b45c59033036ca8e2f
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 643a21a..6fdb30e 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -99,7 +99,7 @@
'db2048' => 400, # C6 2.9TB 160GB,
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow, api
'db2062' => 50,  # B5 3.3TB 160GB, api # mariadb 10.1
-   # 'db2069' => 50,  # D6 3.3TB 160GB, api
+   'db2069' => 50,  # D6 3.3TB 160GB, api
'db2070' => 400, # C5 3.3TB 160GB
'db2071' => 50,  # A6 3.6TB 512GB, api
'db2072' => 500, # B6 3.6TB 512GB
@@ -255,7 +255,7 @@
'api' => [
'db2055' => 1,
'db2062' => 1,
-   # 'db2069' => 1,
+   'db2069' => 1,
'db2071' => 5,
],
],

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

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

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