[MediaWiki-commits] [Gerrit] Assorted WANObjectCache doc tweaks - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Assorted WANObjectCache doc tweaks
..


Assorted WANObjectCache doc tweaks

Change-Id: If207fc64279e344218d3b617eae7e69f88b23b27
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 12 insertions(+), 10 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 41dc66f..fb96269 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -23,17 +23,18 @@
 /**
  * Multi-datacenter aware caching interface
  *
- * All operations go to the local cache, except the delete()
- * and touchCheckKey(), which broadcast to all clusters.
+ * All operations go to the local datacenter cache, except for delete(),
+ * touchCheckKey(), and resetCheckKey(), which broadcast to all clusters.
+ *
  * This class is intended for caching data from primary stores.
  * If the get() method does not return a value, then the caller
  * should query the new value and backfill the cache using set().
- * When the source data changes, the delete() method should be called.
- * Since delete() is expensive, it should be avoided. One can do so if:
+ * When the source data changes, a purge method should be called.
+ * Since purges are expensive, they should be avoided. One can do so if:
  *   - a) The object cached is immutable; or
  *   - b) Validity is checked against the source after get(); or
  *   - c) Using a modest TTL is reasonably correct and performant
- * Consider using getWithSetCallback() instead of the get()/set() cycle.
+ * The simplest purge method is delete().
  *
  * Instances of this class must be configured to point to a valid
  * PubSub endpoint, and there must be listeners on the cache servers
@@ -159,7 +160,8 @@
 *   - b) Keeping transaction duration shorter than delete() hold-off 
TTL
 * However, pre-snapshot values might still be seen due to delete() 
relay lag.
 *
-* For keys that are hot/expensive, consider using getWithSetCallback() 
instead.
+* Consider using getWithSetCallback() instead of get()/set() cycles.
+* That method has cache slam avoiding features for hot/expensive keys.
 *
 * @param string $key Cache key
 * @param mixed $curTTL Approximate TTL left on the key if present 
[returned]
@@ -378,10 +380,10 @@
 * This is similar to touchCheckKey() in that keys using it via
 * getWithSetCallback() will be invalidated. The differences are:
 *   - a) The timestamp will be deleted from all caches and lazily
-*  re-initialized when accessed (rather than set everywhere)
+*re-initialized when accessed (rather than set everywhere)
 *   - b) Thus, dependent keys will be known to be invalid, but not
-*  for how long (they are treated as "just" purged), which
-*  effects any lockTSE logic in getWithSetCallback()
+*for how long (they are treated as "just" purged), which
+*effects any lockTSE logic in getWithSetCallback()
 * The advantage is that this does not place high TTL keys on every 
cache
 * server, making it better for code that will cache many different keys
 * and either does not use lockTSE or uses a low enough TTL anyway.
@@ -420,7 +422,7 @@
 * to maintain "most recent X" values that come from time or sequence
 * based source data, provided that the "as of" id/time is tracked.
 *
-* Usage of $checkKeys is similar to get()/getMulti(). However,
+* Usage of $checkKeys is similar to get() and getMulti(). However,
 * rather than the caller having to inspect a "current time left"
 * variable (e.g. $curTTL, $curTTLs), a cache regeneration will be
 * triggered using the callback.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If207fc64279e344218d3b617eae7e69f88b23b27
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Include phpunit license for backported classes - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Include phpunit license for backported classes
..


Include phpunit license for backported classes

Bug: T113765
Change-Id: I3f4242d4323d447097b2de42bfade969a6e3fd9d
---
M tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
R tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php
A tests/phpunit/includes/phpunit/LICENSE
A tests/phpunit/includes/phpunit/README
4 files changed, 36 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php 
b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
index 090f439..ef6f847 100644
--- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
@@ -24,7 +24,7 @@
 use Monolog\Logger;
 
 // not available in the version of phpunit mw uses, so copied into repo
-require_once __DIR__ . '/../../../ConsecutiveParametersMatcher.php';
+require_once __DIR__ . '/../../../phpunit/ConsecutiveParametersMatcher.php';
 
 class KafkaHandlerTest extends MediaWikiTestCase {
 
diff --git a/tests/phpunit/includes/ConsecutiveParametersMatcher.php 
b/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php
similarity index 100%
rename from tests/phpunit/includes/ConsecutiveParametersMatcher.php
rename to tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php
diff --git a/tests/phpunit/includes/phpunit/LICENSE 
b/tests/phpunit/includes/phpunit/LICENSE
new file mode 100644
index 000..fe178b0
--- /dev/null
+++ b/tests/phpunit/includes/phpunit/LICENSE
@@ -0,0 +1,33 @@
+PHPUnit
+
+Copyright (c) 2001-2014, Sebastian Bergmann .
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/phpunit/includes/phpunit/README 
b/tests/phpunit/includes/phpunit/README
new file mode 100644
index 000..3ec3fd9
--- /dev/null
+++ b/tests/phpunit/includes/phpunit/README
@@ -0,0 +1,2 @@
+This directory contains classes duplicated from new versions of phpunit
+that also work in the older php 3.7.37 used by wmf CI servers.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f4242d4323d447097b2de42bfade969a6e3fd9d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
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] Made convertNamespace() use APC - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Made convertNamespace() use APC
..

Made convertNamespace() use APC

* This can avoid MessageCache::load() calls on another
  language due to variants. The convertNamespace() method
  takes up a significant amount of time for 404 pages.

Change-Id: I4551d5b8e5b5a0bc01d02702b80f93591fc19440
---
M languages/LanguageConverter.php
1 file changed, 30 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/241265/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 7879309..5f1dca4 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -539,27 +539,45 @@
 * @return string Namespace name for display
 */
public function convertNamespace( $index, $variant = null ) {
+   if ( $index === NS_MAIN ) {
+   return '';
+   }
+
if ( $variant === null ) {
$variant = $this->getPreferredVariant();
}
-   if ( $index === NS_MAIN ) {
-   return '';
-   } else {
-   // First check if a message gives a converted name in 
the target variant.
-   $nsConvMsg = wfMessage( 'conversion-ns' . $index 
)->inLanguage( $variant );
-   if ( $nsConvMsg->exists() ) {
-   return $nsConvMsg->plain();
-   }
-   // Then check if a message gives a converted name in 
content language
-   // which needs extra translation to the target variant.
+
+   $cache = ObjectCache::newAccelerator( CACHE_NONE );
+   $key = wfMemcKey( 'languageconverter', 'namespace-text', 
$index, $variant );
+   $nsVariantText = $cache->get( $key );
+   if ( $nsVariantText !== false ) {
+   return $nsVariantText;
+   }
+
+   // First check if a message gives a converted name in the 
target variant.
+   $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inLanguage( 
$variant );
+   if ( $nsConvMsg->exists() ) {
+   $nsVariantText = $nsConvMsg->plain();
+   }
+
+   // Then check if a message gives a converted name in content 
language
+   // which needs extra translation to the target variant.
+   if ( $nsVariantText === false ) {
$nsConvMsg = wfMessage( 'conversion-ns' . $index 
)->inContentLanguage();
if ( $nsConvMsg->exists() ) {
-   return $this->translate( $nsConvMsg->plain(), 
$variant );
+   $nsVariantText = $this->translate( 
$nsConvMsg->plain(), $variant );
}
+   }
+
+   if ( $nsVariantText === false ) {
// No message exists, retrieve it from the target 
variant's namespace names.
$langObj = $this->mLangObj->factory( $variant );
-   return $langObj->getFormattedNsText( $index );
+   $nsVariantText = $langObj->getFormattedNsText( $index );
}
+
+   $cache->set( $key, $nsVariantText, 60 );
+
+   return $nsVariantText;
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] [TopTenPages] restore mw unit tests - change (integration/config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: [TopTenPages] restore mw unit tests
..


[TopTenPages] restore mw unit tests

Even if the repository does not provide tests, we still want to run the
MediaWiki core 'extensions' testsuite which check the resource loader
registrations and autoloader (among others).

Add back extension-unittests-generic

Change-Id: Ic5dcdd2ee1ad5149e049c177ecedea547c67b92d
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 80619d2..4b79eba 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6621,6 +6621,7 @@
   - name: mediawiki/extensions/TopTenPages
 template:
   - name: composer-test
+  - name: extension-unittests-generic
   - name: jsonlint
 
   - name: mediawiki/extensions/VIKI

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

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

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

[MediaWiki-commits] [Gerrit] added Cargo support - change (mediawiki...SafeDelete)

[Cicalese (Code Review)]

Cicalese has submitted this change and it was merged.

Change subject: added Cargo support
..


added Cargo support

Change-Id: I855d1d0635a9b1db01554b89cf4c6b3c1a076e5e
---
M SafeDelete.class.php
M SafeDelete.php
2 files changed, 53 insertions(+), 5 deletions(-)

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



diff --git a/SafeDelete.class.php b/SafeDelete.class.php
index 8c15faf..80c7eb0 100644
--- a/SafeDelete.class.php
+++ b/SafeDelete.class.php
@@ -53,7 +53,7 @@
$title = Title::newFromURL( $par );
$this->getSkin()->setRelevantTitle( $title );
 
-   if ( class_exists ("SemanticTitle" ) ) {
+   if ( class_exists( "SemanticTitle" ) ) {
$displaytitle = SemanticTitle::getText( $title );
} else {
$displaytitle = $title->getPrefixedText();
@@ -63,12 +63,27 @@
 
$this->getOutput()->addBacklinkSubtitle( $title );
 
-   if ( isset($GLOBALS['SafeDeleteSemantic']) &&
-   $GLOBALS['SafeDeleteSemantic'] === true ) {
+   $done = false;
+
+   $result = array();
+
+   if ( isset( $GLOBALS['SafeDeleteSemantic'] ) &&
+   $GLOBALS['SafeDeleteSemantic'] ) {
 
$result = $this->querySemantic( $title );
+   $done = true;
+   }
 
-   } else {
+   if ( isset( $GLOBALS['SafeDeleteCargo'] ) &&
+   is_array( $GLOBALS['SafeDeleteCargo'] ) &&
+   count( $GLOBALS['SafeDeleteCargo'] ) > 0 ) {
+
+   $result = array_merge( $result,
+   $this->queryCargo( $title, 
$GLOBALS['SafeDeleteCargo'] ) );
+   $done = true;
+   }
+
+   if ( !$done ) {
 
$result = $this->queryNonSemantic( $title );
 
@@ -129,6 +144,39 @@
return $result;
}
 
+   private function queryCargo( $title, $cargo_fields ) {
+
+   $targetpage = $title->getPrefixedText();
+
+   $result = array();
+
+   foreach ( $cargo_fields as $field ) {
+
+   if ( isset( $field[2] ) && $field[2] == true ) {
+   $operator = ' HOLDS ';
+   } else {
+   $operator = ' = ';
+   }
+
+   $query = CargoSQLQuery::newFromValues( $field[0], 
'_pageName',
+   $field[1] . $operator .'"' . $targetpage . '"', 
null,
+   '_pageName', null, null, '' );
+   $rows = $query->run();
+
+   foreach ( $rows as $row ) {
+
+   $sourcepage = $row['_pageName'];
+
+   if ( ( $sourcepage != $targetpage ) &&
+   ! array_key_exists( $targetpage, 
$result ) ) {
+   $result[$sourcepage] = 
Title::newFromText( $sourcepage );
+   }
+   }
+   }
+
+   return $result;
+   }
+
public function queryNonSemantic ( $title ) {
 
$dbr = wfGetDB( DB_SLAVE );
diff --git a/SafeDelete.php b/SafeDelete.php
index 78ec089..7118040 100644
--- a/SafeDelete.php
+++ b/SafeDelete.php
@@ -27,7 +27,7 @@
 
 $wgExtensionCredits['special'][] = array (
'name' => 'Safe Delete',
-   'version' => '1.1',
+   'version' => '1.2',
'author' => '[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]',
'descriptionmsg' => 'safedelete-desc',
'path' => __FILE__,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I855d1d0635a9b1db01554b89cf4c6b3c1a076e5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SafeDelete
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 

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

[MediaWiki-commits] [Gerrit] Remove tox-*-trusty job templates - change (integration/config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove tox-*-trusty job templates
..


Remove tox-*-trusty job templates

They are no more used, all jobs have been migrated to the -jessie
equivalent which runs on Nodepool.

Change-Id: Ifa9290c63c0e0bf419f3d749a56bd1c250c3a9cc
---
M jjb/python-jobs.yaml
1 file changed, 0 insertions(+), 35 deletions(-)

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



diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 1088e10..bc1f51d 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -48,40 +48,6 @@
 publishers:
  - archive-log-dir
 
-# Invoke a tox environement on Trusty, non-generic
-#
-# Ubuntu Trusty provides:
-# python 2.7.6
-# python 3.4.0
-#
-# Parameter: {toxenv}
-- job-template:
-name: '{name}-tox-{toxenv}-trusty'
-node: contintLabsSlave && UbuntuTrusty
-defaults: use-remoteonly-zuul
-concurrent: true
-triggers:
- - zuul
-builders:
- - tox:
- venv: '{toxenv}'
-publishers:
- - archive-log-dir
-
-# Generic version of above
-- job-template:
-name: 'tox-{toxenv}-trusty'
-node: contintLabsSlave && UbuntuTrusty
-defaults: use-remote-zuul-shallow-clone
-concurrent: true
-triggers:
- - zuul
-builders:
- - tox:
- venv: '{toxenv}'
-publishers:
- - archive-log-dir
-
 # Same for Jessie
 - job-template:
 name: 'tox-{toxenv}-jessie'
@@ -164,5 +130,4 @@
 
 jobs:
  - 'tox-{toxenv}'
- - 'tox-{toxenv}-trusty'
  - 'tox-{toxenv}-jessie'

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

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

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

[MediaWiki-commits] [Gerrit] Add build and coverage badges - change (pywikibot/wikibase)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: Add build and coverage badges
..

Add build and coverage badges

Change-Id: I264524310e4822956b49a33bd17f28922288bd4d
---
M README.rst
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/53/241053/1

diff --git a/README.rst b/README.rst
index 281af27..e8d8f96 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,11 @@
-pywikibase is the library designed to handle DataModel of Wikiabse.
+.. image:: https://travis-ci.org/wikimedia/pywikibot-wikibase.svg?branch=master
+:target: https://travis-ci.org/wikimedia/pywikibot-wikibase
+
+.. image:: 
http://codecov.io/github/wikimedia/pywikibot-wikibase/coverage.svg?branch=master
+:target: 
http://codecov.io/github/wikimedia/pywikibot-wikibase?branch=master
+
+pywikibase the library designed to handle DataModel of Wikiabse.
+
 
 It was forked from pywikibot-core in 28 July 2015.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I264524310e4822956b49a33bd17f28922288bd4d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
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] Do not run broken scenario during Jenkins job - change (mediawiki...CirrusSearch)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Do not run broken scenario during Jenkins job
..

Do not run broken scenario during Jenkins job

The broken scenario is: Fill in search term and click search.

The Jenkins job is
browsertests-CirrusSearch-en.wikipedia.beta.wmflabs.org-linux-firefox-sa
uce

Bug: T113727
Change-Id: I1d469e720414a4bb38aa6423ed9dc829b0c3a3b1
---
M tests/browser/features/smoke.feature
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/tests/browser/features/smoke.feature 
b/tests/browser/features/smoke.feature
index 82c128f..1f5558e 100644
--- a/tests/browser/features/smoke.feature
+++ b/tests/browser/features/smoke.feature
@@ -9,9 +9,10 @@
 # CirrusSearch top-level directory and at
 # 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS
 #
-@clean @en.wikipedia.beta.wmflabs.org @firefox @test2.wikipedia.org @phantomjs 
@smoke
+@clean @firefox @test2.wikipedia.org @phantomjs @smoke
 Feature: Smoke test
 
+  @en.wikipedia.beta.wmflabs.org
   Scenario: Search suggestions
 Given I am at a random page
 When I search for: main
@@ -25,6 +26,7 @@
   And I click the search button
 Then I should land on Search Results page
 
+  @en.wikipedia.beta.wmflabs.org
   Scenario: Search with accent yields result page with accent
 Given I am at a random page
 When I search for África

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

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

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

[MediaWiki-commits] [Gerrit] Run adb-setup before Android emulator tests - change (integration/config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Run adb-setup before Android emulator tests
..


Run adb-setup before Android emulator tests

The Android instrumentation tests are failing in a strange way after
upgrading the Android Support libraries[0]:

com.android.builder.testing.api.TestException: 
com.android.builder.testing.api.DeviceException: 
com.android.ddmlib.ShellCommandUnresponsiveException

This patch calls adb-setup before executing Android instrumentation
tests, which blocks until the device is ready to test before returning.
All non-Android instrumentation test dependencies are satisfied first to
minimize idle time.

Depends on adb-setup[1].

[0] https://gerrit.wikimedia.org/r/#/c/235859/
[1] https://gerrit.wikimedia.org/r/#/c/239898/

Change-Id: Ie950d0b3ca49fd9506f2d057c890fea6dbebe711
---
M jjb/mobile.yaml
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index ef2b8e6..afe8cf2 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -36,7 +36,12 @@
 builders:
  - shell: |
  scripts/missing-qq.py
- ./gradlew clean checkstyle testAllAlphaRelease
+ ./gradlew clean checkstyle assembleAlphaRelease testAlphaRelease
+ scripts/adb-setup.bash
+
+ # TODO: replace with connectedAlphaReleaseAndroidTest once
+ # https://gerrit.wikimedia.org/r/#/c/235859/ is merged
+ ./gradlew testAllAlphaRelease
 publishers:
  - archive:
  # Capture generated .apk, ProGuard mappings, checkstyle.xml, and test 
results

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie950d0b3ca49fd9506f2d057c890fea6dbebe711
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Hashar 
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] reorder cards and hide iframe card images - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: reorder cards and hide iframe card images
..


reorder cards and hide iframe card images

Change-Id: I48fb9c464adb3191a030c26e74a64b0295b8d11c
---
M worldpay_gateway/forms/css/iframe.css
M worldpay_gateway/worldpay.adapter.php
2 files changed, 20 insertions(+), 8 deletions(-)

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



diff --git a/worldpay_gateway/forms/css/iframe.css 
b/worldpay_gateway/forms/css/iframe.css
index eb1b00c..8e50d0f 100644
--- a/worldpay_gateway/forms/css/iframe.css
+++ b/worldpay_gateway/forms/css/iframe.css
@@ -72,6 +72,16 @@
 
 select { padding: .9em 1em !important; line-height: 40px; }
 
+div.accepted-cards-label {
+  display: none;
+  visibility: none;
+}
+
+div.accepted-cards {
+  display: none;
+  visibility: none;
+}
+
 #pnldynamicdate div.payment-card-entry.evaluatedate ~ 
div.payment-card-entry.evaluatedate
 {
 display: none;
diff --git a/worldpay_gateway/worldpay.adapter.php 
b/worldpay_gateway/worldpay.adapter.php
index 2540bed..8ebb936 100644
--- a/worldpay_gateway/worldpay.adapter.php
+++ b/worldpay_gateway/worldpay.adapter.php
@@ -35,9 +35,19 @@
);
 
// TODO we should store these keys in a config file
+   // TODO the way the cards are ordered on the page is the order of this
+   // array. make that a "weight" that could be controlled by a url param
static $CARD_INFO = array(
+   'cb' => array( // Carte Bleu
+   'api_name' => 'CB',
+   'countries' => array( 'FR' => true ),
+   ),
'visa' => array(
'api_name' => 'VI',
+   'countries' => array( 'FR' => true ),
+   ),
+   'mc' => array(
+   'api_name' => 'MC',
'countries' => array( 'FR' => true ),
),
'amex' => array(
@@ -46,10 +56,6 @@
),
'visa-beneficial' => array(
'api_name' => 'BE',
-   ),
-   'cb' => array( // Carte Bleu
-   'api_name' => 'CB',
-   'countries' => array( 'FR' => true ),
),
'diners' => array(
'api_name' => 'DC',
@@ -62,10 +68,6 @@
),
'maestro' => array(
'api_name' => 'MA',
-   ),
-   'mc' => array(
-   'api_name' => 'MC',
-   'countries' => array( 'FR' => true ),
),
'mc-debit' => array(
'api_name' => 'MD',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48fb9c464adb3191a030c26e74a64b0295b8d11c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move LogFormatter test comment block - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Move LogFormatter test comment block
..


Move LogFormatter test comment block

This was missed in:
https://gerrit.wikimedia.org/r/#/c/239783/
Ia5016c82c00dd7c35a6f1253d6e385b587ec485e

Change-Id: Ibf537aaca2a0ca9d2c509499f6da5b9e51b06037
---
M tests/phpunit/includes/changes/RecentChangeTest.php
M tests/phpunit/includes/logging/LogFormatterTest.php
2 files changed, 38 insertions(+), 38 deletions(-)

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



diff --git a/tests/phpunit/includes/changes/RecentChangeTest.php 
b/tests/phpunit/includes/changes/RecentChangeTest.php
index 4d1a936..fd287b5 100644
--- a/tests/phpunit/includes/changes/RecentChangeTest.php
+++ b/tests/phpunit/includes/changes/RecentChangeTest.php
@@ -42,44 +42,6 @@
}
 
/**
-* The testIrcMsgForAction* tests are supposed to cover the hacky
-* LogFormatter::getIRCActionText / bug 34508
-*
-* Third parties bots listen to those messages. They are clever enough
-* to fetch the i18n messages from the wiki and then analyze the IRC 
feed
-* to reverse engineer the $1, $2 messages.
-* One thing bots can not detect is when MediaWiki change the meaning of
-* a message like what happened when we deployed 1.19. $1 became the 
user
-* performing the action which broke basically all bots around.
-*
-* Should cover the following log actions (which are most commonly used 
by bots):
-* - block/block
-* - block/unblock
-* - block/reblock
-* - delete/delete
-* - delete/restore
-* - newusers/create
-* - newusers/create2
-* - newusers/autocreate
-* - move/move
-* - move/move_redir
-* - protect/protect
-* - protect/modifyprotect
-* - protect/unprotect
-* - protect/move_prot
-* - upload/upload
-* - merge/merge
-* - import/upload
-* - import/interwiki
-*
-* As well as the following Auto Edit Summaries:
-* - blank
-* - replace
-* - rollback
-* - undo
-*/
-
-   /**
 * @covers RecentChange::parseParams
 */
public function testParseParams() {
diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php 
b/tests/phpunit/includes/logging/LogFormatterTest.php
index 5d8a258..1816708 100644
--- a/tests/phpunit/includes/logging/LogFormatterTest.php
+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
@@ -308,6 +308,44 @@
}
 
/**
+* The testIrcMsgForAction* tests are supposed to cover the hacky
+* LogFormatter::getIRCActionText / bug 34508
+*
+* Third parties bots listen to those messages. They are clever enough
+* to fetch the i18n messages from the wiki and then analyze the IRC 
feed
+* to reverse engineer the $1, $2 messages.
+* One thing bots can not detect is when MediaWiki change the meaning of
+* a message like what happened when we deployed 1.19. $1 became the 
user
+* performing the action which broke basically all bots around.
+*
+* Should cover the following log actions (which are most commonly used 
by bots):
+* - block/block
+* - block/unblock
+* - block/reblock
+* - delete/delete
+* - delete/restore
+* - newusers/create
+* - newusers/create2
+* - newusers/autocreate
+* - move/move
+* - move/move_redir
+* - protect/protect
+* - protect/modifyprotect
+* - protect/unprotect
+* - protect/move_prot
+* - upload/upload
+* - merge/merge
+* - import/upload
+* - import/interwiki
+*
+* As well as the following Auto Edit Summaries:
+* - blank
+* - replace
+* - rollback
+* - undo
+*/
+
+   /**
 * @covers LogFormatter::getIRCActionComment
 * @covers LogFormatter::getIRCActionText
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf537aaca2a0ca9d2c509499f6da5b9e51b06037
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Aude 
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] otrs: Install libyaml-libyaml-perl - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: otrs: Install libyaml-libyaml-perl
..


otrs: Install libyaml-libyaml-perl

This is a required package according to
/opt/otrs/bin/otrs.CheckModules.pl output. Thankfully it exists in
Debian/Ubuntu, package name is libyaml-libyaml-perl (not to be confused
with libyaml-perl)

Change-Id: I6e7e9b47bfd2043b6f94edd02ce11eead192d130
---
M modules/otrs/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index f139367..5e6720e 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -68,6 +68,7 @@
 'libsoap-lite-perl',
 'libtext-csv-xs-perl',
 'libtimedate-perl',
+'libyaml-libyaml-perl',
 'mysql-client',
 'perl-doc',
 ]

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

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

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

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

[Cdentinger (Code Review)]

Cdentinger has uploaded a new change for review.

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

Change subject: Update DonationInterface submodule
..

Update DonationInterface submodule

Change-Id: I606b16ba29ea558b19543512aed1e3c030300cc0
---
M extensions/DonationInterface
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/241064/1

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 381faf5..7bad86c 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 381faf50bf1fd4bd42125f5dd67c4ba9b227e77d
+Subproject commit 7bad86c58f501dd1223424af702967711676c662

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606b16ba29ea558b19543512aed1e3c030300cc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Cdentinger 

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

[MediaWiki-commits] [Gerrit] KVStore: batched, more resilient implementation of TTL for i... - change (mediawiki...CentralNotice)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: KVStore: batched, more resilient implementation of TTL for items
..


KVStore: batched, more resilient implementation of TTL for items

Bug: T111385
Change-Id: Idb71795d5d7ad7eaddd03554bc2d5cb6461f5ed9
---
M resources/subscribing/ext.centralNotice.kvStore.js
M resources/subscribing/ext.centralNotice.kvStoreMaintenance.js
M resources/subscribing/ext.centralNotice.startUp.js
3 files changed, 157 insertions(+), 127 deletions(-)

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



diff --git a/resources/subscribing/ext.centralNotice.kvStore.js 
b/resources/subscribing/ext.centralNotice.kvStore.js
index a728ce6..716d2eb 100644
--- a/resources/subscribing/ext.centralNotice.kvStore.js
+++ b/resources/subscribing/ext.centralNotice.kvStore.js
@@ -9,12 +9,20 @@
var KVStorageContext,
kvStore,
error = null,
-   PREFIX = 'CentralNoticeKVStore',
-   SEPARATOR = '|',
campaignName = null,
bannerName = null,
category = null,
-   maintenance = mw.centralNotice.kvStoreMaintenance;
+   now = Math.round( ( new Date() ).getTime() / 1000 ),
+
+   SEPARATOR = '|',
+   FIND_KEY_REGEX = /\|([^|]*)$/,
+
+   // Prefix for all localStorage keys. Must correspond with 
PREFIX_REGEX
+   // in ext.centralNotice.kvStoreMaintenance.js
+   PREFIX = 'CentralNoticeKV',
+
+   // TTL of KV store items is 1/2 year, in seconds
+   ITEM_TTL = 15768000;
 
/**
 * A context for key-value storage.
@@ -111,7 +119,7 @@
 * Does this browser support our KV storage mechanism?
 */
isAvailable: function() {
-   return ( typeof window.localStorage === 'object' );
+   return Boolean( window.localStorage );
},
 
/**
@@ -134,7 +142,7 @@
 */
setItem: function( key, value, context ) {
 
-   var lsKey, encodedValue;
+   var lsKey, encodedWrappedValue;
 
// Check validity of key
if ( key.indexOf( SEPARATOR ) !== -1 ) {
@@ -143,19 +151,21 @@
}
 
lsKey = makeKeyForLocalStorage( key, context );
-   encodedValue = JSON.stringify( value );
+   encodedWrappedValue = JSON.stringify( {
+   expiry: ITEM_TTL + now,
+   val: value
+   } );
 
// Write the value
-   localStorage.setItem( lsKey, encodedValue );
+   localStorage.setItem( lsKey, encodedWrappedValue );
 
// Check that it was written (it might not have been, 
if we're over
// the localStorage quota for this site, for example)
-   if ( localStorage.getItem( lsKey ) !== encodedValue ) {
+   if ( localStorage.getItem( lsKey ) !== 
encodedWrappedValue ) {
setError( 'Couldn\'t write value', key, value, 
context );
return false;
}
 
-   maintenance.touchItem( lsKey );
return true;
},
 
@@ -169,19 +179,16 @@
 */
getItem: function ( key, context ) {
var lsKey = makeKeyForLocalStorage( key, context ),
-   rawValue, value, maintenanceOK;
+   rawValue, wrappedValue;
 
-   if ( !maintenance.expiredItemsRemoved ) {
-   maintenanceOK = 
maintenance.removeExpiredItems();
-   if ( !maintenanceOK ) {
-   setError( 'Maintenance error', key, 
value, context );
-   return false;
-   }
+   rawValue = localStorage.getItem( lsKey );
+
+   if ( rawValue === null ) {
+   return null;
}
 
try {
-   rawValue = localStorage.getItem( lsKey );
-   value = JSON.parse( rawValue );
+   wrappedValue = JSON.parse( rawValue );
 
} catch ( e ) {
 
@@ -204,8 +211,11 @@
}
}
 
-   maintenance.touchItem( lsKey );
-   return value;
+   if ( !wrappedValue.expiry || 

[MediaWiki-commits] [Gerrit] Simplify logging in ssh module - change (mediawiki...scap)

[Chad (Code Review)]

Chad has submitted this change and it was merged.

Change subject: Simplify logging in ssh module
..


Simplify logging in ssh module

Attach ourself to the context logger

Change-Id: I5462b3e5f537a46e3f8c497bff40c53417e31aab
---
M scap/ssh.py
1 file changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/scap/ssh.py b/scap/ssh.py
index 0954269..1c50872 100644
--- a/scap/ssh.py
+++ b/scap/ssh.py
@@ -7,7 +7,6 @@
 
 """
 import errno
-import logging
 import os
 import random
 import select
@@ -23,19 +22,17 @@
 
 class Job(object):
 """Execute a job on a group of remote hosts via ssh."""
-_logger = None
-
-def __init__(self, hosts=None, command=None, user=None):
+@utils.log_context('ssh.job')
+def __init__(self, hosts=None, command=None, user=None, logger=None):
 self.hosts(hosts or [])
 self._command = command
 self._reporter = None
 self._user = user
 self.max_failure = len(hosts)
+self._logger = logger
 
 def get_logger(self):
 """Lazy getter for a logger instance."""
-if self._logger is None:
-self._logger = logging.getLogger('scap.ssh.job')
 return self._logger
 
 def hosts(self, hosts):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5462b3e5f537a46e3f8c497bff40c53417e31aab
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [PipeEscape] Add translatable extensionname - change (mediawiki...PipeEscape)

[Purodha (Code Review)]

Purodha has uploaded a new change for review.

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

Change subject: [PipeEscape] Add translatable extensionname
..

[PipeEscape] Add translatable extensionname

Change-Id: I2b7e38bbc886e3c7172c17fdbbac37ad7858f778
---
M PipeEscape.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PipeEscape 
refs/changes/69/241069/1

diff --git a/PipeEscape.php b/PipeEscape.php
index 9e0e1d4..8803fa7 100644
--- a/PipeEscape.php
+++ b/PipeEscape.php
@@ -31,6 +31,8 @@
'version' => ExtPipeEsc::VERSION,
'url' => 
'https://www.mediawiki.org/wiki/Extension:Pipe_Escape',
'descriptionmsg'  => 'pipeescape-desc',
+   'namemsg' => 'pipeescape-extensionname',
+   'license-name' => 'GPL-2.0+',
 );
 
 $dir = dirname(__FILE__) . DIRECTORY_SEPARATOR;
diff --git a/i18n/en.json b/i18n/en.json
index d164438..f161976 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,6 @@
"Purodha"
]
},
-   "pipeescape-desc": "Parser function #! for when you want a 
pipe character to be just a pipe character"
+   "pipeescape-desc": "Parser function #! for when you want a 
pipe character to be just a pipe character",
+   "pipeescape-extensionname": "Pipe Escape"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index fb9cd4f..a587834 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -5,5 +5,6 @@
"Purodha"
]
},
-   "pipeescape-desc": 
"{{desc|name=[[:mw:Extension:Pipe_Escape|Pipe_Escape]]}}"
+   "pipeescape-desc": 
"{{desc|name=[[:mw:Extension:Pipe_Escape|Pipe_Escape]]}}",
+   "pipeescape-extensionname": "{{optional}} The name for this extension."
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b7e38bbc886e3c7172c17fdbbac37ad7858f778
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PipeEscape
Gerrit-Branch: master
Gerrit-Owner: Purodha 

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

[MediaWiki-commits] [Gerrit] Remove tox-*-trusty job templates - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Remove tox-*-trusty job templates
..

Remove tox-*-trusty job templates

They are no more used, all jobs have been migrated to the -jessie
equivalent which runs on Nodepool.

Change-Id: Ifa9290c63c0e0bf419f3d749a56bd1c250c3a9cc
---
M jjb/python-jobs.yaml
1 file changed, 0 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/51/241051/1

diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 1088e10..bc1f51d 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -48,40 +48,6 @@
 publishers:
  - archive-log-dir
 
-# Invoke a tox environement on Trusty, non-generic
-#
-# Ubuntu Trusty provides:
-# python 2.7.6
-# python 3.4.0
-#
-# Parameter: {toxenv}
-- job-template:
-name: '{name}-tox-{toxenv}-trusty'
-node: contintLabsSlave && UbuntuTrusty
-defaults: use-remoteonly-zuul
-concurrent: true
-triggers:
- - zuul
-builders:
- - tox:
- venv: '{toxenv}'
-publishers:
- - archive-log-dir
-
-# Generic version of above
-- job-template:
-name: 'tox-{toxenv}-trusty'
-node: contintLabsSlave && UbuntuTrusty
-defaults: use-remote-zuul-shallow-clone
-concurrent: true
-triggers:
- - zuul
-builders:
- - tox:
- venv: '{toxenv}'
-publishers:
- - archive-log-dir
-
 # Same for Jessie
 - job-template:
 name: 'tox-{toxenv}-jessie'
@@ -164,5 +130,4 @@
 
 jobs:
  - 'tox-{toxenv}'
- - 'tox-{toxenv}-trusty'
  - 'tox-{toxenv}-jessie'

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

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

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

[MediaWiki-commits] [Gerrit] Updated RuboCop to the latest version - change (mediawiki...ContentTranslation)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Updated RuboCop to the latest version
..

Updated RuboCop to the latest version

After applying recommended base configuration, there was nothing else
left to fix.

https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#Base_confi
guration

Bug: T113742
Change-Id: I0150e5c2a5f8eaa3fe9c7c7d7d1d291c8e25626c
---
M .rubocop.yml
D .rubocop_todo.yml
M Gemfile
M Gemfile.lock
4 files changed, 21 insertions(+), 15 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/54/241054/1

diff --git a/.rubocop.yml b/.rubocop.yml
index 502025c..84567a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,20 @@
-inherit_from: .rubocop_todo.yml
+AllCops:
+  StyleGuideCopsOnly: true
 
 Metrics/LineLength:
   Max: 100
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Style/TrivialAccessors:
+  ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 64386e4..000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-01-08 13:11:06 +0200 using RuboCop version 0.28.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 6
-Style/Documentation:
-  Enabled: false
diff --git a/Gemfile b/Gemfile
index 858dbcd..f8d25c5 100755
--- a/Gemfile
+++ b/Gemfile
@@ -3,5 +3,5 @@
 gem 'commons_upload', '~> 0.0.3'
 gem 'mediawiki_api', '~> 0.3.1'
 gem 'mediawiki_selenium', '~> 0.4.2'
-gem 'rubocop', '~> 0.29.1', require: false
+gem 'rubocop', '~> 0.34.2', require: false
 gem 'screenshot', '~> 0.0.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8381335..841a208 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,9 +70,9 @@
   netrc (~> 0.7)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
-rubocop (0.29.1)
+rubocop (0.34.2)
   astrolabe (~> 1.3)
-  parser (>= 2.2.0.1, < 3.0)
+  parser (>= 2.2.2.5, < 3.0)
   powerpack (~> 0.1)
   rainbow (>= 1.99.1, < 3.0)
   ruby-progressbar (~> 1.4)
@@ -101,5 +101,5 @@
   commons_upload (~> 0.0.3)
   mediawiki_api (~> 0.3.1)
   mediawiki_selenium (~> 0.4.2)
-  rubocop (~> 0.29.1)
+  rubocop (~> 0.34.2)
   screenshot (~> 0.0.6)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0150e5c2a5f8eaa3fe9c7c7d7d1d291c8e25626c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] Fix Monobook skin rendering of banner - change (mediawiki...WikidataPageBanner)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Fix Monobook skin rendering of banner
..

Fix Monobook skin rendering of banner

Bug: T113746
Change-Id: I08915629f1d4ab8d8dfdfcc70b3a30661eb3d132
---
M includes/WikidataPageBanner.functions.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner 
refs/changes/57/241057/1

diff --git a/includes/WikidataPageBanner.functions.php 
b/includes/WikidataPageBanner.functions.php
index 63c8e64..5c99fd1 100644
--- a/includes/WikidataPageBanner.functions.php
+++ b/includes/WikidataPageBanner.functions.php
@@ -269,7 +269,7 @@
global $wgWPBEnableHeadingOverride;
 
if ( in_array( $out->getSkin()->getSkinName(), 
self::$blacklistSkins ) ) {
-   $out->prependHtml( $banner );
+   $out->prependHtml( $html );
}
if ( $wgWPBEnableHeadingOverride ) {
$htmlTitle = $out->getHTMLTitle();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08915629f1d4ab8d8dfdfcc70b3a30661eb3d132
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
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] adds sparql lookup function for metric metadata removes mark... - change (wikidata...dashboard)

[Christopher Johnson (WMDE) (Code Review)]

Christopher Johnson (WMDE) has submitted this change and it was merged.

Change subject: adds sparql lookup function for metric metadata removes 
markdown files modifies owl to make legal uris
..


adds sparql lookup function for metric metadata
removes markdown files
modifies owl to make legal uris

Bug: T113180
Change-Id: I4f44d6fce427a1505242b8b11f3d6bc48544cd20
---
M README.md
A assets/catalog-v001.xml
D assets/content/wikidata-active-users.md
D assets/content/wikidata-content-overview.md
D assets/content/wikidata-content-refstmts.md
D assets/content/wikidata-edits.md
D assets/content/wikidata-pages.md
D assets/content/wikidata-properties.md
D assets/content/wikidata-social-media.md
D assets/content/wikidata_content_descriptions_item.md
D assets/content/wikidata_content_items.md
D assets/content/wikidata_content_labels_item.md
D assets/content/wikidata_content_references.md
D assets/content/wikidata_content_refstmts_other.md
D assets/content/wikidata_content_refstmts_wikipedia.md
D assets/content/wikidata_content_statement_item.md
D assets/content/wikidata_content_statement_ranks.md
D assets/content/wikidata_content_wikilinks_item.md
D assets/content/wikidata_mailing_lists.md
M assets/metrics.owl
M server.R
M ui.R
M utils.R
23 files changed, 469 insertions(+), 202 deletions(-)

Approvals:
  Christopher Johnson (WMDE): Verified; Looks good to me, approved



diff --git a/README.md b/README.md
index 571fb08..80ebb77 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,40 @@
 "ggplot2", "toOrdinal", "plyr", "lubridate", "magrittr"))
 ```
 
+Install RRDF Support:
+
+Install Oracle 8 JRE:
+
+```
+echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee 
/etc/apt/sources.list.d/webupd8team-java.list
+echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | 
tee -a /etc/apt/sources.list.d/webupd8team-java.list
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
+apt-get update
+apt-get install oracle-java8-installer
+exit
+```
+
+then configure R to use it:
+```
+R CMD javareconf
+```
+
+Install rJava:
+```
+$ R
+> install.packages("rJava")
+```
+Download rrdf and rrdflibs from CRAN:
+```
+wget https://cran.r-project.org/src/contrib/Archive/rrdf/rrdf_2.0.2.tar.gz
+wget 
https://cran.r-project.org/src/contrib/Archive/rrdflibs/rrdflibs_1.3.0.tar.gz
+```
+Install rrdflibs and rrdf:
+```
+R CMD INSTALL rrdflibs_1.3.0.tar.gz
+R CMD INSTALL rrdf_2.0.2.tar.gz
+```
+
 Run the server:
 
 ```
diff --git a/assets/catalog-v001.xml b/assets/catalog-v001.xml
new file mode 100644
index 000..396e327
--- /dev/null
+++ b/assets/catalog-v001.xml
@@ -0,0 +1,6 @@
+
+
+
+http://wikiba.se/metrics; uri="metrics.owl"/>
+
+
diff --git a/assets/content/wikidata-active-users.md 
b/assets/content/wikidata-active-users.md
deleted file mode 100644
index 5f1f006..000
--- a/assets/content/wikidata-active-users.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Wikidata Active Users
-===
-
-* Type: Aggregate
-* Source:
-* Update Interval:
-* Reliability:
-* Description:
diff --git a/assets/content/wikidata-content-overview.md 
b/assets/content/wikidata-content-overview.md
deleted file mode 100644
index a3fc970..000
--- a/assets/content/wikidata-content-overview.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Wikidata Content Overview
-===
-
-* Type: Aggregate
-* Source:
-* Update Interval:
-* Reliability:
-* Description:
diff --git a/assets/content/wikidata-content-refstmts.md 
b/assets/content/wikidata-content-refstmts.md
deleted file mode 100644
index 4b1ad90..000
--- a/assets/content/wikidata-content-refstmts.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Referenced Statements
-===
-
-* Type: Aggregate
-* Source:
-* Update Interval:
-* Reliability:
-* Description:
diff --git a/assets/content/wikidata-edits.md b/assets/content/wikidata-edits.md
deleted file mode 100644
index 6ca2876..000
--- a/assets/content/wikidata-edits.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Wikidata Edits
-===
-
-* Type: Aggregate
-* Source:
-* Update Interval:
-* Reliability:
-* Description:
diff --git a/assets/content/wikidata-pages.md b/assets/content/wikidata-pages.md
deleted file mode 100644
index 0e2f9e4..000
--- a/assets/content/wikidata-pages.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Wikidata Pages
-===
-
-* Type: Aggregate
-* Source:
-* Update Interval:
-* Reliability:
-* Description:
diff --git a/assets/content/wikidata-properties.md 
b/assets/content/wikidata-properties.md
deleted file mode 100644
index f6d317e..000
--- a/assets/content/wikidata-properties.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Wikidata Properties
-===
-
-* Type: Aggregate
-* Source:
-* Update Interval:
-* Reliability:
-* Description:
diff --git a/assets/content/wikidata-social-media.md 
b/assets/content/wikidata-social-media.md
deleted file mode 100644
index f6270a5..000
--- a/assets/content/wikidata-social-media.md
+++ /dev/null
@@ -1,8 +0,0 @@

[MediaWiki-commits] [Gerrit] Test JSON and XML output - change (mediawiki...WikibaseQualityExternalValidation)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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

Change subject: Test JSON and XML output
..

Test JSON and XML output

Note that XML tests are skipped for now.
They are to be fixed in follow-up changes.

Bug: T113033
Change-Id: I780b9524a8bbcb46a383b380cfc9cc0ac3b27a4c
---
M tests/phpunit/Serializer/ComparisonResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
M tests/phpunit/Serializer/SerializerTestBase.php
6 files changed, 325 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
 refs/changes/62/241062/1

diff --git a/tests/phpunit/Serializer/ComparisonResultSerializerTest.php 
b/tests/phpunit/Serializer/ComparisonResultSerializerTest.php
index c397fc7..68ecfab 100755
--- a/tests/phpunit/Serializer/ComparisonResultSerializerTest.php
+++ b/tests/phpunit/Serializer/ComparisonResultSerializerTest.php
@@ -2,6 +2,7 @@
 
 namespace WikibaseQuality\ExternalValidation\Tests\Serializer;
 
+use DataValues\DataValue;
 use WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult;
 use WikibaseQuality\ExternalValidation\Serializer\ComparisonResultSerializer;
 
@@ -50,6 +51,9 @@
);
}
 
+   /**
+* @return DataValue
+*/
private function getDataValueMock() {
return $this->getMock( 'DataValues\DataValue' );
}
@@ -186,6 +190,53 @@
);
}
 
+   /**
+* @return array an array of array( JSON, object to serialize)
+*/
+   public function serializationJSONProvider() {
+   return array(
+   array(
+   '{'
+   . '"localValue":"foobar",'
+   . '"externalValues":["foobar","foobar"],'
+   . '"result":"partial-match"'
+   . '}',
+   new ComparisonResult(
+   $this->getDataValueMock(),
+   array(
+   $this->getDataValueMock(),
+   $this->getDataValueMock()
+   ),
+   ComparisonResult::STATUS_PARTIAL_MATCH
+   ),
+   ),
+   );
+   }
+
+   /**
+* @return array an array of array( XML, object to serialize)
+*/
+   public function serializationXMLProvider() {
+   return array(
+   array(
+   ''
+   . ''
+   . '  foobar'
+   . '  foobar'
+   . ''
+   . '',
+   new ComparisonResult(
+   $this->getDataValueMock(),
+   array(
+   $this->getDataValueMock(),
+   $this->getDataValueMock()
+   ),
+   ComparisonResult::STATUS_PARTIAL_MATCH
+   ),
+   ),
+   );
+   }
+
protected function buildSerializer( $shouldIndexTags = false ) {
$serializerMock = $this->getMock( 'Serializers\Serializer' );
$serializerMock->expects( $this->any() )
diff --git a/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php 
b/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
index afeacc6..580245b 100755
--- a/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
+++ b/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
@@ -144,4 +144,52 @@
 
return $mock;
}
+
+   /**
+* @return array an array of array( JSON, object to serialize)
+*/
+   public function serializationJSONProvider() {
+   return array(
+   array(
+   '{'
+   . '"P42":["foobar","foobar"],'
+   . '"P31":["foobar"]'
+   . '}',
+   new CrossCheckResultList(
+   array(
+   $this->getCrossCheckResultMock( 
new PropertyId( 'P42' ) ),
+ 

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/medi... - change (mediawiki...ArticlePlaceholder)

[Lucie Kaffee (Code Review)]

Lucie Kaffee has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticlePlaceholder into 
T109447
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticlePlaceholder into 
T109447

Change-Id: I31bb1fb6c1069e0d9d2cb2c3af95cd77b4963d25
---
M ArticlePlaceholder.php
M includes/Lua/EntityRenderer.lua
2 files changed, 71 insertions(+), 19 deletions(-)


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

diff --git a/ArticlePlaceholder.php b/ArticlePlaceholder.php
index 2d7e10c..e9074a8 100644
--- a/ArticlePlaceholder.php
+++ b/ArticlePlaceholder.php
@@ -37,4 +37,4 @@
 $wgSpecialPages[ 'FancyUnicorn' ] = array(
'ArticlePlaceholder\Specials\SpecialFancyUnicorn',
'newFromGlobalState'
-);
+);
\ No newline at end of file
diff --git a/includes/Lua/EntityRenderer.lua b/includes/Lua/EntityRenderer.lua
index 48720a7..2c88d43 100644
--- a/includes/Lua/EntityRenderer.lua
+++ b/includes/Lua/EntityRenderer.lua
@@ -1,5 +1,8 @@
 local entityrenderer = {}
 
+entityrenderer.imageProperty = 'P6'
+entityrenderer.identifierProperties = {}
+
 -- render an entity
 entityrenderer.render = function(frame)
   local entityID = mw.text.trim( frame.args[1] or "" )
@@ -7,13 +10,27 @@
   result = ""
 
   local description = entityrenderer.descriptionRenderer( entityID )
+  local image = entityrenderer.topImageRenderer( entity, 
entityrenderer.imageProperty, "right" )
   local entityResult = entityrenderer.statementListRenderer( entity )
 
-  result = result .. "Description: " ..  description .. ""
+  result = result .. "Description: " ..  description .. " "
+  result = result .. image .. ""
   result = result .. "Entity" .. "" .. entityResult
-  --local snak = entityrenderer.snakRenderer(  )
 
   return result
+end
+
+entityrenderer.getBestStatements = function( entity, propertyId )
+  local statement = ""
+  local bestStatements = entity:getBestStatements( propertyId )
+  for _, stat in pairs( bestStatements ) do
+if entityrenderer.getDatavalue( propertyId ) == "commonsMedia" then
+  statement = statement .. entityrenderer.imageRenderer( stat, "center" )
+else
+  statement = statement .. entityrenderer.statementRenderer(stat)
+end
+  end
+  return statement
 end
 
 --- Implementation of Renderers 
---
@@ -24,15 +41,9 @@
   local properties = entityrenderer.statementSorter( entity )
   if properties ~= nil then
 for _, propertyId in pairs( properties ) do
-  if propertyId ~= nil then
-result = result .. "" .. 
entityrenderer.labelRenderer(propertyId) .. "" .. ""
-local bestStatements = entity:getBestStatements( propertyId )
-for _, stat in pairs(bestStatements) do
-  local statement = entityrenderer.statementRenderer(stat)
-  if statement ~= nil then
-result = result .. " " .. statement
-  end
-end
+  if propertyId ~= entityrenderer.imageProperty then
+result = result .. "" .. entityrenderer.labelRenderer( 
propertyId ) .. " " .. ""
+result = result .. entityrenderer.getBestStatements( entity, 
propertyId )
   end
 end
   end
@@ -49,16 +60,57 @@
 -- Renders a statement.
 entityrenderer.statementRenderer = function( statement )
   local result = ""
+  local reference = ""
+  local qualifier = ""
+  local mainsnak = ""
   if statement ~= nil then
 for key, value in pairs( statement ) do
-  if key == "references" then result = result .. "Reference" .. 
"" .. entityrenderer.referenceRenderer( value )
-elseif key == "qualifiers" then result = result .. "Qualifier" .. 
"" .. entityrenderer.qualifierRenderer( value )
-  --elseif key == "mainsnak" then result = result .. "Mainsnak:" .. 
"" .. entityrenderer.snakRenderer( value )
+  if key == "mainsnak" then mainsnak = mw.wikibase.renderSnak( value, key )
+  elseif key == "references" then reference = "Reference" .. 
"" .. entityrenderer.referenceRenderer( value )
+  elseif key == "qualifiers" then qualifier = "Qualifier" .. 
"" .. entityrenderer.qualifierRenderer( value )
   end
 end
   end
+  result = result .. mainsnak .. reference .. qualifier
   return result
 end
+
+-- Get the datavalue for a property.
+entityrenderer.getDatavalue = function( propertyId )
+  local property = mw.wikibase.getEntity( propertyId )
+  return property['datatype']
+end
+
+-- Render the image.
+-- @param String propertyId
+-- @return String renderedImage
+entityrenderer.imageRenderer = function( statement, orientationImage )
+  local result = ""
+  local reference = ""
+  local qualifier = ""
+  local image = ""
+  if statement ~= nil then
+for key, value in pairs( statement ) do
+  if key == 

[MediaWiki-commits] [Gerrit] [WIP] Add optional canary deploy group and check - change (mediawiki...scap)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: [WIP] Add optional canary deploy group and check
..

[WIP] Add optional canary deploy group and check

Adds optional `canary_dsh_targets` config variable that behaves the same
as `dsh_targets` (if it's an abolute path, use it, otherwise look for
`/etc/dsh/groups/[file]`).

Adds a `canary_check` stage to `DeployLocal` that is yet to be
implemented, but happens post canary-fetch, -promote, and -check and can be
used for extended canary checks.

Currently, after canary deploy, it waits for input from user; however,
idealy, `cannary_check` could continue to run while waiting for user input.

Bug: T113073
Change-Id: I7d1235197356201626a88056fefa344ddf92d2dd
---
M scap/main.py
1 file changed, 72 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/66/241066/1

diff --git a/scap/main.py b/scap/main.py
index e707533..548a536 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -579,7 +579,7 @@
 class DeployLocal(cli.Application):
 """Deploy service code via git"""
 STAGES = ['fetch', 'promote', 'check']
-EX_STAGES = ['rollback']
+EX_STAGES = ['rollback', 'canary_check']
 
 rev = None
 cache_dir = None
@@ -724,6 +724,10 @@
 self.promote()
 self._remove_progress_link()
 
+def canary_check(self):
+"""Extended checks, only preformed on canary deployment machines"""
+pass
+
 def _link_rev_dir(self, symlink_path):
 tasks.move_symlink(self.rev_dir, symlink_path, user=self.user)
 
@@ -788,11 +792,29 @@
 utils.read_hosts_file(self.config['dsh_targets'])
 )
 
-logger.info(
-'Deploy will run on the following targets: \n\t- {}'.format(
-'\n\t- '.join(self.targets)
-)
-)
+self.canary_targets = utils.read_hosts_file(
+self.config.get('canary_dsh_targets', '/dev/null'))
+
+self.all_targets = self.canary_targets + self.targets
+
+# Remove any canary targets from other targets
+self.targets = list(set(self.targets) - set(self.canary_targets))
+
+if not len(self.all_targets):
+logger.warn('No targets selected, check limits and dsh_targets')
+return 1
+
+canary_target_msg = ''
+if len(self.canary_targets):
+canary_target_msg = '\n== CANARIES ==\n:*{}'.format(
+'\n:* '.join(self.canary_targets))
+
+target_msg = ''
+if len(self.targets):
+target_msg = '\n\n== TARGETS ==\n:* {}\n'.format(
+'\n:* '.join(self.targets))
+
+logger.info('{}{}'.format(canary_target_msg, target_msg))
 
 with utils.lock(self.config['lock_file']):
 with log.Timer('deploy_' + self.repo):
@@ -817,26 +839,63 @@
 # apache server
 tasks.git_update_server_info(self.config['git_submodules'])
 
-for stage in stages:
-ret = self.execute_stage(stage)
-if ret > 0:
-self.execute_rollback(stage)
-return ret
+deploy_groups = [
+{'name': 'Canary',
+ 'targets': self.canary_targets,
+ 'stages': stages + ['canary_check'],
+ 'check': True},
+{'name': 'Normal',
+ 'targets': self.targets,
+ 'stages': stages,
+ 'check': False},
+]
+
+return self._execute_for_groups(deploy_groups)
+return 0
+
+def _execute_for_groups(self, deploy_groups):
+logger = self.get_logger()
+for group in deploy_groups:
+if not len(group['targets']):
+continue
+
+logger.info('== {} deploy group =='.format(group['name']))
+
+ret = self._execute_stages(group['stages'], group['targets'])
+if ret != 0:
+return ret
+
+prompt = '{} deploy successful. Continue?'.format(
+group['name'])
+
+if group['check'] and utils.ask(prompt, 'y') != 'y':
+break
 
 return 0
+
+def _execute_stages(self, stages, targets):
+for stage in stages:
+job = ssh.Job(hosts=targets, user=self.config['ssh_user'])
+ret = self.execute_stage(stage, job)
+if ret > 0:
+self.execute_rollback(stage)
+return ret
+return ret
 
 def execute_rollback(self, stage):
 prompt = "Stage '{}' failed. Perform rollback?".format(stage)
 
+job = ssh.Job(hosts=self.all_targets, user=self.config['ssh_user'])
 if utils.ask(prompt, 'y') == 'y':
-return 

[MediaWiki-commits] [Gerrit] A context manager for managing nested loggers - change (mediawiki...scap)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: A context manager for managing nested loggers
..


A context manager for managing nested loggers

Change-Id: I00351d69f2eaa36fc859848363f98e438b138c34
---
M scap/utils.py
1 file changed, 54 insertions(+), 0 deletions(-)

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



diff --git a/scap/utils.py b/scap/utils.py
index b356406..cc599a2 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -24,6 +24,7 @@
 
 from . import ansi
 from datetime import datetime
+from functools import wraps
 
 
 class LockFailedError(Exception):
@@ -273,6 +274,59 @@
 yield subdir
 
 
+logger_stack = []
+
+
+@contextlib.contextmanager
+def context_logger(context_name, *args):
+"""
+context_logger is a context manager that maintains nested logger
+contexts. Each time you enter a with block using this context manager,
+a named logger is set up as a child of the current logger.
+When exiting the with block, the logger gets popped off the stack and
+the parent logger takes it's place as the 'current' logging context.
+
+The easiest way to use this is to decorate a function with log_context,
+For Example::
+
+@log_context('name')
+def my_func(some, args, logger=None):
+logger.debug('something')
+
+"""
+if len(logger_stack) < 1:
+logger_stack.append(logging.getLogger())
+
+parent = logger_stack[-1]
+
+logger = parent.getChild(context_name)
+logger_stack.append(logger)
+try:
+yield logger
+finally:
+logger_stack.pop()
+
+
+def log_context(context_name):
+"""Decorator to wrap the a function in a new context_logger,
+   the logger is passed to the function via a kwarg named 'logger'"""
+def arg_wrapper(func):
+@wraps(func)
+def context_wrapper(*args, **kwargs):
+if 'logger' in kwargs:
+return func(*args, **kwargs)
+
+with context_logger(context_name) as logger:
+kwargs['logger'] = logger
+return func(*args, **kwargs)
+return context_wrapper
+return arg_wrapper
+
+
+def get_logger():
+return logger_stack[-1]
+
+
 @contextlib.contextmanager
 def lock(filename):
 """Context manager. Acquires a file lock on entry, releases on exit.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00351d69f2eaa36fc859848363f98e438b138c34
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Convert log.Timer and log.Stats to use context logger - change (mediawiki...scap)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Convert log.Timer and log.Stats to use context logger
..

Convert log.Timer and log.Stats to use context logger

Change-Id: Ibd72c991040eb07810dd4f3c435c475743df7d4c
---
M scap/log.py
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/67/241067/1

diff --git a/scap/log.py b/scap/log.py
index 00f8504..caa4bb7 100644
--- a/scap/log.py
+++ b/scap/log.py
@@ -258,8 +258,9 @@
 See  for details.
 """
 
-def __init__(self, host, port):
-self.logger = logging.getLogger('stats')
+@utils.log_context('stats')
+def __init__(self, host, port, logger=None):
+self.logger = logger
 self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 self.address = (host, port)
 
@@ -301,7 +302,8 @@
 ... t.mark('copy phase 2')
 """
 
-def __init__(self, label, stats=None):
+@utils.log_context('timer')
+def __init__(self, label, stats=None, logger=None):
 """
 :param label: Label for block (e.g. 'scap' or 'rsync')
 :type label: str
@@ -310,7 +312,7 @@
 """
 self.label = label
 self.stats = stats
-self.logger = logging.getLogger('timer')
+self.logger = logger
 
 def mark(self, label):
 """

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd72c991040eb07810dd4f3c435c475743df7d4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
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] Removing deprecated modules(8) - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Removing deprecated modules(8)
..


Removing deprecated modules(8)

Fixes all the calls to deprecated modules to reference the new
module names. And if the old or deprecated modules is called or required
in an extension, it will be corrected to reference the new name.

Bug: T113289
Change-Id: I17cf17c4808e0f5cfa7b767ecaffa3274c742b89
---
M resources/mobile.toggle/toggle.js
M resources/skins.minerva.scripts.top/init.js
M resources/skins.minerva.scripts/preInit.js
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/resources/mobile.toggle/toggle.js 
b/resources/mobile.toggle/toggle.js
index 2227e0f..04ee721 100644
--- a/resources/mobile.toggle/toggle.js
+++ b/resources/mobile.toggle/toggle.js
@@ -312,6 +312,6 @@
_getExpandedSections: getExpandedSections,
_expandStoredSections: expandStoredSections,
_cleanObsoleteStoredSections: cleanObsoleteStoredSections
-   } ).deprecate( 'toggle' );
+   } );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/skins.minerva.scripts.top/init.js 
b/resources/skins.minerva.scripts.top/init.js
index 5b122de..abfafe5 100644
--- a/resources/skins.minerva.scripts.top/init.js
+++ b/resources/skins.minerva.scripts.top/init.js
@@ -49,7 +49,7 @@
}
 
// bind events
-   M.define( 'mobile.head/mainMenu', mainMenu ).deprecate( 'mainMenu' );
+   M.define( 'mobile.head/mainMenu', mainMenu );
// FIXME: Remove when cache expires. 
https://phabricator.wikimedia.org/T112315
M.on( 'history-link-loaded', initHistoryLink );
M.on( 'header-loaded', function () {
diff --git a/resources/skins.minerva.scripts/preInit.js 
b/resources/skins.minerva.scripts/preInit.js
index 9e6d7db..8ee7906 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -19,7 +19,7 @@
page: getCurrentPage(),
mainMenu: mainMenu
} );
-   M.define( 'mobile.startup/skin', skin ).deprecate( 'skin' );
+   M.define( 'mobile.startup/skin', skin );
 
$( window )
.on( 'resize', $.debounce( 100, $.proxy( M, 'emit', 'resize' ) 
) )
@@ -71,7 +71,7 @@
getCurrentPage: getCurrentPage
} );
 
-   M.define( 'mobile.startup/pageApi', pageApi ).deprecate( 'pageApi' );
+   M.define( 'mobile.startup/pageApi', pageApi );
 
// Recruit volunteers through the console (note console.log may not be 
a function so check via apply)
if ( window.console && window.console.log && window.console.log.apply &&

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17cf17c4808e0f5cfa7b767ecaffa3274c742b89
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Link to help documentation on global CSS/JS page edit notice - change (mediawiki...GlobalCssJs)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Link to help documentation on global CSS/JS page edit notice
..


Link to help documentation on global CSS/JS page edit notice

Also removes label from global.(js|css) message as wikitext does not
get parsed on JS/CSS pages.

Follow up to If9258b2a14061c
Bug: T110516

Change-Id: I5f0823a7d863170d73f53f200adc0238f856b98c
---
M i18n/central/en.json
M i18n/core/en.json
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/i18n/central/en.json b/i18n/central/en.json
index 9458f49..d2cba46 100644
--- a/i18n/central/en.json
+++ b/i18n/central/en.json
@@ -4,6 +4,6 @@
"Kunal Mehta"
]
},
-   "global.js": "/* Any JavaScript here will be loaded for all users on 
all wikis on every page load ([[:mw:Help:Extension:GlobalCssJs|help]]). */",
-   "global.css": "/* Any CSS here will be loaded for all users on on all 
wikis every page load ([[:mw:Help:Extension:GlobalCssJs|help]]). */"
+   "global.js": "/* Any JavaScript here will be loaded for all users on 
all wikis on every page load. See 
 
*/",
+   "global.css": "/* Any CSS here will be loaded for all users on on all 
wikis every page load. See 
 
*/"
 }
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 5b7c587..70f359b 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -10,6 +10,9 @@
"globalcssjs-warning-js": "Any JavaScript added to this page will be 
loaded on all wikis where you have an account.",
"globalcssjs-warning-css": "Any CSS added to this page will be loaded 
on all wikis where you have an account.",
"globalcssjs-custom-css-js": "Shared CSS/JavaScript for all wikis 
([[:mw:Special:MyLanguage/Help:Extension:GlobalCssJs|more information]]):",
+   "globalcssjs-warning-js": "Any JavaScript added to this page will be 
loaded on all wikis where you have an account (see 
[[mw:Help:Extension:GlobalCssJs|documentation]]).",
+   "globalcssjs-warning-css": "Any CSS added to this page will be loaded 
on all wikis where you have an account (see 
[[mw:Help:Extension:GlobalCssJs|documentation]]).",
+   "globalcssjs-custom-css-js": "Shared CSS/JavaScript for all wikis:",
"globalcssjs-custom-js": "Custom JavaScript",
"globalcssjs-custom-css": "Custom CSS",
"globalcssjs-delete-css": "Deleting CSS page on user request due to 
deployment of [[mw:Help:Extension:GlobalCssJs]]",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f0823a7d863170d73f53f200adc0238f856b98c
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/GlobalCssJs
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Migrate integration-config-tox-dib from Trusty to Jessie - change (integration/config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Migrate integration-config-tox-dib from Trusty to Jessie
..


Migrate integration-config-tox-dib from Trusty to Jessie

And to Nodepool instances in the process.  We used Trusty which has
python3.4. Nodepool instances have it as well.

Cause '{name}-tox-{toxenv}-trusty' to be orphaned. Will remove it in a
later change.

Change-Id: I112e5089aa3d2485290d0fa1a52226bfb8e33e05
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 6808692..9e08758 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -130,7 +130,7 @@
  - 'integration-zuul-layoutvalidation'
  - 'integration-zuul-layoutvalidation-gate'
  - '{name}-puppet-validate'
- - '{name}-tox-{toxenv}-trusty':
+ - '{name}-tox-{toxenv}-jessie':
  toxenv: dib
 
 - project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f5536eb..80619d2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -543,6 +543,8 @@
 parameter-function: offline_when_complete
   - name: ^pywikibot-wikibase-tox-.*-jessie$
 parameter-function: offline_when_complete
+  - name: ^integration-config-tox-.*-jessie$
+parameter-function: offline_when_complete
 
   # Experiment for analytics/kraken repository
   - name: analytics-kraken
@@ -1656,7 +1658,7 @@
 failure-message: 'Failed to compare your patchset with the current 
configuration. FAILURE'
 files: '^jjb/.*'
 
-  - name: 'integration-config-tox-dib-trusty'
+  - name: 'integration-config-tox-dib-jessie'
 files: '^dib/.*'
 
   - name: 'integration-zuul-layoutdiff'
@@ -1999,7 +2001,7 @@
   - tox-flake8
   - tox-py27
   - integration-config-puppet-validate
-  - integration-config-tox-dib-trusty
+  - integration-config-tox-dib-jessie
   - integration-jjb-config-diff
   - integration-zuul-layoutdiff
   - integration-zuul-layoutvalidation
@@ -2007,7 +2009,7 @@
   - tox-flake8
   - tox-py27
   - integration-config-puppet-validate
-  - integration-config-tox-dib-trusty
+  - integration-config-tox-dib-jessie
   - integration-jjb-config-diff
   - integration-zuul-layoutdiff
   - integration-zuul-layoutvalidation-gate

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

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

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

[MediaWiki-commits] [Gerrit] MovePageForm: Remove incorrectly copied line (dead code) - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: MovePageForm: Remove incorrectly copied line (dead code)
..


MovePageForm: Remove incorrectly copied line (dead code)

Follow-up to 5befb9b74790a99aec5514ad8f8784a4fb085288.

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

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



diff --git a/includes/specials/SpecialMovepage.php 
b/includes/specials/SpecialMovepage.php
index bc961b2..f7a0a20 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -446,8 +446,6 @@
}
 
if ( $confirm ) {
-   $watchChecked = $user->isLoggedIn() && ( $this->watch 
|| $user->getBoolOption( 'watchmoves' )
-   || $user->isWatched( $this->oldTitle ) );
$fields[] = new OOUI\FieldLayout(
new OOUI\CheckboxInputWidget( array(
'name' => 'wpConfirm',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46a6efcea701f3daccc874bd914cecc4f2db67bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [TopTenPages] restore mw unit tests - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: [TopTenPages] restore mw unit tests
..

[TopTenPages] restore mw unit tests

Even if the repository does not provide tests, we still want to run the
MediaWiki core 'extensions' testsuite which check the resource loader
registrations and autoloader (among others).

Add back extension-unittests-generic

Change-Id: Ic5dcdd2ee1ad5149e049c177ecedea547c67b92d
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/49/241049/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 80619d2..4b79eba 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6621,6 +6621,7 @@
   - name: mediawiki/extensions/TopTenPages
 template:
   - name: composer-test
+  - name: extension-unittests-generic
   - name: jsonlint
 
   - name: mediawiki/extensions/VIKI

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

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

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

[MediaWiki-commits] [Gerrit] De-decorate inside_git_dir - change (mediawiki...scap)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: De-decorate inside_git_dir
..


De-decorate inside_git_dir

Moves inside_git_dir from fragile decorator to `ensure_git_dir` utility
function. Saves an import, saves SLOC, saves brainpower.

Change-Id: Ic85b0534869f656008db6279294634ae68150acc
---
M scap/tasks.py
M scap/utils.py
2 files changed, 11 insertions(+), 34 deletions(-)

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



diff --git a/scap/tasks.py b/scap/tasks.py
index 111..122a48f 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -574,17 +574,17 @@
 return restart.progress('restart_hhvm').run(batch_size=batch_size)
 
 
-@utils.inside_git_dir
 def git_remote_exists(location, remote):
 """Check if remote exists in location"""
+utils.ensure_git_dir(location)
 with utils.cd(location):
 cmd = '/usr/bin/git config --local --get remote.{}.url'.format(remote)
 return subprocess.call(cmd, shell=True) == 0
 
 
-@utils.inside_git_dir
 def git_remote_set(location, repo, remote='origin', user='mwdeploy'):
 """set the remote at location to repo"""
+utils.ensure_git_dir(location)
 with utils.cd(location):
 if git_remote_exists(location, remote):
 cmd = '/usr/bin/git remote rm {}'.format(remote)
@@ -607,10 +607,11 @@
 utils.sudo_check_call(user, cmd)
 
 
-@utils.inside_git_dir
 def git_checkout(location, rev, submodules=False, user="mwdeploy"):
 """Checkout a git repo sha at a location as a user
 """
+utils.ensure_git_dir(location)
+
 logger = logging.getLogger('git_checkout')
 with utils.cd(location):
 logger.debug(
@@ -638,13 +639,13 @@
 subprocess.check_call(cmd, shell=True)
 
 
-@utils.inside_git_dir
 def git_update_deploy_head(deploy_info, location):
 """updates .git/DEPLOY_HEAD file
 
 :param deploy_info: current deploy info to write to file as JSON
 :param (optional) location: git directory location (default cwd)
 """
+utils.ensure_git_dir(location)
 logger = logging.getLogger('git_deploy_file')
 
 with utils.cd(location):
@@ -655,10 +656,10 @@
 f.close()
 
 
-@utils.inside_git_dir
 def git_tag_repo(deploy_info, location=os.getcwd()):
 """creates new tag in deploy repo"""
 
+utils.ensure_git_dir(location)
 with utils.cd(location):
 cmd = """
 /usr/bin/git tag -fa \\
diff --git a/scap/utils.py b/scap/utils.py
index 77eccd2..b356406 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -9,7 +9,6 @@
 import errno
 import fcntl
 import hashlib
-import inspect
 import json
 import logging
 import os
@@ -550,32 +549,9 @@
 raise IOError(e.errno, e.strerror, path)
 
 
-def inside_git_dir(func):
-"""Decorator to determine if the "location" argument is a git directory"""
-def wrapper(*args, **kwargs):
-argspec = inspect.getargspec(func)
-try:
-l = args[argspec.args.index('location')]
-except IndexError:
-l = None
-
-if l is None:
-d = None
-
-if argspec.defaults is not None:
-defaults = dict(zip(
-argspec.args[-len(argspec.defaults):],
-argspec.defaults
-))
-d = defaults.get('location')
-
-l = kwargs.get('location', d)
-
-if l is None or not is_git_dir(l):
-raise IOError(errno.ENOENT, 'Location is not a git repo', l)
-
-return func(*args, **kwargs)
-return wrapper
+def ensure_git_dir(location):
+if location is None or not is_git_dir(location):
+raise IOError(errno.ENOENT, 'Location is not a git repo', location)
 
 
 def is_git_dir(path):
@@ -594,17 +570,17 @@
 sudo_check_call(user, "mkdir -p '{}'".format(path), logger=logger)
 
 
-@inside_git_dir
 def git_sha(location, rev):
 """Returns SHA1 for things like HEAD or HEAD~~"""
+ensure_git_dir(location)
 with cd(location):
 cmd = '/usr/bin/git rev-parse --verify {}'.format(rev)
 return subprocess.check_output(cmd, shell=True).strip()
 
 
-@inside_git_dir
 def git_next_deploy_tag(location, user=get_real_username()):
 """Calculates the scap/sync/{date}/{n} tag to use for this deployment"""
+ensure_git_dir(location)
 with cd(location):
 timestamp = datetime.utcnow()
 date = timestamp.strftime('%F')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic85b0534869f656008db6279294634ae68150acc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 

[MediaWiki-commits] [Gerrit] T99836 remove trailing spaces - change (wikimedia...crm)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: T99836 remove trailing spaces
..


T99836 remove trailing spaces

I kept having to fix white space issues due to saving without these trailing 
spaces
so have made one teeny-tiny change & saved to strip the spaces out.

Committing this to master in order to avoid any conflicts. Spot the teeny-tiny 
change

Change-Id: I3dd254fbddf3141281ae8ae0be599558437b5283
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 33 insertions(+), 33 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 6a49470..7330420 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -439,7 +439,7 @@
 /**
  * @fixme TODO: make the v3 API calls use the wrapper function
  *
- * @param $type
+ * @param string $type
  * @param $name
  * @return bool
  */
@@ -519,9 +519,9 @@
 }
 
 /**
- * Determines which civi-only payment instrument is appropriate for the 
current 
- * message, and resturns the civi payment instrument's human-readable display 
- * string (if it exists).   
+ * Determines which civi-only payment instrument is appropriate for the current
+ * message, and resturns the civi payment instrument's human-readable display
+ * string (if it exists).
  *
  * TODO lookup table
  *
@@ -543,7 +543,7 @@
 $payment_instrument = 'Bank Transfer';
 break;
 case 'cc':
-$payment_instrument = 'Credit Card';   
+$payment_instrument = 'Credit Card';
 if ( empty( $msg['payment_submethod'] ) ) {
 watchdog( 'wmf_civicrm', 'No credit card submethod given', 
NULL, WATCHDOG_WARNING );
 break;
@@ -650,13 +650,13 @@
break;
 case 'cash':
 $payment_instrument = 'Cash';
-//'cash_boleto' - Only one right now. I assume there might be 
more later? 
+//'cash_boleto' - Only one right now. I assume there might be 
more later?
 switch ( strtolower( $msg['payment_submethod'] ) ){
-case 'cash_boleto': 
+case 'cash_boleto':
 $payment_instrument = 'Boleto';
 break;
 }
-break; 
+break;
 case 'payflowpro':
 if ( strtolower( $msg['gateway'] ) === 'payflowpro' ){
 $payment_instrument = 'Credit Card';
@@ -702,7 +702,7 @@
 
 /**
  * Normalize contribution amounts
- * 
+ *
  * Do exchange rate conversions and set appropriate fields for CiviCRM
  * based on information contained in the message.
  *
@@ -844,10 +844,10 @@
 
 /**
  * Insert the contact record
- * 
+ *
  * Serves as a standard way for message processors to handle contact
  * insertion.  By passing a contact id, a contact can be updated.
- * 
+ *
  * @param array $msg
  * @param int $contact_id
  * @return array
@@ -1097,10 +1097,10 @@
 
 /**
  * Update the contact record
- * 
+ *
  * Serves as a standard way for message processors to handle contact
  * updates.
- * 
+ *
  * @param array $msg
  * @param int $contact_id
  * @return array
@@ -1113,10 +1113,10 @@
 
 /**
  * Insert the location record
- * 
+ *
  * Serves as a standard way for message processors to handle location
  * insertion.
- * 
+ *
  * @param array $msg
  * @param array $contact
  */
@@ -1126,10 +1126,10 @@
 
 /**
  * Update the location record
- * 
+ *
  * Serves as a standard way for message processors to handle location
  * updates.
- * 
+ *
  * @param array $msg
  * @param array $contact
  */
@@ -1229,7 +1229,7 @@
 
 /**
  * Find correct state for insertion
- * 
+ *
  * When passing CiviCRM a state abbreviation, odd things can happen - like 
getting the right abbreviation, but the wrong state
  * So we'll pull back the correct state/province name based off of a user's 
country/state abbreviation
  */
@@ -1276,14 +1276,14 @@
 
 /**
  * Normalize the queued message
- * 
- * Decodes the message and updates some of the message fields in ways 
+ *
+ * Decodes the message and updates some of the message fields in ways
  * that are consistent with how we need to insert data into CiviCRM.
- * This should be useful by other modules processing contribution messages 
+ * This should be useful by other modules processing contribution messages
  * out of the queue.
  *
  * TODO: Split this into a transformation chain.
- * 
+ *
  * @param mixed $msg
  * @return array
  */
@@ -1475,10 +1475,10 @@
 
 /**
  * Insert the tag record
- * 
+ *
  * Serves as a standard way for message processors to handle tag
  * insertion.
- * 
+ *
  * @param array $contact
  * @return array
  */
@@ -1507,8 

[MediaWiki-commits] [Gerrit] Report analytics/limn-wikidata-data to wikidata-feed - change (labs...grrrit)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Report analytics/limn-wikidata-data to wikidata-feed
..

Report analytics/limn-wikidata-data to wikidata-feed

Change-Id: Ie8beed215831e788b9162fc7c2e912c5937c12e9
---
M config.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/60/241060/1

diff --git a/config.yaml b/config.yaml
index f641a3a..98b7cc7 100644
--- a/config.yaml
+++ b/config.yaml
@@ -148,6 +148,7 @@
 mediawiki/extensions/Capiunto:
 mediawiki/extensions/ArticlePlaceholder:
 mediawiki/extensions/WikimediaBadges:
+analytics/limn-wikidata-data:
 "#wikimedia-multimedia":
 mediawiki/extensions/CommonsMetadata.*:
 mediawiki/extensions/MultimediaViewer.*:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8beed215831e788b9162fc7c2e912c5937c12e9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Added 'exhibit' format, written by Luis Morillas - displays ... - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Added 'exhibit' format, written by Luis Morillas - displays 
SIMILE Exhibit
..


Added 'exhibit' format, written by Luis Morillas - displays SIMILE Exhibit

Change-Id: I99770520399387a23d39a771ab49f1257535881b
---
M Cargo.php
M README
M extension.json
A formats/CargoExhibitFormat.php
A libs/ext.cargo.exhibit.js
5 files changed, 360 insertions(+), 0 deletions(-)

Approvals:
  Yaron Koren: Checked; Looks good to me, approved



diff --git a/Cargo.php b/Cargo.php
index bd9156b..33a06f0 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -131,6 +131,7 @@
 $wgAutoloadClasses['CargoBarChartFormat'] = $dir . 
'/formats/CargoBarChartFormat.php';
 $wgAutoloadClasses['CargoGalleryFormat'] = $dir . 
'/formats/CargoGalleryFormat.php';
 $wgAutoloadClasses['CargoTagCloudFormat'] = $dir . 
'/formats/CargoTagCloudFormat.php';
+$wgAutoloadClasses['CargoExhibitFormat'] = $dir . 
'/formats/CargoExhibitFormat.php';
 
 $wgAutoloadClasses['CargoPageSchemas'] = $dir . '/CargoPageSchemas.php';
 
@@ -261,6 +262,14 @@
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
),
+   'ext.cargo.exhibit' => array(
+   'scripts' => array(
+   'libs/ext.cargo.exhibit.js',
+   ),
+   'position' => 'top',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'Cargo'
+   ),
 );
 
 $wgCargoFieldTypes = array( 'Page', 'Text', 'Integer', 'Float', 'Date', 
'Datetime', 'Boolean', 'Coordinates', 'Wikitext', 'File' );
diff --git a/README b/README
index 3559ca8..9594f12 100644
--- a/README
+++ b/README
@@ -54,6 +54,8 @@
 
 Cargo was created, and mostly written by, Yaron Koren.
 
+Query formats were also added by Cindy Cicalese and Luis Morillas.
+
 Important code contributions were also made by Ad Strack van Schijndel,
 Namit Ohri and Vivek Ghaisas.
 
diff --git a/extension.json b/extension.json
index 3aec8ad..54a8621 100644
--- a/extension.json
+++ b/extension.json
@@ -89,6 +89,7 @@
"CargoBarChartFormat": "formats/CargoBarChartFormat.php",
"CargoGalleryFormat": "formats/CargoGalleryFormat.php",
"CargoTagCloudFormat": "formats/CargoTagCloudFormat.php",
+   "CargoExhibitFormat": "formats/CargoExhibitFormat.php",
"CargoPageSchemas": "CargoPageSchemas.php",
"CargoAppliedFilter": "drilldown/CargoAppliedFilter.php",
"CargoFilter": "drilldown/CargoFilter.php",
@@ -191,6 +192,12 @@
"libs/ext.cargo.nvd3.js"
],
"position": "top"
+   },
+   "ext.cargo.exhibit": {
+   "scripts": [
+   "libs/ext.cargo.exhibit.js"
+   ],
+   "position": "top"
}
},
"ResourceFileModulePaths": {
diff --git a/formats/CargoExhibitFormat.php b/formats/CargoExhibitFormat.php
new file mode 100644
index 000..18de217
--- /dev/null
+++ b/formats/CargoExhibitFormat.php
@@ -0,0 +1,312 @@
+http://api.simile-widgets.org/exhibit/HEAD/extensions/map/map-extension.js"/>';
+   $this->mOutput->addHeadItem( $maps_script, $maps_script );
+
+   if ( ! array_key_exists( "latlng", $this->displayParams ) ) {
+   $coordFields = $this->getCoordinatesFields( $sqlQueries 
);
+   if ( count( $coordFields ) > 0 ){
+   $this->displayParams['latlng'] = 
$coordFields[0];
+   }
+   }
+
+   $attrs = array(
+   'data-ex-role' => 'view',
+   'data-ex-view-class' => "Map",
+   'data-ex-latlng' => $this->prependDot( 
$this->displayParams['latlng'] ),
+   'data-ex-autoposition' => "true",
+   );
+
+   if ( array_key_exists( "color", $this->displayParams ) ) {
+   $attrs["data-ex-color-key"] = 
$this->prependDot($this->displayParams['color']);
+   }
+
+   return Html::element( 'div', $attrs );
+   }
+
+   function createTimeline( $sqlQueries ){
+   $timeline_script = 'http://api.simile-widgets.org/exhibit/HEAD/extensions/time/time-extension.js"/>';
+   $this->mOutput->addHeadItem( $timeline_script, $timeline_script 
);
+
+   // div
+   $attrs = array();
+   $attrs['data-ex-role'] = 'view';
+   $attrs["data-ex-view-class"] = "Timeline";
+
+   if ( ! array_key_exists( "start", $this->displayParams ) ) {
+   $tmp = $this->hasDate( $sqlQueries );
+   if ( count($tmp) > 0 ){
+   

[MediaWiki-commits] [Gerrit] Add build and coverage badges - change (pywikibot/wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add build and coverage badges
..


Add build and coverage badges

Change-Id: I264524310e4822956b49a33bd17f28922288bd4d
---
M README.rst
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/README.rst b/README.rst
index 281af27..0070af9 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,11 @@
-pywikibase is the library designed to handle DataModel of Wikiabse.
+.. image:: https://travis-ci.org/wikimedia/pywikibot-wikibase.svg?branch=master
+:target: https://travis-ci.org/wikimedia/pywikibot-wikibase
+
+.. image:: 
http://codecov.io/github/wikimedia/pywikibot-wikibase/coverage.svg?branch=master
+:target: 
http://codecov.io/github/wikimedia/pywikibot-wikibase?branch=master
+
+pywikibase the library designed to handle DataModel of Wikibase.
+
 
 It was forked from pywikibot-core in 28 July 2015.
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I264524310e4822956b49a33bd17f28922288bd4d
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Replace mediawiki-core-phpcs-HEAD with mediawiki-core-phpcs - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Replace mediawiki-core-phpcs-HEAD with mediawiki-core-phpcs
..

Replace mediawiki-core-phpcs-HEAD with mediawiki-core-phpcs

Still non-voting though.

Bug: T102598
Change-Id: I393d41ca61c4cd45f6799259282b6fc3441c6396
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/71/241071/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 8ec027b..094ea44 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -350,7 +350,6 @@
   - 'mediawiki-core-jsduck-publish'
   - 'mediawiki-core-doxygen-publish'
   - mediawiki-gate
-  - mediawiki-core-phpcs-HEAD
   - '{name}-phplint'
   - mediawiki-core-release
   - '{name}-bundle-{bundlecommand}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4b79eba..b872bca 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2066,13 +2066,12 @@
 template:
   - name: extension-gate
 check:
-  - mediawiki-core-phpcs-HEAD
   - mediawiki-core-jslint
   - mediawiki-core-phplint
   - mediawiki-core-ruby1.9.3lint
   - php-composer-package-validate
 test:
-  - mediawiki-core-phpcs-HEAD
+  - mediawiki-core-phpcs
   - mediawiki-core-jsduck
   - mediawiki-core-npm
   - mediawiki-core-phplint
@@ -2109,8 +2108,6 @@
   #   test_release_mediawiki_non_wmf_version_tags
   #
   #- mediawiki-core-release
-experimental:
-  - mediawiki-core-phpcs
 
   - name: mediawiki/vendor
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Removing deprecated modules(7) - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Removing deprecated modules(7)
..


Removing deprecated modules(7)

Fixes all the calls to deprecated modules to reference the new
module names. And if the old or deprecated modules is called or
required in an extension, it will be corrected to reference the new name.
The Thanks extension should be updated so that the removal of the deprecated
call should work.

Bug: T113289
Change-Id: Ifce50aecadd9983145f1cdc5e277c65c84cf1b3a
---
M resources/mobile.swipe/Swipe.js
M resources/mobile.talk.overlays/TalkOverlay.js
M resources/mobile.talk.overlays/TalkSectionAddOverlay.js
M resources/mobile.talk.overlays/TalkSectionOverlay.js
M resources/mobile.toc/TableOfContents.js
M resources/mobile.user/user.js
M resources/mobile.view/View.js
M resources/mobile.watchlist/WatchList.js
M resources/mobile.watchstar/Watchstar.js
M resources/mobile.watchstar/WatchstarApi.js
10 files changed, 10 insertions(+), 18 deletions(-)

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



diff --git a/resources/mobile.swipe/Swipe.js b/resources/mobile.swipe/Swipe.js
index 7786cf7..19c1b73 100644
--- a/resources/mobile.swipe/Swipe.js
+++ b/resources/mobile.swipe/Swipe.js
@@ -141,5 +141,5 @@
}
} );
 
-   M.define( 'mobile.swipe/Swipe', Swipe ).deprecate( 'Swipe' );
+   M.define( 'mobile.swipe/Swipe', Swipe );
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.talk.overlays/TalkOverlay.js 
b/resources/mobile.talk.overlays/TalkOverlay.js
index e522a97..65e61f3 100644
--- a/resources/mobile.talk.overlays/TalkOverlay.js
+++ b/resources/mobile.talk.overlays/TalkOverlay.js
@@ -152,7 +152,6 @@
}
} );
 
-   M.define( 'mobile.talk.overlays/TalkOverlay', TalkOverlay )
-   .deprecate( 'modules/talk/TalkOverlay' );
+   M.define( 'mobile.talk.overlays/TalkOverlay', TalkOverlay );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.talk.overlays/TalkSectionAddOverlay.js 
b/resources/mobile.talk.overlays/TalkSectionAddOverlay.js
index 2600ad4..852a284 100644
--- a/resources/mobile.talk.overlays/TalkSectionAddOverlay.js
+++ b/resources/mobile.talk.overlays/TalkSectionAddOverlay.js
@@ -175,7 +175,6 @@
}
} );
 
-   M.define( 'mobile.talk.overlays/TalkSectionAddOverlay', 
TalkSectionAddOverlay )
-   .deprecate( 'modules/talk/TalkSectionAddOverlay' );
+   M.define( 'mobile.talk.overlays/TalkSectionAddOverlay', 
TalkSectionAddOverlay );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.talk.overlays/TalkSectionOverlay.js 
b/resources/mobile.talk.overlays/TalkSectionOverlay.js
index 597c4f9..7cfe445 100644
--- a/resources/mobile.talk.overlays/TalkSectionOverlay.js
+++ b/resources/mobile.talk.overlays/TalkSectionOverlay.js
@@ -153,6 +153,5 @@
}
} );
 
-   M.define( 'mobile.talk.overlays/TalkSectionOverlay', TalkSectionOverlay 
)
-   .deprecate( 'modules/talk/TalkSectionOverlay' );
+   M.define( 'mobile.talk.overlays/TalkSectionOverlay', TalkSectionOverlay 
);
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.toc/TableOfContents.js 
b/resources/mobile.toc/TableOfContents.js
index c4556ad..9978c65 100644
--- a/resources/mobile.toc/TableOfContents.js
+++ b/resources/mobile.toc/TableOfContents.js
@@ -54,6 +54,5 @@
}
} );
 
-   M.define( 'mobile.toc/TableOfContents', TableOfContents )
-   .deprecate( 'modules/toc/TableOfContents' );
+   M.define( 'mobile.toc/TableOfContents', TableOfContents );
 }( mw.mobileFrontend ) );
diff --git a/resources/mobile.user/user.js b/resources/mobile.user/user.js
index 49602f7..762bae5 100644
--- a/resources/mobile.user/user.js
+++ b/resources/mobile.user/user.js
@@ -80,6 +80,6 @@
}
 
};
-   M.define( 'mobile.user/user', user ).deprecate( 'user' );
+   M.define( 'mobile.user/user', user );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.view/View.js b/resources/mobile.view/View.js
index e5e094f..e9b5831 100644
--- a/resources/mobile.view/View.js
+++ b/resources/mobile.view/View.js
@@ -354,6 +354,6 @@
};
} );
 
-   M.define( 'mobile.view/View', View ).deprecate( 'View' );
+   M.define( 'mobile.view/View', View );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.watchlist/WatchList.js 
b/resources/mobile.watchlist/WatchList.js
index 1712d1a..6719ab1 100644
--- a/resources/mobile.watchlist/WatchList.js
+++ b/resources/mobile.watchlist/WatchList.js
@@ -94,7 +94,6 @@
 
} );
 
-   M.define( 'mobile.watchlist/WatchList', WatchList )
-   .deprecate( 'modules/watchlist/WatchList' );
+   M.define( 'mobile.watchlist/WatchList', WatchList );
 
 }( mw.mobileFrontend, jQuery ) );

[MediaWiki-commits] [Gerrit] Removing deprecated modules(8) - change (mediawiki...MobileFrontend)

[D3r1ck01 (Code Review)]

D3r1ck01 has uploaded a new change for review.

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

Change subject: Removing deprecated modules(8)
..

Removing deprecated modules(8)

Fixes all the calls to deprecated modules to reference the new
module names. And if the old or deprecated modules is called or required
in an extension, it will be corrected to reference the new name.

Bug: T113289
Change-Id: I17cf17c4808e0f5cfa7b767ecaffa3274c742b89
---
M resources/mobile.toggle/toggle.js
M resources/skins.minerva.scripts.top/init.js
M resources/skins.minerva.scripts/preInit.js
3 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/resources/mobile.toggle/toggle.js 
b/resources/mobile.toggle/toggle.js
index 2227e0f..04ee721 100755
--- a/resources/mobile.toggle/toggle.js
+++ b/resources/mobile.toggle/toggle.js
@@ -312,6 +312,6 @@
_getExpandedSections: getExpandedSections,
_expandStoredSections: expandStoredSections,
_cleanObsoleteStoredSections: cleanObsoleteStoredSections
-   } ).deprecate( 'toggle' );
+   } );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/skins.minerva.scripts.top/init.js 
b/resources/skins.minerva.scripts.top/init.js
index 5b122de..abfafe5 100755
--- a/resources/skins.minerva.scripts.top/init.js
+++ b/resources/skins.minerva.scripts.top/init.js
@@ -49,7 +49,7 @@
}
 
// bind events
-   M.define( 'mobile.head/mainMenu', mainMenu ).deprecate( 'mainMenu' );
+   M.define( 'mobile.head/mainMenu', mainMenu );
// FIXME: Remove when cache expires. 
https://phabricator.wikimedia.org/T112315
M.on( 'history-link-loaded', initHistoryLink );
M.on( 'header-loaded', function () {
diff --git a/resources/skins.minerva.scripts/preInit.js 
b/resources/skins.minerva.scripts/preInit.js
index 9e6d7db..8ee7906 100755
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -19,7 +19,7 @@
page: getCurrentPage(),
mainMenu: mainMenu
} );
-   M.define( 'mobile.startup/skin', skin ).deprecate( 'skin' );
+   M.define( 'mobile.startup/skin', skin );
 
$( window )
.on( 'resize', $.debounce( 100, $.proxy( M, 'emit', 'resize' ) 
) )
@@ -71,7 +71,7 @@
getCurrentPage: getCurrentPage
} );
 
-   M.define( 'mobile.startup/pageApi', pageApi ).deprecate( 'pageApi' );
+   M.define( 'mobile.startup/pageApi', pageApi );
 
// Recruit volunteers through the console (note console.log may not be 
a function so check via apply)
if ( window.console && window.console.log && window.console.log.apply &&

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17cf17c4808e0f5cfa7b767ecaffa3274c742b89
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] Maps in Nearby: TNG - change (apps...wikipedia)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Maps in Nearby: TNG
..


Maps in Nearby: TNG

Highlights:
- Using MapBox SDK to retrieve tiles from our server. This sdk adds about
  234 KiB to our APK size.
- Using built-in functionality to display user's location as a marker,
  with a translucent circle representing accuracy.
- Panning and zooming the map refreshes the collection of markers.
- Display of markers is independent of whether we know the user's
  location. This allows the user to randomly "explore" arbitrary areas of
  the map.
- Feature-flagged for non-production only. Since this is nearly a rewrite
  of NearbyFragment, I simply created "NearbyFragmentOld.java" which has
  the old code, and we'll remove it when the time is right.

Bug: T100315
Change-Id: I423745164ce8694d14099ea9aa0b2a05a141c8c3
---
M app/build.gradle
M app/proguard-rules.pro
A app/src/main/assets/licenses/Mapbox
A app/src/main/java/org/wikipedia/nearby/DefaultMapViewListener.java
M app/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
A app/src/main/java/org/wikipedia/nearby/NearbyFragmentOld.java
M app/src/main/java/org/wikipedia/nearby/NearbyPage.java
M app/src/main/java/org/wikipedia/nearby/NearbyResult.java
M app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
A app/src/main/res/drawable-hdpi/ic_gps_fixed_white_24dp.png
A app/src/main/res/drawable-mdpi/ic_gps_fixed_white_24dp.png
A app/src/main/res/drawable-xhdpi/ic_gps_fixed_white_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_gps_fixed_white_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_gps_fixed_white_24dp.png
M app/src/main/res/layout/fragment_nearby.xml
A app/src/main/res/layout/fragment_nearby_old.xml
M app/src/main/res/menu/menu_nearby.xml
M app/src/main/res/values/credits.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/strings-no-translate.xml
M app/src/main/res/values/strings.xml
22 files changed, 1,210 insertions(+), 223 deletions(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index eeb3394..72901d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -162,6 +162,9 @@
 compile 'com.github.chrisbanes.photoview:library:1.2.3'
 compile 'com.github.ryanjohn1:onboarding:1.0.3'
 compile 'com.jakewharton:disklrucache:2.0.2'
+compile('com.mapbox.mapboxsdk:mapbox-android-sdk:0.7.4@aar') {
+transitive = true
+}
 
 testCompile 'junit:junit:4.12'
 testCompile 'org.mockito:mockito-core:1.9.5'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 91a7b75..ae5c931 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -109,3 +109,6 @@
 -keep class org.mediawiki.api.json.** {*;}
 -keep enum org.wikipedia.api.json.** { (...); *; }
 
+# Mapbox
+# TODO: use official rules when 
https://github.com/mapbox/mapbox-android-sdk/issues/363 is resolved.
+-dontwarn java.awt.**
diff --git a/app/src/main/assets/licenses/Mapbox 
b/app/src/main/assets/licenses/Mapbox
new file mode 100644
index 000..0756848
--- /dev/null
+++ b/app/src/main/assets/licenses/Mapbox
@@ -0,0 +1,70 @@
+Copyright Mapbox Inc 2014
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+---
+
+This is a fork of [OSMDroid](https://code.google.com/p/osmdroid/), also 
licensed under
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+---
+
+Includes `MultiTouchController.java`, by Luke Hutchison (luke.hu...@mit.edu),
+licensed under Apache License 2.0 and GPLv2.
+
+---
+
+Includes [android-geojson](https://github.com/cocoahero/android-geojson) by 
[Jonathan Baker](https://github.com/cocoahero), licensed under MIT
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2014 Jonathan Baker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 

[MediaWiki-commits] [Gerrit] Added 'exhibit' format, written by Luis Morillas - displays ... - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Added 'exhibit' format, written by Luis Morillas - displays 
SIMILE Exhibit
..

Added 'exhibit' format, written by Luis Morillas - displays SIMILE Exhibit

Change-Id: I99770520399387a23d39a771ab49f1257535881b
---
M Cargo.php
M README
M extension.json
A formats/CargoExhibitFormat.php
A libs/ext.cargo.exhibit.js
5 files changed, 360 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/55/241055/1

diff --git a/Cargo.php b/Cargo.php
index bd9156b..33a06f0 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -131,6 +131,7 @@
 $wgAutoloadClasses['CargoBarChartFormat'] = $dir . 
'/formats/CargoBarChartFormat.php';
 $wgAutoloadClasses['CargoGalleryFormat'] = $dir . 
'/formats/CargoGalleryFormat.php';
 $wgAutoloadClasses['CargoTagCloudFormat'] = $dir . 
'/formats/CargoTagCloudFormat.php';
+$wgAutoloadClasses['CargoExhibitFormat'] = $dir . 
'/formats/CargoExhibitFormat.php';
 
 $wgAutoloadClasses['CargoPageSchemas'] = $dir . '/CargoPageSchemas.php';
 
@@ -261,6 +262,14 @@
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
),
+   'ext.cargo.exhibit' => array(
+   'scripts' => array(
+   'libs/ext.cargo.exhibit.js',
+   ),
+   'position' => 'top',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'Cargo'
+   ),
 );
 
 $wgCargoFieldTypes = array( 'Page', 'Text', 'Integer', 'Float', 'Date', 
'Datetime', 'Boolean', 'Coordinates', 'Wikitext', 'File' );
diff --git a/README b/README
index 3559ca8..9594f12 100644
--- a/README
+++ b/README
@@ -54,6 +54,8 @@
 
 Cargo was created, and mostly written by, Yaron Koren.
 
+Query formats were also added by Cindy Cicalese and Luis Morillas.
+
 Important code contributions were also made by Ad Strack van Schijndel,
 Namit Ohri and Vivek Ghaisas.
 
diff --git a/extension.json b/extension.json
index 3aec8ad..54a8621 100644
--- a/extension.json
+++ b/extension.json
@@ -89,6 +89,7 @@
"CargoBarChartFormat": "formats/CargoBarChartFormat.php",
"CargoGalleryFormat": "formats/CargoGalleryFormat.php",
"CargoTagCloudFormat": "formats/CargoTagCloudFormat.php",
+   "CargoExhibitFormat": "formats/CargoExhibitFormat.php",
"CargoPageSchemas": "CargoPageSchemas.php",
"CargoAppliedFilter": "drilldown/CargoAppliedFilter.php",
"CargoFilter": "drilldown/CargoFilter.php",
@@ -191,6 +192,12 @@
"libs/ext.cargo.nvd3.js"
],
"position": "top"
+   },
+   "ext.cargo.exhibit": {
+   "scripts": [
+   "libs/ext.cargo.exhibit.js"
+   ],
+   "position": "top"
}
},
"ResourceFileModulePaths": {
diff --git a/formats/CargoExhibitFormat.php b/formats/CargoExhibitFormat.php
new file mode 100644
index 000..18de217
--- /dev/null
+++ b/formats/CargoExhibitFormat.php
@@ -0,0 +1,312 @@
+http://api.simile-widgets.org/exhibit/HEAD/extensions/map/map-extension.js"/>';
+   $this->mOutput->addHeadItem( $maps_script, $maps_script );
+
+   if ( ! array_key_exists( "latlng", $this->displayParams ) ) {
+   $coordFields = $this->getCoordinatesFields( $sqlQueries 
);
+   if ( count( $coordFields ) > 0 ){
+   $this->displayParams['latlng'] = 
$coordFields[0];
+   }
+   }
+
+   $attrs = array(
+   'data-ex-role' => 'view',
+   'data-ex-view-class' => "Map",
+   'data-ex-latlng' => $this->prependDot( 
$this->displayParams['latlng'] ),
+   'data-ex-autoposition' => "true",
+   );
+
+   if ( array_key_exists( "color", $this->displayParams ) ) {
+   $attrs["data-ex-color-key"] = 
$this->prependDot($this->displayParams['color']);
+   }
+
+   return Html::element( 'div', $attrs );
+   }
+
+   function createTimeline( $sqlQueries ){
+   $timeline_script = 'http://api.simile-widgets.org/exhibit/HEAD/extensions/time/time-extension.js"/>';
+   $this->mOutput->addHeadItem( $timeline_script, $timeline_script 
);
+
+   // div
+   $attrs = array();
+   $attrs['data-ex-role'] = 'view';
+   $attrs["data-ex-view-class"] = "Timeline";
+
+   if ( ! array_key_exists( "start", $this->displayParams ) ) {
+   $tmp = $this->hasDate( $sqlQueries );
+   if ( 

[MediaWiki-commits] [Gerrit] Move LogFormatter test comment block - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Move LogFormatter test comment block
..

Move LogFormatter test comment block

This was missed in:
https://gerrit.wikimedia.org/r/#/c/239783/
Ia5016c82c00dd7c35a6f1253d6e385b587ec485e

Change-Id: Ibf537aaca2a0ca9d2c509499f6da5b9e51b06037
---
M tests/phpunit/includes/changes/RecentChangeTest.php
M tests/phpunit/includes/logging/LogFormatterTest.php
2 files changed, 38 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/241056/1

diff --git a/tests/phpunit/includes/changes/RecentChangeTest.php 
b/tests/phpunit/includes/changes/RecentChangeTest.php
index 4d1a936..fd287b5 100644
--- a/tests/phpunit/includes/changes/RecentChangeTest.php
+++ b/tests/phpunit/includes/changes/RecentChangeTest.php
@@ -42,44 +42,6 @@
}
 
/**
-* The testIrcMsgForAction* tests are supposed to cover the hacky
-* LogFormatter::getIRCActionText / bug 34508
-*
-* Third parties bots listen to those messages. They are clever enough
-* to fetch the i18n messages from the wiki and then analyze the IRC 
feed
-* to reverse engineer the $1, $2 messages.
-* One thing bots can not detect is when MediaWiki change the meaning of
-* a message like what happened when we deployed 1.19. $1 became the 
user
-* performing the action which broke basically all bots around.
-*
-* Should cover the following log actions (which are most commonly used 
by bots):
-* - block/block
-* - block/unblock
-* - block/reblock
-* - delete/delete
-* - delete/restore
-* - newusers/create
-* - newusers/create2
-* - newusers/autocreate
-* - move/move
-* - move/move_redir
-* - protect/protect
-* - protect/modifyprotect
-* - protect/unprotect
-* - protect/move_prot
-* - upload/upload
-* - merge/merge
-* - import/upload
-* - import/interwiki
-*
-* As well as the following Auto Edit Summaries:
-* - blank
-* - replace
-* - rollback
-* - undo
-*/
-
-   /**
 * @covers RecentChange::parseParams
 */
public function testParseParams() {
diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php 
b/tests/phpunit/includes/logging/LogFormatterTest.php
index 844c9af..d25a61f 100644
--- a/tests/phpunit/includes/logging/LogFormatterTest.php
+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
@@ -308,6 +308,44 @@
}
 
/**
+* The testIrcMsgForAction* tests are supposed to cover the hacky
+* LogFormatter::getIRCActionText / bug 34508
+*
+* Third parties bots listen to those messages. They are clever enough
+* to fetch the i18n messages from the wiki and then analyze the IRC 
feed
+* to reverse engineer the $1, $2 messages.
+* One thing bots can not detect is when MediaWiki change the meaning of
+* a message like what happened when we deployed 1.19. $1 became the 
user
+* performing the action which broke basically all bots around.
+*
+* Should cover the following log actions (which are most commonly used 
by bots):
+* - block/block
+* - block/unblock
+* - block/reblock
+* - delete/delete
+* - delete/restore
+* - newusers/create
+* - newusers/create2
+* - newusers/autocreate
+* - move/move
+* - move/move_redir
+* - protect/protect
+* - protect/modifyprotect
+* - protect/unprotect
+* - protect/move_prot
+* - upload/upload
+* - merge/merge
+* - import/upload
+* - import/interwiki
+*
+* As well as the following Auto Edit Summaries:
+* - blank
+* - replace
+* - rollback
+* - undo
+*/
+
+   /**
 * @covers LogFormatter::getIRCActionComment
 * @covers LogFormatter::getIRCActionText
 */

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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)

[Cdentinger (Code Review)]

Cdentinger has uploaded a new change for review.

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

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

Merge branch 'master' into deployment

efb6cdb Don't remove overlay when redirecting
3c0eca7 reorder cards and hide iframe card images

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a650844779c8349db6347e53e28f93746ca984b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

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


Merge branch 'master' into deployment

efb6cdb Don't remove overlay when redirecting
3c0eca7 reorder cards and hide iframe card images

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a650844779c8349db6347e53e28f93746ca984b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use context logger and stop passing one to sudo_check_call - change (mediawiki...scap)

[Chad (Code Review)]

Chad has submitted this change and it was merged.

Change subject: Use context logger and stop passing one to sudo_check_call
..


Use context logger and stop passing one to sudo_check_call

And everything it touches

Change-Id: I1634f5db229a76491019c3636c59ed115fb9a672
---
M scap/main.py
M scap/tasks.py
M scap/utils.py
3 files changed, 23 insertions(+), 37 deletions(-)

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



diff --git a/scap/main.py b/scap/main.py
index e707533..2d04e00 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -218,7 +218,7 @@
 
 # Bug 63659: Compile deploy_dir/wikiversions.json to cdb
 utils.sudo_check_call('mwdeploy',
-self.get_script_path('compile-wikiversions'), self.get_logger())
+self.get_script_path('compile-wikiversions'))
 
 # Update list of extension message files and regenerate the
 # localisation cache.
@@ -309,8 +309,7 @@
 if self.arguments.update_l10n:
 utils.sudo_check_call(
 'mwdeploy',
-self.get_script_path('scap-rebuild-cdbs') + ' --no-progress',
-self.get_logger()
+self.get_script_path('scap-rebuild-cdbs') + ' --no-progress'
 )
 return 0
 
@@ -530,17 +529,17 @@
 pass
 else:
 utils.sudo_check_call('root',
-'/usr/sbin/apache2ctl graceful-stop', self.get_logger())
+'/usr/sbin/apache2ctl graceful-stop')
 # Wait for Apache to stop hard after GracefulShutdownTimeout
 # seconds or when requests actually complete
 psutil.Process(apache_pid).wait()
 
 # Restart HHVM
-utils.sudo_check_call('root', '/sbin/restart hhvm', self.get_logger())
+utils.sudo_check_call('root', '/sbin/restart hhvm')
 
 if have_pybal:
 utils.sudo_check_call('root',
-'/usr/sbin/service apache2 start', self.get_logger())
+'/usr/sbin/service apache2 start')
 
 return 0
 
@@ -623,15 +622,13 @@
 the possibility for future rollback.
 """
 
-logger = self.get_logger()
-
 repo = self.config['git_repo']
 server = self.config['git_server']
 has_submodules = self.config['git_submodules']
 
 # create deployment directories if they don't already exist
 for d in [self.cache_dir, self.revs_dir]:
-utils.mkdir_p(d, logger=logger)
+utils.mkdir_p(d)
 
 # only supports http from tin for the moment
 scheme = 'http'
diff --git a/scap/tasks.py b/scap/tasks.py
index 122a48f..3ac6f9f 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -436,7 +436,6 @@
 :param force: Whether to pass --force
 :param quiet: Whether to pass --quiet
 """
-logger = logging.getLogger('update_localization_cache')
 
 with utils.sudo_temp_dir('www-data', 'scap_l10n_') as temp_dir:
 # Seed the temporary directory with the current CDB and/or PHP files.
@@ -449,8 +448,7 @@
 "cp '%(out_dir)s/'*.[pc][hd][pb] '%(temp_dir)s'" % {
 'temp_dir': temp_dir,
 'out_dir': out_dir
-},
-logger)
+})
 
 # Generate the files into a temporary directory as www-data
 utils.sudo_check_call('www-data',
@@ -463,16 +461,14 @@
 'lang': '--lang ' + lang if lang else '',
 'force': '--force' if force else '',
 'quiet': '--quiet' if quiet else ''
-},
-logger)
+})
 
 # Copy the files into the real directory as l10nupdate
 utils.sudo_check_call('l10nupdate',
 'cp -r "%(temp_dir)s"/* "%(out_dir)s"' % {
 'temp_dir': temp_dir,
 'out_dir': out_dir
-},
-logger)
+})
 
 
 def update_localization_cache(version, wikidb, verbose, cfg):
@@ -523,16 +519,14 @@
 '--wiki="%s" --list-file="%s/wmf-config/extension-list" '
 '--output="%s" %s' % (
 wikidb, cfg['stage_dir'], new_extension_messages,
-verbose_messagelist),
-logger)
+verbose_messagelist))
 utils.sudo_check_call('www-data',
-'chmod 0664 "%s"' % new_extension_messages,
-logger)
+'chmod 0664 "%s"' % new_extension_messages)
 logger.debug('Copying %s to %s' % (
 new_extension_messages, extension_messages))
 shutil.copyfile(new_extension_messages, extension_messages)
 utils.sudo_check_call('www-data',
-'rm "%s"' % new_extension_messages, logger)
+'rm "%s"' % new_extension_messages)
 
 # Update ExtensionMessages-*.php in the local copy.
 deploy_dir = os.path.realpath(cfg['deploy_dir'])
@@ -541,8 +535,7 @@
 logger.debug('Copying 

[MediaWiki-commits] [Gerrit] Hygiene: Remove unused global variables - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Remove unused global variables
..


Hygiene: Remove unused global variables

Change-Id: I2bc397ad14b9f9925d1ad99ca55a8d9a96df79ce
---
M includes/config/Uploads.php
M includes/skins/SkinMinerva.php
2 files changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/includes/config/Uploads.php b/includes/config/Uploads.php
index f09299f..4a43f4b 100644
--- a/includes/config/Uploads.php
+++ b/includes/config/Uploads.php
@@ -4,13 +4,6 @@
 }
 
 /**
- * A css selector which is used by mf-photo.js to test whether to prompt the 
user photo uploads on
- * the current page. When the selector matches no elements the photo uploader 
will show.
- * This is an advanced config variable so use caution in editing.
- */
-$wgMFLeadPhotoUploadCssSelector = 'img, .navbox';
-
-/**
  * The wiki id/dbname for where photos are uploaded, if photos are uploaded to
  * a wiki other than the local wiki (eg commonswiki).
  * @var string
@@ -23,11 +16,6 @@
  * Defaults to the current wiki
  */
 $wgMFPhotoUploadEndpoint = '';
-
-/**
- * (wiki)text to append to photo description during photo upload.
- */
-$wgMFPhotoUploadAppendToDesc = '';
 
 /**
  * Set the minimum edits the user needs before they can upload images in 
mobile mode
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 8939d31..901c498 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -935,8 +935,6 @@
'wgMFMenuData' => $this->getMenuData(),
'wgMFEnableJSConsoleRecruitment' => $config->get( 
'MFEnableJSConsoleRecruitment' ),
'wgMFUseCentralAuthToken' => $config->get( 
'MFUseCentralAuthToken' ),
-   'wgMFPhotoUploadAppendToDesc' => $config->get( 
'MFPhotoUploadAppendToDesc' ),
-   'wgMFLeadPhotoUploadCssSelector' => $config->get( 
'MFLeadPhotoUploadCssSelector' ),
'wgMFPhotoUploadEndpoint' =>
$config->get( 'MFPhotoUploadEndpoint' ) ? 
$config->get( 'MFPhotoUploadEndpoint' ) : '',
'wgPreferredVariant' => 
$title->getPageLanguage()->getPreferredVariant(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc397ad14b9f9925d1ad99ca55a8d9a96df79ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
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] Use UserArray instead of separate User in onEchoGetDefaultNo... - change (mediawiki...Newsletter)

[Glaisher (Code Review)]

Glaisher has uploaded a new change for review.

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

Change subject: Use UserArray instead of separate User in 
onEchoGetDefaultNotifiedUsers
..

Use UserArray instead of separate User in onEchoGetDefaultNotifiedUsers

Change-Id: Idc0cf4c8853d10b437f15fe127df056d478d4549
---
M Newsletter.hooks.php
1 file changed, 6 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/70/241070/1

diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 3298bb2..09830b9 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -38,22 +38,17 @@
 * @todo Use the JobQueue for this to make sure it scales amazingly
 *
 * @param EchoEvent $event
-* @param User[] $users
+* @param Iterator|IteratorAggregate|array $users
 * @return bool
 */
public static function onEchoGetDefaultNotifiedUsers( $event, &$users ) 
{
-   $eventType = $event->getType();
-   if ( $eventType === 'subscribe-newsletter' ) {
+   // @todo rename event as this is misleading - we're not really 
subscribing here
+   if ( $event->getType() === 'subscribe-newsletter' ) {
$extra = $event->getExtra();
+   $ids = NewsletterDb::newFromGlobalState()
+   ->getUserIdsSubscribedToNewsletter( 
$extra['newsletterId'] );
 
-   $db = NewsletterDb::newFromGlobalState();
-   $userIds = $db->getUserIdsSubscribedToNewsletter( 
$extra['newsletterId'] );
-
-   //TODO queries to the user table should be done in 
batches using UserArray::newFromIds
-   foreach ( $userIds as $userId ) {
-   $recipient = User::newFromId( $userId );
-   $users[$userId] = $recipient;
-   }
+   $users = UserArray::newFromIDs( $ids );
}
 
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc0cf4c8853d10b437f15fe127df056d478d4549
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 

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

[MediaWiki-commits] [Gerrit] Bump minSdkVersion, versionCode, and versionName. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Bump minSdkVersion, versionCode, and versionName.
..


Bump minSdkVersion, versionCode, and versionName.

Any patches merged beyond this point shall no longer work in API <15.
This opens the floodgates to the arduous (but extremely pleasant) task
of exfoliating the app of all API-10-specific code.

The minor version number has been bumped by 1, to celebrate the
significance of this occasion.

The versionCode has been bumped by 20, to provide a sufficient gap for
future backporting of features to the Gingerbread version of the app, the
tag for which is located at b97d0cd00f4c4fb932e9fc087334dfe779c59be3.

Change-Id: I06127568bf939585e6f758f5616f418a96d66ff4
---
M app/build.gradle
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 9bc754d..eeb3394 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,7 +34,7 @@
 }
 
 def computeVersionName(label) {
-return "2.0.${android.defaultConfig.versionCode}-${label}-${date}"
+return "2.1.${android.defaultConfig.versionCode}-${label}-${date}"
 }
 
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_7
@@ -55,9 +55,9 @@
 }
 defaultConfig {
 applicationId 'org.wikipedia'
-minSdkVersion 10
+minSdkVersion 15
 targetSdkVersion 22
-versionCode 111
+versionCode 131
 testApplicationId 'org.wikipedia.test'
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Use a constructive button on Special:MovePage - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Use a constructive button on Special:MovePage
..

Use a constructive button on Special:MovePage

Instead of a progressive button, use a constructive one, which indicates,
that the process of moving a page will be finished after submitting
the form.

Bug: T113493
Change-Id: I35ad8e5325452c20ffe2124ddbfd5bc1f0e7bb3c
---
M includes/specials/SpecialMovepage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/241072/1

diff --git a/includes/specials/SpecialMovepage.php 
b/includes/specials/SpecialMovepage.php
index f7a0a20..ab28fa4 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -464,7 +464,7 @@
'name' => $submitVar,
'value' => $movepagebtn,
'label' => $movepagebtn,
-   'flags' => array( 'progressive', 'primary' ),
+   'flags' => array( 'constructive', 'primary' ),
'type' => 'submit',
) ),
array(

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

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

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

[MediaWiki-commits] [Gerrit] Migrate protect log to new log system - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Migrate protect log to new log system
..


Migrate protect log to new log system

This localize the protect type, level and expiry on Special:Log/protect.
To allow i18n there are some details stored in the log params of new log
items, these details also shown on API output.
The details cannot get from the old existing data, because there are
containing L10n strings therefore i18n works only for new items.
In the api and for IRC the old description text is still stored in the
log params for backward compatibility.

This allows use of gender on Special:Log. Old messages are kept for use
in IRC. Tests already exists to ensure an unchanged IRC message.

Bug: T47988
Change-Id: I3bb85c61b857972e66c99c499d7d785c88cafb25
---
M includes/DefaultSettings.php
M includes/logging/LogFormatter.php
M includes/logging/LogPage.php
M includes/logging/ProtectLogFormatter.php
M includes/page/WikiPage.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M tests/phpunit/includes/logging/LogFormatterTest.php
M tests/phpunit/includes/logging/LogFormatterTestCase.php
M tests/phpunit/includes/logging/ProtectLogFormatterTest.php
10 files changed, 560 insertions(+), 71 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index aa21c44..8b220f3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6934,11 +6934,7 @@
  *
  * Extensions with custom log types may add to this array.
  */
-$wgLogActions = array(
-   'protect/modify' => 'modifiedarticleprotection',
-   'protect/protect' => 'protectedarticle',
-   'protect/unprotect' => 'unprotectedarticle',
-);
+$wgLogActions = array();
 
 /**
  * The same as above, but here values are names of classes,
@@ -6965,7 +6961,10 @@
'move/move' => 'MoveLogFormatter',
'move/move_redir' => 'MoveLogFormatter',
'patrol/patrol' => 'PatrolLogFormatter',
+   'protect/modify' => 'ProtectLogFormatter',
'protect/move_prot' => 'ProtectLogFormatter',
+   'protect/protect' => 'ProtectLogFormatter',
+   'protect/unprotect' => 'ProtectLogFormatter',
'rights/autopromote' => 'RightsLogFormatter',
'rights/rights' => 'RightsLogFormatter',
'suppress/block' => 'BlockLogFormatter',
diff --git a/includes/logging/LogFormatter.php 
b/includes/logging/LogFormatter.php
index f31a42a..1d31088 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -263,7 +263,7 @@
switch ( $entry->getSubtype() ) {
case 'protect':
$text = wfMessage( 
'protectedarticle' )
-   ->rawParams( $target . 
' ' . $parameters[0] )->inContentLanguage()->escaped();
+   ->rawParams( $target . 
' ' . $parameters['4::description'] )->inContentLanguage()->escaped();
break;
case 'unprotect':
$text = wfMessage( 
'unprotectedarticle' )
@@ -271,7 +271,7 @@
break;
case 'modify':
$text = wfMessage( 
'modifiedarticleprotection' )
-   ->rawParams( $target . 
' ' . $parameters[0] )->inContentLanguage()->escaped();
+   ->rawParams( $target . 
' ' . $parameters['4::description'] )->inContentLanguage()->escaped();
break;
case 'move_prot':
$text = wfMessage( 
'movedarticleprotection' )
@@ -931,32 +931,6 @@
$title = $this->entry->getTarget();
$type = $this->entry->getType();
$subtype = $this->entry->getSubtype();
-
-   if ( $type == 'protect'
-   && ( $subtype == 'protect' || $subtype == 'modify' || 
$subtype == 'unprotect' )
-   ) {
-   $links = array(
-   Linker::link( $title,
-   $this->msg( 'hist' )->escaped(),
-   array(),
-   array(
-   'action' => 'history',
-   'offset' => 
$this->entry->getTimestamp()
-   )
-   )
-   );
- 

[MediaWiki-commits] [Gerrit] Remove " " around - change (mediawiki...SemanticSignup)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: Remove " " around 
..

Remove " " around 

Was used in a wrong order and useless because  is styled

Change-Id: If873fd3c734a829ead271d45a4b5846302d01257
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index eec424c..e5909d6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,8 +9,8 @@
 "semanticsignup": "Semantic Signup",
 "ses-desc": "Allows to populate a user page with semantic data at signup 
time",
 "ses-nousername": "Username has not been specified.",
-"ses-noformname": "A signup form has not been specified. (see the 
\"egSemanticSignupSettings\" setting for information on this.)",
-"ses-nobotname": "A privileged user (bot) has not been specified to allow 
to create new user accounts. (see the \"egSemanticSignupSettings\" 
setting for information on this.)",
+"ses-noformname": "A signup form has not been specified. (see the 
egSemanticSignupSettings setting for information on this.)",
+"ses-nobotname": "A privileged user (bot) has not been specified to allow 
to create new user accounts. (see the egSemanticSignupSettings 
setting for information on this.)",
 "ses-nopwdmatch": "Password and password confirmation do not match.",
 "ses-norealname": "Real name is required but has not been specified.",
 "ses-userexists": "User already exists.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If873fd3c734a829ead271d45a4b5846302d01257
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticSignup
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Remove wikiversions.cdb code now that we use wikiversions.php - change (mediawiki...scap)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Remove wikiversions.cdb code now that we use wikiversions.php
..

Remove wikiversions.cdb code now that we use wikiversions.php

Change-Id: I1030f30dec356561de924cec70f5b7507bf2565d
---
M scap/tasks.py
1 file changed, 4 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/61/241061/1

diff --git a/scap/tasks.py b/scap/tasks.py
index d305598..5e00d72 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -105,10 +105,8 @@
 3. Validate that all wikis listed in the realm specific all.dblist exist
in the json
 4. Create a temporary CDB file from the json contents
-5. Atomically rename the temporary CDB to the realm specific
-   wikiversions.cdb filename
-6. Create a temporary php file from the json contents
-7. Atomically rename the temporary php to the realm specific
+5. Create a temporary php file from the json contents
+6. Atomically rename the temporary php to the realm specific
wikiversions.php filename
 
 :param source_tree: Source tree to read file from: 'deploy' or 'stage'
@@ -123,7 +121,6 @@
 json_file = utils.get_realm_specific_filename(
 base_file, cfg['wmf_realm'], cfg['datacenter'])
 base_name = os.path.splitext(json_file)[0]
-cdb_file = base_name + '.cdb'
 php_file = base_name + '.php'
 
 with open(json_file) as f:
@@ -146,29 +143,6 @@
 if missing_dbs:
 raise KeyError('Missing %d expected dbs in %s: %s' % (
 len(missing_dbs), json_file, ', '.join(missing_dbs)))
-
-# Build the CDB version
-tmp_cdb_file = '%s.tmp' % cdb_file
-try:
-os.unlink(tmp_cdb_file)
-except OSError:
-pass
-
-# Write temp cdb file
-with open(tmp_cdb_file, 'wb') as fp:
-writer = cdblib.Writer(fp)
-for dbname, version in wikiversions.items():
-writer.put(str('ver:%s' % dbname), str(version))
-writer.finalize()
-os.fsync(fp.fileno())
-
-if not os.path.isfile(tmp_cdb_file):
-raise IOError(
-errno.ENOENT, 'Failed to create cdb wikiversions', tmp_cdb_file)
-
-os.rename(tmp_cdb_file, cdb_file)
-os.chmod(cdb_file, 0664)
-logger.info('Compiled %s to %s', json_file, cdb_file)
 
 # Build the php version
 php_code = 'https://gerrit.wikimedia.org/r/241061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1030f30dec356561de924cec70f5b7507bf2565d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
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] Convert most of utils to use context loggers too! - change (mediawiki...scap)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Convert most of utils to use context loggers too!
..

Convert most of utils to use context loggers too!

Change-Id: I7d58617bab9a12b69a1137fca2a233a27587e183
---
M scap/tasks.py
1 file changed, 26 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/68/241068/1

diff --git a/scap/tasks.py b/scap/tasks.py
index 3ac6f9f..dca15ae 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -96,7 +96,8 @@
 utils.check_valid_json_file(abspath)
 
 
-def compile_wikiversions(source_tree, cfg):
+@utils.log_context('compile_wikiversions')
+def compile_wikiversions(source_tree, cfg, logger=None):
 """Validate and compile the wikiversions.json file.
 
 1. Find the realm specific filename for wikiversions.json in staging area
@@ -114,7 +115,6 @@
 :param source_tree: Source tree to read file from: 'deploy' or 'stage'
 :param cfg: Dict of global configuration values
 """
-logger = logging.getLogger('compile_wikiversions')
 
 working_dir = cfg['%s_dir' % source_tree]
 
@@ -198,7 +198,9 @@
 logger.info('Compiled %s to %s', json_file, php_file)
 
 
-def merge_cdb_updates(directory, pool_size, trust_mtime=False, mute=False):
+@utils.log_context('merge_cdb_updates')
+def merge_cdb_updates(directory, pool_size, trust_mtime=False, mute=False,
+  logger=None):
 """Update l10n CDB files using JSON data.
 
 :param directory: L10n cache directory
@@ -206,7 +208,6 @@
 :param trust_mtime: Trust file modification time?
 :param mute: Disable progress indicator
 """
-logger = logging.getLogger('merge_cdb_updates')
 
 cache_dir = os.path.realpath(directory)
 upstream_dir = os.path.join(cache_dir, 'upstream')
@@ -274,7 +275,8 @@
 purge.progress('l10n purge').run()
 
 
-def sync_common(cfg, include=None, sync_from=None, verbose=False):
+@utils.log_context('sync_common')
+def sync_common(cfg, include=None, sync_from=None, verbose=False, logger=None):
 """Sync local deploy dir with upstream rsync server's copy
 
 Rsync from ``server::common`` to the local deploy directory.
@@ -290,7 +292,6 @@
 ``/***``.
 :param sync_from: List of rsync servers to fetch from.
 """
-logger = logging.getLogger('sync_common')
 
 if not os.path.isdir(cfg['deploy_dir']):
 raise Exception((
@@ -350,14 +351,14 @@
 return rsync.progress('sync_wikiversions').run()
 
 
-def update_l10n_cdb(cache_dir, cdb_file, trust_mtime=False):
+@utils.log_context('update_l10n_cdb')
+def update_l10n_cdb(cache_dir, cdb_file, trust_mtime=False, logger=None):
 """Update a localization CDB database.
 
 :param cache_dir: L10n cache directory
 :param cdb_file: L10n CDB database
 :param trust_mtime: Trust file modification time?
 """
-logger = logging.getLogger('update_l10n_cdb')
 
 md5_path = os.path.join(cache_dir, 'upstream', '%s.MD5' % cdb_file)
 if not os.path.exists(md5_path):
@@ -410,7 +411,8 @@
 return False
 
 
-def update_l10n_cdb_wrapper(args):
+@utils.log_context('update_l10n_cdb_wrapper')
+def update_l10n_cdb_wrapper(args, logger=None):
 """Wrapper for update_l10n_cdb to be used in contexts where only a single
 argument can be provided.
 
@@ -420,8 +422,7 @@
 return update_l10n_cdb(*args)
 except:
 # Log detailed error; multiprocessing will truncate the stack trace
-logging.getLogger('update_l10n_cdb_wrapper').exception(
-'Failure processing %s', args)
+logger.exception('Failure processing %s', args)
 raise
 
 
@@ -471,7 +472,8 @@
 })
 
 
-def update_localization_cache(version, wikidb, verbose, cfg):
+@utils.log_context('update_localization_cache')
+def update_localization_cache(version, wikidb, verbose, cfg, logger=None):
 """Update the localization cache for a given MW version.
 
 :param version: MediaWiki version
@@ -479,7 +481,6 @@
 :param verbose: Provide verbose output
 :param cfg: Global configuration
 """
-logger = logging.getLogger('update_localization_cache')
 
 # Calculate the number of parallel threads
 # Leave a couple of cores free for other stuff
@@ -599,12 +600,13 @@
 utils.sudo_check_call(user, cmd)
 
 
-def git_checkout(location, rev, submodules=False, user="mwdeploy"):
+@utils.log_context('git_checkout')
+def git_checkout(location, rev, submodules=False, user="mwdeploy",
+ logger=None):
 """Checkout a git repo sha at a location as a user
 """
 utils.ensure_git_dir(location)
 
-logger = logging.getLogger('git_checkout')
 with utils.cd(location):
 logger.debug(
 'Checking out rev: {} at location: {}'.format(rev, location))
@@ -617,9 +619,10 @@
 utils.sudo_check_call(user, cmd)
 
 

[MediaWiki-commits] [Gerrit] Add mw.wikibase.getEntityIdForCurrentPage() - change (mediawiki...Wikibase)

[Ricordisamoa (Code Review)]

Ricordisamoa has uploaded a new change for review.

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

Change subject: Add mw.wikibase.getEntityIdForCurrentPage()
..

Add mw.wikibase.getEntityIdForCurrentPage()

Bug: T110683
Change-Id: Id70420d428824477d416d78f44a594364c1ff3c7
---
M client/includes/DataAccess/Scribunto/mw.wikibase.lua
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/client/includes/DataAccess/Scribunto/mw.wikibase.lua 
b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
index d4e6b4c..695c92c 100644
--- a/client/includes/DataAccess/Scribunto/mw.wikibase.lua
+++ b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
@@ -161,6 +161,8 @@
return php.resolvePropertyId( propertyLabelOrId )
end
 
+   wikibase.getEntityIdForCurrentPage = getEntityIdForCurrentPage
+
mw = mw or {}
mw.wikibase = wikibase
package.loaded['mw.wikibase'] = wikibase

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id70420d428824477d416d78f44a594364c1ff3c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 

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

[MediaWiki-commits] [Gerrit] Hygiene: remove AsyncTask.java from our code. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: remove AsyncTask.java from our code.
..


Hygiene: remove AsyncTask.java from our code.

It looks like we were using a straight-up copy of AsyncTask.java from
AOSP, for the sole purpose of providing the executeOnExecutor() function
for API 10...
I don't think so!

As a side effect, this fixes the remaining checkstyle errors under Windows.

Bug: T110105
Change-Id: I2d586368f11bd7524d4de23ea396581de13f9196
---
D app/src/main/java/org/wikipedia/concurrency/AsyncTask.java
M app/src/main/java/org/wikipedia/concurrency/SaneAsyncTask.java
2 files changed, 2 insertions(+), 678 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/concurrency/AsyncTask.java 
b/app/src/main/java/org/wikipedia/concurrency/AsyncTask.java
deleted file mode 100644
index 9045403..000
--- a/app/src/main/java/org/wikipedia/concurrency/AsyncTask.java
+++ /dev/null
@@ -1,678 +0,0 @@
-package org.wikipedia.concurrency;
-
-// Copied from Android 4.4.2_r2 source
-// so we can use executeOnExecutor :P
-//
-// 
https://android.googlesource.com/platform/frameworks/base/+/android-4.4.2_r2/core/java/android/os/AsyncTask.java
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import android.os.Handler;
-import android.os.Message;
-import android.os.Process;
-import android.support.annotation.NonNull;
-
-import java.util.ArrayDeque;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * AsyncTask enables proper and easy use of the UI thread. This class 
allows to
- * perform background operations and publish results on the UI thread without
- * having to manipulate threads and/or handlers.
- *
- * AsyncTask is designed to be a helper class around {@link Thread} and 
{@link Handler}
- * and does not constitute a generic threading framework. AsyncTasks should 
ideally be
- * used for short operations (a few seconds at the most.) If you need to keep 
threads
- * running for long periods of time, it is highly recommended you use the 
various APIs
- * provided by the java.util.concurrent pacakge such as {@link 
Executor},
- * {@link ThreadPoolExecutor} and {@link FutureTask}.
- *
- * An asynchronous task is defined by a computation that runs on a 
background thread and
- * whose result is published on the UI thread. An asynchronous task is defined 
by 3 generic
- * types, called Params, Progress and 
Result,
- * and 4 steps, called onPreExecute, doInBackground,
- * onProgressUpdate and onPostExecute.
- *
- * 
- * Developer Guides
- * For more information about using tasks and threads, read the
- * Processes 
and
- * Threads developer guide.
- * 
- *
- * Usage
- * AsyncTask must be subclassed to be used. The subclass will override at 
least
- * one method ({@link #doInBackground}), and most often will override a
- * second one ({@link #onPostExecute}.)
- *
- * Here is an example of subclassing:
- * 
- * private class DownloadFilesTask extends AsyncTaskURL, Integer, Long 
{
- * protected Long doInBackground(URL... urls) {
- * int count = urls.length;
- * long totalSize = 0;
- * for (int i = 0; i < count; i++) {
- * totalSize += Downloader.downloadFile(urls[i]);
- * publishProgress((int) ((i / (float) count) * 100));
- * // Escape early if cancel() is called
- * if (isCancelled()) break;
- * }
- * return totalSize;
- * }
- *
- * protected void onProgressUpdate(Integer... progress) {
- * setProgressPercent(progress[0]);
- * }
- *
- * protected void onPostExecute(Long result) {
- * showDialog("Downloaded " + result + " 

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

Change-Id: I606b16ba29ea558b19543512aed1e3c030300cc0
---
M extensions/DonationInterface
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 381faf5..7bad86c 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 381faf50bf1fd4bd42125f5dd67c4ba9b227e77d
+Subproject commit 7bad86c58f501dd1223424af702967711676c662

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I606b16ba29ea558b19543512aed1e3c030300cc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Awight 
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] Convert log.Timer and log.Stats to use context logger - change (mediawiki...scap)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Convert log.Timer and log.Stats to use context logger
..


Convert log.Timer and log.Stats to use context logger

Change-Id: Ibd72c991040eb07810dd4f3c435c475743df7d4c
---
M scap/log.py
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/scap/log.py b/scap/log.py
index 00f8504..caa4bb7 100644
--- a/scap/log.py
+++ b/scap/log.py
@@ -258,8 +258,9 @@
 See  for details.
 """
 
-def __init__(self, host, port):
-self.logger = logging.getLogger('stats')
+@utils.log_context('stats')
+def __init__(self, host, port, logger=None):
+self.logger = logger
 self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 self.address = (host, port)
 
@@ -301,7 +302,8 @@
 ... t.mark('copy phase 2')
 """
 
-def __init__(self, label, stats=None):
+@utils.log_context('timer')
+def __init__(self, label, stats=None, logger=None):
 """
 :param label: Label for block (e.g. 'scap' or 'rsync')
 :type label: str
@@ -310,7 +312,7 @@
 """
 self.label = label
 self.stats = stats
-self.logger = logging.getLogger('timer')
+self.logger = logger
 
 def mark(self, label):
 """

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd72c991040eb07810dd4f3c435c475743df7d4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] CXStats: Club the cumulative and trend under tabs - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: CXStats: Club the cumulative and trend under tabs
..


CXStats: Club the cumulative and trend under tabs

Bug: T113335
Bug: T113356
Change-Id: I882c28294f35e5c0ec8e883ac6f328694a936808
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/stats/ext.cx.stats.js
4 files changed, 170 insertions(+), 106 deletions(-)

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



diff --git a/extension.json b/extension.json
index 4b3cac9..2971959 100644
--- a/extension.json
+++ b/extension.json
@@ -883,7 +883,9 @@
"cx-stats-grouping-title",
"cx-trend-published-translations-title",
"cx-trend-translations-to-title",
-   "percent"
+   "percent",
+   "cx-stats-cumulative-tab-title",
+   "cx-stats-weekly-trend-tab-title"
]
},
"chart.js": {
diff --git a/i18n/en.json b/i18n/en.json
index 5ddb401..3cf1a1b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -144,6 +144,8 @@
"cx-stats-draft-translations-label": "Translations in progress",
"cx-stats-new-draft-translations-label": "New translations in progress",
"cx-stats-published-translators-title": "Number of translators",
+   "cx-stats-cumulative-tab-title": "Total",
+   "cx-stats-weekly-trend-tab-title": "Per week",
"cx-draft-discard-confirmation-message": "Are you sure you want to 
permanently delete this translation?",
"cx-draft-cancel-button-label": "Cancel",
"cx-draft-discard-button-label": "Delete translation",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5ce6e72..2313f94 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -85,6 +85,8 @@
"cx-tools-categories-count-message": "Indicates the number of 
categories associated with the page.\n\nDisplayed at the top of source and 
translation columns in [[Special:ContentTranslation]].\n\nParameters:\n* $1 - 
number of categories\n{{Identical|Category}}",
"cx-stats-title": "The title for the Special:ContentTranslationStats 
special page.",
"cx-stats-unknown": "Text when the source or target language is 
unknown. An adjective that describes the language.\n{{Identical|Unknown}}",
+   "cx-stats-cumulative-tab-title": "Title of cumulative stats tabs in 
[[Special:ContentTranslationStats]]",
+   "cx-stats-weekly-trend-tab-title": "Title of weekly trend stats tabs in 
[[Special:ContentTranslationStats]]",
"cx-tools-reference-title": "Title of Reference (footnote) tool card on 
Special:ContentTranslation.\n{{Identical|Reference}}",
"cx-tools-reference-add": "Text shown in the reference tool card. 
Clicking on it will add the reference in the cursor position.",
"cx-tools-reference-remove": "Text shown in the reference tool card. 
Clicking on it removes the reference in the context.",
diff --git a/modules/stats/ext.cx.stats.js b/modules/stats/ext.cx.stats.js
index 39f09d9..5812cae 100644
--- a/modules/stats/ext.cx.stats.js
+++ b/modules/stats/ext.cx.stats.js
@@ -32,79 +32,25 @@
$( '' ).addClass( 'bounce3' )
);
this.$highlights = $( '' ).addClass( 'cx-stats-highlights' 
);
-   this.$cumulativeGraph = $( '' ).attr( {
-   id: 'cxcumulative',
-   width: this.$container.width() - 200, // Leave a 200px 
margin buffer to avoid overflow
-   height: 400
-   } );
-
-   this.$languageCumulativeGraph = $( '' ).attr( {
-   id: 'cxlangcumulative',
-   width: this.$container.width() - 200, // Leave a 200px 
margin buffer to avoid overflow
-   height: 400
-   } );
-
-   this.$translatonTrendBarChart = $( '' ).attr( {
-   id: 'cxtrendchart',
-   width: this.$container.width() - 200, // Leave a 200px 
margin buffer to avoid overflow
-   height: 400
-   } );
-
-   this.$langTranslatonTrendBarChart = $( '' ).attr( {
-   id: 'cxlangtrendchart',
-   width: this.$container.width() - 200, // Leave a 200px 
margin buffer to avoid overflow
-   height: 400
-   } );
-
-   this.$container.append(
-   $spinner,
-   this.$highlights,
-   $( '' ).text( mw.msg( 
'cx-stats-all-translations-title' ) ),
-   $( '' )
-   .addClass( 'cx-stats-graph 
cx-stats-cumulative-total' )
-   .append( 

[MediaWiki-commits] [Gerrit] Migrate pywikibot/* tox jobs from Trusty to Jessie - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Migrate pywikibot/* tox jobs from Trusty to Jessie
..

Migrate pywikibot/* tox jobs from Trusty to Jessie

And to Nodepool instances in the process.  We used Trusty which has
python3.4. Nodepool instances have it as well.

Introduce JJB template '{name}-tox-{toxenv}-jessie', tied to Nodepool.

Delete:
pywikibot-core-tox-flake8-docstrings-mandatory-trusty
pywikibot-core-tox-flake8-docstrings-trusty
pywikibot-core-tox-flake8-py3-trusty
pywikibot-core-tox-nose-trusty
pywikibot-core-tox-nose34-trusty
pywikibot-wikibase-tox-flake8-py3-trusty
pywikibot-wikibase-tox-nose-trusty
pywikibot-wikibase-tox-nose34-trusty

Create:
pywikibot-core-tox-flake8-docstrings-jessie
pywikibot-core-tox-flake8-docstrings-mandatory-jessie
pywikibot-core-tox-flake8-py3-jessie
pywikibot-core-tox-nose-jessie
pywikibot-core-tox-nose34-jessie
pywikibot-wikibase-tox-flake8-py3-jessie
pywikibot-wikibase-tox-nose-jessie
pywikibot-wikibase-tox-nose34-jessie

Adjust Zuul triggers.

Change-Id: I386f0bd8620c6eb536a0608b265972f6bf770fea
---
M jjb/python-jobs.yaml
M jjb/pywikibot.yaml
M zuul/layout.yaml
3 files changed, 30 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/11/241011/1

diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 6a925c7..1088e10 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -18,6 +18,22 @@
 publishers:
  - archive-log-dir
 
+- job-template:
+name: '{name}-tox-{toxenv}-jessie'
+node: ci-jessie-wikimedia
+defaults: use-remoteonly-zuul
+concurrent: true
+properties:
+ - zeromq-event
+triggers:
+ - zuul
+builders:
+ - tox:
+ venv: '{toxenv}'
+publishers:
+ - archive-log-dir
+
+
 # Generic version of above.
 - job-template:
 name: 'tox-{toxenv}'
diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index 448d987..9893acc 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -14,18 +14,18 @@
 - project:
 name: pywikibot-core
 toxenv:
- - flake8-py3  # must only trigger the '-trusty' version
+ - flake8-py3  # must only trigger the '-jessie' version
  - flake8-docstrings
  - flake8-docstrings-mandatory
  - nose
- - nose34  # must only trigger the '-trusty' version
+ - nose34  # must only trigger the '-jessie' version
 
 jobs:
  - '{name}-tox-doc-publish':
 docsrc: 'docs/_build/html'
 docdest: 'pywikibot'
  - '{name}-tox-{toxenv}'
- - '{name}-tox-{toxenv}-trusty'
+ - '{name}-tox-{toxenv}-jessie'
 
 - project:
 name: pywikibot-i18n
@@ -67,4 +67,4 @@
 
 jobs:
  - '{name}-tox-{toxenv}'
- - '{name}-tox-{toxenv}-trusty'
+ - '{name}-tox-{toxenv}-jessie'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bf703bb..aa36ca9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7825,19 +7825,19 @@
   - noop
 test:
   - 'tox-flake8'
-  - 'pywikibot-core-tox-flake8-py3-trusty'
+  - 'pywikibot-core-tox-flake8-py3-jessie'
   - 'pywikibot-core-tox-flake8-docstrings'
   - 'pywikibot-core-tox-flake8-docstrings-mandatory'
   - 'pywikibot-core-tox-nose'
-  - 'pywikibot-core-tox-nose34-trusty'
-  - 'tox-doc-trusty'
+  - 'pywikibot-core-tox-nose34-jessie'
+  - 'tox-doc-jessie'
 gate-and-submit:
   - 'tox-flake8'
-  - 'pywikibot-core-tox-flake8-py3-trusty'
+  - 'pywikibot-core-tox-flake8-py3-jessie'
   - 'pywikibot-core-tox-flake8-docstrings-mandatory'
   - 'pywikibot-core-tox-nose'
-  - 'pywikibot-core-tox-nose34-trusty'
-  - 'tox-doc-trusty'
+  - 'pywikibot-core-tox-nose34-jessie'
+  - 'tox-doc-jessie'
 postmerge:
   - 'pywikibot-core-tox-doc-publish'
 
@@ -7863,13 +7863,13 @@
 test:
   - 'tox-flake8'
   - 'pywikibot-wikibase-tox-nose'
-  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
-  - 'pywikibot-wikibase-tox-nose34-trusty'
+  - 'pywikibot-wikibase-tox-flake8-py3-jessie'
+  - 'pywikibot-wikibase-tox-nose34-jessie'
 gate-and-submit:
   - 'tox-flake8'
   - 'pywikibot-wikibase-tox-nose'
-  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
-  - 'pywikibot-wikibase-tox-nose34-trusty'
+  - 'pywikibot-wikibase-tox-flake8-py3-jessie'
+  - 'pywikibot-wikibase-tox-nose34-jessie'
 
   - name: qrpedia
 check-voter:

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

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

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Fix some message use in stats - change (mediawiki...ContentTranslation)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Fix some message use in stats
..

Fix some message use in stats

* Removed unused cx-stats-unknown
* Removed unused cx-stats-monthly-publised
* Removed unused cx-trend-translations-to-title
* Removed unused cx-trend-published-translations-title
* Sorted messages entry in extension.json for ext.cx.stats
* Use cx-stats-draft-translations-title for title instead of
  -label, as labels are reserved for labels.
* Removed word "total" from cx-stats-all-translations-title
Change-Id: I41c4ee52d7afb7e70a3fe7e9f64c5274cb5bc545
---
M extension.json
M i18n/en.json
M modules/stats/ext.cx.stats.js
3 files changed, 18 insertions(+), 25 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/12/241012/1

diff --git a/extension.json b/extension.json
index 2971959..f8799b1 100644
--- a/extension.json
+++ b/extension.json
@@ -861,31 +861,28 @@
],
"messages": [
"cx-stats-all-translations-title",
+   "cx-stats-cumulative-tab-title",
+   "cx-stats-draft-source-target",
+   "cx-stats-draft-target-source",
+   "cx-stats-draft-translations-label",
+   "cx-stats-draft-translations-title",
+   "cx-stats-grouping-title",
+   "cx-stats-local-published",
+   "cx-stats-local-published-number",
+   "cx-stats-new-draft-translations-label",
+   "cx-stats-published-source-target",
+   "cx-stats-published-target-source",
"cx-stats-published-translations-label",
"cx-stats-published-translations-title",
-   "cx-stats-draft-translations-title",
-   "cx-stats-draft-translations-label",
-   "cx-stats-new-draft-translations-label",
"cx-stats-published-translators-title",
-   "cx-trend-deletions",
-   "cx-trend-translations-to",
-   "cx-stats-try-contenttranslation",
-   "cx-stats-published-target-source",
-   "cx-stats-published-source-target",
-   "cx-stats-draft-target-source",
-   "cx-stats-draft-source-target",
"cx-stats-tabs-expand",
"cx-stats-total-published",
-   "cx-stats-monthly-published",
+   "cx-stats-try-contenttranslation",
"cx-stats-weekly-published",
-   "cx-stats-local-published-number",
-   "cx-stats-local-published",
-   "cx-stats-grouping-title",
-   "cx-trend-published-translations-title",
-   "cx-trend-translations-to-title",
-   "percent",
-   "cx-stats-cumulative-tab-title",
-   "cx-stats-weekly-trend-tab-title"
+   "cx-stats-weekly-trend-tab-title",
+   "cx-trend-deletions",
+   "cx-trend-translations-to",
+   "percent"
]
},
"chart.js": {
diff --git a/i18n/en.json b/i18n/en.json
index 3cf1a1b..4b85208 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -79,7 +79,6 @@
"cx-tools-mt-dont-use": "Don't use machine translation",
"cx-tools-categories-count-message": "{{PLURAL:$1|$1 category|$1 
categories|0=No categories}}",
"cx-stats-title": "Content Translation statistics",
-   "cx-stats-unknown": "unknown",
"cx-tools-reference-title": "Reference",
"cx-tools-reference-add": "Add reference",
"cx-tools-reference-remove": "Remove reference",
@@ -161,7 +160,7 @@
"cx-trend-deletions": "Deleted translations",
"cx-trend-translations-to": "Translations to $1",
"cx-stats-try-contenttranslation": "Content Translation is a tool to 
create new pages by translating from other languages. [$1 Try Content 
Translation]",
-   "cx-stats-all-translations-title": "Total translations to all 
languages",
+   "cx-stats-all-translations-title": "Translations to all languages",
"cx-stats-published-translations-label": "Published translations",

[MediaWiki-commits] [Gerrit] Migrate integration-config-tox-dib from Trusty to Jessie - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Migrate integration-config-tox-dib from Trusty to Jessie
..

Migrate integration-config-tox-dib from Trusty to Jessie

And to Nodepool instances in the process.  We used Trusty which has
python3.4. Nodepool instances have it as well.

Cause '{name}-tox-{toxenv}-trusty' to be orphaned. Will remove it in a
later change.

Change-Id: I112e5089aa3d2485290d0fa1a52226bfb8e33e05
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/13/241013/1

diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 6808692..9e08758 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -130,7 +130,7 @@
  - 'integration-zuul-layoutvalidation'
  - 'integration-zuul-layoutvalidation-gate'
  - '{name}-puppet-validate'
- - '{name}-tox-{toxenv}-trusty':
+ - '{name}-tox-{toxenv}-jessie':
  toxenv: dib
 
 - project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index aa36ca9..0d1396e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1652,7 +1652,7 @@
 failure-message: 'Failed to compare your patchset with the current 
configuration. FAILURE'
 files: '^jjb/.*'
 
-  - name: 'integration-config-tox-dib-trusty'
+  - name: 'integration-config-tox-dib-jessie'
 files: '^dib/.*'
 
   - name: 'integration-zuul-layoutdiff'
@@ -1995,7 +1995,7 @@
   - tox-flake8
   - tox-py27
   - integration-config-puppet-validate
-  - integration-config-tox-dib-trusty
+  - integration-config-tox-dib-jessie
   - integration-jjb-config-diff
   - integration-zuul-layoutdiff
   - integration-zuul-layoutvalidation
@@ -2003,7 +2003,7 @@
   - tox-flake8
   - tox-py27
   - integration-config-puppet-validate
-  - integration-config-tox-dib-trusty
+  - integration-config-tox-dib-jessie
   - integration-jjb-config-diff
   - integration-zuul-layoutdiff
   - integration-zuul-layoutvalidation-gate

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

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

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

[MediaWiki-commits] [Gerrit] Convert most of utils to use context loggers too! - change (mediawiki...scap)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Convert most of utils to use context loggers too!
..


Convert most of utils to use context loggers too!

Change-Id: I7d58617bab9a12b69a1137fca2a233a27587e183
---
M scap/tasks.py
1 file changed, 26 insertions(+), 24 deletions(-)

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



diff --git a/scap/tasks.py b/scap/tasks.py
index 3ac6f9f..dca15ae 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -96,7 +96,8 @@
 utils.check_valid_json_file(abspath)
 
 
-def compile_wikiversions(source_tree, cfg):
+@utils.log_context('compile_wikiversions')
+def compile_wikiversions(source_tree, cfg, logger=None):
 """Validate and compile the wikiversions.json file.
 
 1. Find the realm specific filename for wikiversions.json in staging area
@@ -114,7 +115,6 @@
 :param source_tree: Source tree to read file from: 'deploy' or 'stage'
 :param cfg: Dict of global configuration values
 """
-logger = logging.getLogger('compile_wikiversions')
 
 working_dir = cfg['%s_dir' % source_tree]
 
@@ -198,7 +198,9 @@
 logger.info('Compiled %s to %s', json_file, php_file)
 
 
-def merge_cdb_updates(directory, pool_size, trust_mtime=False, mute=False):
+@utils.log_context('merge_cdb_updates')
+def merge_cdb_updates(directory, pool_size, trust_mtime=False, mute=False,
+  logger=None):
 """Update l10n CDB files using JSON data.
 
 :param directory: L10n cache directory
@@ -206,7 +208,6 @@
 :param trust_mtime: Trust file modification time?
 :param mute: Disable progress indicator
 """
-logger = logging.getLogger('merge_cdb_updates')
 
 cache_dir = os.path.realpath(directory)
 upstream_dir = os.path.join(cache_dir, 'upstream')
@@ -274,7 +275,8 @@
 purge.progress('l10n purge').run()
 
 
-def sync_common(cfg, include=None, sync_from=None, verbose=False):
+@utils.log_context('sync_common')
+def sync_common(cfg, include=None, sync_from=None, verbose=False, logger=None):
 """Sync local deploy dir with upstream rsync server's copy
 
 Rsync from ``server::common`` to the local deploy directory.
@@ -290,7 +292,6 @@
 ``/***``.
 :param sync_from: List of rsync servers to fetch from.
 """
-logger = logging.getLogger('sync_common')
 
 if not os.path.isdir(cfg['deploy_dir']):
 raise Exception((
@@ -350,14 +351,14 @@
 return rsync.progress('sync_wikiversions').run()
 
 
-def update_l10n_cdb(cache_dir, cdb_file, trust_mtime=False):
+@utils.log_context('update_l10n_cdb')
+def update_l10n_cdb(cache_dir, cdb_file, trust_mtime=False, logger=None):
 """Update a localization CDB database.
 
 :param cache_dir: L10n cache directory
 :param cdb_file: L10n CDB database
 :param trust_mtime: Trust file modification time?
 """
-logger = logging.getLogger('update_l10n_cdb')
 
 md5_path = os.path.join(cache_dir, 'upstream', '%s.MD5' % cdb_file)
 if not os.path.exists(md5_path):
@@ -410,7 +411,8 @@
 return False
 
 
-def update_l10n_cdb_wrapper(args):
+@utils.log_context('update_l10n_cdb_wrapper')
+def update_l10n_cdb_wrapper(args, logger=None):
 """Wrapper for update_l10n_cdb to be used in contexts where only a single
 argument can be provided.
 
@@ -420,8 +422,7 @@
 return update_l10n_cdb(*args)
 except:
 # Log detailed error; multiprocessing will truncate the stack trace
-logging.getLogger('update_l10n_cdb_wrapper').exception(
-'Failure processing %s', args)
+logger.exception('Failure processing %s', args)
 raise
 
 
@@ -471,7 +472,8 @@
 })
 
 
-def update_localization_cache(version, wikidb, verbose, cfg):
+@utils.log_context('update_localization_cache')
+def update_localization_cache(version, wikidb, verbose, cfg, logger=None):
 """Update the localization cache for a given MW version.
 
 :param version: MediaWiki version
@@ -479,7 +481,6 @@
 :param verbose: Provide verbose output
 :param cfg: Global configuration
 """
-logger = logging.getLogger('update_localization_cache')
 
 # Calculate the number of parallel threads
 # Leave a couple of cores free for other stuff
@@ -599,12 +600,13 @@
 utils.sudo_check_call(user, cmd)
 
 
-def git_checkout(location, rev, submodules=False, user="mwdeploy"):
+@utils.log_context('git_checkout')
+def git_checkout(location, rev, submodules=False, user="mwdeploy",
+ logger=None):
 """Checkout a git repo sha at a location as a user
 """
 utils.ensure_git_dir(location)
 
-logger = logging.getLogger('git_checkout')
 with utils.cd(location):
 logger.debug(
 'Checking out rev: {} at location: {}'.format(rev, location))
@@ -617,9 +619,10 @@
 utils.sudo_check_call(user, cmd)
 
 
-def 

[MediaWiki-commits] [Gerrit] Revert "Let MW-Selenium 1.x use the local test suite configu... - change (integration/config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Let MW-Selenium 1.x use the local test suite 
configuration"
..


Revert "Let MW-Selenium 1.x use the local test suite configuration"

This reverts commit 700edd9b3c458971bdbc1dc536b92277d2808cae.

Bug: T111510
Change-Id: I79afc810973695f88d4782300ee0586d33307f58
---
M jjb/macro-browsertests.yaml
1 file changed, 6 insertions(+), 25 deletions(-)

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



diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 5cacf6e..7de1948 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -9,18 +9,18 @@
   fi
   export CUCUMBER_TAGS={cucumber_tags}
   export HEADLESS={headless}
-
+  export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
+  export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
   export PLATFORM='{platform}'
   # Replace PLATFORM underscores (Jenkins) to spaces (SauceLabs)
   export PLATFORM=${{PLATFORM//_/ }}
-
   export SCREENSHOT_FAILURES=true
   export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
 
   # Log results to Raita
   export RAITA_URL=http://integration-raita.eqiad.wmflabs:9200/raita
 
-  # Set MEDIAWIKI_ENVIRONMENT for mw-selenium 1.x
+  # Set MEDIAWIKI_ENVIRONMENT for mediawiki-selenium >= 1.0.0
   case '{mediawiki_url}' in
 *.beta.wmflabs.org)
   export MEDIAWIKI_ENVIRONMENT=beta
@@ -31,33 +31,14 @@
   esac
 
   set +x
-
   if [ -z $MEDIAWIKI_CREDENTIALS ]; then
   echo "\$MEDIAWIKI_CREDENTIALS is empty. Check job configuration."
   exit 1
   fi
-
-  MEDIAWIKI_USER=`echo $MEDIAWIKI_CREDENTIALS | cut -f1 -d:`
-  MEDIAWIKI_PASSWORD=`echo $MEDIAWIKI_CREDENTIALS | cut -f2- -d:`
-
+  export MEDIAWIKI_USER=`echo $MEDIAWIKI_CREDENTIALS | cut -f1 -d:`
+  export MEDIAWIKI_PASSWORD=`echo $MEDIAWIKI_CREDENTIALS | cut -f2- 
-d:`
+  export MEDIAWIKI_PASSWORD_VARIABLE='MEDIAWIKI_PASSWORD'
   set -x
-
-  MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
-  MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
-
-  # Let test suites running mw-selenium 1.x use their own
-  # configuration for URLs and users, but export our settings for
-  # versions 0.x
-  if [ ! -f "{folder}/browser/environments.yml" ]; then
-  export MEDIAWIKI_API_URL
-  export MEDIAWIKI_URL
-  export MEDIAWIKI_USER
-  fi
-
-  # Export the MW user password regardless, as passwords are not kept
-  # in test suite configurations
-  export MEDIAWIKI_PASSWORD
-
 
   # VERSION is used for SauceLabs
   export VERSION={version}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79afc810973695f88d4782300ee0586d33307f58
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] registration: Vary the loaded queue cache on $wgVersion - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: registration: Vary the loaded queue cache on $wgVersion
..


registration: Vary the loaded queue cache on $wgVersion

If the version changes, we need to recheck the dependency requirements.

Follows-up cef1f31167177ca05c8981d.

Change-Id: I30e95b5dec7b5a1d9ca391fb2ae55e0b3de0c528
---
M includes/registration/ExtensionRegistry.php
1 file changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index 23e29d8..f91aeff 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -114,12 +114,22 @@
}
 
public function loadFromQueue() {
+   global $wgVersion;
if ( !$this->queued ) {
return;
}
 
+   // A few more things to vary the cache on
+   $versions = array(
+   'registration' => self::CACHE_VERSION,
+   'mediawiki' => $wgVersion
+   );
+
// See if this queue is in APC
-   $key = wfMemcKey( 'registration', md5( json_encode( 
$this->queued ) ), self::CACHE_VERSION );
+   $key = wfMemcKey(
+   'registration',
+   md5( json_encode( $this->queued + $versions ) )
+   );
$data = $this->cache->get( $key );
if ( $data ) {
$this->exportExtractedData( $data );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30e95b5dec7b5a1d9ca391fb2ae55e0b3de0c528
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [WIP] Disable failing sniffs in phpcs.xml - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: [WIP] Disable failing sniffs in phpcs.xml
..

[WIP] Disable failing sniffs in phpcs.xml

Change-Id: I6731d2d07bbd89d424a660ceb7aee4c0392500d3
---
M phpcs.xml
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/85/241085/1

diff --git a/phpcs.xml b/phpcs.xml
index 36ad394..fda07ec 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,9 @@
 
 
-   
+   
+   
+   
+   
.



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

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

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

[MediaWiki-commits] [Gerrit] Update namemsg to convention - change (mediawiki...apex)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update namemsg to convention
..

Update namemsg to convention

Bug: T113632
Change-Id: Idf10d74a5214b415ebcda59572a494e3395fdafb
---
M i18n/en.json
M i18n/qqq.json
M skin.json
3 files changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 6303654..14dbd46 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,7 +2,7 @@
"@metadata": {
"authors": []
},
-   "skinname-apex": "Apex",
+   "apex-skinname": "Apex",
"apex-desc": "Modern version of Vector with fresh look and many 
usability improvements",
"apex.css": "/* CSS placed here will affect users of the Apex skin */",
"apex.js": "/* Any JavaScript here will be loaded for users using the 
Apex skin */",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8806002..b899fd5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,6 +1,8 @@
 {
-   "@metadata": [],
-   "skinname-apex": "{{optional}}",
+   "@metadata": {
+   "authors": []
+   },
+   "apex-skinname": "{{optional}}",
"apex-desc": 
"{{desc|what=skin|name=Apex|url=https://www.mediawiki.org/wiki/Skin:Apex}};,
"apex.css": "{{optional}}",
"apex.js": "{{optional}}",
diff --git a/skin.json b/skin.json
index 4bc6316..177d1c9 100644
--- a/skin.json
+++ b/skin.json
@@ -1,11 +1,11 @@
 {
"name": "Apex",
+   "namemsg": "apex-skinname",
"author": [
"Trevor Parscal"
],
"url": "https://www.mediawiki.org/wiki/Skin:Apex;,
"descriptionmsg": "apex-desc",
-   "namemsg": "skinname-apex",
"license-name": "GPL-2.0+",
"type": "skin",
"ValidSkinNames": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf10d74a5214b415ebcda59572a494e3395fdafb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Add // @codingStandardsIgnoreFile to FormatMetadata - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add // @codingStandardsIgnoreFile to FormatMetadata
..

Add // @codingStandardsIgnoreFile to FormatMetadata

PHPCS can't handle the level of nesting in this file and the tokenizer
dies.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/241100/1

diff --git a/includes/media/FormatMetadata.php 
b/includes/media/FormatMetadata.php
index 0fee8cc..b4892c4 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1,4 +1,6 @@
 https://gerrit.wikimedia.org/r/241100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Make `parserTests.js --quiet` truly quiet - change (mediawiki...parsoid)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Make `parserTests.js --quiet` truly quiet
..

Make `parserTests.js --quiet` truly quiet

Add a `suppressErrors` option to the parsoid clause in parserTests to
suppress error messages when they are expected (for example, when
testing error handling in Parsoid).  Also suppress errors for
tests of , since we know that doesn't work yet.

Tag tests with `suppressErrors` where needed, and make a few others
PHP-only.  Count and report the number of errors logged during
parserTests execution, and exit with a non-zero code if we log
errors.  This ensures that jenkins will help us keep parser tests
quiet.

Change-Id: I7593d579d9487df69cc9a5f64efe2efa36c7668e
---
M tests/parserTests-blacklist.js
M tests/parserTests.js
M tests/parserTests.txt
3 files changed, 51 insertions(+), 20 deletions(-)


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

diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 5db184a..87bff45 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -137,10 +137,8 @@
 add("wt2html", "{{#speciale:}} page name, known", "Parser
 function implementation for pf_#speciale missing in Parsoid.");
 add("wt2html", "{{#speciale:}} page name with subpage, known", "Parser
 function implementation for pf_#speciale missing in Parsoid.");
 add("wt2html", "{{#speciale:}} page name, unknown", "Parser 
function implementation for pf_#speciale missing in Parsoid.");
-add("wt2html", "Image with link parameter, wgExternalLinkTarget", "http://example.com/\; data-parsoid=\"{}\">");
 add("wt2html", "Image with link parameter, wgNoFollowLinks set to false", "http://example.com/\; data-parsoid=\"{}\">");
 add("wt2html", "Image with link parameter, wgNoFollowDomainExceptions", "http://example.com/\; data-parsoid=\"{}\">");
-add("wt2html", "Image with link parameter, wgExternalLinkTarget, unnamed 
parameter", "http://example.com/\; 
data-parsoid=\"{}\">");
 add("wt2html", "SVG thumbnails with invalid language code", "caption");
 add("wt2html", "BUG 561: {{/Subpage}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:/Subpage");
 add("wt2html", "Simple category", "");
@@ -523,10 +521,8 @@
 add("html2html", "Allow empty links in image captions (Bug 60753)", "Caption Link1\n[[]]\nLink2\n");
 add("html2html", "Image with multiple attributes from the same template", 
"Caption 
text\n");
 add("html2html", "Image with link tails", "123456\n123\n\n456\n123\n\n456\n");
-add("html2html", "Image with link parameter, wgExternalLinkTarget", "http://example.com/\; 
data-parsoid='{\"targetOff\":21,\"contentOffsets\":[21,62],\"dsr\":[0,63,21,1]}'>http://example.com/images/3/3a/Foobar.jpg\; alt=\"Foobar.jpg\" 
data-parsoid='{\"type\":\"extlink\",\"dsr\":[21,62,null,null]}'/>\n");
 add("html2html", "Image with link parameter, wgNoFollowLinks set to false", 
"http://example.com/images/3/3a/Foobar.jpg\; alt=\"Foobar.jpg\" 
rel=\"mw:externalImage\" data-parsoid='{\"dsr\":[0,41,null,null]}'/>\n");
 add("html2html", "Image with link parameter, wgNoFollowDomainExceptions", "http://example.com/images/3/3a/Foobar.jpg\; alt=\"Foobar.jpg\" 
rel=\"mw:externalImage\" data-parsoid='{\"dsr\":[0,41,null,null]}'/>\n");
-add("html2html", "Image with link parameter, wgExternalLinkTarget, unnamed 
parameter", "http://example.com/\; 
data-parsoid='{\"targetOff\":21,\"contentOffsets\":[21,62],\"dsr\":[0,63,21,1]}'>http://example.com/images/3/3a/Foobar.jpg\; alt=\"Foobar.jpg\" 
data-parsoid='{\"type\":\"extlink\",\"dsr\":[21,62,null,null]}'/>\n");
 add("html2html", "Link to image page- image page normally doesn't exists, 
hence edit link\nAdd test with existing image page\n#Image:test", "[/index.php?title=File:Testaction=editredlink=1
 Image:test]\n");
 add("html2html", "bug 18784  Link to non-existent image page with caption 
should use caption as link text", "[/index.php?title=File:Testaction=editredlink=1
 caption]\n");
 add("html2html", "SVG thumbnails with invalid language code", "\n");
@@ -1079,10 +1075,8 @@
 add("html2wt", "Image with multiple alignments -- use first (bug 48664)", 
"[[File:Foobar.jpg|left|thumb|caption]]\n[[File:Foobar.jpg|middle|caption]]\n");
 add("html2wt", "Image with width attribute at different positions", 
"[[File:Foobar.jpg|right|200x200px|Caption]]\n[[File:Foobar.jpg|right|200x200px|Caption]]\n[[File:Foobar.jpg|right|200x200px|Caption]]\n");
 add("html2wt", "Image with link parameter, wiki target", 
"[[File:Foobar.jpg|link=Main_Page]]\n");
-add("html2wt", "Image with link parameter, wgExternalLinkTarget", 
"[http://example.com/ http://example.com/images/3/3a/Foobar.jpg]\n;);
 add("html2wt", "Image with link parameter, wgNoFollowLinks set to false", 
"http://example.com/images/3/3a/Foobar.jpg\n;);
 add("html2wt", "Image with link parameter, 

[MediaWiki-commits] [Gerrit] Fix spacing in ReplacementArray - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix spacing in ReplacementArray
..


Fix spacing in ReplacementArray

Change-Id: I8cb23892a06ebd8ad0f0726e8a6f4c853d0eb4c3
---
M includes/libs/ReplacementArray.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/libs/ReplacementArray.php 
b/includes/libs/ReplacementArray.php
index b6faa37..ea50a85 100644
--- a/includes/libs/ReplacementArray.php
+++ b/includes/libs/ReplacementArray.php
@@ -112,7 +112,7 @@
 */
public function replace( $subject ) {
if (
-   function_exists( 'fss_prep_replace' )  &&
+   function_exists( 'fss_prep_replace' ) &&
version_compare( PHP_VERSION, '5.5.0' ) < 0
) {
if ( $this->fss === false ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cb23892a06ebd8ad0f0726e8a6f4c853d0eb4c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [FEAT] Test Python 3.5 on Travis - change (pywikibot/core)

[XZise (Code Review)]

XZise has uploaded a new change for review.

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

Change subject: [FEAT] Test Python 3.5 on Travis
..

[FEAT] Test Python 3.5 on Travis

As Python 3.5 has been officially released we should test on this. There are
minor issues with deprecations as `inspect.getargspec` has been deprecated. But
apart from a deprecation message it still works and will only be broken with
Python 3.6.

Bug: T106209
Change-Id: Ic8256184d1c1dbf841def5ad3846155564e05b75
---
M .travis.yml
M tests/utils.py
2 files changed, 7 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/47/241147/1

diff --git a/.travis.yml b/.travis.yml
index 01b04ad..24cad4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@
   - '2.7'
   - '3.3'
   - '3.4'
+  - '3.5'
   - '2.6'
 
 # OSX builds do not yet support Python
@@ -109,29 +110,6 @@
   matrix:
 - LANGUAGE=en FAMILY=wikipedia PYWIKIBOT2_TEST_PROD_ONLY=1
 - LANGUAGE=zh FAMILY=wikisource PYSETUP_TEST_EXTRAS=1 
PYWIKIBOT2_TEST_PROD_ONLY=1 PYWIKIBOT2_TEST_NO_RC=1
-
-matrix:
-  include:
-- python: '2.7_with_system_site_packages'  # equivalent to virtualenv: 
system_site_packages: true
-  env: LANGUAGE=he FAMILY=wikivoyage SITE_ONLY=1
-- python: '2.7'
-  env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1 
OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org"
-- python: '3.3'
-  env: LANGUAGE=zh FAMILY=wpbeta SITE_ONLY=1 
OAUTH_DOMAIN="zh.wikipedia.beta.wmflabs.org"
-- python: '3.4'
-  env: LANGUAGE=en FAMILY=wsbeta SITE_ONLY=1
-- python: '2.7'
-  env: LANGUAGE=wikia FAMILY=wikia PYWIKIBOT2_TEST_NO_RC=1
-- python: '3.3'
-  env: LANGUAGE=en FAMILY=musicbrainz SITE_ONLY=1
-- python: '3.4'
-  env: LANGUAGE=test FAMILY=wikipedia SITE_ONLY=1 
OAUTH_DOMAIN="test.wikipedia.org"
-- python: '3.4'
-  env: LANGUAGE=test FAMILY=wikidata SITE_ONLY=1
-- python: '3.4'
-  env: LANGUAGE=ar FAMILY=wiktionary PYWIKIBOT2_TEST_NO_RC=1
-- python: '2.6'
-  env: LANGUAGE=wikidata FAMILY=wikidata SITE_ONLY=1
 
 notifications:
   email:
diff --git a/tests/utils.py b/tests/utils.py
index fb2fafb..654b91b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -227,6 +227,12 @@
 else:
 skip_lines -= 1
 
+# Avoid failures because getargspec hasn't been removed yet: 
T106209
+if PYTHON_VERSION >= (3, 5, 0):
+if str(entry.message) == ('inspect.getargspec() is deprecated, 
'
+  'use inspect.signature() instead'):
+return
+
 log.append(entry)
 
 log = super(WarningSourceSkipContextManager, self).__enter__()

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

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

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

[MediaWiki-commits] [Gerrit] Remove PHP localization cache code - change (mediawiki...scap)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove PHP localization cache code
..


Remove PHP localization cache code

Nice experiment, but didn't pan out.

This partially reverts 1 commit:
 - Revert "Don't assume current l10n cache files are .cdb"
   This reverts commit d7db8de6e496fda30c247a8387fa69114ab16d31.

Change-Id: I74178adec3545c2d0da1ffee40e2f188709d95dc
---
M scap/tasks.py
1 file changed, 3 insertions(+), 7 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scap/tasks.py b/scap/tasks.py
index 122a48f..d305598 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -439,14 +439,10 @@
 logger = logging.getLogger('update_localization_cache')
 
 with utils.sudo_temp_dir('www-data', 'scap_l10n_') as temp_dir:
-# Seed the temporary directory with the current CDB and/or PHP files.
-# The unspeakable horror that is '[pc][hd][pb]' is a portable way of
-# matching one or more .cdb / .php files. We only need this
-# monstronsity during a temporary migration period. Slap Ori if it
-# is still around after 1-Sep-2015.
-if glob.glob('%s/*.[pc][hd][pb]' % out_dir):
+# Seed the temporary directory with the current CDB files
+if glob.glob('%s/*.cdb' % out_dir):
 utils.sudo_check_call('www-data',
-"cp '%(out_dir)s/'*.[pc][hd][pb] '%(temp_dir)s'" % {
+"cp '%(out_dir)s/'*.cdb '%(temp_dir)s'" % {
 'temp_dir': temp_dir,
 'out_dir': out_dir
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74178adec3545c2d0da1ffee40e2f188709d95dc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [PULL THROUGH] MWLinkAnnotationInspector: Use new getTextInp... - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: [PULL THROUGH] MWLinkAnnotationInspector: Use new 
getTextInputWidget method
..

[PULL THROUGH] MWLinkAnnotationInspector: Use new getTextInputWidget method

Depends on I4bccf0711 in core.

Change-Id: Ia33797d612be7b4521e7212047a38480ee2520df
---
M modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
index d4d74de..63e7b64 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
@@ -114,7 +114,7 @@
htmlDoc
);
if ( targetData.isInternal ) {
-   this.internalAnnotationInput.text.setValue( 
targetData.title );
+   
this.internalAnnotationInput.getTextInputWidget().setValue( targetData.title );
return;
}
}
@@ -195,7 +195,7 @@
 ve.ui.MWLinkAnnotationInspector.prototype.getReadyProcess = function ( data ) {
return 
ve.ui.MWLinkAnnotationInspector.super.prototype.getReadyProcess.call( this, 
data )
.next( function () {
-   this.internalAnnotationInput.text.populateLookupMenu();
+   
this.internalAnnotationInput.getTextInputWidget().populateLookupMenu();
}, this );
 };
 
@@ -253,7 +253,7 @@
  * @param {OO.ui.MenuOptionWidget} item Selected item
  */
 ve.ui.MWLinkAnnotationInspector.prototype.onLinkTypeSelectSelect = function () 
{
-   var text = this.annotationInput.text.getValue(),
+   var text = this.annotationInput.getTextInputWidget().getValue(),
end = text.length,
isExternal = this.isExternal(),
inputHasProtocol = 
ve.init.platform.getExternalLinkUrlProtocolsRegExp().test( text );
@@ -268,12 +268,12 @@
this.allowProtocolInInternal = true;
}
 
-   this.annotationInput.text.setValue( text ).focus();
+   this.annotationInput.getTextInputWidget().setValue( text ).focus();
// Firefox moves the cursor to the beginning
-   this.annotationInput.text.$input[ 0 ].setSelectionRange( end, end );
+   this.annotationInput.getTextInputWidget().$input[ 0 
].setSelectionRange( end, end );
 
if ( !isExternal ) {
-   this.annotationInput.text.populateLookupMenu();
+   this.annotationInput.getTextInputWidget().populateLookupMenu();
}
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia33797d612be7b4521e7212047a38480ee2520df
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] Syncronize VisualEditor: 6904180..6b25f41 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 6904180..6b25f41
..

Syncronize VisualEditor: 6904180..6b25f41

Change-Id: I80a8483d70ad8c185cc9a373e531926692d4965c
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/27/241227/1

diff --git a/VisualEditor b/VisualEditor
index 6904180..6b25f41 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 6904180054cf8b087f002275e31f5fcb94179431
+Subproject commit 6b25f41b95dbb492aabcb1fb1d579a3e496c3a87

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80a8483d70ad8c185cc9a373e531926692d4965c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Enable A/B test for combined language search. - change (operations/mediawiki-config)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Enable A/B test for combined language search.
..

Enable A/B test for combined language search.

Bug: T3837
Change-Id: I6055b639f98d230c86de75dde690b6622d841050
---
M wmf-config/InitialiseSettings.php
1 file changed, 33 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index bcbd3f5..b803ef4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15402,7 +15402,39 @@
 ),
 
 'wmgCirrusSearchUserTesting' => array(
-   'default' => array(),
+   'default' => array(
+   // Multiple languages search test. Languages supported: en, es, 
de, pt, zh, ar, ru
+   'multilang' => array(
+   'sampleRate' => 10,
+   'buckets' => array(
+   // control bucket, retain defaults
+   'a' => array(),
+   // test bucket, alternative suggestions
+   'b' => array(
+   'wgCirrusSearchEnableAltLanguage' => 
true,
+   'wgCirrusSearchLanguageToWikiMap' => 
array(
+   'en' => 'en',
+   'es' => 'es',
+   'de' => 'de',
+   'pt' => 'pt',
+   'zh-cn' => 'zh',
+   'zh-tw' => 'zh',
+   'ar' => 'ar',
+   'ru' => 'ru',
+   ),
+   'wgCirrusSearchWikiToNameMap' => array(
+   'ar' => 'arwiki',
+   'de' => 'dewiki',
+   'en' => 'enwiki',
+   'es' => 'eswiki',
+   'pt' => 'ptwiki',
+   'ru' => 'ruwiki',
+   'zh' => 'zhwiki',
+   ),
+   ),
+   ),
+   ),
+   ),
 ),
 
 'wmgWMEEnableCompletionExperiment' => array(

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

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

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

[MediaWiki-commits] [Gerrit] limn: make compatible with Apache 2.4 syntax - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: limn: make compatible with Apache 2.4 syntax
..


limn: make compatible with Apache 2.4 syntax

The syntax for this changed between Apache 2.2 and 2.4.

It still works on 2.4 when mod_access_compat is loaded,
which is likely the case by default. But if it isn't
it would break.

Make it compatible with both.

Taken out of I4c8e0aa365fbcc6.

Change-Id: Iccf241d7b03f8eb8fcec5a472f35cd66768ea384
---
M modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb
M modules/limn/templates/vhost-limn-proxy.conf.erb
2 files changed, 14 insertions(+), 4 deletions(-)

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



diff --git a/modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb 
b/modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb
index 9945ec2..b26ccc2 100644
--- a/modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb
+++ b/modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb
@@ -15,8 +15,13 @@
 
   ProxyRequests Off
   
-Order allow,deny
-Allow from all
+= 2.4>
+  Require all granted
+
+
+  Order allow,deny
+  Allow from all
+
   
 
   # 410 - Gone for Wikipedia Zero
diff --git a/modules/limn/templates/vhost-limn-proxy.conf.erb 
b/modules/limn/templates/vhost-limn-proxy.conf.erb
index 7bf4d74..961e390 100644
--- a/modules/limn/templates/vhost-limn-proxy.conf.erb
+++ b/modules/limn/templates/vhost-limn-proxy.conf.erb
@@ -15,8 +15,13 @@
 
   ProxyRequests Off
   
-Order allow,deny
-Allow from all
+= 2.4>
+  Require all granted
+
+
+  Order allow,deny
+  Allow from all
+
   
 
   # If the file does not exist, assume this is a dynamic

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

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

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

[MediaWiki-commits] [Gerrit] [wip] Rewrite browser tests for Echo - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: [wip] Rewrite browser tests for Echo
..

[wip] Rewrite browser tests for Echo

The new oouified echo popup makes the tests invalid; this commit
rewrites those tests.

Also by doing this commit we are upgrading to Selenium 1.4.

Change-Id: I26215558768d55be449276c55b4b745c3a458ecb
---
M Gemfile
M Gemfile.lock
M modules/ooui/mw.echo.ui.NotificationBadgeWidget.js
D tests/browser/features/flyout.feature
D tests/browser/features/flyout_nojs.feature
D tests/browser/features/messages.feature
D tests/browser/features/notifications.feature
D tests/browser/features/notifications_userrights.feature
D tests/browser/features/step_definitions/common_steps.rb
D tests/browser/features/step_definitions/flyout_steps.rb
D tests/browser/features/step_definitions/messages_steps.rb
D tests/browser/features/step_definitions/notifications_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/features/support/hooks.rb
M tests/browser/features/support/pages/article_page.rb
15 files changed, 47 insertions(+), 317 deletions(-)


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

diff --git a/Gemfile b/Gemfile
index 50019af..861b8f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,8 @@
-source 'https://rubygems.org'
+#ruby=ruby-2.1.1
+#ruby-gemset=Flow
 
-gem 'chunky_png', '~> 1.3.4'
-gem 'csscss', '~> 1.3.3'
-gem 'mediawiki_api', '~> 0.3.0'
-gem 'mediawiki_selenium', '~> 0.4.2'
-gem 'rubocop', '~> 0.29.0', require: false
+source "https://rubygems.org;
+
+gem "csscss"
+gem 'mediawiki_selenium', '~> 1.4.0'
+gem "rubocop", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index d8a172d..5a81931 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,6 @@
 builder (3.2.2)
 childprocess (0.5.6)
   ffi (~> 1.0, >= 1.0.11)
-chunky_png (1.3.4)
 colorize (0.7.7)
 csscss (1.3.3)
   colorize
@@ -40,18 +39,19 @@
   domain_name (~> 0.5)
 i18n (0.7.0)
 json (1.8.3)
-mediawiki_api (0.3.1)
+mediawiki_api (0.5.0)
   faraday (~> 0.9, >= 0.9.0)
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
-mediawiki_selenium (0.4.3)
-  cucumber (~> 1.3, >= 1.3.10)
+mediawiki_selenium (1.4.0)
+  cucumber (~> 1.3, >= 1.3.20)
   headless (~> 1.0, >= 1.0.1)
   json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.2, >= 0.2.1)
+  mediawiki_api (~> 0.4, >= 0.4.1)
   page-object (~> 1.0)
   rest-client (~> 1.6, >= 1.6.7)
   rspec-expectations (~> 2.14, >= 2.14.4)
   syntax (~> 1.2, >= 1.2.0)
+  thor (~> 0.19, >= 0.19.1)
 mime-types (2.6.2)
 multi_json (1.11.2)
 multi_test (0.1.2)
@@ -75,9 +75,9 @@
   netrc (~> 0.7)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
-rubocop (0.29.1)
+rubocop (0.34.2)
   astrolabe (~> 1.3)
-  parser (>= 2.2.0.1, < 3.0)
+  parser (>= 2.2.2.5, < 3.0)
   powerpack (~> 0.1)
   rainbow (>= 1.99.1, < 3.0)
   ruby-progressbar (~> 1.4)
@@ -89,6 +89,7 @@
   rubyzip (~> 1.0)
   websocket (~> 1.0)
 syntax (1.2.0)
+thor (0.19.1)
 unf (0.1.4)
   unf_ext
 unf_ext (0.0.7.1)
@@ -101,8 +102,9 @@
   ruby
 
 DEPENDENCIES
-  chunky_png (~> 1.3.4)
-  csscss (~> 1.3.3)
-  mediawiki_api (~> 0.3.0)
-  mediawiki_selenium (~> 0.4.2)
-  rubocop (~> 0.29.0)
+  csscss
+  mediawiki_selenium (~> 1.4.0)
+  rubocop
+
+BUNDLED WITH
+   1.10.5
diff --git a/modules/ooui/mw.echo.ui.NotificationBadgeWidget.js 
b/modules/ooui/mw.echo.ui.NotificationBadgeWidget.js
index 18530ec..eb37836 100644
--- a/modules/ooui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ooui/mw.echo.ui.NotificationBadgeWidget.js
@@ -106,7 +106,8 @@
// The following messages can be used here:
// echo-notification-alert-text-only
// echo-notification-message-text-only
-   label: mw.msg( 'echo-notification-' + this.type + 
'-text-only' )
+   label: mw.msg( 'echo-notification-' + this.type + 
'-text-only' ),
+   classes: [ 
'mw-echo-ui-notificationBadgeButtonPopupWidget-popup' ]
} );
// HACK: Add an icon to the popup head label
this.popupHeadIcon = new OO.ui.IconWidget();
diff --git a/tests/browser/features/flyout.feature 
b/tests/browser/features/flyout.feature
deleted file mode 100644
index 4307235..000
--- a/tests/browser/features/flyout.feature
+++ /dev/null
@@ -1,17 +0,0 @@
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
-Feature: Flyout
-
-  Background:
-Given I am on the "Selenium Echo flyout test page" page
-
-  Scenario: Flyout button not present when anon
-Then I do not see the notification flyout button
-
-  Scenario: Flyout button present
-Given I am logged in
-  

[MediaWiki-commits] [Gerrit] mailman: raise queue monitoring threshold - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: mailman: raise queue monitoring threshold
..

mailman: raise queue monitoring threshold

Raising the arbitrary "42" to "100" for now to avoid
false positives we get when lists like wikidata-bugs or
pywikibot-bugs who receive every phabricator notification
for certain bugs and cause spikes in the "in" queue.

We'll want different thresholds for different queues.

Change-Id: I9677924c639715fc789ef6c1f3a43b07b082c884
---
M manifests/role/lists.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/241232/1

diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 31e38c0..c2a728e 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -115,7 +115,7 @@
 
 nrpe::monitor_service { 'mailman_queue':
 description   => 'mailman_queue_size',
-nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 42',
+nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 100',
 }
 
 # on list servers we monitor I/O with iostat

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

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

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

[MediaWiki-commits] [Gerrit] apache: Remove useless use of AllowOverride directive from s... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: apache: Remove useless use of AllowOverride directive from 
status.conf
..

apache: Remove useless use of AllowOverride directive from status.conf

Change-Id: I4fab13eef211fcf4468679f7b3a47f1da12ed259
---
M modules/apache/files/status.conf
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/241156/1

diff --git a/modules/apache/files/status.conf b/modules/apache/files/status.conf
index c28cdeb..84f2981 100644
--- a/modules/apache/files/status.conf
+++ b/modules/apache/files/status.conf
@@ -17,7 +17,6 @@
 
   
 SetHandler server-status
-AllowOverride None
 
 = 2.4>
   Require local

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fab13eef211fcf4468679f7b3a47f1da12ed259
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] apache: Remove useless use of AllowOverride directive from s... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: apache: Remove useless use of AllowOverride directive from 
status.conf
..


apache: Remove useless use of AllowOverride directive from status.conf

Change-Id: I4fab13eef211fcf4468679f7b3a47f1da12ed259
---
M modules/apache/files/status.conf
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/apache/files/status.conf b/modules/apache/files/status.conf
index c28cdeb..84f2981 100644
--- a/modules/apache/files/status.conf
+++ b/modules/apache/files/status.conf
@@ -17,7 +17,6 @@
 
   
 SetHandler server-status
-AllowOverride None
 
 = 2.4>
   Require local

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fab13eef211fcf4468679f7b3a47f1da12ed259
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Normalize CirrusSearch in stats collection names - change (mediawiki...CirrusSearch)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Normalize CirrusSearch in stats collection names
..

Normalize CirrusSearch in stats collection names

It might be nice to be able to wrap a stats collector
to prefix everything, so in one place we wrap to
core collector, and everywhere else is guaranteed
to use the same prefix. But there are only two for
now, so thats probably overkill.

This just changes one string.

Change-Id: Iac60d86908416fd23cec511dd5282b7d41d3fe86
---
M includes/ElasticsearchIntermediary.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index eb11b25..018ed5b 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -209,7 +209,7 @@
 
$stats = RequestContext::getMain()->getStats();
$type = self::classifyErrorMessage( $message );
-   $stats->increment( "cirrussearch.backend_failure.$type" );
+   $stats->increment( "CirrusSearch.backend_failure.$type" );
 
LoggerFactory::getInstance( 'CirrusSearch' )->warning(
"Search backend error during {$this->description} after 
{took}: {message}",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac60d86908416fd23cec511dd5282b7d41d3fe86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
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] [FEAT] Test Python 3.5 on Travis - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: [FEAT] Test Python 3.5 on Travis
..


[FEAT] Test Python 3.5 on Travis

As Python 3.5 has been officially released we should test on this. There are
minor issues with deprecations as `inspect.getargspec` has been deprecated. But
apart from a deprecation message it still works and will only be broken with
Python 3.6.

Bug: T106209
Change-Id: Ic8256184d1c1dbf841def5ad3846155564e05b75
---
M .travis.yml
M tests/utils.py
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 01b04ad..eaca16b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@
   - '2.7'
   - '3.3'
   - '3.4'
+  - '3.5'
   - '2.6'
 
 # OSX builds do not yet support Python
diff --git a/tests/utils.py b/tests/utils.py
index fb2fafb..654b91b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -227,6 +227,12 @@
 else:
 skip_lines -= 1
 
+# Avoid failures because getargspec hasn't been removed yet: 
T106209
+if PYTHON_VERSION >= (3, 5, 0):
+if str(entry.message) == ('inspect.getargspec() is deprecated, 
'
+  'use inspect.signature() instead'):
+return
+
 log.append(entry)
 
 log = super(WarningSourceSkipContextManager, self).__enter__()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8256184d1c1dbf841def5ad3846155564e05b75
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] MWLinkAnnotationInspector: Use TitleSearchWidget instead of ... - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: MWLinkAnnotationInspector: Use TitleSearchWidget instead of 
TitleInputWidget
..

MWLinkAnnotationInspector: Use TitleSearchWidget instead of TitleInputWidget

Depends on I335bd912d in MediaWiki core.

Bug: T101169
Change-Id: I2932c9df5444d1363af5af9b438bb905ed298148
---
M modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
M modules/ve-mw/ui/styles/inspectors/ve.ui.MWLinkAnnotationInspector.css
M modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkAnnotationWidget.js
3 files changed, 47 insertions(+), 24 deletions(-)


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

diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
index 63e7b64..e58ebbe 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
@@ -46,14 +46,9 @@
  * @inheritdoc
  */
 ve.ui.MWLinkAnnotationInspector.prototype.initialize = function () {
-   var overlay = this.manager.getOverlay();
-
// Properties
this.allowProtocolInInternal = false;
-   this.internalAnnotationInput = new 
ve.ui.MWInternalLinkAnnotationWidget( {
-   // Sub-classes may want to know where to position overlays
-   $overlay: overlay ? overlay.$element : this.$frame
-   } );
+   this.internalAnnotationInput = new 
ve.ui.MWInternalLinkAnnotationWidget();
this.externalAnnotationInput = new 
ve.ui.MWExternalLinkAnnotationWidget();
 
this.linkTypeSelect = new OO.ui.TabSelectWidget( {
@@ -76,6 +71,12 @@
this.linkTypeSelect.connect( this, { select: 'onLinkTypeSelectSelect' } 
);
this.internalAnnotationInput.connect( this, { change: 
'onInternalLinkChange' } );
this.externalAnnotationInput.connect( this, { change: 
'onExternalLinkChange' } );
+
+   this.internalAnnotationInput.input.results.connect( this, {
+   add: 'onInternalLinkChangeResultsChange'
+   // Listening to remove causes a flicker, and is not required
+   // as 'add' is always trigger on a change too
+   } );
 
// Parent method
ve.ui.MWLinkAnnotationInspector.super.prototype.initialize.call( this );
@@ -126,6 +127,16 @@
this.linkTypeSelect.selectItemByData( 'external' );
}
this.updateActions();
+};
+
+/**
+ * Handle list change events ('add') from the interal link's result widget
+ *
+ * @param {OO.ui.OptionWidget[]} items Added items
+ * @param {number} index Index of insertion point
+ */
+ve.ui.MWLinkAnnotationInspector.prototype.onInternalLinkChangeResultsChange = 
function () {
+   this.updateSize();
 };
 
 /**
@@ -186,16 +197,6 @@
this.initialAnnotation instanceof 
ve.dm.MWExternalLinkAnnotation ? 'external' : 'internal'
);
this.annotationInput.setAnnotation( 
this.initialAnnotation );
-   }, this );
-};
-
-/**
- * @inheritdoc
- */
-ve.ui.MWLinkAnnotationInspector.prototype.getReadyProcess = function ( data ) {
-   return 
ve.ui.MWLinkAnnotationInspector.super.prototype.getReadyProcess.call( this, 
data )
-   .next( function () {
-   
this.internalAnnotationInput.getTextInputWidget().populateLookupMenu();
}, this );
 };
 
@@ -271,10 +272,6 @@
this.annotationInput.getTextInputWidget().setValue( text ).focus();
// Firefox moves the cursor to the beginning
this.annotationInput.getTextInputWidget().$input[ 0 
].setSelectionRange( end, end );
-
-   if ( !isExternal ) {
-   this.annotationInput.getTextInputWidget().populateLookupMenu();
-   }
 };
 
 /**
diff --git 
a/modules/ve-mw/ui/styles/inspectors/ve.ui.MWLinkAnnotationInspector.css 
b/modules/ve-mw/ui/styles/inspectors/ve.ui.MWLinkAnnotationInspector.css
index 85c2b18..05d1bb2 100644
--- a/modules/ve-mw/ui/styles/inspectors/ve.ui.MWLinkAnnotationInspector.css
+++ b/modules/ve-mw/ui/styles/inspectors/ve.ui.MWLinkAnnotationInspector.css
@@ -7,4 +7,24 @@
 
 .ve-ui-mwLinkAnnotationInspector-linkTypeSelect {
margin: -0.75em -0.75em 0.75em -0.75em;
-}
\ No newline at end of file
+}
+
+.ve-ui-linkAnnotationWidget .mw-widget-titleSearchWidget {
+   position: relative;
+}
+
+.ve-ui-linkAnnotationWidget .mw-widget-titleSearchWidget 
.oo-ui-searchWidget-query {
+   padding: 0;
+   height: auto;
+   border: 0;
+}
+
+.ve-ui-linkAnnotationWidget .mw-widget-titleSearchWidget 
.oo-ui-searchWidget-query .oo-ui-textInputWidget {
+   margin: 0;
+}
+
+.ve-ui-linkAnnotationWidget .mw-widget-titleSearchWidget 
.oo-ui-searchWidget-results {
+   position: relative;
+   top: 0;

[MediaWiki-commits] [Gerrit] Remove ListView dividers and adjust margins - change (apps...wikipedia)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove ListView dividers and adjust margins
..


Remove ListView dividers and adjust margins

* Remove ListView dividers in search results, saved pages, nearby
  places, history records, and read more results.
* Numerous tweaks to padding and margins per card and Material
  requirements[0], notably in the previously mentioned ListViews. Minor
  additional tweaks to toolbar search hint and link preview.
* Calculate fully expanded "read more" ListView height by inflating and
  measuring one item instead of expecting no padding and no margin. This
  code should probably ultimately be replaced but this change will make
  it less fragile.
* Replace needless LinearLayout in fragment_page with FrameLayout.

[0] 
http://www.google.com/design/spec/layout/metrics-and-keylines.html#metrics-and-keylines-keylines-and-spacing

Bug: T110685
Bug: T111474
Change-Id: I7551662d1b6da99422e242b8b0ac59786d5e4125
---
M app/src/main/java/org/wikipedia/page/ToCHandler.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
M app/src/main/res/layout/activity_langlinks.xml
M app/src/main/res/layout/activity_page.xml
M app/src/main/res/layout/dialog_link_preview.xml
M app/src/main/res/layout/dialog_page_info.xml
M app/src/main/res/layout/dialog_preference_languages.xml
M app/src/main/res/layout/fragment_history.xml
M app/src/main/res/layout/fragment_nearby.xml
M app/src/main/res/layout/fragment_page.xml
M app/src/main/res/layout/fragment_saved_pages.xml
M app/src/main/res/layout/fragment_search_recent.xml
M app/src/main/res/layout/fragment_search_results.xml
M app/src/main/res/layout/item_issue.xml
M app/src/main/res/layout/item_language_list_entry.xml
M app/src/main/res/layout/item_nearby_entry.xml
M app/src/main/res/layout/item_page_list_entry.xml
M app/src/main/res/layout/item_search_recent.xml
M app/src/main/res/layout/item_toc_entry.xml
M app/src/main/res/values-sw600dp/dimens.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/styles.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
25 files changed, 207 insertions(+), 204 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/ToCHandler.java 
b/app/src/main/java/org/wikipedia/page/ToCHandler.java
index dbe522f..72356d8 100755
--- a/app/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/app/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -22,6 +22,7 @@
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
@@ -57,7 +58,7 @@
 this.slidingPane = slidingPane;
 
 this.tocList = (ListView) slidingPane.findViewById(R.id.page_toc_list);
-((LinearLayout.LayoutParams) tocList.getLayoutParams()).setMargins(0, 
Utils.getContentTopOffsetPx(activity), 0, 0);
+((FrameLayout.LayoutParams) tocList.getLayoutParams()).setMargins(0, 
Utils.getContentTopOffsetPx(activity), 0, 0);
 this.tocProgress = (ProgressBar) 
slidingPane.findViewById(R.id.page_toc_in_progress);
 
 bridge.addListener("currentSectionResponse", new 
CommunicationBridge.JSEventListener() {
diff --git 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 2cc2af6..97cc2ce 100644
--- 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++ 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -235,10 +235,10 @@
 // calculate the height of the listview, based on the number of items 
inside it.
 ListAdapter adapter = readMoreList.getAdapter();
 if (adapter != null && adapter.getCount() > 0) {
+View item = View.inflate(readMoreList.getContext(), 
R.layout.item_page_list_entry, null);
+item.measure(View.MeasureSpec.UNSPECIFIED, 
View.MeasureSpec.UNSPECIFIED);
 ViewGroup.LayoutParams params = readMoreList.getLayoutParams();
-final int itemHeight = 
(int)activity.getResources().getDimension(R.dimen.defaultListItemSize);
-params.height = adapter.getCount() * itemHeight
-+ (readMoreList.getDividerHeight() * 
(adapter.getCount() - 1));
+params.height = adapter.getCount() * item.getMeasuredHeight();
 readMoreList.setLayoutParams(params);
 }
 
diff --git a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java 

[MediaWiki-commits] [Gerrit] Do not run broken scenario during Jenkins job - change (mediawiki...CirrusSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Do not run broken scenario during Jenkins job
..


Do not run broken scenario during Jenkins job

The broken scenario is: Fill in search term and click search.

The Jenkins job is
browsertests-CirrusSearch-en.wikipedia.beta.wmflabs.org-linux-firefox-sa
uce

Bug: T113727
Change-Id: I1d469e720414a4bb38aa6423ed9dc829b0c3a3b1
---
M tests/browser/features/smoke.feature
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/tests/browser/features/smoke.feature 
b/tests/browser/features/smoke.feature
index 82c128f..1f5558e 100644
--- a/tests/browser/features/smoke.feature
+++ b/tests/browser/features/smoke.feature
@@ -9,9 +9,10 @@
 # CirrusSearch top-level directory and at
 # 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS
 #
-@clean @en.wikipedia.beta.wmflabs.org @firefox @test2.wikipedia.org @phantomjs 
@smoke
+@clean @firefox @test2.wikipedia.org @phantomjs @smoke
 Feature: Smoke test
 
+  @en.wikipedia.beta.wmflabs.org
   Scenario: Search suggestions
 Given I am at a random page
 When I search for: main
@@ -25,6 +26,7 @@
   And I click the search button
 Then I should land on Search Results page
 
+  @en.wikipedia.beta.wmflabs.org
   Scenario: Search with accent yields result page with accent
 Given I am at a random page
 When I search for África

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d469e720414a4bb38aa6423ed9dc829b0c3a3b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove wikiversions.cdb code now that we use wikiversions.php - change (mediawiki...scap)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove wikiversions.cdb code now that we use wikiversions.php
..


Remove wikiversions.cdb code now that we use wikiversions.php

Change-Id: I1030f30dec356561de924cec70f5b7507bf2565d
---
M scap/tasks.py
1 file changed, 4 insertions(+), 30 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scap/tasks.py b/scap/tasks.py
index d305598..5e00d72 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -105,10 +105,8 @@
 3. Validate that all wikis listed in the realm specific all.dblist exist
in the json
 4. Create a temporary CDB file from the json contents
-5. Atomically rename the temporary CDB to the realm specific
-   wikiversions.cdb filename
-6. Create a temporary php file from the json contents
-7. Atomically rename the temporary php to the realm specific
+5. Create a temporary php file from the json contents
+6. Atomically rename the temporary php to the realm specific
wikiversions.php filename
 
 :param source_tree: Source tree to read file from: 'deploy' or 'stage'
@@ -123,7 +121,6 @@
 json_file = utils.get_realm_specific_filename(
 base_file, cfg['wmf_realm'], cfg['datacenter'])
 base_name = os.path.splitext(json_file)[0]
-cdb_file = base_name + '.cdb'
 php_file = base_name + '.php'
 
 with open(json_file) as f:
@@ -146,29 +143,6 @@
 if missing_dbs:
 raise KeyError('Missing %d expected dbs in %s: %s' % (
 len(missing_dbs), json_file, ', '.join(missing_dbs)))
-
-# Build the CDB version
-tmp_cdb_file = '%s.tmp' % cdb_file
-try:
-os.unlink(tmp_cdb_file)
-except OSError:
-pass
-
-# Write temp cdb file
-with open(tmp_cdb_file, 'wb') as fp:
-writer = cdblib.Writer(fp)
-for dbname, version in wikiversions.items():
-writer.put(str('ver:%s' % dbname), str(version))
-writer.finalize()
-os.fsync(fp.fileno())
-
-if not os.path.isfile(tmp_cdb_file):
-raise IOError(
-errno.ENOENT, 'Failed to create cdb wikiversions', tmp_cdb_file)
-
-os.rename(tmp_cdb_file, cdb_file)
-os.chmod(cdb_file, 0664)
-logger.info('Compiled %s to %s', json_file, cdb_file)
 
 # Build the php version
 php_code = 'https://gerrit.wikimedia.org/r/241061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1030f30dec356561de924cec70f5b7507bf2565d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6904180..6b25f41 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 6904180..6b25f41
..


Syncronize VisualEditor: 6904180..6b25f41

Change-Id: I80a8483d70ad8c185cc9a373e531926692d4965c
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 6904180..6b25f41 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 6904180054cf8b087f002275e31f5fcb94179431
+Subproject commit 6b25f41b95dbb492aabcb1fb1d579a3e496c3a87

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80a8483d70ad8c185cc9a373e531926692d4965c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] mediawiki.widgets: Create TitleSearchWidget - change (mediawiki/core)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: mediawiki.widgets: Create TitleSearchWidget
..

mediawiki.widgets: Create TitleSearchWidget

TitleSearchWidget inherits from SearchWidget instead of TextInputWidget,
showing search results even when blurred.

To avoid duplication, much of the logic from TitleInputWidget has been
moved into the TitleWidget mixin.

Bug: T101169
Change-Id: I335bd912d4f5139646ba05a6a85a0d9ff3d772fa
---
M resources/Resources.php
D resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css
M resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
A resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js
A resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
A resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less
7 files changed, 488 insertions(+), 303 deletions(-)


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

diff --git a/resources/Resources.php b/resources/Resources.php
index b35ebad..6aeb206 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1893,7 +1893,9 @@

'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js',
+   
'resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',
+   
'resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
@@ -1903,7 +1905,7 @@
'default' => array(

'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less',

'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less',
-   
'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css',
+   
'resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less',
),
),
'dependencies' => array(
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css 
b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css
deleted file mode 100644
index 2c24b2b..000
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
- * MediaWiki Widgets - TitleInputWidget styles.
- *
- * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-.mw-widget-titleInputWidget-menu-withImages .mw-widget-titleOptionWidget {
-   -webkit-box-sizing: border-box;
-   -moz-box-sizing: border-box;
-   box-sizing: border-box;
-   min-height: 3.75em;
-   margin-left: 3.75em;
-}
-
-.mw-widget-titleInputWidget-menu-withImages 
.mw-widget-titleOptionWidget:not(:last-child) {
-   margin-bottom: 1px;
-}
-
-.mw-widget-titleInputWidget-menu-withImages .oo-ui-iconElement 
.oo-ui-iconElement-icon {
-   display: block;
-   width: 3.75em;
-   height: 3.75em;
-   left: -3.75em;
-   background-color: #ccc;
-   opacity: 0.4;
-}
-
-.mw-widget-titleInputWidget-menu-withImages .oo-ui-iconElement 
.mw-widget-titleOptionWidget-hasImage {
-   border: 0;
-   background-size: cover;
-   opacity: 1;
-}
-
-.mw-widget-titleInputWidget-menu-withImages .mw-widget-titleOptionWidget 
.oo-ui-labelElement-label {
-   line-height: 2.8em;
-}
-
-.mw-widget-titleOptionWidget-description {
-   display: none;
-}
-
-.mw-widget-titleInputWidget-menu-withDescriptions .mw-widget-titleOptionWidget 
.oo-ui-labelElement-label {
-   line-height: 1.5em;
-}
-
-.mw-widget-titleInputWidget-menu-withDescriptions 
.mw-widget-titleOptionWidget-description {
-   display: block;
-   white-space: nowrap;
-   text-overflow: ellipsis;
-   overflow: hidden;
-}
-
-.oo-ui-menuOptionWidget:not(.oo-ui-optionWidget-selected) 
.mw-widget-titleOptionWidget-description,
-.oo-ui-menuOptionWidget.oo-ui-optionWidget-highlighted 
.mw-widget-titleOptionWidget-description {
-   color: #888;
-}
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index d5a7abc..c1bea6f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ 

[MediaWiki-commits] [Gerrit] Turn $wgSearchRunSuggestedQueryPercent into $wgSearchRunSugg... - change (mediawiki/core)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Turn $wgSearchRunSuggestedQueryPercent into 
$wgSearchRunSuggestedQuery
..

Turn $wgSearchRunSuggestedQueryPercent into $wgSearchRunSuggestedQuery

Deciding how to behave randomly is useful for testing, yet misleading
for general usage. Now that testing is over, make it a boolean switch.

Change-Id: I3e4d02aa57c853c20152c9071c444e09da57fb35
---
M RELEASE-NOTES-1.26
M includes/DefaultSettings.php
M includes/specials/SpecialSearch.php
3 files changed, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/241230/1

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index a13fc2e..aab1b42 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -91,6 +91,9 @@
   page. During the deprecation period, the styles will only be loaded on pages
   which contain 'mw-ui-button' in their HTML. Starting in 1.28, the styles will
   only be loaded if explicitly required.
+* If search returns zero results and current search engine has a "did you mean"
+  suggestion, results for suggestion will be shown. Can be disabled by setting
+  $wgSearchRunSuggestedQuery to false.
 
  External libraries 
 * Update es5-shim from v4.0.0 to v4.1.5.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8b220f3..f58b339 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -7706,14 +7706,13 @@
 );
 
 /**
- * Controls the percentage of zero-result search queries with suggestions that
- * run the suggestion automatically. Must be a number between 0 and 1.  This
- * can be lowered to reduce query volume at the expense of result quality.
+ * Controls whether zero-result search queries with suggestions should display 
results for
+ * these suggestions.
  *
- * @var float
+ * @var bool
  * @since 1.26
  */
-$wgSearchRunSuggestedQueryPercent = 1;
+$wgSearchRunSuggestedQuery = true;
 
 /**
  * For really cool vim folding this needs to be at the end:
diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index d806be3..3f67e93 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -415,10 +415,7 @@
return false;
}
 
-   // Generate a random number between 0 and 1. If the
-   // number is less than the desired percentages run it.
-   $rand = rand( 0, getrandmax() ) / getrandmax();
-   return $this->getConfig()->get( 
'SearchRunSuggestedQueryPercent' ) > $rand;
+   return $this->getConfig()->get( 'SearchRunSuggestedQuery' );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Add deploy-service user - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Add deploy-service user
..


Add deploy-service user

These are changes necessary for service deployment to work inside beta.

deploy-service user
---

Creates a deploy-service user that will be used to execute remote
commands on RESTBase nodes in the RESTBase remote deploy directory
(`/srv/deployment/restbase/deploy`).

This user is for RESTBase hosts

To ensure that this new user has full control over the remote repository
(currently deployed via trebuchet) the ownership of the remote directory
is modified via a puppet exec.

The exec call (as well as deployment via trebuchet) will
be removed as the scap3 project progresses.

deploy-service group
---

Creates a deploy-service group which has access to the ssh-agent proxy
containing the private key for the servicedeploy user on RESTBase hosts.

The private key is in the private puppet repository (commit 3c2da005f0749b).
Its passphrase is in the password store (commit 93ceafd744c).

This group is for tin.

Change-Id: I0a1da64658b4a9df4bb57897c890da105dba95d6
Bug: T109862
---
M hieradata/role/common/deployment/server.yaml
M manifests/role/deployment.pp
M modules/admin/data/data.yaml
M modules/beta/templates/pam-access.conf.erb
A modules/restbase/files/servicedeploy_rsa.pub
A modules/restbase/manifests/deploy.pp
M modules/restbase/manifests/init.pp
7 files changed, 86 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/deployment/server.yaml 
b/hieradata/role/common/deployment/server.yaml
index eb26f28..2304440 100644
--- a/hieradata/role/common/deployment/server.yaml
+++ b/hieradata/role/common/deployment/server.yaml
@@ -1,5 +1,6 @@
 admin::groups:
   - deployment
+  - deploy-service
   - parsoid-admin
   - ocg-render-admins
   - wdqs-admins
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index c7263ce..3abe222 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -11,6 +11,7 @@
 # Can't include this while scap is present on tin:
 # include misc::deployment::scripts
 include role::deployment::mediawiki
+include role::deployment::services
 
 class { 'deployment::deployment_server':
 deployer_groups => [$deployment_group],
@@ -149,6 +150,21 @@
 }
 }
 
+class role::deployment::services (
+$keyholder_user  = 'deploy-service',
+$keyholder_group = 'deploy-service',
+$key_fingerprint  = '6d:54:92:8b:39:10:f5:9b:84:40:36:ef:3c:9a:6d:d8',
+) {
+require ::keyholder
+require ::keyholder::monitoring
+
+keyholder::agent { $keyholder_user:
+trusted_group   => $keyholder_group,
+key_fingerprint => $key_fingerprint,
+key_file=> 'servicedeploy_rsa',
+}
+}
+
 class role::deployment::test {
 package { 'test/testrepo':
 provider => 'trebuchet',
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 0c009ca..cd7ae96 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -398,6 +398,11 @@
 members: [krinkle]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
 
+  deploy-service:
+gid: 763
+description: Service deploy users
+members: [eevans, gwicke, mobrovac, demon, twentyafterfour, thcipriani, 
dduvall]
+privileges: []
 
 users:
   rush:
diff --git a/modules/beta/templates/pam-access.conf.erb 
b/modules/beta/templates/pam-access.conf.erb
index a46decb..fa77641 100644
--- a/modules/beta/templates/pam-access.conf.erb
+++ b/modules/beta/templates/pam-access.conf.erb
@@ -3,5 +3,5 @@
 # users except for members of the nova project
 # that this instance is a member of:
 
-+ : mwdeploy : <%= @bastion_ip %>
++ : deploy-service mwdeploy : <%= @bastion_ip %>
 -:ALL EXCEPT (project-deployment-prep) root:ALL
diff --git a/modules/restbase/files/servicedeploy_rsa.pub 
b/modules/restbase/files/servicedeploy_rsa.pub
new file mode 100644
index 000..8b596e9
--- /dev/null
+++ b/modules/restbase/files/servicedeploy_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCvbV8H7VzyH+NZuCMakT/YYIZH8qyzi1VefDuidplENGZgnXf1whCASFKpgE/y2aZOhHOFQR4jg42dRMDbmEQQGWFm/0Ve4gjmdv87ZNIPdZiGKgWBPnt1+XaUdRc+RvTS9uJg67XhKA5mxyk4uj5wj9OZq65C1okQIC3FuowhZCTkdHryjrQ1JxrayAvI6gED2rALIgScqfvw+UwJ/guoS9XH/yb07SNcuHmF9H5nRTsAYzfvv71/rVTFFTyrnSBUNDIvXsHJjKTwD4SX3FsZPsQ0mK/Uu98YypLN+hsIEFF6q8YTxxab2T2kV59MI7XBJgQi+MptDezA2y2nqp0L
 servicedeploy_rsa
diff --git a/modules/restbase/manifests/deploy.pp 
b/modules/restbase/manifests/deploy.pp
new file mode 100644
index 000..5bd6748
--- /dev/null
+++ b/modules/restbase/manifests/deploy.pp
@@ -0,0 +1,55 @@
+# == Class restbase::deploy
+#
+# Creates user and permissions for deploy user
+# on restbase hosts
+#
+# === Parameters
+#
+# [*public_key*]
+#   This is the public_key for the deploy-service user. The private part of 
this
+#   

[MediaWiki-commits] [Gerrit] mailman: raise queue monitoring threshold - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: mailman: raise queue monitoring threshold
..


mailman: raise queue monitoring threshold

Raising the arbitrary "42" to "100" for now to avoid
false positives we get when lists like wikidata-bugs or
pywikibot-bugs who receive every phabricator notification
for certain bugs and cause spikes in the "in" queue.

We'll want different thresholds for different queues.

Change-Id: I9677924c639715fc789ef6c1f3a43b07b082c884
---
M manifests/role/lists.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  John F. Lewis: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 31e38c0..c2a728e 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -115,7 +115,7 @@
 
 nrpe::monitor_service { 'mailman_queue':
 description   => 'mailman_queue_size',
-nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 42',
+nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 100',
 }
 
 # on list servers we monitor I/O with iostat

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9677924c639715fc789ef6c1f3a43b07b082c884
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: John F. Lewis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add hooks that carnt be added in extension.json in MobileFro... - change (mediawiki...MobileFrontend)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add hooks that carnt be added in extension.json in 
MobileFrontend.hooks.php
..

Add hooks that carnt be added in extension.json in MobileFrontend.hooks.php

Change-Id: I46e77be9ad70504da3c33420d67bdebe2a0e746e
---
M includes/MobileFrontend.hooks.php
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index b97ea3d..86fc6aa 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -14,6 +14,21 @@
 class MobileFrontendHooks {
 
/**
+* Executed after processing extension.json
+*/
+   public static function registerExtension() {
+   global $wgResourceLoaderLESSImportPaths, $wgResourceModules, 
$wgMFResourceBoilerplate,
+   $wgMFResourceFileModuleBoilerplate, 
$wgMFMobileSpecialPageResourceBoilerplate,
+   $wgMFResourceParsedMessageModuleBoilerplate, 
$wgMobileEchoModules, $wgMobileVEModules,
+   $wgMobileCodeMirrorModules, $wgResourceModuleSkinStyles;
+
+   $wgResourceLoaderLESSImportPaths[] = __DIR__ . 
"/../minerva.less/";
+   $wgResourceLoaderLESSImportPaths[] = __DIR__ . "/../resources/";
+
+   require_once __DIR__ . "/Resources.php";
+   }
+
+   /**
 * LinksUpdate hook handler - saves a count of h2 elements that occur 
in the WikiPage
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/LinksUpdate
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46e77be9ad70504da3c33420d67bdebe2a0e746e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Use new page name for wmf release notes - change (mediawiki...release)

[Greg Grossmeier (Code Review)]

Greg Grossmeier has submitted this change and it was merged.

Change subject: Use new page name for wmf release notes
..


Use new page name for wmf release notes

Instead of "MediaWiki 1.27/wmf1" use "MediaWiki 1.27/wmf.1".

Greg said that :P 
(https://gerrit.wikimedia.org/r/#/c/239562/3/make-deploy-notes/uploadChangelog.php)

Bug: T67306
Change-Id: Ia074f1a0aebf1e768589095dd78ff15cfab73228
---
M make-deploy-notes/uploadChangelog.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Greg Grossmeier: Looks good to me, approved



diff --git a/make-deploy-notes/uploadChangelog.php 
b/make-deploy-notes/uploadChangelog.php
index 994a0ed..ab0a182 100644
--- a/make-deploy-notes/uploadChangelog.php
+++ b/make-deploy-notes/uploadChangelog.php
@@ -57,7 +57,7 @@
 }
 
 list( $major, $minor ) = getMajorMinor( $version );
-$wiki->edit( "MediaWiki 1.{$major}/wmf{$minor}/Changelog", $output, "Update 
changelog for $version", false, false );
+$wiki->edit( "MediaWiki 1.{$major}/wmf.{$minor}/Changelog", $output, "Update 
changelog for $version", false, false );
 
 print "Changelog updated\n";
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia074f1a0aebf1e768589095dd78ff15cfab73228
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Browser tests: Refresh flow page until optin process is fini... - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Browser tests: Refresh flow page until optin process is finished
..


Browser tests: Refresh flow page until optin process is finished

* Also using refresh_until for recent changes tests

Change-Id: Ib379980ae78fe86c120c98c7db2fa380fd37c646
---
M tests/browser/features/step_definitions/flow_in_recent_changes_steps.rb
M tests/browser/features/step_definitions/opt_in_steps.rb
M tests/browser/features/step_definitions/special_enable_flow_steps.rb
D tests/browser/features/support/div_extension.rb
M tests/browser/features/support/env.rb
A tests/browser/features/support/extensions.rb
6 files changed, 49 insertions(+), 29 deletions(-)

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



diff --git 
a/tests/browser/features/step_definitions/flow_in_recent_changes_steps.rb 
b/tests/browser/features/step_definitions/flow_in_recent_changes_steps.rb
index 7828377..4b55c50 100644
--- a/tests/browser/features/step_definitions/flow_in_recent_changes_steps.rb
+++ b/tests/browser/features/step_definitions/flow_in_recent_changes_steps.rb
@@ -3,9 +3,13 @@
 end
 
 Then(/^the new topic should be in the Recent Changes page$/) do
-  expect(on(RecentChangesPage).recent_changes_element.when_present.text).to 
match @topic_string
+  on(RecentChangesPage) do |page|
+page.refresh_until { page.recent_changes.match @topic_string }
+  end
 end
 
 Then(/^the new title should be in the Recent Changes page$/) do
-  expect(on(RecentChangesPage).recent_changes_element.when_present.text).to 
match @edited_topic_string
+  on(RecentChangesPage) do |page|
+page.refresh_until { page.recent_changes.match @edited_topic_string }
+  end
 end
diff --git a/tests/browser/features/step_definitions/opt_in_steps.rb 
b/tests/browser/features/step_definitions/opt_in_steps.rb
index 7042cb1..981fb61 100644
--- a/tests/browser/features/step_definitions/opt_in_steps.rb
+++ b/tests/browser/features/step_definitions/opt_in_steps.rb
@@ -17,7 +17,7 @@
 
 Then(/^my talk page is a Flow board$/) do
   visit(UserTalkPage, using_params: { username: @username }) do |page|
-page.flow.board_element.when_present
+page.refresh_until { page.flow.board_element.visible? }
   end
 end
 
@@ -56,8 +56,9 @@
 Then(/^my wikitext talk page is restored$/) do
   talk_page_link = "User_talk:#{@username}".gsub '_', ' '
   visit(UserTalkPage, using_params: { username: @username }) do |page|
-page.content_element.when_present
-expect(page.content).to match @talk_page_content
+page.refresh_until do
+  page.content.match @talk_page_content
+end
 expect(page.content).to_not match talk_page_link
   end
 end
@@ -66,6 +67,7 @@
   flow_archive_name = "./User_talk:#{@username}/Flow_Archive_1"
   talk_page_link = "User_talk:#{@username}".gsub '_', ' '
   visit(WikiPage, using_params: { page: flow_archive_name }) do |page|
+page.refresh_until { page.flow.board_element.visible? }
 page.flow.board_element.when_present
 expect(page.flow.header).to_not match talk_page_link
   end
@@ -74,6 +76,7 @@
 Given(/^I have used the Flow beta feature before$/) do
   step 'my talk page has wiktext content'
   step 'I enable Flow beta feature'
+  step 'my talk page is a Flow board'
   @topic_title = @data_manager.get 'title'
   api.action('flow', submodule: 'new-topic', page: "User_talk:#{@username}", 
nttopic: @topic_title, ntcontent: 'created via API')
   step 'I disable Flow beta feature'
@@ -82,15 +85,17 @@
 Then(/^my talk page is my old Flow board$/) do
   archive_name = "User_talk:#{@username}/Archive_1".gsub '_', ' '
   visit(UserTalkPage, using_params: { username: @username }) do |page|
+page.refresh_until do
+  page.flow.header_element.exists? && page.flow.header.match(archive_name)
+end
 expect(page.content_element.when_present.text).to match @topic_title
-expect(page.flow.header).to match archive_name
   end
 end
 
 Then(/^my flow board contains a link to my archived talk page$/) do
   archive_name = "User_talk:#{@username}/Archive_1".gsub '_', ' '
   visit(UserTalkPage, using_params: { username: @username }) do |page|
-page.flow.board_element.when_present
+page.refresh_until { page.flow.board_element.visible? }
 expect(page.flow.header).to match archive_name
   end
 end
diff --git 
a/tests/browser/features/step_definitions/special_enable_flow_steps.rb 
b/tests/browser/features/step_definitions/special_enable_flow_steps.rb
index a15d5f9..de54c65 100644
--- a/tests/browser/features/step_definitions/special_enable_flow_steps.rb
+++ b/tests/browser/features/step_definitions/special_enable_flow_steps.rb
@@ -71,6 +71,7 @@
 
 Then(/^the board description contains the templates from my talk page$/) do
   on(AbstractFlowPage) do |page|
+page.refresh_until { page.description.content_element.visible? }
 description = 

[MediaWiki-commits] [Gerrit] Update namemsg to convention - change (mediawiki...Metrolook)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update namemsg to convention
..

Update namemsg to convention

Bug: T113632
Change-Id: I86323ac69d420927c852eb9197fba3d589e73f1b
---
M i18n/en.json
M i18n/qqq.json
M skin.json
3 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index b70309c..6a1d76b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,7 +4,7 @@
"paladox"
]
},
-   "skinname-metrolook": "Metrolook",
+   "metrolook-skinname": "Metrolook",
"metrolook-desc": "Metrolook is a 
[https://en.wikipedia.org/wiki/Metro_(design_language) Metro-inspired] fork of 
the Vector skin",
"metrolook.css": "/* CSS placed here will affect users of the Metrolook 
skin */",
"metrolook.js": "/* Any JavaScript here will be loaded for users using 
the Metrolook skin */",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dda71c1..31f456c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -6,7 +6,7 @@
"Umherirrender"
]
},
-   "skinname-metrolook": "{{optional}}",
+   "metrolook-skinname": "{{optional}}",
"metrolook-desc": 
"{{desc|what=skin|name=Metrolook|url=https://www.mediawiki.org/wiki/Skin:Metrolook}};,
"metrolook.css": "{{optional}}",
"metrolook.js": "{{optional}}",
diff --git a/skin.json b/skin.json
index 2030616..2431eaa 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Metrolook",
-   "namemsg": "skinname-metrolook",
+   "namemsg": "metrolook-skinname",
"version": "4.0 rc 1",
"author": [
"immewnity",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86323ac69d420927c852eb9197fba3d589e73f1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Add @codingStandardsIgnoreFile to ConsecutiveParametersMatch... - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add @codingStandardsIgnoreFile to 
ConsecutiveParametersMatcher.php
..


Add @codingStandardsIgnoreFile to ConsecutiveParametersMatcher.php

It was apparently copied from upstream, and doesn't match our coding
conventions.

Change-Id: I6da7ce6f29c9dff007f81a6fbf07dcc6ad37f04c
---
M tests/phpunit/includes/ConsecutiveParametersMatcher.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/ConsecutiveParametersMatcher.php 
b/tests/phpunit/includes/ConsecutiveParametersMatcher.php
index adf74bb..8de467f 100644
--- a/tests/phpunit/includes/ConsecutiveParametersMatcher.php
+++ b/tests/phpunit/includes/ConsecutiveParametersMatcher.php
@@ -1,4 +1,5 @@
 https://gerrit.wikimedia.org/r/241081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6da7ce6f29c9dff007f81a6fbf07dcc6ad37f04c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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] Changed so we test Facebook page on mobile - change (performance/WebPageTest)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Changed so we test Facebook page on mobile
..


Changed so we test Facebook page on mobile

Unifying so that we test the facebook page for
desktop, emulated mobile and mobile.

Also changed so we pick up repeat view for mobile
to be able to verify caching.

Change-Id: Ic71fe9cca9baaac4f6fc41b874515702c1e70455
---
M scripts/batch/mobile-wpt-org.txt
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/batch/mobile-wpt-org.txt b/scripts/batch/mobile-wpt-org.txt
index 50ec59b..b61cfec 100644
--- a/scripts/batch/mobile-wpt-org.txt
+++ b/scripts/batch/mobile-wpt-org.txt
@@ -11,4 +11,4 @@
 # nodejs installed), just make sure to change the value of the WebPageTest key:
 # $ WPT_ORG_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost 
WPT_ORG_MOBILE_RUNS=1 node lib/index.js --batch 
./scripts/batch/mobile-wpt-org.txt
 
---webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_MotoG:Motorola G - Chrome --label 
chrome-m --runs <%WPT_ORG_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> 
--sendMetrics --first true --namespace webpagetest.enwiki-mobile.San_Francisco 
--timeout 2400 https://en.m.wikipedia.org/wiki/San_Francisco
+--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_MotoG:Motorola G - Chrome --label 
chrome-m --runs <%WPT_ORG_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> 
--sendMetrics --namespace webpagetest.enwiki-mobile.Facebook --timeout 2400 
https://en.m.wikipedia.org/wiki/Facebook

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic71fe9cca9baaac4f6fc41b874515702c1e70455
Gerrit-PatchSet: 1
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Phedenskog 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix spacing in ReplacementArray - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix spacing in ReplacementArray
..

Fix spacing in ReplacementArray

Change-Id: I8cb23892a06ebd8ad0f0726e8a6f4c853d0eb4c3
---
M includes/libs/ReplacementArray.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/241099/1

diff --git a/includes/libs/ReplacementArray.php 
b/includes/libs/ReplacementArray.php
index b6faa37..ea50a85 100644
--- a/includes/libs/ReplacementArray.php
+++ b/includes/libs/ReplacementArray.php
@@ -112,7 +112,7 @@
 */
public function replace( $subject ) {
if (
-   function_exists( 'fss_prep_replace' )  &&
+   function_exists( 'fss_prep_replace' ) &&
version_compare( PHP_VERSION, '5.5.0' ) < 0
) {
if ( $this->fss === false ) {

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

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

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

[MediaWiki-commits] [Gerrit] Interstitial should be fixed position - change (mediawiki...ZeroBanner)

[Jhobs (Code Review)]

Jhobs has uploaded a new change for review.

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

Change subject: Interstitial should be fixed position
..

Interstitial should be fixed position

Fix interstitial styling to be fixed position relative
to the viewport. Solves height issue as well.

Change-Id: Ibe18abd4e7ee19e9f0ed07440503bbf3b3627fa0
---
M modules/interstitial.less
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner 
refs/changes/04/241104/1

diff --git a/modules/interstitial.less b/modules/interstitial.less
index da04562..ff5131f 100644
--- a/modules/interstitial.less
+++ b/modules/interstitial.less
@@ -21,14 +21,12 @@
 /* end mixins */
 
 .zero-interstitial {
+   position: fixed;
padding: 25px 0;
-   max-width: 70%;
+   width: 70%;
max-height: 70%;
-   left: 15%;
-   right: 15%;
-   top: 15%;
-   bottom: 15%;
-   margin: auto;
+   min-height: 400px;
+   margin: 15%;
border: 1px solid #AAA;
.drop-shadow(@y: 4px);
.border-radius(25px);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe18abd4e7ee19e9f0ed07440503bbf3b3627fa0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Jhobs 

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

[MediaWiki-commits] [Gerrit] Adds augmented clickthroughs to dashboard + Adds 'user engag... - change (wikimedia...rainbow)

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Adds augmented clickthroughs to dashboard + Adds 'user 
engagement' KPI summary box + Adds 'user engagement' KPI time series + Adds 
page visit time LD10/25/50/75/90/95/99 time series + Fixes dashboard titles 
(including in browser window)
..

Adds augmented clickthroughs to dashboard
+ Adds 'user engagement' KPI summary box
+ Adds 'user engagement' KPI time series
+ Adds page visit time LD10/25/50/75/90/95/99 time series
+ Fixes dashboard titles (including in browser window)

Bug: T113637
Change-Id: I808213c595925ae7ad3269403637b77483a4116e
---
A assets/content/kpi_aug_clickthru.md
M assets/content/kpis_summary.md
A assets/content/survival.md
M server.R
M ui.R
M utils.R
6 files changed, 250 insertions(+), 110 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow 
refs/changes/15/241115/1

diff --git a/assets/content/kpi_aug_clickthru.md 
b/assets/content/kpi_aug_clickthru.md
new file mode 100644
index 000..4a52a64
--- /dev/null
+++ b/assets/content/kpi_aug_clickthru.md
@@ -0,0 +1,23 @@
+Key Performance Indicator: User Engagement (Augmented Clickthroughs)
+===
+
+We are in the process of obtaining qualitative data from our users (their 
intent and satisfaction), so this metric is less akin to "user satisfaction" 
and more akin to "user engagement" we observe.
+
+This metric combines the clickthrough rate and the proportion of users' 
session dwell times exceeding the threshold of 10s.
+
+Outages and inaccuracies
+--
+
+* None so far!
+
+Questions, bug reports, and feature suggestions
+--
+For technical, non-bug questions, [email 
Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you 
experience a bug or notice something wrong or have a suggestion, [open a ticket 
in 
Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery)
 in the Discovery board or [email 
Dan](mailto:dga...@wikimedia.org?subject=Dashboard%20Question).
+
+
+
+  Link to this dashboard:
+  http://searchdata.wmflabs.org/metrics/#kpi_zero_results;>
+http://searchdata.wmflabs.org/metrics/#kpi_zero_results
+  
+
diff --git a/assets/content/kpis_summary.md b/assets/content/kpis_summary.md
index 40d2ab6..ff55a60 100644
--- a/assets/content/kpis_summary.md
+++ b/assets/content/kpis_summary.md
@@ -1,10 +1,10 @@
 Key Performance Indicators
 ===
 
-* **User-perceived load time** If our search is fast and snappy, then more 
people will use it! 
-* **Zero Results Rate** If a user gets zero results for their query, they’ve 
by definition not found what they’re looking for.
-* **API usage** We want people, both within our movement and outside it, to be 
able to easily access our information.
-* **[User 
Satisfaction](https://meta.wikimedia.org/wiki/Research:Measuring_User_Search_Satisfaction)**
 If a user searches for something and clicks on a result, then they found what 
they wanted.
+- **User-perceived load time** If our search is fast and snappy, then more 
people will use it! 
+- **Zero Results Rate** If a user gets zero results for their query, they’ve 
by definition not found what they’re looking for.
+- **API usage** We want people, both within our movement and outside it, to be 
able to easily access our information.
+- **User Engagement** (not quite **[User 
Satisfaction](https://meta.wikimedia.org/wiki/Research:Measuring_User_Search_Satisfaction)**)
 This is an augmented version of clickthrough rate. In it we are including the 
proportion of users' sessions exceeding a pre-specified threshold. **Note** 
that we deployed v2.0 of the satisfaction schema on 9/2/2015. You may see 
**NA** if we do not have enough data available at the time.
 
 Outages and inaccuracies
 --
diff --git a/assets/content/survival.md b/assets/content/survival.md
new file mode 100644
index 000..d678917
--- /dev/null
+++ b/assets/content/survival.md
@@ -0,0 +1,25 @@
+Automated survival analysis: page visit times
+===
+
+This shows the length of time that must pass before we lose N% of the test 
population. In general, it appears it takes 15s to lose 10%, 25-35s to lose 
25%, and 55-75s to lose 50%. When the number goes up, we can infer that users 
are staying on the pages longer.
+
+On most days, we retain at least 20% of the test population past the 7 minute 
mark (the point at which the user's browser stops checking in), so on those 
days we cannot calculate the time it takes to lose 90/95/99% of the users.
+
+There are some days when we CAN calculate those times, and it can take 
anywhere between 270s (4m30s) and 390s (6m30s) for 90% of the users to have 
closed the page they clicked through from the search results page.
+
+Outages and inaccuracies
+--
+
+* None so far!
+
+Questions, bug reports, and feature suggestions
+--
+For technical, non-bug questions, [email 

[MediaWiki-commits] [Gerrit] Improve the wording of apihelp-parse-param-section - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Improve the wording of apihelp-parse-param-section
..


Improve the wording of apihelp-parse-param-section

* Change "retrieve" to "parse" (according to Anomie's comments).
* Split the first sentence for easier understanding and translation.
* Rephrase the last sentence about "new"'s validity to be more
  precise and less English-centric.

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

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



diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 78f0568..849cef8 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -308,7 +308,7 @@
"apihelp-parse-param-pst": "Do a pre-save transform on the input before 
parsing it. Only valid when used with text.",
"apihelp-parse-param-onlypst": "Do a pre-save transform (PST) on the 
input, but don't parse it. Returns the same wikitext, after a PST has been 
applied. Only valid when used with $1text.",
"apihelp-parse-param-effectivelanglinks": "Includes language links 
supplied by extensions (for use with $1prop=langlinks).",
-   "apihelp-parse-param-section": "Only retrieve the content of this 
section number or when new generate a new section.\n\nnew 
section is only honored when specifying text.",
+   "apihelp-parse-param-section": "Only parse the content of this section 
number.\n\nWhen new, parse $1text and 
$1sectiontitle as if adding a new section to the 
page.\n\nnew is allowed only when specifying text.",
"apihelp-parse-param-sectiontitle": "New section title when 
section is new.\n\nUnlike page editing, this does not 
fall back to summary when omitted or empty.",
"apihelp-parse-param-disablelimitreport": "Omit the limit report 
(\"NewPP limit report\") from the parser output.",
"apihelp-parse-param-disablepp": "Use $1disablelimitreport 
instead.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71473fb186ded9e9929682d145a2381becf68767
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Interstitial should be fixed position - change (mediawiki...ZeroBanner)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Interstitial should be fixed position
..


Interstitial should be fixed position

Fix interstitial styling to be fixed position relative
to the viewport. Solves height issue as well.

Change-Id: Ibe18abd4e7ee19e9f0ed07440503bbf3b3627fa0
---
M modules/interstitial.less
1 file changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/modules/interstitial.less b/modules/interstitial.less
index da04562..ff5131f 100644
--- a/modules/interstitial.less
+++ b/modules/interstitial.less
@@ -21,14 +21,12 @@
 /* end mixins */
 
 .zero-interstitial {
+   position: fixed;
padding: 25px 0;
-   max-width: 70%;
+   width: 70%;
max-height: 70%;
-   left: 15%;
-   right: 15%;
-   top: 15%;
-   bottom: 15%;
-   margin: auto;
+   min-height: 400px;
+   margin: 15%;
border: 1px solid #AAA;
.drop-shadow(@y: 4px);
.border-radius(25px);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe18abd4e7ee19e9f0ed07440503bbf3b3627fa0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Jhobs 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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