[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Travis: Don't test PHP5.3, but rather 7.0 and 7.1

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338069 )

Change subject: Travis: Don't test PHP5.3, but rather 7.0 and 7.1
..

Travis: Don't test PHP5.3, but rather 7.0 and 7.1

Change-Id: I0ec94cb6f954168b56fafa72068146cb96a41c06
---
M .travis.yml
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/.travis.yml b/.travis.yml
index d350b0f..57328af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,6 @@
   fast_finish: true
   include:
 - env: DBTYPE=mysql
-  php: 5.3
-- env: DBTYPE=sqlite
-  php: 5.3
-- env: DBTYPE=mysql
   php: 5.5
 - env: DBTYPE=sqlite
   php: 5.5
@@ -15,6 +11,10 @@
   php: hhvm
 - env: DBTYPE=sqlite
   php: hhvm
+- env: DBTYPE=mysql
+  php: 7.0
+- env: DBTYPE=sqlite
+  php: 7.1
 
 before_script:
   - bash ./build/travis/before_script.sh

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ec94cb6f954168b56fafa72068146cb96a41c06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

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

[jenkins-bot (Code Review)]

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

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


Revert "db-codfw.php: Depool db2060"

This reverts commit 2f383c0aab77a23c6c2e68a3166933fc937b0914.

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

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



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

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

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

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

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

[Marostegui (Code Review)]

Hello Florianschmidtwelzow, jenkins-bot,

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

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

to review the following change.


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

Revert "db-codfw.php: Depool db2060"

This reverts commit 2f383c0aab77a23c6c2e68a3166933fc937b0914.

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


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

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

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase load db1082

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Increase load db1082
..


db-eqiad.php: Increase load db1082

db1082 had a crash and was repooled with reduced load.
Increase it a bit to see how it reacts

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cb4ed2c..bdd5508 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -144,7 +144,7 @@
 #  'db1045' => 0,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump
'db1071' => 50,  # D1 2.8TB 160GB, api
-   'db1082' => 10,  # A2 3.6TB 512GB, #mysql crashed, pooled with 
low load
+   'db1082' => 100,  # A2 3.6TB 512GB, #mysql crashed, pooled with 
low load
'db1087' => 300, # C2 3.6TB 512GB, api #temp
'db1092' => 500, # D2 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Support UnboundedQuantityValue for range constraint checks

[jenkins-bot (Code Review)]

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

Change subject: Support UnboundedQuantityValue for range constraint checks
..


Support UnboundedQuantityValue for range constraint checks

Needed to rework the tests to more meaningfully check
handling of invalid values (throws exception), and for
handling supported data value types.

Bug: T158183
Change-Id: Idc76a8794662dc6d87c53dad27ce9fd6d7d8de1c
---
M includes/ConstraintCheck/Helper/RangeCheckerHelper.php
M tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
2 files changed, 40 insertions(+), 32 deletions(-)

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



diff --git a/includes/ConstraintCheck/Helper/RangeCheckerHelper.php 
b/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
index 62a3cc9..00338e7 100644
--- a/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
+++ b/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
@@ -5,6 +5,7 @@
 use DataValues\DataValue;
 use DataValues\QuantityValue;
 use DataValues\TimeValue;
+use DataValues\UnboundedQuantityValue;
 use InvalidArgumentException;
 
 /**
@@ -21,6 +22,8 @@
return $dataValue->getTime();
} elseif ( $dataValue instanceof QuantityValue ) {
return $dataValue->getAmount()->getValue();
+   } elseif ( $dataValue instanceof UnboundedQuantityValue ) {
+   return $dataValue->getAmount()->getValue();
}
 
throw new InvalidArgumentException( 'Unsupported data value 
type' );
diff --git a/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php 
b/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
index 6167049..c686ee0 100644
--- a/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
+++ b/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
@@ -2,9 +2,13 @@
 
 namespace WikibaseQuality\ConstraintReport\Test\RangeChecker;
 
+use DataValues\DataValue;
 use DataValues\DecimalValue;
 use DataValues\QuantityValue;
+use DataValues\StringValue;
 use DataValues\TimeValue;
+use DataValues\UnboundedQuantityValue;
+use InvalidArgumentException;
 use PHPUnit_Framework_TestCase;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\RangeCheckerHelper;
 
@@ -22,47 +26,48 @@
 class RangeCheckerHelperTest extends PHPUnit_Framework_TestCase {
 
/**
-* @var RangeCheckerHelper
+* @dataProvider getComparativeValueProvider
 */
-   private $helper;
+   public function testGetComparativeValue( $expected, DataValue 
$dataValue ) {
+   $rangeCheckHelper = new RangeCheckerHelper();
+   $comparativeValue = $rangeCheckHelper->getComparativeValue( 
$dataValue );
+
+   $this->assertSame( $expected, $comparativeValue );
+   }
+
+   public function getComparativeValueProvider() {
+   $cases = [
+   [ '+1970-01-01T00:00:00Z', $this->getTimeValue() ],
+   [ '+42', $this->getQuantityValue() ],
+   [ '+9000', UnboundedQuantityValue::newFromNumber( 
'+9000' ) ]
+   ];
+
+   return $cases;
+   }
 
/**
-* @var TimeValue
+* @expectedException InvalidArgumentException
 */
-   private $time;
-
-   /**
-* @var QuantityValue
-*/
-   private $quantity;
-
-   protected function setUp() {
-   parent::setUp();
-   $this->helper = new RangeCheckerHelper();
-   $this->time = new TimeValue( '+0001970-01-01T00:00:00Z', 0, 
0, 0, 11, 'http://www.wikidata.org/entity/Q1985727' );
-   $value = new DecimalValue( 3.1415926536 );
-   $this->quantity = new QuantityValue( $value, '1', $value, 
$value );
+   public function 
testGetComparativeValue_unsupportedDataValueTypeThrowsException() {
+   $rangeCheckHelper = new RangeCheckerHelper();
+   $rangeCheckHelper->getComparativeValue( new StringValue( 
'kittens' ) );
}
 
-   protected function tearDown() {
-   unset( $this->helper );
-   parent::tearDown();
+   private function getTimeValue() {
+   return new TimeValue(
+   '+0001970-01-01T00:00:00Z',
+   0,
+   0,
+   0,
+   11,
+   'http://www.wikidata.org/entity/Q1985727'
+   );
}
 
-   public function testGetComparativeValueTimeValid() {
-   $this->assertEquals( '+1970-01-01T00:00:00Z', 
$this->helper->getComparativeValue( $this->time ) );
-   }
+   private function getQuantityValue() {
+   $decimalValue = new DecimalValue( 42 );
 
-   public function 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase load db1082

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Increase load db1082
..

db-eqiad.php: Increase load db1082

db1082 had a crash and was repooled with reduced load.
Increase it a bit to see how it reacts

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cb4ed2c..bdd5508 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -144,7 +144,7 @@
 #  'db1045' => 0,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump
'db1071' => 50,  # D1 2.8TB 160GB, api
-   'db1082' => 10,  # A2 3.6TB 512GB, #mysql crashed, pooled with 
low load
+   'db1082' => 100,  # A2 3.6TB 512GB, #mysql crashed, pooled with 
low load
'db1087' => 300, # C2 3.6TB 512GB, api #temp
'db1092' => 500, # D2 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [JsonConfig] Update keys

[Raimond Spekking (Code Review)]

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

Change subject: [JsonConfig] Update keys
..


[JsonConfig] Update keys

Change-Id: I351ded4b0828f646dcf485838a6c8fec662452a5
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 06afe12..d45a5fe 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1383,9 +1383,9 @@
 optional = jsbreadcrumbs-separator
 
 Json Config
-ignored = jsonconfig-license-notice-box-CC0-1.0+
+ignored = jsonconfig-license-notice-box-CC0-1.0
 optional = jsonconfig-type-abbr-invalid, jsonconfig-type-abbr-string, 
jsonconfig-type-abbr-localized
-optional = jsonconfig-type-abbr-number, jsonconfig-type-abbr-boolean, 
jsonconfig-license-url-CC0-1.0+
+optional = jsonconfig-type-abbr-number, jsonconfig-type-abbr-boolean, 
jsonconfig-license-url-CC0-1.0
 
 Kartographer
 optional = visualeditor-mwmapsdialog-geojson, kartographer-coord-combined, 
kartographer-coord-dms

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [JsonConfig] Update keys

[Raimond Spekking (Code Review)]

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

Change subject: [JsonConfig] Update keys
..

[JsonConfig] Update keys

Change-Id: I351ded4b0828f646dcf485838a6c8fec662452a5
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 06afe12..d45a5fe 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1383,9 +1383,9 @@
 optional = jsbreadcrumbs-separator
 
 Json Config
-ignored = jsonconfig-license-notice-box-CC0-1.0+
+ignored = jsonconfig-license-notice-box-CC0-1.0
 optional = jsonconfig-type-abbr-invalid, jsonconfig-type-abbr-string, 
jsonconfig-type-abbr-localized
-optional = jsonconfig-type-abbr-number, jsonconfig-type-abbr-boolean, 
jsonconfig-license-url-CC0-1.0+
+optional = jsonconfig-type-abbr-number, jsonconfig-type-abbr-boolean, 
jsonconfig-license-url-CC0-1.0
 
 Kartographer
 optional = visualeditor-mwmapsdialog-geojson, kartographer-coord-combined, 
kartographer-coord-dms

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Fix broken site picks feature for compact language links

[Nikerabbit (Code Review)]

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

Change subject: Fix broken site picks feature for compact language links
..

Fix broken site picks feature for compact language links

Ref T153900#3011037 and T155995

Change-Id: I429cdf330b6bf70d1710cd5a041c782e6617cb39
---
M UniversalLanguageSelector.hooks.php
1 file changed, 2 insertions(+), 4 deletions(-)


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

diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 0f43061..c03d0ef 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -331,10 +331,8 @@

'/UniversalLanguageSelector/data/fontrepo/fonts/';
}
 
-   // Cannot check where whether CLL is enabled for a particular 
user. The overhead
-   // of including this data is small.
-   if ( isset( $wgWBClientSettings['sortPrepend'] ) ) {
-   $vars['wgULSCompactLinksPrepend'] = 
$wgWBClientSettings['sortPrepend'];
+   if ( isset( $wgInterwikiSortingSortPrepend ) && 
$wgInterwikiSortingSortPrepend !== [] ) {
+   $vars['wgULSCompactLinksPrepend'] = 
$wgInterwikiSortingSortPrepend;
}
 
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I429cdf330b6bf70d1710cd5a041c782e6617cb39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: rename event bus subscribers

[Niedzielski (Code Review)]

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

Change subject: Hygiene: rename event bus subscribers
..

Hygiene: rename event bus subscribers

Remove verbose redundant event bus methods which only differ
polymorphically

Change-Id: Iea8865cc7b57bbf7da55be311a903bd8d7bd8434
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
4 files changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 9548d44..8d4d12d 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -63,7 +63,7 @@
 
 private class EventBusMethods {
 // todo: reevaluate lifecycle. the bus is active when this activity is 
paused and we show ui
-@Subscribe public void onZeroEnter(WikipediaZeroEnterEvent event) {
+@Subscribe public void on(WikipediaZeroEnterEvent event) {
 if (Prefs.isZeroTutorialEnabled()) {
 Prefs.setZeroTutorialEnabled(false);
 WikipediaApp.getInstance().getWikipediaZeroHandler()
diff --git 
a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java 
b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
index f260143..a468bef 100644
--- a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
@@ -119,8 +119,8 @@
 }
 
 private class EventBusMethods {
-@Subscribe public void onThemeChange(ThemeChangeEvent event) {
-ThemedActionBarActivity.this.recreate();
+@Subscribe public void on(ThemeChangeEvent event) {
+recreate();
 }
 }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 587c317..42e833d 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -845,7 +845,7 @@
 }
 
 private class EventBusMethods {
-@Subscribe public void onChangeTextSize(ChangeTextSizeEvent event) {
+@Subscribe public void on(ChangeTextSizeEvent event) {
 if (pageFragment != null && pageFragment.getWebView() != null) {
 pageFragment.updateFontSize();
 }
diff --git a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java 
b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index d686f74..5abc5cf 100644
--- a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -96,8 +96,7 @@
 app.getBus().unregister(this);
 }
 
-@Subscribe
-public void onWebViewInvalidated(WebViewInvalidateEvent event) {
+@Subscribe public void on(WebViewInvalidateEvent event) {
 updatingFont = false;
 updateButtonState();
 }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove redundant theme change subscriber in MainAct...

[Niedzielski (Code Review)]

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

Change subject: Hygiene: remove redundant theme change subscriber in 
MainActivity
..

Hygiene: remove redundant theme change subscriber in MainActivity

MainActivity inherits from ThemedActionBarActivity which already
subscribes

Change-Id: I65a9552b47397d6d57a32bc0bf66b63a0fd3de66
---
M app/src/main/java/org/wikipedia/main/MainActivity.java
1 file changed, 0 insertions(+), 45 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/main/MainActivity.java 
b/app/src/main/java/org/wikipedia/main/MainActivity.java
index 986cdc7..f8f5d89 100644
--- a/app/src/main/java/org/wikipedia/main/MainActivity.java
+++ b/app/src/main/java/org/wikipedia/main/MainActivity.java
@@ -2,37 +2,18 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.view.View;
 
-import com.squareup.otto.Bus;
-import com.squareup.otto.Subscribe;
-
 import org.wikipedia.R;
-import org.wikipedia.WikipediaApp;
 import org.wikipedia.activity.SingleFragmentToolbarActivity;
-import org.wikipedia.events.ThemeChangeEvent;
 import org.wikipedia.navtab.NavTab;
-import org.wikipedia.util.log.L;
 
 public class MainActivity extends SingleFragmentToolbarActivity
 implements MainFragment.Callback {
 
-private WikipediaApp app;
-private Bus bus;
-private MainActivity.EventBusMethods busMethods;
-
 public static Intent newIntent(@NonNull Context context) {
 return new Intent(context, MainActivity.class);
-}
-
-@Override
-public void onCreate(Bundle savedInstanceState) {
-super.onCreate(savedInstanceState);
-app = (WikipediaApp) getApplicationContext();
-busMethods = new EventBusMethods();
-registerBus();
 }
 
 @Override protected MainFragment createFragment() {
@@ -85,31 +66,5 @@
 return;
 }
 finish();
-}
-
-@Override
-public void onDestroy() {
-unregisterBus();
-super.onDestroy();
-}
-
-private void registerBus() {
-bus = app.getBus();
-bus.register(busMethods);
-L.d("Registered bus.");
-}
-
-private void unregisterBus() {
-bus.unregister(busMethods);
-bus = null;
-L.d("Unregistered bus.");
-}
-
-private class EventBusMethods {
-
-@Subscribe
-public void onChangeTheme(ThemeChangeEvent event) {
-MainActivity.this.recreate();
-}
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: SearchFragment NPE in async callback UI update

[Niedzielski (Code Review)]

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

Change subject: Fix: SearchFragment NPE in async callback UI update
..

Fix: SearchFragment NPE in async callback UI update

Change-Id: I0cfdd0adf0cf52ec71e804e868303d76ba083a53
---
M app/src/main/java/org/wikipedia/search/SearchFragment.java
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/search/SearchFragment.java 
b/app/src/main/java/org/wikipedia/search/SearchFragment.java
index 5c89c47..5c91ccc 100644
--- a/app/src/main/java/org/wikipedia/search/SearchFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchFragment.java
@@ -484,6 +484,10 @@
 langPrefDialog.setOnDismissListener(new 
DialogInterface.OnDismissListener() {
 @Override
 public void onDismiss(DialogInterface dialog) {
+if (getActivity() == null) {
+return;
+}
+
 
langButton.setText(app.getAppOrSystemLanguageCode().toUpperCase());
 formatLangButtonText();
 if (!TextUtils.isEmpty(query)) {

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: move language switching code to ResourceUtil

[Niedzielski (Code Review)]

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

Change subject: Hygiene: move language switching code to ResourceUtil
..

Hygiene: move language switching code to ResourceUtil

Change-Id: I9f4978cacb11fb4a265883a4972836083650737f
---
M app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
M app/src/main/java/org/wikipedia/util/ResourceUtil.java
2 files changed, 40 insertions(+), 17 deletions(-)


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

diff --git a/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java 
b/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
index 123aef7..42d5d39 100644
--- a/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
@@ -4,7 +4,6 @@
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
-import android.os.LocaleList;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
@@ -24,6 +23,7 @@
 import org.junit.experimental.theories.Theories;
 import org.junit.runner.RunWith;
 import org.wikipedia.theme.Theme;
+import org.wikipedia.util.ResourceUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -94,7 +94,6 @@
 this.fontScale = fontScale;
 this.theme = theme;
 ctx = new ContextThemeWrapper(getTargetContext(), 
theme.getResourceId());
-Locale.setDefault(locale);
 config();
 }
 
@@ -164,21 +163,7 @@
 Configuration cfg = new 
Configuration(ctx.getResources().getConfiguration());
 cfg.screenWidthDp = widthDp;
 cfg.fontScale = fontScale.multiplier();
-setConfigLocale(cfg, locale);
-
-ctx.getResources().updateConfiguration(cfg, null);
-}
-
-private void setConfigLocale(@NonNull Configuration config, @NonNull 
Locale locale) {
-if (android.os.Build.VERSION.SDK_INT >= 
android.os.Build.VERSION_CODES.N) {
-config.setLocales(new LocaleList(locale));
-} else if (Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR1) {
-config.setLocale(locale);
-config.setLayoutDirection(locale);
-} else {
-//noinspection deprecation
-config.locale = locale;
-}
+ResourceUtil.setLocale(ctx, cfg, locale);
 }
 
 // todo: identify method name by @Theory / @Test annotation instead of 
depth and remove repeated
diff --git a/app/src/main/java/org/wikipedia/util/ResourceUtil.java 
b/app/src/main/java/org/wikipedia/util/ResourceUtil.java
index 0bd952e..38bcf94 100644
--- a/app/src/main/java/org/wikipedia/util/ResourceUtil.java
+++ b/app/src/main/java/org/wikipedia/util/ResourceUtil.java
@@ -2,9 +2,12 @@
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.net.Uri;
+import android.os.Build;
+import android.os.LocaleList;
 import android.support.annotation.AnyRes;
 import android.support.annotation.ArrayRes;
 import android.support.annotation.DrawableRes;
@@ -13,6 +16,9 @@
 import android.util.TypedValue;
 
 import org.wikipedia.R;
+import org.wikipedia.WikipediaApp;
+
+import java.util.Locale;
 
 public final class ResourceUtil {
 private static final int NO_ID = 0;
@@ -68,6 +74,38 @@
 .build();
 }
 
+public static void setLocale(@NonNull Context ctx, @NonNull String lang) {
+// todo: this conversion is performed elsewhere in the app but is 
probably buggy
+Locale locale = new Locale(lang);
+String sysLang = WikipediaApp.getInstance().getSystemLanguageCode();
+Configuration cfg = new 
Configuration(ctx.getResources().getConfiguration());
+if (lang.equals(sysLang)) {
+setLocale(ctx, cfg, locale);
+} else {
+setLocale(ctx, cfg, locale, new Locale(sysLang));
+}
+}
+
+public static void setLocale(@NonNull Context ctx, @NonNull Configuration 
cfg,
+ @NonNull Locale... locales) {
+Locale.setDefault(locales[0]);
+
+setConfigLocale(cfg, locales);
+ctx.getResources().updateConfiguration(cfg, 
ctx.getResources().getDisplayMetrics());
+}
+
+private static void setConfigLocale(@NonNull Configuration config, 
@NonNull Locale... locales) {
+if (android.os.Build.VERSION.SDK_INT >= 
android.os.Build.VERSION_CODES.N) {
+config.setLocales(new LocaleList(locales));
+} else if (Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR1) {
+config.setLocale(locales[0]);
+config.setLayoutDirection(locales[0]);
+} else {
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: use app language for UI

[Niedzielski (Code Review)]

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

Change subject: Update: use app language for UI
..

Update: use app language for UI

Bug: T142019
Change-Id: I68757c3b17e35f8694380c06bcdda77c2f1ddb41
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
A app/src/main/java/org/wikipedia/events/AppLangChangeEvent.java
3 files changed, 26 insertions(+), 7 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 784bd53..d43eca7 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -20,6 +20,7 @@
 import com.squareup.leakcanary.RefWatcher;
 import com.squareup.otto.Bus;
 
+import org.apache.commons.lang3.StringUtils;
 import org.mediawiki.api.json.Api;
 import org.wikipedia.analytics.FunnelManager;
 import org.wikipedia.analytics.SessionFunnel;
@@ -36,6 +37,7 @@
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
 import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory;
 import org.wikipedia.edit.summaries.EditSummary;
+import org.wikipedia.events.AppLangChangeEvent;
 import org.wikipedia.events.ChangeTextSizeEvent;
 import org.wikipedia.events.ThemeChangeEvent;
 import org.wikipedia.history.HistoryEntry;
@@ -277,8 +279,12 @@
 }
 
 public void setAppLanguageCode(@Nullable String code) {
+String prevCode = appLanguageState.getAppLanguageCode();
 appLanguageState.setAppLanguageCode(code);
 resetWikiSite();
+if (!StringUtils.equals(code, prevCode)) {
+bus.post(new AppLangChangeEvent());
+}
 }
 
 private void updateUserIdForLanguage(@NonNull final String code) {
diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 8d4d12d..ea4c5bb 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -12,12 +12,22 @@
 import com.squareup.otto.Subscribe;
 
 import org.wikipedia.WikipediaApp;
+import org.wikipedia.events.AppLangChangeEvent;
 import org.wikipedia.events.WikipediaZeroEnterEvent;
 import org.wikipedia.settings.Prefs;
+
+import static org.wikipedia.util.ResourceUtil.setLocale;
 
 public abstract class BaseActivity extends AppCompatActivity {
 private boolean destroyed;
 private EventBusMethods busMethods;
+
+@Override public boolean isDestroyed() {
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+return super.isDestroyed();
+}
+return destroyed;
+}
 
 @Override public boolean onOptionsItemSelected(MenuItem item) {
 switch (item.getItemId()) {
@@ -39,6 +49,9 @@
 super.onCreate(savedInstanceState);
 busMethods = new EventBusMethods();
 WikipediaApp.getInstance().getBus().register(busMethods);
+
+// todo: largely eliminate concept of system language
+setLocale(this, 
WikipediaApp.getInstance().getAppOrSystemLanguageCode());
 }
 
 @Override protected void onDestroy() {
@@ -54,14 +67,11 @@
 }
 }
 
-@Override public boolean isDestroyed() {
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-return super.isDestroyed();
-}
-return destroyed;
-}
-
 private class EventBusMethods {
+@Subscribe public void on(AppLangChangeEvent event) {
+recreate();
+}
+
 // todo: reevaluate lifecycle. the bus is active when this activity is 
paused and we show ui
 @Subscribe public void on(WikipediaZeroEnterEvent event) {
 if (Prefs.isZeroTutorialEnabled()) {
diff --git a/app/src/main/java/org/wikipedia/events/AppLangChangeEvent.java 
b/app/src/main/java/org/wikipedia/events/AppLangChangeEvent.java
new file mode 100644
index 000..524313e
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/events/AppLangChangeEvent.java
@@ -0,0 +1,3 @@
+package org.wikipedia.events;
+
+public class AppLangChangeEvent { }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove dead code in PageActivity

[Niedzielski (Code Review)]

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

Change subject: Hygiene: remove dead code in PageActivity
..

Hygiene: remove dead code in PageActivity

Change-Id: Ibd0d8e081a4f4ade0878f785e3d27c46f7c4810f
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 36d9733..587c317 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -716,7 +716,6 @@
 if (!isCabOpen()) {
 conditionallyInjectCustomCabMenu(mode);
 }
-freezeToolbar();
 super.onSupportActionModeStarted(mode);
 }
 
@@ -731,7 +730,6 @@
 if (!isCabOpen()) {
 conditionallyInjectCustomCabMenu(mode);
 }
-freezeToolbar();
 super.onActionModeStarted(mode);
 }
 
@@ -746,10 +744,6 @@
 if (currentActionMode.shouldInjectCustomMenu()) {
 currentActionMode.injectCustomMenu(pageFragment);
 }
-}
-
-private void freezeToolbar() {
-// TODO: remove this, if necessary
 }
 
 private void registerBus() {

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove superfluous @TargetApi annotations

[Niedzielski (Code Review)]

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

Change subject: Hygiene: remove superfluous @TargetApi annotations
..

Hygiene: remove superfluous @TargetApi annotations

Lint now checks API conditionals

Change-Id: I8c0782655b9128b64220bfd55ee16b8695cdba97
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/auth/AccountUtil.java
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
M app/src/main/java/org/wikipedia/drawable/AppLevelListDrawable.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/page/FindInPageActionProvider.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/views/ViewUtil.java
8 files changed, 19 insertions(+), 29 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index e387f76..784bd53 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -1,6 +1,5 @@
 package org.wikipedia;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Application;
 import android.database.ContentObserver;
@@ -581,7 +580,6 @@
 };
 }
 
-@TargetApi(Build.VERSION_CODES.KITKAT)
 private void enableWebViewDebugging() {
 if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.KITKAT) {
 WebView.setWebContentsDebuggingEnabled(true);
diff --git a/app/src/main/java/org/wikipedia/auth/AccountUtil.java 
b/app/src/main/java/org/wikipedia/auth/AccountUtil.java
index 11e0492..de10076 100644
--- a/app/src/main/java/org/wikipedia/auth/AccountUtil.java
+++ b/app/src/main/java/org/wikipedia/auth/AccountUtil.java
@@ -3,7 +3,6 @@
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
-import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -56,7 +55,6 @@
 }
 }
 
-@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
 public static void removeAccount() {
 Account account = account();
 if (account != null) {
diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
index 09e1b29..6598b78 100644
--- 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
+++ 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
@@ -1,6 +1,5 @@
 package org.wikipedia.descriptions;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -15,18 +14,14 @@
 extends SingleFragmentActivity
 implements DescriptionEditTutorialFragment.Callback {
 
-public static Intent newIntent(@NonNull Context context) {
+@NonNull public static Intent newIntent(@NonNull Context context) {
 return new Intent(context, DescriptionEditTutorialActivity.class);
 }
 
-@TargetApi(18) @Override public void onCreate(Bundle savedInstanceState) {
+@Override public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
-// Setting this in the manifest will not suffice since any manifest 
screenOrientation
-// setting is overridden by the call to 
ActivityUtil.requestFullUserOrientation() in the
-// base ActionBarActivity's onCreate().
-setRequestedOrientation(Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR2
-? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
-: ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
+setPortraitOrientation();
 
 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 
getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
@@ -34,12 +29,21 @@
 }
 }
 
-@Override protected DescriptionEditTutorialFragment createFragment() {
-return DescriptionEditTutorialFragment.newInstance();
-}
-
 @Override public void onStartEditingClick() {
 setResult(RESULT_OK);
 finish();
 }
-}
+
+@Override protected DescriptionEditTutorialFragment createFragment() {
+return DescriptionEditTutorialFragment.newInstance();
+}
+
+private void setPortraitOrientation() {
+int orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+orientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT;
+ 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: consolidate more into BaseActivity

[Niedzielski (Code Review)]

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

Change subject: Hygiene: consolidate more into BaseActivity
..

Hygiene: consolidate more into BaseActivity

Change-Id: I954efc4ed79f20a7f17a7490bcda86a16792e0cd
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
M app/src/main/java/org/wikipedia/activity/SingleFragmentToolbarActivity.java
M app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
5 files changed, 77 insertions(+), 63 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 88cf8fb..9548d44 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -1,18 +1,23 @@
 package org.wikipedia.activity;
 
-import android.annotation.TargetApi;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.ColorRes;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
+import com.squareup.otto.Subscribe;
+
+import org.wikipedia.WikipediaApp;
+import org.wikipedia.events.WikipediaZeroEnterEvent;
+import org.wikipedia.settings.Prefs;
+
 public abstract class BaseActivity extends AppCompatActivity {
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-protected void requestFullUserOrientation() {
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
-}
-}
+private boolean destroyed;
+private EventBusMethods busMethods;
 
 @Override public boolean onOptionsItemSelected(MenuItem item) {
 switch (item.getItemId()) {
@@ -23,4 +28,47 @@
 return false;
 }
 }
+
+protected void requestFullUserOrientation() {
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
+}
+}
+
+@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+busMethods = new EventBusMethods();
+WikipediaApp.getInstance().getBus().register(busMethods);
+}
+
+@Override protected void onDestroy() {
+WikipediaApp.getInstance().getBus().unregister(busMethods);
+busMethods = null;
+super.onDestroy();
+destroyed = true;
+}
+
+protected void setStatusBarColor(@ColorRes int color) {
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+getWindow().setStatusBarColor(ContextCompat.getColor(this, color));
+}
+}
+
+@Override public boolean isDestroyed() {
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+return super.isDestroyed();
+}
+return destroyed;
+}
+
+private class EventBusMethods {
+// todo: reevaluate lifecycle. the bus is active when this activity is 
paused and we show ui
+@Subscribe public void onZeroEnter(WikipediaZeroEnterEvent event) {
+if (Prefs.isZeroTutorialEnabled()) {
+Prefs.setZeroTutorialEnabled(false);
+WikipediaApp.getInstance().getWikipediaZeroHandler()
+.showZeroTutorialDialog(BaseActivity.this);
+}
+}
+}
 }
\ No newline at end of file
diff --git 
a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java 
b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
index f5987e4..83873d2 100644
--- a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
@@ -1,12 +1,9 @@
 package org.wikipedia.activity;
 
-import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorRes;
 import android.support.annotation.IdRes;
 import android.support.annotation.LayoutRes;
 import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 
 import org.wikipedia.R;
 
@@ -54,9 +51,4 @@
 return getFragment() != null;
 }
 
-protected void setStatusBarColor(@ColorRes int color) {
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-getWindow().setStatusBarColor(ContextCompat.getColor(this, color));
-}
-}
-}
+}
\ No newline at end of file
diff --git 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: make common base Activity ancestor & DRY up Activit...

[Niedzielski (Code Review)]

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

Change subject: Hygiene: make common base Activity ancestor & DRY up 
ActivityUtil
..

Hygiene: make common base Activity ancestor & DRY up ActivityUtil

Change-Id: I32b2e3e153e66a513ec3ecd039bd4a21cc499545
---
M app/src/main/java/org/wikipedia/activity/ActivityUtil.java
A app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
M 
app/src/main/java/org/wikipedia/activity/SingleFragmentActivityTransparent.java
M app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
M app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/language/LangLinksActivity.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/settings/AboutActivity.java
M app/src/main/java/org/wikipedia/settings/LicenseActivity.java
13 files changed, 38 insertions(+), 103 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/activity/ActivityUtil.java 
b/app/src/main/java/org/wikipedia/activity/ActivityUtil.java
index 1ff7848..906670f 100644
--- a/app/src/main/java/org/wikipedia/activity/ActivityUtil.java
+++ b/app/src/main/java/org/wikipedia/activity/ActivityUtil.java
@@ -1,47 +1,16 @@
 package org.wikipedia.activity;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Build;
-import android.support.annotation.Nullable;
 import android.view.MenuItem;
 import android.view.View;
 
 public final class ActivityUtil {
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-public static void requestFullUserOrientation(Activity activity) {
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
-}
-}
-
 public static View getRootView(Activity activity) {
 return activity.findViewById(android.R.id.content).getRootView();
 }
 
 public static View getMenuItemView(Activity activity, MenuItem item) {
 return activity.findViewById(item.getItemId());
-}
-
-public static boolean defaultOnOptionsItemSelected(Activity activity, 
MenuItem item) {
-switch (item.getItemId()) {
-case android.R.id.home:
-activity.onBackPressed();
-return true;
-default:
-return false;
-}
-}
-
-public static Intent getLaunchIntent(Context context) {
-return getLaunchIntent(context, context.getPackageName());
-}
-
-@Nullable public static Intent getLaunchIntent(Context context, String 
packageName) {
-return 
context.getPackageManager().getLaunchIntentForPackage(packageName);
 }
 
 private ActivityUtil() { }
diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
new file mode 100644
index 000..88cf8fb
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -0,0 +1,26 @@
+package org.wikipedia.activity;
+
+import android.annotation.TargetApi;
+import android.content.pm.ActivityInfo;
+import android.os.Build;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+
+public abstract class BaseActivity extends AppCompatActivity {
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+protected void requestFullUserOrientation() {
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
+}
+}
+
+@Override public boolean onOptionsItemSelected(MenuItem item) {
+switch (item.getItemId()) {
+case android.R.id.home:
+onBackPressed();
+return true;
+default:
+return false;
+}
+}
+}
\ No newline at end of file
diff --git 
a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java 
b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
index 6c45d68..f5987e4 100644
--- a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
@@ -7,7 +7,6 @@
 import android.support.annotation.LayoutRes;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
-import 

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Support UnboundedQuantityValue for range constraint checks

[Aude (Code Review)]

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

Change subject: Support UnboundedQuantityValue for range constraint checks
..

Support UnboundedQuantityValue for range constraint checks

Needed to rework the tests to more meaningfully check
handling of invalid values (throws exception), and for
handling supported data value types.

Bug: T158183
Change-Id: Idc76a8794662dc6d87c53dad27ce9fd6d7d8de1c
---
M includes/ConstraintCheck/Helper/RangeCheckerHelper.php
M tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
2 files changed, 42 insertions(+), 34 deletions(-)


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

diff --git a/includes/ConstraintCheck/Helper/RangeCheckerHelper.php 
b/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
index 62a3cc9..00338e7 100644
--- a/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
+++ b/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
@@ -5,6 +5,7 @@
 use DataValues\DataValue;
 use DataValues\QuantityValue;
 use DataValues\TimeValue;
+use DataValues\UnboundedQuantityValue;
 use InvalidArgumentException;
 
 /**
@@ -21,6 +22,8 @@
return $dataValue->getTime();
} elseif ( $dataValue instanceof QuantityValue ) {
return $dataValue->getAmount()->getValue();
+   } elseif ( $dataValue instanceof UnboundedQuantityValue ) {
+   return $dataValue->getAmount()->getValue();
}
 
throw new InvalidArgumentException( 'Unsupported data value 
type' );
diff --git a/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php 
b/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
index 6167049..cb3a78b 100644
--- a/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
+++ b/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
@@ -2,9 +2,13 @@
 
 namespace WikibaseQuality\ConstraintReport\Test\RangeChecker;
 
+use DataValues\DataValue;
 use DataValues\DecimalValue;
 use DataValues\QuantityValue;
+use DataValues\StringValue;
 use DataValues\TimeValue;
+use DataValues\UnboundedQuantityValue;
+use InvalidArgumentException;
 use PHPUnit_Framework_TestCase;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\RangeCheckerHelper;
 
@@ -22,47 +26,48 @@
 class RangeCheckerHelperTest extends PHPUnit_Framework_TestCase {
 
/**
-* @var RangeCheckerHelper
+* @dataProvider getComparativeValueProvider
 */
-   private $helper;
+   public function testGetComparativeValue( $expected, DataValue 
$dataValue ) {
+   $rangeCheckHelper = new RangeCheckerHelper();
+   $comparativeValue = $rangeCheckHelper->getComparativeValue( 
$dataValue );
+
+   $this->assertSame( $expected, $comparativeValue );
+   }
+
+   public function getComparativeValueProvider() {
+   $cases = [
+   [ '+1970-01-01T00:00:00Z', $this->getTimeValue() ],
+   [ '+42', $this->getQuantityValue() ],
+   [ '+9000', UnboundedQuantityValue::newFromNumber( '+9000' ) 
]
+   ];
+
+   return $cases;
+   }
 
/**
-* @var TimeValue
+* @expectedException InvalidArgumentException
 */
-   private $time;
-
-   /**
-* @var QuantityValue
-*/
-   private $quantity;
-
-   protected function setUp() {
-   parent::setUp();
-   $this->helper = new RangeCheckerHelper();
-   $this->time = new TimeValue( '+0001970-01-01T00:00:00Z', 0, 
0, 0, 11, 'http://www.wikidata.org/entity/Q1985727' );
-   $value = new DecimalValue( 3.1415926536 );
-   $this->quantity = new QuantityValue( $value, '1', $value, 
$value );
+   public function 
testGetComparativeValue_unsupportedDataValueTypeThrowsException() {
+   $rangeCheckHelper = new RangeCheckerHelper();
+   $rangeCheckHelper->getComparativeValue( new StringValue( 
'kittens' ) );
}
 
-   protected function tearDown() {
-   unset( $this->helper );
-   parent::tearDown();
+   private function getTimeValue() {
+   return new TimeValue(
+   '+0001970-01-01T00:00:00Z',
+   0,
+   0,
+   0,
+   11,
+   'http://www.wikidata.org/entity/Q1985727'
+   );
}
 
-   public function testGetComparativeValueTimeValid() {
-   $this->assertEquals( '+1970-01-01T00:00:00Z', 
$this->helper->getComparativeValue( $this->time ) );
+   private function getQuantityValue() {
+   $decimalValue = new DecimalValue( 42 );
+
+   return new 

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Problem when the language is different between the user lang...

[jenkins-bot (Code Review)]

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

Change subject: Problem when the language is different between the user 
language and the content of Wiki.
..


Problem when the language is different between the user language and the 
content of Wiki.

Change-Id: I6633040035615a8b9a20b3aeee0d9ee9841331b0
---
M specialpages/SpecialRDFUnit.php
1 file changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/specialpages/SpecialRDFUnit.php b/specialpages/SpecialRDFUnit.php
index 4475a6b..ff45bd3 100644
--- a/specialpages/SpecialRDFUnit.php
+++ b/specialpages/SpecialRDFUnit.php
@@ -256,8 +256,9 @@
"pass" => 
$configSaveData->getInstanceEndpoint()->getPassword()
));
}
-$category = Title::newFromText(wfMessage( 
'linkedwiki-category-rdf-schema' )->parse() )->getDBKey(); //"RDF_schema";
- 
+
+$category = Title::newFromText(wfMessage( 
'linkedwiki-category-rdf-schema' )->inContentLanguage()->parse() )->getDBKey(); 
//"RDF_schema";
+
 $wgOut->addHTML("Refresh test cases");
 
 $wgOut->addWikiText("== RDF schemas in the Wiki ==");
@@ -276,7 +277,7 @@
 INNER JOIN categorylinks c ON c.cl_from = p.page_id 
 INNER JOIN searchindex s ON s.si_page = p.page_id 
  WHERE c.cl_to='".$category."' ORDER BY p.page_title ASC";
-//echo  $sql;
+//echo  $sql;
$res = $dbr->query($sql, __METHOD__);
 
 $schemas = array();
@@ -286,7 +287,7 @@
 $schemas[] = $row;
 $schemasStr[] = '"'.Title::newFromID( $row->pid 
)->getFullURL().'?action=raw=rdf"';
 // $wgOut->addWikiText("* [[".$row->title."]] ");
- $wgOut->addWikiText("* ".$row->pid." - [".Title::newFromID( 
$row->pid )->getFullURL()." ".$row->title."] ");
+ $wgOut->addWikiText("* [".Title::newFromID( $row->pid 
)->getFullURL()." ".$row->title."] ");
 }
 
 //return $list;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6633040035615a8b9a20b3aeee0d9ee9841331b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 
Gerrit-Reviewer: Karima Rafes 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Problem when the language is different between the user lang...

[Karima Rafes (Code Review)]

Karima Rafes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338053 )

Change subject: Problem when the language is different between the user 
language and the content of Wiki.
..

Problem when the language is different between the user language and the 
content of Wiki.

Change-Id: I6633040035615a8b9a20b3aeee0d9ee9841331b0
---
M specialpages/SpecialRDFUnit.php
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkedWiki 
refs/changes/53/338053/1

diff --git a/specialpages/SpecialRDFUnit.php b/specialpages/SpecialRDFUnit.php
index 4475a6b..ff45bd3 100644
--- a/specialpages/SpecialRDFUnit.php
+++ b/specialpages/SpecialRDFUnit.php
@@ -256,8 +256,9 @@
"pass" => 
$configSaveData->getInstanceEndpoint()->getPassword()
));
}
-$category = Title::newFromText(wfMessage( 
'linkedwiki-category-rdf-schema' )->parse() )->getDBKey(); //"RDF_schema";
- 
+
+$category = Title::newFromText(wfMessage( 
'linkedwiki-category-rdf-schema' )->inContentLanguage()->parse() )->getDBKey(); 
//"RDF_schema";
+
 $wgOut->addHTML("Refresh test cases");
 
 $wgOut->addWikiText("== RDF schemas in the Wiki ==");
@@ -276,7 +277,7 @@
 INNER JOIN categorylinks c ON c.cl_from = p.page_id 
 INNER JOIN searchindex s ON s.si_page = p.page_id 
  WHERE c.cl_to='".$category."' ORDER BY p.page_title ASC";
-//echo  $sql;
+//echo  $sql;
$res = $dbr->query($sql, __METHOD__);
 
 $schemas = array();
@@ -286,7 +287,7 @@
 $schemas[] = $row;
 $schemasStr[] = '"'.Title::newFromID( $row->pid 
)->getFullURL().'?action=raw=rdf"';
 // $wgOut->addWikiText("* [[".$row->title."]] ");
- $wgOut->addWikiText("* ".$row->pid." - [".Title::newFromID( 
$row->pid )->getFullURL()." ".$row->title."] ");
+ $wgOut->addWikiText("* [".Title::newFromID( $row->pid 
)->getFullURL()." ".$row->title."] ");
 }
 
 //return $list;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6633040035615a8b9a20b3aeee0d9ee9841331b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Disable europeana2802016 campaign

[KartikMistry (Code Review)]

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

Change subject: Disable europeana2802016 campaign
..

Disable europeana2802016 campaign

This campaign is over and shouldn't be in config file.

Change-Id: Id0b8114629c9fd37ca7f5647228128dabf39e7be
---
M extension.json
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index 45174d4..6d0efe2 100644
--- a/extension.json
+++ b/extension.json
@@ -139,8 +139,7 @@
"ContentTranslationCampaigns": {
"cxstats": true,
"specialcx": true,
-   "newarticle": true,
-   "europeana2802016": true
+   "newarticle": true
},
"ContentTranslationBrowserBlacklist": {
"msie": [ [ "<", 10 ] ]

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: stylelint: Fix `no-unknown-animations` errors

[KartikMistry (Code Review)]

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

Change subject: stylelint: Fix `no-unknown-animations` errors
..

stylelint: Fix `no-unknown-animations` errors

Disable until we figure out how stylelint can work with animation
defined in an imported less file as a part of dependency.

Upstream bug: https://github.com/stylelint/stylelint/issues/2363

Bug: T157416
Change-Id: Iaf343195d038e49fc357661a5032a49d955b4c23
---
M .stylelintrc
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/.stylelintrc b/.stylelintrc
index 2c90730..8bfccaf 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,3 +1,6 @@
 {
-   "extends": "stylelint-config-wikimedia"
+   "extends": "stylelint-config-wikimedia",
+   "rules": {
+   "no-unknown-animations": null
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Add Serializer::getLastChild()

[Tim Starling (Code Review)]

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

Change subject: Add Serializer::getLastChild()
..

Add Serializer::getLastChild()

Change-Id: Icd5df8c83930849cb3438393f99ff88654d187a3
---
M src/Serializer/Serializer.php
1 file changed, 19 insertions(+), 1 deletion(-)


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

diff --git a/src/Serializer/Serializer.php b/src/Serializer/Serializer.php
index 51e66b9..65da72e 100644
--- a/src/Serializer/Serializer.php
+++ b/src/Serializer/Serializer.php
@@ -72,6 +72,8 @@
 
/**
 * Get the root SerializerNode.
+*
+* @return SerializerNode
 */
public function getRootNode() {
return $this->root;
@@ -79,9 +81,25 @@
 
/**
 * Get the parent SerializerNode of a given SerializerNode
+*
+* @param SerializerNode $node
+* @return SerializerNode
 */
public function getParentNode( SerializerNode $node ) {
return $this->nodes[$node->parentId];
+   }
+
+   /**
+* Get the last child of a given SerializerNode
+*
+* @param SerializerNode $node
+* @return SerializerNode|string|null
+*/
+   public function getLastChild( SerializerNode $node ) {
+   $children = $node->children;
+   $lastChildIndex = count( $children ) - 1;
+   $lastChild = $lastChildIndex >= 0 ? $children[$lastChildIndex] 
: null;
+   return $lastChild;
}
 
public function startDocument( $fragmentNamespace, $fragmentName ) {
@@ -110,7 +128,7 @@
$this->nextNodeId = 0;
}
 
-   private function interpretPlacement( $preposition, $refElement ) {
+   protected function interpretPlacement( $preposition, $refElement ) {
if ( $preposition === TreeBuilder::ROOT ) {
return [ $this->root, null ];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd5df8c83930849cb3438393f99ff88654d187a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] labs...stashbot[master]: flake8 fixes

[jenkins-bot (Code Review)]

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

Change subject: flake8 fixes
..


flake8 fixes

Stop copping out on flake8 by excluding some rules.

Change-Id: Ic7848d5eeca1d24985f4feff293e029a09f4c168
---
M stashbot.py
M stashbot/bot.py
M stashbot/sal.py
M tox.ini
4 files changed, 12 insertions(+), 9 deletions(-)

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



diff --git a/stashbot.py b/stashbot.py
index eaa9580..0d4f06c 100755
--- a/stashbot.py
+++ b/stashbot.py
@@ -22,9 +22,11 @@
 import stashbot.config
 
 parser = argparse.ArgumentParser(description='Stashbot')
-parser.add_argument('-c', '--config',
+parser.add_argument(
+'-c', '--config',
 default='etc/config.yaml', help='Configuration file')
-parser.add_argument('-v', '--verbose', action='count',
+parser.add_argument(
+'-v', '--verbose', action='count',
 default=0, dest='loglevel', help='Increase logging verbosity')
 args = parser.parse_args()
 
diff --git a/stashbot/bot.py b/stashbot/bot.py
index b6388fb..08038d2 100644
--- a/stashbot/bot.py
+++ b/stashbot/bot.py
@@ -152,7 +152,8 @@
 elif msg.startswith('!bash '):
 self.do_bash(conn, event, doc)
 
-if (event.target not in self.config['phab'].get('notin', []) and
+if (
+event.target not in self.config['phab'].get('notin', []) and
 'echo' in self.config['phab'] and
 RE_PHAB_NOURL.search(msg)
 ):
@@ -264,7 +265,8 @@
 ret = self.es.index(index='bash', doc_type='bash', body=bash)
 
 if 'created' in ret and ret['created'] is True:
-self.respond(conn, event,
+self.respond(
+conn, event,
 '%s: Stored quip at %s' % (
 event.source.nick,
 self.config['bash']['view_url'] % ret['_id']
@@ -272,7 +274,8 @@
 )
 else:
 self.logger.error('Failed to save document: %s', ret)
-self.respond(conn, event,
+self.respond(
+conn, event,
 '%s: Yuck. Something blew up when I tried to save that.' % (
 event.source.nick,
 )
diff --git a/stashbot/sal.py b/stashbot/sal.py
index b03de15..dbbae35 100644
--- a/stashbot/sal.py
+++ b/stashbot/sal.py
@@ -218,7 +218,8 @@
 def _store_in_es(self, bang):
 """Save a !log message to elasticsearch."""
 ret = self.es.index(index='sal', doc_type='sal', body=bang)
-if ('phab' in self.config['sal'] and
+if (
+'phab' in self.config['sal'] and
 'created' in ret and ret['created'] is True
 ):
 m = RE_PHAB.findall(bang['message'])
diff --git a/tox.ini b/tox.ini
index dcc3996..4f40bcf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,9 +24,6 @@
 deps = flake8
 
 [flake8]
-; E128 continuation line under-indented for visual indent
-; E124 closing bracket does not match visual indentation
-ignore = E128, E124
 exclude = .tox
 count = 1
 show-pep8 = 1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7848d5eeca1d24985f4feff293e029a09f4c168
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stashbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...stashbot[master]: Support Python3

[jenkins-bot (Code Review)]

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

Change subject: Support Python3
..


Support Python3

Make the code run on both python2 and python3.

Change-Id: Iac98ff3363ca60474a9df796593ae54dab356391
---
M stashbot/mediawiki.py
M tox.ini
2 files changed, 14 insertions(+), 4 deletions(-)

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



diff --git a/stashbot/mediawiki.py b/stashbot/mediawiki.py
index 087c383..e64da49 100644
--- a/stashbot/mediawiki.py
+++ b/stashbot/mediawiki.py
@@ -17,7 +17,10 @@
 # this program.  If not, see .
 
 import mwclient
-import urlparse
+try:
+from urlparse import urlparse
+except ImportError:
+from urllib.parse import urlparse
 
 
 class Client(object):
@@ -38,7 +41,7 @@
 consumer_token=None, consumer_secret=None,
 access_token=None, access_secret=None
 ):
-parts = urlparse.urlparse(url)
+parts = urlparse(url)
 host = parts.netloc
 if parts.scheme != 'https':
 host = (parts.scheme, parts.netloc)
diff --git a/tox.ini b/tox.ini
index 0af9877..dcc3996 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,20 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py2, flake8
+envlist = py2, py3, flake8
 
-[testenv]
+[testenv:py2]
 basepython = python2
 commands =
   nosetests --with-doctest --doctest-tests -v --detailed-errors
+deps =
+  -r{toxinidir}/requirements.txt
+  nose
 
+[testenv:py3]
+basepython = python3
+commands =
+  nosetests --with-doctest --doctest-tests -v --detailed-errors
 deps =
   -r{toxinidir}/requirements.txt
   nose

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac98ff3363ca60474a9df796593ae54dab356391
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stashbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Clean project titles before using

[jenkins-bot (Code Review)]

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

Change subject: Clean project titles before using
..


Clean project titles before using

Bug: T158245
Change-Id: Id2150ec9daf23e627b4e18990eff4835404eaada
---
M PageAssessmentsBody.php
M tests/phpunit/PageAssessmentsTest.php
2 files changed, 31 insertions(+), 1 deletion(-)

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



diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php
index 89e50b6..24f3eb9 100644
--- a/PageAssessmentsBody.php
+++ b/PageAssessmentsBody.php
@@ -49,7 +49,7 @@
foreach ( $assessmentData as $parserData ) {
// If the name of the project is set...
if ( isset( $parserData[0] ) && $parserData[0] !== '' ) 
{
-   $projectName = $parserData[0];
+   $projectName = self::cleanProjectTitle( 
$parserData[0] );
// ...get the corresponding ID from 
page_assessments_projects table.
$projectId = self::getProjectId( $projectName );
// If there is no existing project by that 
name, add it to the table.
@@ -196,6 +196,25 @@
return $id;
}
 
+   /**
+* Clean up the title of the project (or subproject)
+*
+* Since the project title comes from a template parameter, it can 
basically
+* be anything. This function accounts for common cases where editors 
put
+* extra stuff into the parameter besides just the name of the project.
+* @param string $project WikiProject title
+* @return string Cleaned-up WikiProject title
+*/
+   public static function cleanProjectTitle( $project ) {
+   // Remove any bold formatting.
+   $project = str_replace( "'''", "", $project );
+   // Remove "the" prefix for subprojects (common on English 
Wikipedia).
+   // This is case-sensitive on purpose, as there are some 
legitimate
+   // subproject titles starting with "The", e.g. "The Canterbury 
Tales".
+   $project = str_replace( "/the ", "/", $project );
+   // Truncate to 255 characters to avoid DB warnings.
+   return substr( $project, 0, 255 );
+   }
 
/**
 * Update record in DB if there are new values
diff --git a/tests/phpunit/PageAssessmentsTest.php 
b/tests/phpunit/PageAssessmentsTest.php
index cd04d9a..5815a7f 100644
--- a/tests/phpunit/PageAssessmentsTest.php
+++ b/tests/phpunit/PageAssessmentsTest.php
@@ -105,6 +105,17 @@
 
 
/**
+* Test the cleanProjectTitle() function in PageAssessmentsBody class
+*/
+   public function testCleanProjectTitle() {
+   $pageBody = new PageAssessmentsBody;
+   $projectTitle = "Drinks/the '''Coffee task force'''";
+   $cleanedProjectTitle = $pageBody->cleanProjectTitle( 
$projectTitle );
+   $this->assertEquals( "Drinks/Coffee task force", 
$cleanedProjectTitle );
+   }
+
+
+   /**
 * Tear down - called at the end
 */
protected function tearDown() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2150ec9daf23e627b4e18990eff4835404eaada
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: stylelint: Fix no-descending-specificity Part 2

[KartikMistry (Code Review)]

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

Change subject: stylelint: Fix no-descending-specificity Part 2
..

stylelint: Fix no-descending-specificity Part 2

Disabled check on recursive dependencies.

Bug: T158161
Change-Id: I293b5205eeb407b6d9cdbe0a70cc4d7683f1de05
---
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
M modules/ui/styles/mw.cx.ui.TranslationColumn.less
3 files changed, 12 insertions(+), 12 deletions(-)


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

diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index 9bacbd4..257e8bd 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -11,7 +11,7 @@
 
 .cx-suggestionlist h2,
 .cx-suggestionlist__public-title {
-   .mw-ui-one-whole;
+   .mw-ui-one-whole; /* stylelint-disable-line no-descending-specificity */
border-bottom: 0;
 }
 
@@ -54,7 +54,7 @@
 .cx-suggestionlist__collapse,
 .cx-suggestionlist__expand,
 .cx-suggestionlist__refresh {
-   .mw-ui-one-whole;
+   .mw-ui-one-whole; /* stylelint-disable-line no-descending-specificity */
padding: 10px;
background-color: #fff;
border: 1px solid #ddd;
diff --git a/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less 
b/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
index 2a21129..94348fe 100644
--- a/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
+++ b/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
@@ -18,14 +18,10 @@
.cx-spinner {
margin: 0 auto;
}
-   .cx-column--translation:hover &:first-child {
-   color: transparent;
-   background-color: transparent;
-   }
 
&:first-child,
.cx-column--translation &:first-child:hover,
-   &:hover {
+   &:hover { /* stylelint-disable-line no-descending-specificity */
color: #aaa;
background-color: #f8f8f8;
/* In supported browsers, center the placeholder text */
@@ -33,4 +29,8 @@
justify-content: center; /* align horizontally */
align-items: center; /* align vertically */
}
+   .cx-column--translation:hover &:first-child {
+   color: transparent;
+   background-color: transparent;
+   }
 }
diff --git a/modules/ui/styles/mw.cx.ui.TranslationColumn.less 
b/modules/ui/styles/mw.cx.ui.TranslationColumn.less
index 0758ad8..db2fab6 100644
--- a/modules/ui/styles/mw.cx.ui.TranslationColumn.less
+++ b/modules/ui/styles/mw.cx.ui.TranslationColumn.less
@@ -35,14 +35,10 @@
.cx-spinner {
margin: 0 auto;
}
-   .cx-column--translation:hover &:first-child {
-   color: transparent;
-   background-color: transparent;
-   }
 
&:first-child,
.cx-column--translation &:first-child:hover,
-   &:hover {
+   &:hover { /* stylelint-disable-line no-descending-specificity */
color: #aaa;
background-color: #f8f8f8;
/* In supported browsers, center the placeholder text */
@@ -50,4 +46,8 @@
justify-content: center; /* align horizontally */
align-items: center; /* align vertically */
}
+   .cx-column--translation:hover &:first-child {
+   color: transparent;
+   background-color: transparent;
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Fix problems about the Curl's constructor and the RDFUnit sp...

[jenkins-bot (Code Review)]

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

Change subject: Fix problems about the Curl's constructor and the RDFUnit 
specialpage
..


Fix problems about the Curl's constructor and the RDFUnit specialpage

Change-Id: I43ce5388f7d3eff5b8ddc18d159b09c165e1e253
---
M specialpages/SpecialRDFUnit.php
M vendor/bordercloud/sparql/Curl.php
2 files changed, 206 insertions(+), 14 deletions(-)

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



diff --git a/specialpages/SpecialRDFUnit.php b/specialpages/SpecialRDFUnit.php
index f75904d..4475a6b 100644
--- a/specialpages/SpecialRDFUnit.php
+++ b/specialpages/SpecialRDFUnit.php
@@ -18,6 +18,188 @@
  */
 if (!defined('MEDIAWIKI')) die();
 
+/**
+ * Constants usable with http_build_url()
+ * @link http://php.net/manual/en/http.constants.php#constant.http-url-replace
+ */
+defined('HTTP_URL_REPLACE')or define('HTTP_URL_REPLACE',0);
+defined('HTTP_URL_JOIN_PATH')  or define('HTTP_URL_JOIN_PATH',  1);
+defined('HTTP_URL_JOIN_QUERY') or define('HTTP_URL_JOIN_QUERY', 2);
+defined('HTTP_URL_STRIP_USER') or define('HTTP_URL_STRIP_USER', 4);
+defined('HTTP_URL_STRIP_PASS') or define('HTTP_URL_STRIP_PASS', 8);
+defined('HTTP_URL_STRIP_AUTH') or define('HTTP_URL_STRIP_AUTH', 12);
+defined('HTTP_URL_STRIP_PORT') or define('HTTP_URL_STRIP_PORT', 32);
+defined('HTTP_URL_STRIP_PATH') or define('HTTP_URL_STRIP_PATH', 64);
+defined('HTTP_URL_STRIP_QUERY')or define('HTTP_URL_STRIP_QUERY',128);
+defined('HTTP_URL_STRIP_FRAGMENT') or define('HTTP_URL_STRIP_FRAGMENT', 256);
+defined('HTTP_URL_STRIP_ALL')  or define('HTTP_URL_STRIP_ALL',  492);
+if ( ! function_exists('http_build_str')) :
+   /**
+* Build query string
+* @link http://php.net/manual/en/function.http-build-str.php
+* @param array $query associative array of query string parameters
+* @param string $prefix top level prefix
+* @param string $arg_separator argument separator to use (by default 
the INI setting arg_separator.output will be used, or "&" if neither is set
+* @return string Returns the built query as string on success or FALSE 
on failure. 
+*/
+   function http_build_str(array $query, $prefix = '', $arg_separator = 
null)
+   {
+   if (is_null($arg_separator)) $arg_separator = 
ini_get('arg_separator.output');
+   $out = array();
+   foreach($query as $k => $v)
+   {
+   $key = $prefix ? "{$prefix}%5B{$k}%5D" : $k;
+   if (is_array($v))
+   $out[] = call_user_func(__FUNCTION__, $v, $key, 
$arg_separator);
+   else
+   $out[] = $key . '=' . urlencode($v);
+   }
+   return implode($arg_separator, $out);
+   }
+endif;
+if ( ! function_exists('http_build_url')) :
+   /**
+* Build a URL
+* @link http://php.net/manual/en/function.http-build-url.php
+* @param mixed $url (part(s) of) an URL in form of a string or 
associative array like parse_url() returns
+* @param mixed $parts same as the first argument
+* @param integer $flags a bitmask of binary or'ed HTTP_URL constants; 
HTTP_URL_REPLACE is the default
+* @param array $new_url if set, it will be filled with the parts of 
the composed url like parse_url() would return
+* @return string Returns the new URL as string on success or FALSE on 
failure.
+*/
+   function http_build_url($url = array(), $parts = array(), $flags = 
HTTP_URL_REPLACE, &$new_url = null)
+   {
+   $defaults = array(
+   'scheme' => (empty($_SERVER['HTTPS']) || 
strtolower($_SERVER['HTTPS'])=='off' ? 'http' : 'https'),
+   'host'   => $_SERVER['HTTP_HOST'],
+   'port'   => '',
+   'user'   => '', 'pass' => '',
+   'path'   => preg_replace('`^([^\?]*).*$`', '$1', 
$_SERVER['REQUEST_URI']),
+   'query'  => '', 'fragment' => '',
+   );
+   is_array($url) or $url = parse_url($url);
+   is_array($parts) or $parts = parse_url($parts);
+   $new_url = $parts + $url + $defaults;
+   $flags or $flags = (HTTP_URL_JOIN_PATH); // Default flags ?
+   $JOIN_PATH  = (($flags | HTTP_URL_JOIN_PATH) == $flags);
+   $JOIN_QUERY = (($flags | HTTP_URL_JOIN_QUERY) == $flags);
+   $STRIP_USER = (($flags | HTTP_URL_STRIP_USER) == $flags);
+   $STRIP_PASS = (($flags | HTTP_URL_STRIP_PASS) == $flags);
+   $STRIP_PATH = (($flags | HTTP_URL_STRIP_PATH) == $flags);
+   

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Fix problems about the Curl's constructor and the RDFUnit sp...

[Karima Rafes (Code Review)]

Karima Rafes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338049 )

Change subject: Fix problems about the Curl's constructor and the RDFUnit 
specialpage
..

Fix problems about the Curl's constructor and the RDFUnit specialpage

Change-Id: I43ce5388f7d3eff5b8ddc18d159b09c165e1e253
---
M specialpages/SpecialRDFUnit.php
M vendor/bordercloud/sparql/Curl.php
2 files changed, 206 insertions(+), 14 deletions(-)


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

diff --git a/specialpages/SpecialRDFUnit.php b/specialpages/SpecialRDFUnit.php
index f75904d..4475a6b 100644
--- a/specialpages/SpecialRDFUnit.php
+++ b/specialpages/SpecialRDFUnit.php
@@ -18,6 +18,188 @@
  */
 if (!defined('MEDIAWIKI')) die();
 
+/**
+ * Constants usable with http_build_url()
+ * @link http://php.net/manual/en/http.constants.php#constant.http-url-replace
+ */
+defined('HTTP_URL_REPLACE')or define('HTTP_URL_REPLACE',0);
+defined('HTTP_URL_JOIN_PATH')  or define('HTTP_URL_JOIN_PATH',  1);
+defined('HTTP_URL_JOIN_QUERY') or define('HTTP_URL_JOIN_QUERY', 2);
+defined('HTTP_URL_STRIP_USER') or define('HTTP_URL_STRIP_USER', 4);
+defined('HTTP_URL_STRIP_PASS') or define('HTTP_URL_STRIP_PASS', 8);
+defined('HTTP_URL_STRIP_AUTH') or define('HTTP_URL_STRIP_AUTH', 12);
+defined('HTTP_URL_STRIP_PORT') or define('HTTP_URL_STRIP_PORT', 32);
+defined('HTTP_URL_STRIP_PATH') or define('HTTP_URL_STRIP_PATH', 64);
+defined('HTTP_URL_STRIP_QUERY')or define('HTTP_URL_STRIP_QUERY',128);
+defined('HTTP_URL_STRIP_FRAGMENT') or define('HTTP_URL_STRIP_FRAGMENT', 256);
+defined('HTTP_URL_STRIP_ALL')  or define('HTTP_URL_STRIP_ALL',  492);
+if ( ! function_exists('http_build_str')) :
+   /**
+* Build query string
+* @link http://php.net/manual/en/function.http-build-str.php
+* @param array $query associative array of query string parameters
+* @param string $prefix top level prefix
+* @param string $arg_separator argument separator to use (by default 
the INI setting arg_separator.output will be used, or "&" if neither is set
+* @return string Returns the built query as string on success or FALSE 
on failure. 
+*/
+   function http_build_str(array $query, $prefix = '', $arg_separator = 
null)
+   {
+   if (is_null($arg_separator)) $arg_separator = 
ini_get('arg_separator.output');
+   $out = array();
+   foreach($query as $k => $v)
+   {
+   $key = $prefix ? "{$prefix}%5B{$k}%5D" : $k;
+   if (is_array($v))
+   $out[] = call_user_func(__FUNCTION__, $v, $key, 
$arg_separator);
+   else
+   $out[] = $key . '=' . urlencode($v);
+   }
+   return implode($arg_separator, $out);
+   }
+endif;
+if ( ! function_exists('http_build_url')) :
+   /**
+* Build a URL
+* @link http://php.net/manual/en/function.http-build-url.php
+* @param mixed $url (part(s) of) an URL in form of a string or 
associative array like parse_url() returns
+* @param mixed $parts same as the first argument
+* @param integer $flags a bitmask of binary or'ed HTTP_URL constants; 
HTTP_URL_REPLACE is the default
+* @param array $new_url if set, it will be filled with the parts of 
the composed url like parse_url() would return
+* @return string Returns the new URL as string on success or FALSE on 
failure.
+*/
+   function http_build_url($url = array(), $parts = array(), $flags = 
HTTP_URL_REPLACE, &$new_url = null)
+   {
+   $defaults = array(
+   'scheme' => (empty($_SERVER['HTTPS']) || 
strtolower($_SERVER['HTTPS'])=='off' ? 'http' : 'https'),
+   'host'   => $_SERVER['HTTP_HOST'],
+   'port'   => '',
+   'user'   => '', 'pass' => '',
+   'path'   => preg_replace('`^([^\?]*).*$`', '$1', 
$_SERVER['REQUEST_URI']),
+   'query'  => '', 'fragment' => '',
+   );
+   is_array($url) or $url = parse_url($url);
+   is_array($parts) or $parts = parse_url($parts);
+   $new_url = $parts + $url + $defaults;
+   $flags or $flags = (HTTP_URL_JOIN_PATH); // Default flags ?
+   $JOIN_PATH  = (($flags | HTTP_URL_JOIN_PATH) == $flags);
+   $JOIN_QUERY = (($flags | HTTP_URL_JOIN_QUERY) == $flags);
+   $STRIP_USER = (($flags | HTTP_URL_STRIP_USER) == $flags);
+   $STRIP_PASS = (($flags | HTTP_URL_STRIP_PASS) == $flags);
+   $STRIP_PATH = (($flags | HTTP_URL_STRIP_PATH) == $flags);
+ 

[MediaWiki-commits] [Gerrit] labs...stashbot[master]: flake8 fixes

[BryanDavis (Code Review)]

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

Change subject: flake8 fixes
..

flake8 fixes

Stop copping out on flake8 by excluding some rules.

Change-Id: Ic7848d5eeca1d24985f4feff293e029a09f4c168
---
M stashbot.py
M stashbot/bot.py
M stashbot/sal.py
M tox.ini
4 files changed, 12 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stashbot 
refs/changes/47/338047/1

diff --git a/stashbot.py b/stashbot.py
index eaa9580..0d4f06c 100755
--- a/stashbot.py
+++ b/stashbot.py
@@ -22,9 +22,11 @@
 import stashbot.config
 
 parser = argparse.ArgumentParser(description='Stashbot')
-parser.add_argument('-c', '--config',
+parser.add_argument(
+'-c', '--config',
 default='etc/config.yaml', help='Configuration file')
-parser.add_argument('-v', '--verbose', action='count',
+parser.add_argument(
+'-v', '--verbose', action='count',
 default=0, dest='loglevel', help='Increase logging verbosity')
 args = parser.parse_args()
 
diff --git a/stashbot/bot.py b/stashbot/bot.py
index b6388fb..08038d2 100644
--- a/stashbot/bot.py
+++ b/stashbot/bot.py
@@ -152,7 +152,8 @@
 elif msg.startswith('!bash '):
 self.do_bash(conn, event, doc)
 
-if (event.target not in self.config['phab'].get('notin', []) and
+if (
+event.target not in self.config['phab'].get('notin', []) and
 'echo' in self.config['phab'] and
 RE_PHAB_NOURL.search(msg)
 ):
@@ -264,7 +265,8 @@
 ret = self.es.index(index='bash', doc_type='bash', body=bash)
 
 if 'created' in ret and ret['created'] is True:
-self.respond(conn, event,
+self.respond(
+conn, event,
 '%s: Stored quip at %s' % (
 event.source.nick,
 self.config['bash']['view_url'] % ret['_id']
@@ -272,7 +274,8 @@
 )
 else:
 self.logger.error('Failed to save document: %s', ret)
-self.respond(conn, event,
+self.respond(
+conn, event,
 '%s: Yuck. Something blew up when I tried to save that.' % (
 event.source.nick,
 )
diff --git a/stashbot/sal.py b/stashbot/sal.py
index b03de15..dbbae35 100644
--- a/stashbot/sal.py
+++ b/stashbot/sal.py
@@ -218,7 +218,8 @@
 def _store_in_es(self, bang):
 """Save a !log message to elasticsearch."""
 ret = self.es.index(index='sal', doc_type='sal', body=bang)
-if ('phab' in self.config['sal'] and
+if (
+'phab' in self.config['sal'] and
 'created' in ret and ret['created'] is True
 ):
 m = RE_PHAB.findall(bang['message'])
diff --git a/tox.ini b/tox.ini
index dcc3996..4f40bcf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,9 +24,6 @@
 deps = flake8
 
 [flake8]
-; E128 continuation line under-indented for visual indent
-; E124 closing bracket does not match visual indentation
-ignore = E128, E124
 exclude = .tox
 count = 1
 show-pep8 = 1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7848d5eeca1d24985f4feff293e029a09f4c168
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stashbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] labs...stashbot[master]: Guard against multiple bots competing in channels

[BryanDavis (Code Review)]

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

Change subject: Guard against multiple bots competing in channels
..

Guard against multiple bots competing in channels

* Die when using secondary nick and given a nick in use notice
* Use `/msg NickServ regain` when reclaiming primary nick
* Check for primary nick before handling channel messages

Bug: T156895
Change-Id: I375175b07a6c924555e3a35f5ea5b01af4b42eb6
---
M stashbot/bot.py
1 file changed, 23 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stashbot 
refs/changes/48/338048/1

diff --git a/stashbot/bot.py b/stashbot/bot.py
index 08038d2..9bd87df 100644
--- a/stashbot/bot.py
+++ b/stashbot/bot.py
@@ -95,7 +95,13 @@
 def on_nicknameinuse(self, conn, event):
 nick = conn.get_nickname()
 self.logger.warning('Requested nick "%s" in use', nick)
-conn.nick(nick + '_')
+alt_nick = self.config['irc']['nick'] + '_'
+if nick == alt_nick:
+# Primary and secondary nicks taken, abort connection
+self.die(
+'Cowardly refusing to fill the channel with copies of myself')
+
+conn.nick(alt_nick)
 if 'password' in self.config['irc']:
 self.reactor.scheduler.execute_after(30, self.do_reclaim_nick)
 
@@ -126,6 +132,10 @@
 self.logger.warning(str(event))
 
 def on_pubmsg(self, conn, event):
+if not self._have_primary_nick():
+# Don't do anything if we haven't aquired the primary nick
+return
+
 # Log all public channel messages we receive
 doc = self.es.event_to_doc(conn, event)
 self.do_write_to_elasticsearch(conn, event, doc)
@@ -214,9 +224,14 @@
 1, functools.partial(self.do_join, cdr))
 
 def do_reclaim_nick(self):
-nick = self.connection.get_nickname()
-if nick != self.config['irc']['nick']:
-self.connection.nick(self.config['irc']['nick'])
+if not self._have_primary_nick():
+# REGAIN disconnects an old user session, or somebody
+# attempting to use your nickname without authorization,
+# then changes your nickname to the given nickname.
+# This may not work, disconnecting you, if the target
+# client reconnects automatically.
+self.connection.privmsg('NickServ', 'regain %s %s' % (
+self.config['irc']['nick'], self.config['irc']['password']))
 
 def do_ping(self):
 """Send a ping or disconnect if too many pings are outstanding."""
@@ -319,6 +334,10 @@
 """Remove common status indicators and normlize to lower case."""
 return nick.split('|', 1)[0].rstrip('`_').lower()
 
+def _have_primary_nick(self):
+"""Do we currently have the desired nick?"""
+return self.connection.get_nickname() == self.config['irc']['nick']
+
 def respond(self, conn, event, msg):
 """Respond to an event with a message."""
 to = event.target

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I375175b07a6c924555e3a35f5ea5b01af4b42eb6
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stashbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] labs...stashbot[master]: Support Python3

[BryanDavis (Code Review)]

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

Change subject: Support Python3
..

Support Python3

Make the code run on both python2 and python3.

Change-Id: Iac98ff3363ca60474a9df796593ae54dab356391
---
M stashbot/mediawiki.py
M tox.ini
2 files changed, 14 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stashbot 
refs/changes/46/338046/1

diff --git a/stashbot/mediawiki.py b/stashbot/mediawiki.py
index 087c383..e64da49 100644
--- a/stashbot/mediawiki.py
+++ b/stashbot/mediawiki.py
@@ -17,7 +17,10 @@
 # this program.  If not, see .
 
 import mwclient
-import urlparse
+try:
+from urlparse import urlparse
+except ImportError:
+from urllib.parse import urlparse
 
 
 class Client(object):
@@ -38,7 +41,7 @@
 consumer_token=None, consumer_secret=None,
 access_token=None, access_secret=None
 ):
-parts = urlparse.urlparse(url)
+parts = urlparse(url)
 host = parts.netloc
 if parts.scheme != 'https':
 host = (parts.scheme, parts.netloc)
diff --git a/tox.ini b/tox.ini
index 0af9877..dcc3996 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,20 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py2, flake8
+envlist = py2, py3, flake8
 
-[testenv]
+[testenv:py2]
 basepython = python2
 commands =
   nosetests --with-doctest --doctest-tests -v --detailed-errors
+deps =
+  -r{toxinidir}/requirements.txt
+  nose
 
+[testenv:py3]
+basepython = python3
+commands =
+  nosetests --with-doctest --doctest-tests -v --detailed-errors
 deps =
   -r{toxinidir}/requirements.txt
   nose

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac98ff3363ca60474a9df796593ae54dab356391
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stashbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable wgEnableWANCacheReaper in beta labs

[jenkins-bot (Code Review)]

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

Change subject: Enable wgEnableWANCacheReaper in beta labs
..


Enable wgEnableWANCacheReaper in beta labs

Change-Id: I83661f976c4cd8e1261f593466fa6dd123fa29e1
---
M wmf-config/mc-labs.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/mc-labs.php b/wmf-config/mc-labs.php
index 8ef819e..b1157d6 100644
--- a/wmf-config/mc-labs.php
+++ b/wmf-config/mc-labs.php
@@ -28,4 +28,7 @@
'loggroup' => 'memcached',
 ];
 
+# Confirm page related key purges via scanning recent changes
+$wgEnableWANCacheReaper = true;
+
 } # end safe guard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83661f976c4cd8e1261f593466fa6dd123fa29e1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add spacing before the mw-collapsible-toggle links

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338045 )

Change subject: Add spacing before the mw-collapsible-toggle links
..

Add spacing before the mw-collapsible-toggle links

Bug: T155347
Change-Id: I2f0fcfbb4095e8f7e8955ceda613685ea0f6bef9
---
M resources/src/jquery/jquery.makeCollapsible.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/338045/1

diff --git a/resources/src/jquery/jquery.makeCollapsible.js 
b/resources/src/jquery/jquery.makeCollapsible.js
index eef3846..3b2deaa 100644
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -278,6 +278,7 @@
.text( collapseText )
.wrap( '' )
.parent()
+   .css( 'margin-left', '0.3em' )
.prepend( '[' )
.append( ']' )
.on( 'click.mw-collapsible 
keypress.mw-collapsible', actionHandler );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f0fcfbb4095e8f7e8955ceda613685ea0f6bef9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: navtiming: Make tests easier to extend

[Krinkle (Code Review)]

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

Change subject: navtiming: Make tests easier to extend
..

navtiming: Make tests easier to extend

Convert unit test data to have a 1:many mapping between expected
results and inputs to parse_ua(). This will make it easier to
add new versions of the inputs in I85323b6997.

Change-Id: I699c61e3ae20e2f0653213c213d107b9be730e63
---
M modules/webperf/files/navtiming.py
M modules/webperf/files/navtiming_ua_data.yaml
2 files changed, 57 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/338044/1

diff --git a/modules/webperf/files/navtiming.py 
b/modules/webperf/files/navtiming.py
index 3a88470..6035b00 100755
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -323,11 +323,13 @@
 with open('navtiming_ua_data.yaml') as f:
 data = yaml.safe_load(f)
 for case in data:
-if case['result']:
-expect = tuple(case['result'].split('.'))
-else:
+if case == 'Other._':
 expect = None
-self.assertEqual(
-parse_ua(case['ua']),
-expect
-)
+else:
+expect = tuple(case.split('.'))
+uas = data.get(case)
+for ua in uas:
+self.assertEqual(
+parse_ua(ua),
+expect
+)
diff --git a/modules/webperf/files/navtiming_ua_data.yaml 
b/modules/webperf/files/navtiming_ua_data.yaml
index d8f2ca8..33a8f38 100644
--- a/modules/webperf/files/navtiming_ua_data.yaml
+++ b/modules/webperf/files/navtiming_ua_data.yaml
@@ -1,61 +1,59 @@
-# https://developer.chrome.com/multidevice/user-agent#webview_user_agent
-- result: Android.4
-  ua: 'Mozilla/5.0 (Linux; U; Android 4.1.1; en-gb; Build/KLP) 
AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30'
-- result: Android.4
-  ua: 'Mozilla/5.0 (Linux; Android 4.4; Nexus 5 Build/_BuildID_) 
AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile 
Safari/537.36'
-- result: Android.5
-  ua: 'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 5 Build/LMY48B; wv) 
AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.65 Mobile 
Safari/537.36'
+Android.4:
+  # https://developer.chrome.com/multidevice/user-agent#webview_user_agent
+  - 'Mozilla/5.0 (Linux; U; Android 4.1.1; en-gb; Build/KLP) 
AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30'
+  - 'Mozilla/5.0 (Linux; Android 4.4; Nexus 5 Build/_BuildID_) 
AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile 
Safari/537.36'
+Android.5:
+  - 'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 5 Build/LMY48B; wv) 
AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.65 Mobile 
Safari/537.36'
 
-- result: Chromium.10
-  ua: 'Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like 
Gecko) Ubuntu/10.10 Chromium/10.0.648.133 Chrome/10.0.648.133 Safari/534.16'
-- result: Chrome.50
-  ua: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 
(KHTML, like Gecko) Chrome/50.0.2652.0 Safari/537.36'
-- result: Chrome_Mobile.35
-  ua: 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 5 Build/KOT49H) 
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.122 Mobile 
Safari/537.36'
+Chromium.10:
+  - 'Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like 
Gecko) Ubuntu/10.10 Chromium/10.0.648.133 Chrome/10.0.648.133 Safari/534.16'
+Chrome.50:
+  - 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 
(KHTML, like Gecko) Chrome/50.0.2652.0 Safari/537.36'
+Chrome_Mobile.35:
+  - 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 5 Build/KOT49H) 
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.122 Mobile 
Safari/537.36'
+Chrome_Mobile_iOS.19:
+  - 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en-gb) 
AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 
Safari/7534.48.3'
 
-- result: Chrome_Mobile_iOS.19
-  ua: 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en-gb) 
AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 
Safari/7534.48.3'
+Firefox.43:
+  - 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:43.0) Gecko/20100101 
Firefox/43.0'
+Firefox_Mobile.41:
+  - 'Mozilla/5.0 (Android 5.0; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0'
 
-- result: Firefox.43
-  ua: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:43.0) Gecko/20100101 
Firefox/43.0'
-- result: Firefox_Mobile.41
-  ua: 'Mozilla/5.0 (Android 5.0; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0'
+Opera.9:
+  - 'Opera/9.50 (Nintendo DSi; Opera/507; U; en-US)'
+Opera.10:
+  - 'Opera/9.80 (Windows NT 5.1; U; ru) Presto/2.5.24 Version/10.53'
+Opera.33:

[MediaWiki-commits] [Gerrit] mediawiki...Tabber[master]: Stylize code to MediaWiki code conventions

[SamanthaNguyen (Code Review)]

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

Change subject: Stylize code to MediaWiki code conventions
..

Stylize code to MediaWiki code conventions

Change-Id: I37a5cdac03337640f64cbf09bbdb412d2b51df45
---
M Tabber.hooks.php
D Tabber.i18n.php
D Tabber.php
A css/ext.tabber.css
D css/tabber.css
M extension.json
A js/ext.tabber.js
D js/tabber.js
8 files changed, 141 insertions(+), 208 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Tabber 
refs/changes/43/338043/1

diff --git a/Tabber.hooks.php b/Tabber.hooks.php
index c997a82..c7de207 100644
--- a/Tabber.hooks.php
+++ b/Tabber.hooks.php
@@ -3,64 +3,67 @@
  * Tabber
  * Tabber Hooks Class
  *
- * @author Eric Fortin, Alexia E. Smith
- * @licenseGPL
- * @packageTabber
- * @link   https://www.mediawiki.org/wiki/Extension:Tabber
+ * @author Eric Fortin
+ * @author Alexia E. Smith
+ * @license GPL
+ * @package Tabber
+ * @link https://www.mediawiki.org/wiki/Extension:Tabber
  *
 **/
 class TabberHooks {
/**
 * Sets up this extension's parser functions.
 *
-* @access  public
-* @param   object  Parser object passed as a reference.
-* @return  boolean true
+* @access public
+* @param object Parser object passed as a reference.
+* @return boolean true
 */
-   static public function onParserFirstCallInit(Parser &$parser) {
-   $parser->setHook("tabber", "TabberHooks::renderTabber");
+   static public function onParserFirstCallInit( Parser &$parser ) {
+   $parser->setHook( 'tabber', 'TabberHooks::renderTabber' );
return true;
}
+
/**
 * Renders the necessary HTML for a  tag.
 *
-* @access  public
-* @param   string  The input URL between the beginning and ending 
tags.
-* @param   array   Array of attribute arguments on that beginning 
tag.
-* @param   object  Mediawiki Parser Object
-* @param   object  Mediawiki PPFrame Object
-* @return  string  HTML
+* @access public
+* @param string The input URL between the beginning and ending tags.
+* @param array Array of attribute arguments on that beginning tag.
+* @param object Mediawiki Parser Object
+* @param object Mediawiki PPFrame Object
+* @return string HTML
 */
-   static public function renderTabber($input, array $args, Parser 
$parser, PPFrame $frame) {
-   $parser->getOutput()->addModules('ext.Tabber');
-   $key = md5($input);
-   $arr = explode("|-|", $input);
+   static public function renderTabber( $input, array $args, Parser 
$parser, PPFrame $frame ) {
+   $parser->getOutput()->addModules( 'ext.Tabber' );
+   $key = md5( $input );
+   $arr = explode( "|-|", $input );
$htmlTabs = '';
-   foreach ($arr as $tab) {
-   $htmlTabs .= self::buildTab($tab, $parser, $frame);
+   foreach ( $arr as $tab ) {
+   $htmlTabs .= self::buildTab( $tab, $parser, $frame );
}
-   $HTML = ''.$htmlTabs."";
+   $HTML = '' . 
$htmlTabs . "";
return $HTML;
}
+
/**
 * Build individual tab.
 *
-* @access  private
-* @param   string  Tab information
-* @param   object  Mediawiki Parser Object
-* @param   object  Mediawiki PPFrame Object
-* @return  string  HTML
+* @access private
+* @param string Tab information
+* @param object Mediawiki Parser Object
+* @param object Mediawiki PPFrame Object
+* @return string HTML
 */
-   static private function buildTab($tab = '', Parser $parser, PPFrame 
$frame) {
-   $tab = trim($tab);
-   if (empty($tab)) {
+   static private function buildTab( $tab = '', Parser $parser, PPFrame 
$frame ) {
+   $tab = trim( $tab );
+   if ( empty( $tab ) ) {
return $tab;
}
-   list($tabName, $tabBody) = explode('=', $tab, 2);
-   $tabBody = $parser->recursiveTagParse($tabBody, $frame);
+   list( $tabName, $tabBody ) = explode( '=', $tab, 2 );
+   $tabBody = $parser->recursiveTagParse( $tabBody, $frame );
$tab = '
-   
-   '.$tabBody.'
+   
+   ' . $tabBody . '
';
return $tab;
}
diff --git a/Tabber.i18n.php b/Tabber.i18n.php
deleted file mode 100644
index 0b77688..000

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add role::quiz

[BryanDavis (Code Review)]

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

Change subject: Add role::quiz
..

Add role::quiz

Add a role for https://www.mediawiki.org/wiki/Extension:Quiz

Bug: T148969
Change-Id: Ie0efa1f08894eb3450c112712585ae7c10d0567c
---
A puppet/modules/role/manifests/quiz.pp
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/42/338042/1

diff --git a/puppet/modules/role/manifests/quiz.pp 
b/puppet/modules/role/manifests/quiz.pp
new file mode 100644
index 000..50d9382
--- /dev/null
+++ b/puppet/modules/role/manifests/quiz.pp
@@ -0,0 +1,7 @@
+# == Class: role::quiz
+# Quiz is the quiz building tool adopted on the Wikiversity.
+#
+class role::quiz {
+include ::role::mediawiki
+mediawiki::extension { 'Quiz': }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0efa1f08894eb3450c112712585ae7c10d0567c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

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

[jenkins-bot (Code Review)]

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

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


Use videoinfo if it's available

 * Make an paraminfo request to detect if the feature is available.

Change-Id: If9f224c2fac384731d679ccac76ef054ac7ccc95
---
M lib/config/MWParserEnvironment.js
M lib/config/WikiConfig.js
M lib/mw/ApiRequest.js
M lib/wt2html/tt/LinkHandler.js
M tests/mockAPI.js
5 files changed, 93 insertions(+), 8 deletions(-)

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



diff --git a/lib/config/MWParserEnvironment.js 
b/lib/config/MWParserEnvironment.js
index 4b4b5a2..c2fd42d 100644
--- a/lib/config/MWParserEnvironment.js
+++ b/lib/config/MWParserEnvironment.js
@@ -468,10 +468,14 @@
}
});
 
-   return getConfigPromise().then(function(resultConf) {
+   return getConfigPromise()
+   .then(function(resultConf) {
if (resultConf === nothingToDo) { return; }
env.conf.wiki = new WikiConfig(parsoidConfig, resultConf, 
prefix);
env.confCache[prefix] = env.conf.wiki;
+   if (parsoidConfig.fetchConfig) {
+   return env.conf.wiki.detectFeatures(env);
+   }
}).nodify(cb);
 };
 
diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index c51b10d..0e12724 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -9,6 +9,7 @@
 var JSUtils = require('../utils/jsutils.js').JSUtils;
 var DU = require('../utils/DOMUtils.js').DOMUtils;
 var Util = require('../utils/Util.js').Util;
+var ParamInfoRequest = require('../mw/ApiRequest.js').ParamInfoRequest;
 
 // Make sure our base config is never modified
 JSUtils.deepFreeze(baseConfig);
@@ -811,6 +812,19 @@
return this._unanchoredProtocolRegex.exec(potentialLink);
 };
 
+/**
+ * Detect which parameters are available in the MediaWiki API.
+ */
+WikiConfig.prototype.detectFeatures = function(env) {
+   return ParamInfoRequest.promise(env)
+   .then(function(query) {
+   // Do we have the "videoinfo" prop?
+   this.useVideoInfo = Array.isArray(query.parameters)
+   && query.parameters.some(function(o) {
+   return o && o.name === 'prop' && 
o.type.indexOf('videoinfo') > -1;
+   });
+   }.bind(this));
+};
 
 if (typeof module === 'object') {
module.exports.WikiConfig = WikiConfig;
diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index c2f81fe..646e479 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js
@@ -968,10 +968,26 @@
var imgns = conf.namespaceNames[imgnsid];
var props = [
'mediatype',
+   'mime',
'size',
'url',
'badfile',
];
+
+   // If the videoinfo prop is available, as determined by our feature
+   // detection when initializing the wiki config, use that to fetch the
+   // derivates for videos.  videoinfo is just a wrapper for imageinfo,
+   // so all our media requests should go there, and the response can be
+   // disambiguated by the returned mediatype.
+   var prop, prefix;
+   if (conf.useVideoInfo) {
+   prop = 'videoinfo';
+   prefix = 'vi';
+   props.push('derivatives');
+   } else {
+   prop = 'imageinfo';
+   prefix = 'ii';
+   }
 
this.ns = imgns;
 
@@ -982,19 +998,20 @@
var apiArgs = {
action: 'query',
format: 'json',
-   prop: 'imageinfo',
+   prop: prop,
titles: filenames.join('|'),
-   iiprop: props.join('|'),
-   iibadfilecontexttitle: env.page.name,
rawcontinue: 1,
};
 
+   apiArgs[prefix + 'prop'] = props.join('|');
+   apiArgs[prefix + 'badfilecontexttitle'] = env.page.name;
+
if (dims) {
if (dims.width) {
-   apiArgs.iiurlwidth = dims.width;
+   apiArgs[prefix + 'urlwidth'] = dims.width;
}
if (dims.height) {
-   apiArgs.iiurlheight = dims.height;
+   apiArgs[prefix + 'urlheight'] = dims.height;
}
}
 
@@ -1154,6 +1171,49 @@
this._processListeners(error, data);
 };
 
+/**
+ * ParamInfo Request
+ *
+ * @param {MWParserEnvironment} env
+ * @param {string} [queueKey] The queue key
+ */
+function ParamInfoRequest(env, queueKey) {
+   ApiRequest.call(this, env, null);
+   this.reqType = 'ParamInfo Request';
+
+   var apiargs = {
+   format: 'json',
+   action: 'paraminfo',
+   modules: 'query',
+   rawcontinue: 1,
+   };
+
+   

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Pass $overlay to FieldsetLayout and FieldLayout in various p...

[Code Review]

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

Change subject: Pass $overlay to FieldsetLayout and FieldLayout in various 
places
..

Pass $overlay to FieldsetLayout and FieldLayout in various places

We now use dialog's overlay in every case where we have a FieldsetLayout
or a FieldLayout with a help popup inside a dialog.

Bug: T100571
Change-Id: I8bd0ed430637feca63ec0f13cb7e1e1c659391a5
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
5 files changed, 19 insertions(+), 6 deletions(-)


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 00d460d..ce26902 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -244,6 +244,7 @@
importRules: this.constructor.static.getImportRules()
} );
this.captionFieldset = new OO.ui.FieldsetLayout( {
+   $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-content-section' ),
help: ve.msg( 'visualeditor-dialog-media-content-section-help' 
),
icon: 'parameter',
@@ -253,6 +254,7 @@
 
// Alt text
altTextFieldset = new OO.ui.FieldsetLayout( {
+   $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-alttext-section' ),
help: ve.msg( 'visualeditor-dialog-media-alttext-section-help' 
),
icon: 'parameter'
@@ -273,12 +275,14 @@
 
this.positionCheckbox = new OO.ui.CheckboxInputWidget();
positionField = new OO.ui.FieldLayout( this.positionCheckbox, {
+   $overlay: this.$overlay,
align: 'inline',
label: ve.msg( 'visualeditor-dialog-media-position-checkbox' ),
help: ve.msg( 
'visualeditor-dialog-media-position-checkbox-help' )
} );
 
positionFieldset = new OO.ui.FieldsetLayout( {
+   $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-position-section' ),
help: ve.msg( 'visualeditor-dialog-media-position-section-help' 
),
icon: 'parameter'
@@ -292,6 +296,7 @@
 
// Type
this.typeFieldset = new OO.ui.FieldsetLayout( {
+   $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-type-section' ),
help: ve.msg( 'visualeditor-dialog-media-type-section-help' ),
icon: 'parameter'
@@ -337,6 +342,7 @@
 
// Size
this.sizeFieldset = new OO.ui.FieldsetLayout( {
+   $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-size-section' ),
icon: 'parameter',
help: ve.msg( 'visualeditor-dialog-media-size-section-help' )
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index fd204d4..a0520d2 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -64,11 +64,8 @@
this.panels = new OO.ui.StackLayout();
this.bookletLayout = new OO.ui.BookletLayout( { outlined: true } );
this.categoriesPage = new ve.ui.MWCategoriesPage( 'categories', { 
$overlay: this.$overlay } );
-   this.settingsPage = new ve.ui.MWSettingsPage(
-   'settings',
-   { $overlay: this.$overlay }
-   );
-   this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage( 
'advancedSettings' );
+   this.settingsPage = new ve.ui.MWSettingsPage( 'settings', { $overlay: 
this.$overlay } );
+   this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage( 
'advancedSettings', { $overlay: this.$overlay } );
this.languagesPage = new ve.ui.MWLanguagesPage( 'languages' );
this.templatesUsedPage = new ve.ui.MWTemplatesUsedPage( 'templatesUsed' 
);
 
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index 0e13cd4..ef8aeac 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -14,8 +14,9 @@
  * @constructor
  * @param {string} name Unique symbolic name of page
  * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
  */
-ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage() {
+ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage( name, 

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: uw.units: Add missing dependency

[jenkins-bot (Code Review)]

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

Change subject: uw.units: Add missing dependency
..


uw.units: Add missing dependency

Change-Id: Icb697709fb765a751c9585fa5f2c8eabb78b34b9
---
M extension.json
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 18cb3ac..a1f82bf 100644
--- a/extension.json
+++ b/extension.json
@@ -790,6 +790,9 @@
"scripts": [
"resources/uw.units.js"
],
+   "dependencies": [
+   "uw.base"
+   ],
"messages": [
"size-gigabytes",
"size-megabytes",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb697709fb765a751c9585fa5f2c8eabb78b34b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.ui.MWAdvancedSettingsPage: Actually display help for sett...

[jenkins-bot (Code Review)]

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

Change subject: ve.ui.MWAdvancedSettingsPage: Actually display help for 
settings about language variants
..


ve.ui.MWAdvancedSettingsPage: Actually display help for settings about language 
variants

Follow-up to 712ea472d34371176bb08b79c723374fa6800dd6.

Change-Id: I2f3617fb4e9a80272e559b35c947052c0d8e534b
---
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index e1c4922..0e13cd4 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -118,7 +118,8 @@
new OO.ui.CheckboxInputWidget(),
{
align: 'inline',
-   label: this.label
+   label: this.label,
+   help: this.help
}
);
advancedSettingsPage.advancedSettingsFieldset.addItems( [ 
this.fieldLayout ] );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f3617fb4e9a80272e559b35c947052c0d8e534b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.19.2

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.19.2
..


Update OOjs UI to v0.19.2

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.2

Depends-On: If351020ee7f29d038eeea8258e0bd607c4134060
Change-Id: I2dbc0fb49cb500f8a378b5f9c8175fd1dabebf17
---
M composer.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/images/icons/eye.png
M resources/lib/oojs-ui/themes/apex/images/icons/eye.svg
M resources/lib/oojs-ui/themes/mediawiki/images/icons/eye-invert.png
M resources/lib/oojs-ui/themes/mediawiki/images/icons/eye-invert.svg
M resources/lib/oojs-ui/themes/mediawiki/images/icons/eye-progressive.png
M resources/lib/oojs-ui/themes/mediawiki/images/icons/eye-progressive.svg
M resources/lib/oojs-ui/themes/mediawiki/images/icons/eye.png
M resources/lib/oojs-ui/themes/mediawiki/images/icons/eye.svg
23 files changed, 126 insertions(+), 106 deletions(-)

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



diff --git a/composer.json b/composer.json
index d41492e..1125529 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"ext-xml": "*",
"liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
-   "oojs/oojs-ui": "0.19.1",
+   "oojs/oojs-ui": "0.19.2",
"oyejorge/less.php": "1.7.0.10",
"php": ">=5.5.9",
"psr/log": "1.0.2",
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js 
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 3fc8b45..2307413 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.19.1
+ * OOjs UI v0.19.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-02-08T00:38:31Z
+ * Date: 2017-02-14T22:47:20Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css 
b/resources/lib/oojs-ui/oojs-ui-core-apex.css
index 3144734..524c16b 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.19.1
+ * OOjs UI v0.19.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-02-08T00:38:35Z
+ * Date: 2017-02-14T22:47:25Z
  */
 .oo-ui-element-hidden {
   display: none !important;
@@ -235,6 +235,9 @@
  -moz-box-sizing: border-box;
   box-sizing: border-box;
   min-height: 3.125em;
+}
+.oo-ui-floatableElement {
+  position: absolute;
 }
 .oo-ui-iconElement .oo-ui-iconElement-icon,
 .oo-ui-iconElement.oo-ui-iconElement-icon {
@@ -647,7 +650,6 @@
 }
 .oo-ui-popupWidget {
   position: absolute;
-  /* @noflip */
   left: 0;
 }
 .oo-ui-popupWidget-popup {
@@ -662,8 +664,7 @@
 .oo-ui-popupWidget-anchored .oo-ui-popupWidget-anchor {
   display: block;
   position: absolute;
-  /* `top` property is to be set in theme's selector due to specific 
`@size-anchor` values
-   /* @noflip */
+  /* `top` property is to be set in theme's selector due to specific 
`@size-anchor` values */
   left: 0;
   background-repeat: no-repeat;
 }
@@ -748,11 +749,9 @@
   cursor: auto;
 }
 .oo-ui-popupWidget.oo-ui-popupButtonWidget-frameless-popup {
-  /* @noflip */
   margin-left: 0.9375em;
 }
 .oo-ui-popupWidget.oo-ui-popupButtonWidget-framed-popup {
-  /* @noflip */
   margin-left: 1.2375em;
 }
 .oo-ui-inputWidget {
diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css 
b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
index d1d4a57..f3b3fce 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.19.1
+ * OOjs UI v0.19.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-02-08T00:38:35Z
+ * 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: [Re-apply] Update OOjs UI to v0.19.2

[jenkins-bot (Code Review)]

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

Change subject: [Re-apply] Update OOjs UI to v0.19.2
..


[Re-apply] Update OOjs UI to v0.19.2

Re-attempt for c0cdd705c5181cccb404451d612bb13863905f89.

This reverts commit 57ef8912f1e5ab6b42bb3242b4cfb8b36447487c.

Bug: T158141
Change-Id: If351020ee7f29d038eeea8258e0bd607c4134060
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/package.json
6 files changed, 113 insertions(+), 92 deletions(-)

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



diff --git a/composer.json b/composer.json
index f0cd9d7..eb1e070 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.19.1",
+   "oojs/oojs-ui": "0.19.2",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 411108d..595c8e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "bd584c21af40cc628648796b0ccf8e91",
-"content-hash": "008b82e482b471745b498860c2e038b4",
+"hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
+"content-hash": "17e19b0718d463c61c3be9db39fc18e2",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.19.1",
+"version": "v0.19.2",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
+"reference": "58fb445bc1f2323548b736b84af8409a13499107"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107;,
+"reference": "58fb445bc1f2323548b736b84af8409a13499107",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-02-08 00:17:30"
+"time": "2017-02-14 22:27:07"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 77eb7f8..fc8afc6 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,87 +1895,6 @@
 "description": "PHP port of the TextCat language guesser utility, see 
http://odur.let.rug.nl/~vannoord/TextCat/.;
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.19.1",
-"version_normalized": "0.19.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-"php": ">=5.5.9"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.6.0",
-"phpunit/phpunit": "4.8.21"
-},
-"time": "2017-02-08 00:17:30",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-"php/"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Timo Tijhof",
-"email": "krinklem...@gmail.com"
-},
-{
-"name": "Bartosz Dziewoński",
-"email": "matma@gmail.com"
-},
-{
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve visual association of elements in OOjs UI HTMLForm m...

[jenkins-bot (Code Review)]

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

Change subject: Improve visual association of elements in OOjs UI HTMLForm 
matrix
..


Improve visual association of elements in OOjs UI HTMLForm matrix

Improving visual association of checkboxes and their descriptions
in OOjs UI HTMLForm matrix by introducing row `background-color`
cue and decreasing distance between elements.
Also increasing top margin of `.htmlform-tip`.

Bug: T152532
Change-Id: I84f64e54b242efef897073eed8afb2555614116b
---
M resources/src/mediawiki/htmlform/ooui.styles.css
1 file changed, 30 insertions(+), 8 deletions(-)

Approvals:
  Huji: Looks good to me, but someone else must approve
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki/htmlform/ooui.styles.css 
b/resources/src/mediawiki/htmlform/ooui.styles.css
index 40f4f52..dbf2b6b 100644
--- a/resources/src/mediawiki/htmlform/ooui.styles.css
+++ b/resources/src/mediawiki/htmlform/ooui.styles.css
@@ -1,16 +1,33 @@
 /* OOUIHTMLForm styles */
 
-.mw-htmlform-ooui .mw-htmlform-submit-buttons {
-   margin-top: 1em;
-}
-
-.mw-htmlform-ooui .mw-htmlform-field-HTMLCheckMatrix,
-.mw-htmlform-ooui .mw-htmlform-matrix,
-.mw-htmlform-ooui .mw-htmlform-matrix tr {
+.mw-htmlform-ooui .mw-htmlform-field-HTMLCheckMatrix {
width: 100%;
 }
 
-.mw-htmlform-ooui .mw-htmlform-matrix tr td.first {
+.mw-htmlform-ooui .mw-htmlform-matrix {
+   border-spacing: 0;
+}
+
+.mw-htmlform-ooui .mw-htmlform-matrix td {
+   padding: 0.35em 0.7em;
+   -webkit-transition: background-color 250ms;
+   -moz-transition: background-color 250ms;
+   transition: background-color 250ms;
+}
+
+.mw-htmlform-ooui .mw-htmlform-matrix tbody tr:nth-child( even ) td {
+   background-color: #f8f9fa;
+}
+
+.mw-htmlform-ooui .mw-htmlform-matrix tbody tr:not( :first-child ):hover td {
+   background-color: #eaecf0;
+}
+
+.mw-htmlform-ooui .mw-htmlform-matrix tbody tr:first-child td {
+   background-color: #fff;
+}
+
+.mw-htmlform-ooui .mw-htmlform-matrix td.first {
margin-right: 5%;
width: 39%;
 }
@@ -23,3 +40,8 @@
display: inline-block;
margin-right: 1em;
 }
+
+.mw-htmlform-ooui .htmlform-tip,
+.mw-htmlform-ooui .mw-htmlform-submit-buttons {
+   margin-top: 1em;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84f64e54b242efef897073eed8afb2555614116b
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...wikistats[master]: add tooltip texts to describe columns

[Dzahn (Code Review)]

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

Change subject: add tooltip texts to describe columns
..


add tooltip texts to describe columns

As requested in T157181, add definitions of column headers.

Do it as tooltips, using the Bootstrap Tooltip Plugin.

https://www.w3schools.com/bootstrap/bootstrap_tooltip.asp

Bug: T157181
Change-Id: Icbdb6d911bd137a939a905aa063c5b745c7aa7fc
---
M var/www/wikistats/display.php
1 file changed, 15 insertions(+), 15 deletions(-)

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



diff --git a/var/www/wikistats/display.php b/var/www/wikistats/display.php
index e8945f4..8aa37e7 100644
--- a/var/www/wikistats/display.php
+++ b/var/www/wikistats/display.php
@@ -286,21 +286,21 @@
 }
 
 print <Good
+Total 
+Edits
+Admins
+Users
+https://www.mediawiki.org/wiki/Manual:$wgActiveUserDays)">Active Users
+Files
+Stub Ratio
+Version
+License
+Archive
+HTTP
+ID
+mt
+Last update
 THEAD_MAIN;
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbdb6d911bd137a939a905aa063c5b745c7aa7fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Southparkfan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...wikistats[master]: add tooltip texts to describe columns

[Dzahn (Code Review)]

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

Change subject: add tooltip texts to describe columns
..

add tooltip texts to describe columns

As requested in T157181, add definitions of column headers.

Do it as tooltips, using the Bootstrap Tooltip Plugin.

https://www.w3schools.com/bootstrap/bootstrap_tooltip.asp

Bug: T157181
Change-Id: Icbdb6d911bd137a939a905aa063c5b745c7aa7fc
---
M var/www/wikistats/display.php
1 file changed, 15 insertions(+), 15 deletions(-)


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

diff --git a/var/www/wikistats/display.php b/var/www/wikistats/display.php
index e8945f4..8aa37e7 100644
--- a/var/www/wikistats/display.php
+++ b/var/www/wikistats/display.php
@@ -286,21 +286,21 @@
 }
 
 print <Good
+Total 
+Edits
+Admins
+Users
+https://www.mediawiki.org/wiki/Manual:$wgActiveUserDays)">Active Users
+Files
+Stub Ratio
+Version
+License
+Archive
+HTTP
+ID
+mt
+Last update
 THEAD_MAIN;
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbdb6d911bd137a939a905aa063c5b745c7aa7fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.ui.MWAdvancedSettingsPage: Actually display help for sett...

[Code Review]

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

Change subject: ve.ui.MWAdvancedSettingsPage: Actually display help for 
settings about language variants
..

ve.ui.MWAdvancedSettingsPage: Actually display help for settings about language 
variants

Follow-up to 712ea472d34371176bb08b79c723374fa6800dd6.

Change-Id: I2f3617fb4e9a80272e559b35c947052c0d8e534b
---
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index e1c4922..0e13cd4 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -118,7 +118,8 @@
new OO.ui.CheckboxInputWidget(),
{
align: 'inline',
-   label: this.label
+   label: this.label,
+   help: this.help
}
);
advancedSettingsPage.advancedSettingsFieldset.addItems( [ 
this.fieldLayout ] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f3617fb4e9a80272e559b35c947052c0d8e534b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: uw.units: Add missing dependency

[Code Review]

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

Change subject: uw.units: Add missing dependency
..

uw.units: Add missing dependency

Change-Id: Icb697709fb765a751c9585fa5f2c8eabb78b34b9
---
M extension.json
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/38/338038/1

diff --git a/extension.json b/extension.json
index 18cb3ac..a1f82bf 100644
--- a/extension.json
+++ b/extension.json
@@ -790,6 +790,9 @@
"scripts": [
"resources/uw.units.js"
],
+   "dependencies": [
+   "uw.base"
+   ],
"messages": [
"size-gigabytes",
"size-megabytes",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb697709fb765a751c9585fa5f2c8eabb78b34b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] performance/WebPageTest[master]: Test Barack_Obama on beta

[jenkins-bot (Code Review)]

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

Change subject: Test Barack_Obama on beta
..


Test Barack_Obama on beta

We removed all tests on beta for the alerts, lets add one back
as requested by jdlrobson.

Change-Id: Iff1d3c92c9d57466a72611bf914b78c63687932a
---
M scripts/batch/mobile.txt
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/scripts/batch/mobile.txt b/scripts/batch/mobile.txt
index b170e07..839e589 100644
--- a/scripts/batch/mobile.txt
+++ b/scripts/batch/mobile.txt
@@ -16,3 +16,5 @@
 --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile.anonymous.Barack_Obama --emulateMobile true 
--connectivity 3GFast --reporter statsv --first true --timeline true --bodies 
true https://en.m.wikipedia.org/wiki/Barack_Obama
 
 --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile.anonymous.Ingrid_Vang_Nyman --emulateMobile true 
--connectivity 3GFast --reporter statsv --first true --timeline true --bodies 
true https://en.m.wikipedia.org/wiki/Ingrid_Vang_Nyman
+
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-beta-mobile.anonymous.Barack_Obama --emulateMobile true 
--connectivity 3GFast --reporter statsv --first true --timeline true --bodies 
true https://en.m.wikipedia.beta.wmflabs.org/wiki/Barack_Obama

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff1d3c92c9d57466a72611bf914b78c63687932a
Gerrit-PatchSet: 1
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Phedenskog 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Repool db1082 with low load after crash

[Jcrespo (Code Review)]

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

Change subject: Repool db1082 with low load after crash
..


Repool db1082 with low load after crash

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index e7ed240..cb4ed2c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -144,7 +144,7 @@
 #  'db1045' => 0,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump
'db1071' => 50,  # D1 2.8TB 160GB, api
-#  'db1082' => 300, # A2 3.6TB 512GB, api #mysql crashed
+   'db1082' => 10,  # A2 3.6TB 512GB, #mysql crashed, pooled with 
low load
'db1087' => 300, # C2 3.6TB 512GB, api #temp
'db1092' => 500, # D2 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Repool db1082 with low load after crash

[Jcrespo (Code Review)]

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

Change subject: Repool db1082 with low load after crash
..

Repool db1082 with low load after crash

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index e7ed240..cb4ed2c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -144,7 +144,7 @@
 #  'db1045' => 0,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump
'db1071' => 50,  # D1 2.8TB 160GB, api
-#  'db1082' => 300, # A2 3.6TB 512GB, api #mysql crashed
+   'db1082' => 10,  # A2 3.6TB 512GB, #mysql crashed, pooled with 
low load
'db1087' => 300, # C2 3.6TB 512GB, api #temp
'db1092' => 500, # D2 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

41cc249 Further Benevity report fix on handling on formatted '0'.

Change-Id: I595b1ed6509882ce75cdd7df2eca06b1a29e9a55
---
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
1 file changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv 
b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
deleted file mode 100644
index 15fed83..000
--- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-<<< HEAD   (1ffc09 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last 
Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction 
ID,Donation Frequency,Donation Amount,Matched Amount,Total
-Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200
-Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey 
Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200
-Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,22.00,25.00,47
-Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0.00,0.5,0.5
->>> BRANCH (41cc24 Further Benevity report fix on handling on formatted 
'0'.)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.test.utils.createSurfaceFromDocument: Actually attach sur...

[jenkins-bot (Code Review)]

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

Change subject: ve.test.utils.createSurfaceFromDocument: Actually attach 
surface to DOM
..


ve.test.utils.createSurfaceFromDocument: Actually attach surface to DOM

Bug: T158141
Change-Id: I999bcdc7095a3b9e2a86a7d5eca0e1f3ceb175ef
---
M modules/ve-mw/tests/ve.test.utils.js
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/tests/ve.test.utils.js 
b/modules/ve-mw/tests/ve.test.utils.js
index 3b94f5e..db4c648 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -7,7 +7,7 @@
 
 ve.test.utils.createSurfaceFromDocument = function ( doc ) {
// eslint-disable-next-line no-unused-vars
-   var target, mwTarget;
+   var target, mwTarget, surface;
 
// Prevent the target from setting up the surface immediately
ve.init.platform.initialized = $.Deferred();
@@ -22,7 +22,11 @@
 
ve.init.platform.initialized.resolve();
mwTarget = null;
-   return target.addSurface( doc );
+   surface = target.addSurface( doc );
+   // HACK HACK HACK: The target fuckery above results in the surface not 
being attached to the DOM.
+   // I'm not debugging that, screw it. Let's add another hack on top, 
surely that won't be a problem.
+   $( '#qunit-fixture' ).append( surface.$element );
+   return surface;
 };
 
 // Unregister MW override nodes.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I999bcdc7095a3b9e2a86a7d5eca0e1f3ceb175ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] T115461: Record MW Api responses as the mock Api

[Arlolra (Code Review)]

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

Change subject: [WIP] T115461: Record MW Api responses as the mock Api
..

[WIP] T115461: Record MW Api responses as the mock Api

Change-Id: Ida03895b5b5386457c251bcd596a3fbc7b2492c4
---
M bin/parserTests.js
M tests/mocha/api.js
M tests/mocha/templatedata.js
A tests/mockAPI-parserTests.json
M tests/mockAPI.js
M tests/serviceWrapper.js
6 files changed, 142 insertions(+), 501 deletions(-)


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

diff --git a/bin/parserTests.js b/bin/parserTests.js
index 9c61212..bf2a20c 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1453,7 +1453,10 @@
 
 // Start the mock api server and kick off parser tests
 var runner;
-serviceWrapper.runServices({ skipParsoid: true })
+serviceWrapper.runServices({
+   skipParsoid: true,
+   mockFile: 'mockAPI-parserTests.json',
+})
 .then(function(ret) {
runner = ret.runner;
var options = PTUtils.prepareOptions();
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index d63592f..33acbf3 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -27,6 +27,7 @@
before(function() {
return serviceWrapper.runServices({
localsettings: configPath,
+   mockFile: 'mockAPI-mocha-api.json',
}).then(function(ret) {
api = ret.parsoidURL;
runner = ret.runner;
diff --git a/tests/mocha/templatedata.js b/tests/mocha/templatedata.js
index b0cff25..cb59967 100644
--- a/tests/mocha/templatedata.js
+++ b/tests/mocha/templatedata.js
@@ -193,6 +193,7 @@
before(function() {
return serviceWrapper.runServices({
localsettings: configPath,
+   mockFile: 'mockAPI-mocha-templatedata.json',
}).then(function(ret) {
api = ret.parsoidURL;
runner = ret.runner;
diff --git a/tests/mockAPI-parserTests.json b/tests/mockAPI-parserTests.json
new file mode 100644
index 000..df28488
--- /dev/null
+++ b/tests/mockAPI-parserTests.json
@@ -0,0 +1,76 @@
+{
+   
"{\"action\":\"query\",\"format\":\"json\",\"prop\":\"imageinfo\",\"titles\":\"File:%+abc9\",\"iiprop\":\"mediatype|size|url|badfile\",\"iibadfilecontexttitle\":\"Main
 Page\",\"rawcontinue\":\"1\"}": 
"{\"query\":{\"pages\":{\"-1\":{\"ns\":6,\"title\":\"File:%+abc9\",\"missing\":\"\",\"imagerepository\":\"\",\"imageinfo\":[{\"size\":0,\"width\":0,\"height\":0,\"url\":\"https://upload.wikimedia.org/wikipedia/en/e/ed/%25%2Babc9\",\"descriptionurl\":\"https://en.wikipedia.org/wiki/File:%25%2Babc9\",\"descriptionshorturl\":\"https://en.wikipedia.org/w/index.php?curid=0\",\"mediatype\":null}];,
+   
"{\"action\":\"query\",\"format\":\"json\",\"prop\":\"imageinfo\",\"titles\":\"File:*_image6\",\"iiprop\":\"mediatype|size|url|badfile\",\"iibadfilecontexttitle\":\"Main
 Page\",\"rawcontinue\":\"1\",\"iiurlwidth\":\"120\",\"iiurlheight\":\"120\"}": 
"{\"query\":{\"normalized\":[{\"from\":\"File:*_image6\",\"to\":\"File:* 
image6\"}],\"pages\":{\"-1\":{\"ns\":6,\"title\":\"File:* 
image6\",\"missing\":\"\",\"imagerepository\":\"\",\"imageinfo\":[{\"size\":0,\"width\":0,\"height\":0,\"thumburl\":\"https://en.wikipedia.org/w/resources/assets/file-type-icons/fileicon.png\",\"thumbwidth\":120,\"thumbheight\":120,\"url\":\"https://upload.wikimedia.org/wikipedia/en/3/37/%2A_image6\",\"descriptionurl\":\"https://en.wikipedia.org/wiki/File:*_image6\",\"descriptionshorturl\":\"https://en.wikipedia.org/w/index.php?curid=0\",\"mediatype\":null}];,
+   
"{\"action\":\"query\",\"format\":\"json\",\"prop\":\"imageinfo\",\"titles\":\"File:7%_solution.gif\",\"iiprop\":\"mediatype|size|url|badfile\",\"iibadfilecontexttitle\":\"Main
 Page\",\"rawcontinue\":\"1\"}": 
"{\"query\":{\"normalized\":[{\"from\":\"File:7%_solution.gif\",\"to\":\"File:7%
 solution.gif\"}],\"pages\":{\"-1\":{\"ns\":6,\"title\":\"File:7% 
solution.gif\",\"missing\":\"\",\"imagerepository\":\"\",\"imageinfo\":[{\"size\":0,\"width\":0,\"height\":0,\"url\":\"https://upload.wikimedia.org/wikipedia/en/2/24/7%25_solution.gif\",\"descriptionurl\":\"https://en.wikipedia.org/wiki/File:7%25_solution.gif\",\"descriptionshorturl\":\"https://en.wikipedia.org/w/index.php?curid=0\",\"mediatype\":null}];,
+   
"{\"action\":\"query\",\"format\":\"json\",\"prop\":\"imageinfo\",\"titles\":\"File:Bad.jpg\",\"iiprop\":\"mediatype|size|url|badfile\",\"iibadfilecontexttitle\":\"Main
 Page\",\"rawcontinue\":\"1\"}": 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Get rid of PARSOID_MOCKAPI_URL env var

[Arlolra (Code Review)]

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

Change subject: Get rid of PARSOID_MOCKAPI_URL env var
..

Get rid of PARSOID_MOCKAPI_URL env var

Change-Id: I1e4f1de7d41f22a2f392df37ddfde74ee51f46b6
---
M tests/mocha/apitest.localsettings.js
M tests/rttest.localsettings.js
M tests/serviceWrapper.js
3 files changed, 12 insertions(+), 21 deletions(-)


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

diff --git a/tests/mocha/apitest.localsettings.js 
b/tests/mocha/apitest.localsettings.js
index d99ee0f..0549a40 100644
--- a/tests/mocha/apitest.localsettings.js
+++ b/tests/mocha/apitest.localsettings.js
@@ -1,15 +1,6 @@
 'use strict';
 
 exports.setup = function(parsoidConfig) {
-   // The URL of your MediaWiki API endpoint.
-   if (process.env.PARSOID_MOCKAPI_URL) {
-   parsoidConfig.setMwApi({
-   prefix: 'mock.prefix',
-   domain: 'mock.domain',
-   uri: process.env.PARSOID_MOCKAPI_URL,
-   });
-   }
-
// We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly
// for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks',
// 'enwikivoyage' etc. (default false)
diff --git a/tests/rttest.localsettings.js b/tests/rttest.localsettings.js
index 133f848..0da6f50 100644
--- a/tests/rttest.localsettings.js
+++ b/tests/rttest.localsettings.js
@@ -1,15 +1,6 @@
 'use strict';
 
 exports.setup = function(parsoidConfig) {
-   // The URL of your MediaWiki API endpoint.
-   if (process.env.PARSOID_MOCKAPI_URL) {
-   parsoidConfig.setMwApi({
-   prefix: 'customwiki',
-   domain: 'customwiki',
-   uri: process.env.PARSOID_MOCKAPI_URL,
-   });
-   }
-
// Turn on the batching API
parsoidConfig.useBatchAPI = true;
 
diff --git a/tests/serviceWrapper.js b/tests/serviceWrapper.js
index 5e5fa48..5007b04 100644
--- a/tests/serviceWrapper.js
+++ b/tests/serviceWrapper.js
@@ -51,14 +51,13 @@
});
}
p = p.then(function(mockURL) {
-   process.env.PARSOID_MOCKAPI_URL = mockURL;
ret.mockURL = mockURL;
});
}
 
if (!options.skipParsoid) {
p = p.then(choosePort).then(function(parsoidPort) {
-   services.push({
+   var pServ = {
module: path.resolve(__dirname, 
'../lib/index.js'),
entrypoint: 'apiServiceWorker',
conf: {
@@ -67,7 +66,17 @@
localsettings: options.localsettings ||
path.resolve(__dirname, 
'./rttest.localsettings.js'),
},
-   });
+   };
+   if (ret.mockURL) {
+   pServ.conf.mwApis = [
+   {
+   prefix: 'mock.prefix',
+   domain: 'mock.domain',
+   uri: ret.mockURL,
+   },
+   ];
+   }
+   services.push(pServ);
ret.parsoidURL = 'http://localhost:' + parsoidPort + 
'/';
});
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Wait till we're stopped before exiting

[Arlolra (Code Review)]

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

Change subject: Wait till we're stopped before exiting
..

Wait till we're stopped before exiting

Change-Id: Ibb65a6e67b8fa91ca660974bff9cae95caad1d0f
---
M bin/parserTests.js
M lib/api/ParsoidService.js
M lib/config/MWParserEnvironment.js
M tests/serviceWrapper.js
4 files changed, 20 insertions(+), 4 deletions(-)


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

diff --git a/bin/parserTests.js b/bin/parserTests.js
index c7a6312..9c61212 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1452,8 +1452,10 @@
 };
 
 // Start the mock api server and kick off parser tests
+var runner;
 serviceWrapper.runServices({ skipParsoid: true })
 .then(function(ret) {
+   runner = ret.runner;
var options = PTUtils.prepareOptions();
var testFilePaths;
if (options._[0]) {
@@ -1475,6 +1477,8 @@
}, 0);
 })
 .then(function(status) {
-   process.exit(status);
+   runner.stop().then(function() {
+   process.exit(status);
+   });
 })
 .done();
diff --git a/lib/api/ParsoidService.js b/lib/api/ParsoidService.js
index 399a3ed..c75e5d8 100644
--- a/lib/api/ParsoidService.js
+++ b/lib/api/ParsoidService.js
@@ -200,7 +200,14 @@
util.format('ready on %s:%s', host || '', port));
return {
close: function() {
-   return Promise.promisify(server.close, false, 
server)();
+   return Promise.promisify(server.close, false, 
server)()
+   .tap(function() {
+   // The conf cache is reused across 
requests, but shouldn't
+   // be shared between services.  This 
conflict arises when
+   // service-runner num_workers is zero, 
and mocha spawns
+   // services in succession.
+   
require('../config/MWParserEnvironment.js').MWParserEnvironment.resetConfCache();
+   });
},
port: port,
};
diff --git a/lib/config/MWParserEnvironment.js 
b/lib/config/MWParserEnvironment.js
index 4b4b5a2..f44852b 100644
--- a/lib/config/MWParserEnvironment.js
+++ b/lib/config/MWParserEnvironment.js
@@ -267,7 +267,10 @@
 MWParserEnvironment.prototype.defaultPageName = "Main Page";
 
 // Cache for wiki configurations, shared between requests.
-MWParserEnvironment.prototype.confCache = {};
+MWParserEnvironment.resetConfCache = function() {
+   MWParserEnvironment.prototype.confCache = {};
+};
+MWParserEnvironment.resetConfCache();
 
 MWParserEnvironment.prototype.setCaches = function(caches) {
// TODO gwicke: probably not that useful any more as this is per-request
diff --git a/tests/serviceWrapper.js b/tests/serviceWrapper.js
index 5007b04..1165ee4 100644
--- a/tests/serviceWrapper.js
+++ b/tests/serviceWrapper.js
@@ -90,7 +90,9 @@
});
ret.runner = runner;
return runner.start({
-   num_workers: 1,
+   // Set this to zero since otherwise service-runner 
doesn't actually
+   // call close on the worker.
+   num_workers: 0,
worker_heartbeat_timeout: 2 * 60 * 1000,
logging: {
level: 'info',  // Default is 'warn'

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[Eileen (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

41cc249 Further Benevity report fix on handling on formatted '0'.

Change-Id: I595b1ed6509882ce75cdd7df2eca06b1a29e9a55
---
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/33/338033/1

diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv 
b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
deleted file mode 100644
index 15fed83..000
--- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-<<< HEAD   (1ffc09 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last 
Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction 
ID,Donation Frequency,Donation Amount,Matched Amount,Total
-Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200
-Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey 
Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200
-Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,22.00,25.00,47
-Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0.00,0.5,0.5
->>> BRANCH (41cc24 Further Benevity report fix on handling on formatted 
'0'.)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: [DNM] Convert GeoData for elasticsearch 5 update

[EBernhardson (Code Review)]

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

Change subject: [DNM] Convert GeoData for elasticsearch 5 update
..

[DNM] Convert GeoData for elasticsearch 5 update

Once elasticsearch 5 is shipped out the configuration of geo_point
fields slightly changes. It will no longer be necessary to specify what
type of input will be provided, instead the field just accepts all
possible inputs and figures out what was provided at index time.

Don't merge this until after the elasticsearch 5 upgrade. Indices
created before we switch to es 5 need this config in the mapping.

Bug: T158143
Change-Id: I68b6fd8929cd76c79388086587e8eabe62b9feb2
---
M includes/Search/GeoPointIndexField.php
1 file changed, 0 insertions(+), 14 deletions(-)


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

diff --git a/includes/Search/GeoPointIndexField.php 
b/includes/Search/GeoPointIndexField.php
index b9c7bff..261f487 100644
--- a/includes/Search/GeoPointIndexField.php
+++ b/includes/Search/GeoPointIndexField.php
@@ -14,26 +14,12 @@
 */
protected $typeName = 'geo_point';
 
-
/**
 * @param string $name name of the field
 * @param SearchConfig $config CirrusSearch config
 */
public function __construct( $name, SearchConfig $config ) {
parent::__construct( $name, $this->typeName, $config );
-   }
-
-   /**
-* @param SearchConfig $engine
-* @return array elasticsearch mapping
-*/
-   public function getMapping( SearchEngine $engine ) {
-   $fields = parent::getMapping( $engine );
-   // Used by the geo distance query to run bounding box
-   // optimization query
-   // @fixme: lat_lon will be removed in elastic 5x
-   $fields['lat_lon'] = true;
-   return $fields;
}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68b6fd8929cd76c79388086587e8eabe62b9feb2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
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] wikimedia...crm[master]: Further Benevity report fix on handling on formatted '0'.

[Eileen (Code Review)]

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

Change subject: Further Benevity report fix on handling on formatted '0'.
..


Further Benevity report fix on handling on formatted '0'.

Bug: T115044
Change-Id: I6e09386b107f3ced5dcea15774e9b457e519ef51
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/data/benevity.csv
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index 07095bb..e5fb16e 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -112,7 +112,7 @@
*/
   public function doImport($msg) {
 $contribution = array();
-if (!empty($msg['gross'])) {
+if (!empty($msg['gross']) && $msg['gross'] > 0) {
   $contribution = wmf_civicrm_contribution_message_import($msg);
 }
 
diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv 
b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
index ec9c667..909cdbd 100644
--- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv
+++ b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
@@ -2,4 +2,4 @@
 Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200
 Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey 
Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200
 Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,22.00,25.00,47
-Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0,0.5,0.5
+Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0.00,0.5,0.5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e09386b107f3ced5dcea15774e9b457e519ef51
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
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] wikimedia...crm[master]: Further Benevity report fix on handling on formatted '0'.

[Eileen (Code Review)]

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

Change subject: Further Benevity report fix on handling on formatted '0'.
..

Further Benevity report fix on handling on formatted '0'.

Bug: T115044
Change-Id: I6e09386b107f3ced5dcea15774e9b457e519ef51
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/data/benevity.csv
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/31/338031/1

diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index 07095bb..e5fb16e 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -112,7 +112,7 @@
*/
   public function doImport($msg) {
 $contribution = array();
-if (!empty($msg['gross'])) {
+if (!empty($msg['gross']) && $msg['gross'] > 0) {
   $contribution = wmf_civicrm_contribution_message_import($msg);
 }
 
diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv 
b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
index ec9c667..909cdbd 100644
--- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv
+++ b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
@@ -2,4 +2,4 @@
 Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200
 Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey 
Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200
 Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,22.00,25.00,47
-Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0,0.5,0.5
+Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0.00,0.5,0.5

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Allow whitelisted remote services

[Smalyshev (Code Review)]

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

Change subject: Allow whitelisted remote services
..

Allow whitelisted remote services

Bug: T155127
Change-Id: Iae1b19c0f6674bb14db0fd5fb308f08e1e621f9d
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/geo/GeoService.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
M dist/src/script/runBlazegraph.sh
4 files changed, 80 insertions(+), 9 deletions(-)


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

diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
index c5d651d..7bf98ff 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
@@ -1,5 +1,11 @@
 package org.wikidata.query.rdf.blazegraph;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletContextEvent;
@@ -24,6 +30,7 @@
 
 import com.bigdata.bop.BOpContextBase;
 import com.bigdata.bop.IValueExpression;
+import com.bigdata.rdf.graph.impl.bd.GASService;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.constraints.DateBOp.DateOp;
 import com.bigdata.rdf.sail.sparql.PrefixDeclProcessor;
@@ -34,31 +41,58 @@
 import com.bigdata.rdf.sparql.ast.FunctionRegistry.Factory;
 import com.bigdata.rdf.sparql.ast.eval.AST2BOpUtility;
 import com.bigdata.rdf.sparql.ast.eval.AbstractServiceFactoryBase;
+import com.bigdata.rdf.sparql.ast.eval.SampleServiceFactory;
+import com.bigdata.rdf.sparql.ast.eval.SliceServiceFactory;
+import com.bigdata.rdf.sparql.ast.eval.ValuesServiceFactory;
 import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
+import com.bigdata.rdf.sparql.ast.service.RemoteServiceFactoryImpl;
 import com.bigdata.rdf.sparql.ast.service.RemoteServiceOptions;
+import com.bigdata.rdf.sparql.ast.service.SPARQLVersion;
 import com.bigdata.rdf.sparql.ast.service.ServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
+import com.bigdata.rdf.sparql.ast.service.ServiceFactory;
 import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
-import com.bigdata.service.fts.FTS;
+import com.bigdata.rdf.store.BDS;
 
 /**
  * Context listener to enact configurations we need on initialization.
  */
+@SuppressWarnings("checkstyle:classfanoutcomplexity")
 public class WikibaseContextListener extends BigdataRDFServletContextListener {
 
 private static final Logger log = 
LoggerFactory.getLogger(WikibaseContextListener.class);
 
 /**
- * Replaces the default Blazegraph services with ones that do not allow
- * remote services and a label resolution service.
+ * Default service whitelist filename.
+ */
+public static final String WHITELIST_DEFAULT = "whitelist.txt";
+
+/**
+ * Whitelist configuration name.
+ */
+public static final String WHITELIST = 
System.getProperty("wikibaseServiceWhitelist", WHITELIST_DEFAULT);
+
+/**
+ * Initializes BG service setup to allow whitelisted services.
+ * Also add additional custom services and functions.
  */
 public static void initializeServices() {
-ServiceRegistry.getInstance().setDefaultServiceFactory(new 
DisableRemotesServiceFactory());
+// Enable service whitelisting
+final ServiceRegistry reg = ServiceRegistry.getInstance();
+reg.setWhitelistEnabled(true);
 LabelService.register();
 GeoService.register();
 
-// Remove FTS service for now since it allows arbitrary endpoints
-ServiceRegistry.getInstance().remove(FTS.SEARCH);
+// Whitelist services we like by default
+reg.addWhitelistURL(GASService.Options.SERVICE_KEY.toString());
+reg.addWhitelistURL(ValuesServiceFactory.SERVICE_KEY.toString());
+reg.addWhitelistURL(BDS.SEARCH_IN_SEARCH.toString());
+reg.addWhitelistURL(SliceServiceFactory.SERVICE_KEY.toString());
+reg.addWhitelistURL(SampleServiceFactory.SERVICE_KEY.toString());
+loadWhitelist(reg);
+
+// Initialize remote services
+reg.setDefaultServiceFactory(getDefaultServiceFactory());
 
 // Override date functions so that we can handle them
 // via WikibaseDate
@@ -103,6 +137,36 @@
 }
 
 /**
+ * Get default service factory, with proper options.
+ * @return
+ */
+private static ServiceFactory getDefaultServiceFactory() {
+final 

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[es5]: Update norms mapping for es5

[EBernhardson (Code Review)]

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

Change subject: Update norms mapping for es5
..

Update norms mapping for es5

ES5 still supports the old style [enabled: bool], but logs warnings
about it being deprecated. Convert to the new style which is a simple
boolean with no options.

Change-Id: I0ab2889055912f21a237541e91f8213629072e7c
---
M includes/Search/KeywordIndexField.php
M includes/Search/ShortTextIndexField.php
M includes/Search/SourceTextIndexField.php
M includes/Search/TextIndexField.php
4 files changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/includes/Search/KeywordIndexField.php 
b/includes/Search/KeywordIndexField.php
index 5320971..5058fd0 100644
--- a/includes/Search/KeywordIndexField.php
+++ b/includes/Search/KeywordIndexField.php
@@ -23,7 +23,7 @@
$config['analyzer'] =
$this->checkFlag( self::FLAG_CASEFOLD ) ? 
'lowercase_keyword' : 'keyword';
$config += [
-   'norms' => [ 'enabled' => false ],
+   'norms' => false,
// Omit the length norm because there is only even one 
token
'index_options' => 'docs',
// TODO: Re-enable after upgrade to es 5.2 and changing 
type to keyword
diff --git a/includes/Search/ShortTextIndexField.php 
b/includes/Search/ShortTextIndexField.php
index 280f878..68238bf 100644
--- a/includes/Search/ShortTextIndexField.php
+++ b/includes/Search/ShortTextIndexField.php
@@ -16,13 +16,13 @@
$config['search_analyzer'] = 'short_text_search';
// NOTE: these fields are not used for scoring yet. We should
// reevaluate these options to
-   // - norms => [ 'enabled' => true ]
+   // - norms => true
// if we plan to use such fields for scoring and:
// - index_options => 'offsets'
// if we plan to support highlighting
$config += [
// Omit the length norm because we use it only for 
filtering
-   'norms' => [ 'enabled' => false ],
+   'norms' => false,
// Store positions because by using aggressive_splitting
// we need to allow precise position matching with 
phrases
'index_options' => 'positions',
diff --git a/includes/Search/SourceTextIndexField.php 
b/includes/Search/SourceTextIndexField.php
index 91227d0..c25ae21 100644
--- a/includes/Search/SourceTextIndexField.php
+++ b/includes/Search/SourceTextIndexField.php
@@ -40,7 +40,7 @@
'fields' => [
'plain' => [
'type' => 'text',
-   'norms' => ['enabled' => false],
+   'norms' => false,
'analyzer' => 'source_text_plain',
'search_analyzer' => 
'source_text_plain_search',
'position_increment_gap' => 
self::POSITION_INCREMENT_GAP,
@@ -51,7 +51,7 @@
 
if ( $this->withTrigrams ) {
$field['fields']['trigram'] = [
-   'norms' => ['enabled' => false],
+   'norms' => false,
'type' => 'text',
'analyzer' => 'trigram',
'index_options' => 'docs',
diff --git a/includes/Search/TextIndexField.php 
b/includes/Search/TextIndexField.php
index 1c8f5ca..90ed634 100644
--- a/includes/Search/TextIndexField.php
+++ b/includes/Search/TextIndexField.php
@@ -123,7 +123,7 @@
if ( $this->checkFlag( SearchIndexField::FLAG_CASEFOLD ) ) {
$extra[] = [
'analyzer' => 'lowercase_keyword',
-   'norms' => [ 'enabled' => false ],
+   'norms' => false,
'index_options' => 'docs',
// TODO: Re-enable in ES 5.2 with keyword type 
and s/analyzer/normalizer/
//'ignore_above' => 
KeywordIndexField::KEYWORD_IGNORE_ABOVE,
@@ -148,7 +148,7 @@
];
$disableNorms = !$this->checkFlag( self::ENABLE_NORMS );
if ( $disableNorms ) {
-   $disableNorms = [ 'norms' => [ 'enabled' => false ] ];
+   $disableNorms = [ 'norms' => false ];
$field = array_merge( $field, $disableNorms );
$field[ 'fields' ][ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: partman: delete raid1-lvm-ext4 recipe

[Dzahn (Code Review)]

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

Change subject: partman: delete raid1-lvm-ext4 recipe
..


partman: delete raid1-lvm-ext4 recipe

This recipe does not appear to be used
when grep'ing netboot.cfg.

for recipe in *.cfg; do if ! grep -q $recipe ../netboot.cfg; then echo "$recipe 
not used"; git rm $recipe; fi; done

So delete it to consolidate.

Bug: T156955
Change-Id: Id1b9fe32ec78a03f39b68647acf1fcb12d9d2299
---
D modules/install_server/files/autoinstall/partman/raid1-lvm-ext4.cfg
1 file changed, 0 insertions(+), 54 deletions(-)

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



diff --git 
a/modules/install_server/files/autoinstall/partman/raid1-lvm-ext4.cfg 
b/modules/install_server/files/autoinstall/partman/raid1-lvm-ext4.cfg
deleted file mode 100644
index bd3a0e4..000
--- a/modules/install_server/files/autoinstall/partman/raid1-lvm-ext4.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-# Automatic software RAID 1 with LVM partitioning
-#
-# * two disks, sda & sdb
-# * layout:
-#   - /:   ext4, RAID1, 50GB
-#   - swap:   RAID1, 1GB, on LVM
-#   - free space for the rest under RAID1/LVM
-
-d-ipartman-auto/method string  raid
-d-ipartman-md/device_remove_md boolean true
-d-ipartman-lvm/device_remove_lvm   boolean true
-
-# Use the first two disks
-d-ipartman-auto/disk   string  /dev/sda /dev/sdb
-
-# Define physical partitions
-d-ipartman-auto/expert_recipe  string  \
-   multiraid ::\
-   500080005   raid\
-   $primary{ } method{ raid }  \
-   $lvmignore{ }   \
-   .   \
-   10001000-1  raid\
-   $primary{ } method{ raid }  \
-   $lvmignore{ }   \
-   .   \
-   100010001000linux-swap  \
-   $defaultignore{ }   \
-   $lvmok{ } lv_name{ swap }   \
-   method{ swap }  \
-   format{ }   \
-   .
-
-# Parameters are:
-#  \
-#   
-d-ipartman-auto-raid/recipestring  \
-   1   2   0   ext4/   \
-   /dev/sda1#/dev/sdb1 \
-   .   \
-   1   2   0   lvm -   \
-   /dev/sda2#/dev/sdb2 \
-   .
-
-d-ipartman-md/confirm  boolean true
-d-ipartman-md/confirm_nooverwrite  boolean true
-d-ipartman/confirm_write_new_label boolean true
-d-ipartman/choose_partitionselect  finish
-d-ipartman/confirm boolean true
-d-ipartman/confirm_nooverwrite boolean true
-
-d-ipartman-auto-lvm/guided_sizestring  80%
-d-ipartman-lvm/confirm boolean true
-d-ipartman-lvm/confirm_nooverwrite boolean true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1b9fe32ec78a03f39b68647acf1fcb12d9d2299
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Papaul 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Fix Service[eventlogging-devserver]

[jenkins-bot (Code Review)]

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

Change subject: Fix Service[eventlogging-devserver]
..


Fix Service[eventlogging-devserver]

I missed the 'systemd::' prefix in the first patch.

Change-Id: I4d1976d8518024ae767be9446aeaf1c045ac20f6
---
M puppet/modules/eventlogging/manifests/devserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/eventlogging/manifests/devserver.pp 
b/puppet/modules/eventlogging/manifests/devserver.pp
index ecfd0dc..0fdaf8b 100644
--- a/puppet/modules/eventlogging/manifests/devserver.pp
+++ b/puppet/modules/eventlogging/manifests/devserver.pp
@@ -8,7 +8,7 @@
 # Local variable for ease of use in service.upstart.erb template.
 $eventlogging_path = $::eventlogging::path
 
-service { 'eventlogging-devserver':
+systemd::service { 'eventlogging-devserver':
 ensure=> 'present',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d1976d8518024ae767be9446aeaf1c045ac20f6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.test.utils.createSurfaceFromDocument: Actually attach sur...

[Code Review]

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

Change subject: ve.test.utils.createSurfaceFromDocument: Actually attach 
surface to DOM
..

ve.test.utils.createSurfaceFromDocument: Actually attach surface to DOM

Bug: T158141
Change-Id: I999bcdc7095a3b9e2a86a7d5eca0e1f3ceb175ef
---
M modules/ve-mw/tests/ve.test.utils.js
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-mw/tests/ve.test.utils.js 
b/modules/ve-mw/tests/ve.test.utils.js
index 3b94f5e..db4c648 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -7,7 +7,7 @@
 
 ve.test.utils.createSurfaceFromDocument = function ( doc ) {
// eslint-disable-next-line no-unused-vars
-   var target, mwTarget;
+   var target, mwTarget, surface;
 
// Prevent the target from setting up the surface immediately
ve.init.platform.initialized = $.Deferred();
@@ -22,7 +22,11 @@
 
ve.init.platform.initialized.resolve();
mwTarget = null;
-   return target.addSurface( doc );
+   surface = target.addSurface( doc );
+   // HACK HACK HACK: The target fuckery above results in the surface not 
being attached to the DOM.
+   // I'm not debugging that, screw it. Let's add another hack on top, 
surely that won't be a problem.
+   $( '#qunit-fixture' ).append( surface.$element );
+   return surface;
 };
 
 // Unregister MW override nodes.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I999bcdc7095a3b9e2a86a7d5eca0e1f3ceb175ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] research/recommendation-api[master]: Add option to rank translation recs by sitelinks

[jenkins-bot (Code Review)]

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

Change subject: Add option to rank translation recs by sitelinks
..


Add option to rank translation recs by sitelinks

Bug: T157371
Change-Id: I64fe7b620d4230d3548ab24412ceb7c3e39a7926
---
M recommendation/api/external_data/fetcher.py
M recommendation/api/external_data/wikidata.py
M 
recommendation/api/types/test/test_translation_and_related_articles_relationship.py
M recommendation/api/types/translation/candidate_finders.py
M recommendation/api/types/translation/filters.py
M recommendation/api/types/translation/pageviews.py
A recommendation/api/types/translation/recommendation.py
M recommendation/api/types/translation/test/test_api.py
M recommendation/api/types/translation/test/test_candidate_finders.py
M recommendation/api/types/translation/test/test_filters.py
M recommendation/api/types/translation/test/test_pageviews.py
M recommendation/api/types/translation/translation.py
D recommendation/api/types/translation/utils.py
M recommendation/data/recommendation.ini
M recommendation/web/gapfinder.py
M recommendation/web/static/gf-input.tag
M recommendation/web/templates/index.html
M setup.py
18 files changed, 274 insertions(+), 269 deletions(-)

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



diff --git a/recommendation/api/external_data/fetcher.py 
b/recommendation/api/external_data/fetcher.py
index dda437a..3a5a4fb 100644
--- a/recommendation/api/external_data/fetcher.py
+++ b/recommendation/api/external_data/fetcher.py
@@ -100,6 +100,30 @@
 return results
 
 
+def get_most_popular_articles(source):
+days = configuration.get_config_int('popular_pageviews', 'days')
+date_format = configuration.get_config_value('popular_pageviews', 
'date_format')
+query = configuration.get_config_value('popular_pageviews', 'query')
+date = (datetime.datetime.utcnow() - 
datetime.timedelta(days=days)).strftime(date_format)
+query = query.format(source=source, date=date)
+try:
+data = get(query)
+except ValueError:
+log.info('pageview query failed')
+return []
+
+if 'items' not in data or len(data['items']) < 1 or 'articles' not in 
data['items'][0]:
+log.info('pageview data is not in a known format')
+return []
+
+articles = []
+
+for article in data['items'][0]['articles']:
+articles.append({'title': article['article'], 'pageviews': 
article['views']})
+
+return articles
+
+
 def build_wiki_search(source, seed, count, morelike):
 endpoint = configuration.get_config_value('endpoints', 
'wikipedia').format(source=source)
 params = configuration.get_config_dict('wiki_search_params')
diff --git a/recommendation/api/external_data/wikidata.py 
b/recommendation/api/external_data/wikidata.py
index c3edd72..ed50ac9 100644
--- a/recommendation/api/external_data/wikidata.py
+++ b/recommendation/api/external_data/wikidata.py
@@ -8,43 +8,66 @@
 
 log = logging.getLogger(__name__)
 
-WikidataItem = collections.namedtuple('WikidataItem', ['id', 'title', 'url'])
+_RawWikidataItem = collections.namedtuple('RawWikidataItem', ['id', 
'sitelinks'])
+WikidataItem = collections.namedtuple('WikidataItem', ['id', 'title', 'url', 
'sitelink_count'])
 
 
-def query(params, expected_sitelinks=1):
-"""
-Query the wikidata endpoint and return a list of WikidataItem
+def get_items_in_source_missing_in_target_by_titles(source, target, titles):
+target_wiki = '{}wiki'.format(target)
+items = get_items(source, titles=titles, raw_filter=lambda item: 
target_wiki not in item.sitelinks)
+return {item.title: item for item in items}
 
- This only includes items that have exactly expected_sitelinks sitelink
-"""
-endpoint = configuration.get_config_value('endpoints', 'wikidata')
-try:
-data = fetcher.post(endpoint, data=params)
-if 'warnings' in data:
-raise ValueError()
-except ValueError:
-log.info('Bad Wikidata API response')
-return {}
 
-entities = data.get('entities', {})
+def get_wikidata_items_from_titles(source, titles):
+return get_items(source, titles=titles)
 
+
+def get_titles_from_wikidata_items(source, items):
+return get_items(source, ids=items)
+
+
+def default_filter(_):
+return True
+
+
+def get_items(source, titles=None, ids=None, raw_filter=default_filter):
+params = configuration.get_config_dict('wikidata_query_params')
+params['sites'] = params['sites'].format(source=source)
 items = []
-
-for id, entity in entities.items():
-sitelinks = entity.get('sitelinks', {})
-if len(sitelinks.keys()) != expected_sitelinks:
-continue
-sitelink = sitelinks.popitem()[1]
-
-item = WikidataItem(id=id,
-title=sitelink['title'].replace(' ', '_'),
-

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Fix rubocop lint problem

[jenkins-bot (Code Review)]

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

Change subject: Fix rubocop lint problem
..


Fix rubocop lint problem

Random linters are random. No idea how this got in in the first place.

Change-Id: I0d4f99cbd8b568d29f51cbf461cdf5cf0a2605ed
---
M Vagrantfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 773bfc9..0e2f2ce 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -76,7 +76,7 @@
   config.vm.provider :hyperv do |_hyperv, override|
 override.vm.box = 'ira/leap'
 override.vm.network :private_network, ip: settings[:static_ip]
-   end
+  end
 
   # LXC provider. Enable wtih `--provider=lxc`
   # Requires vagrant-lxc plugin and Vagrant 1.7+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d4f99cbd8b568d29f51cbf461cdf5cf0a2605ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Fix rubocop lint problem

[BryanDavis (Code Review)]

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

Change subject: Fix rubocop lint problem
..

Fix rubocop lint problem

Random linters are random. No idea how this got in in the first place.

Change-Id: I0d4f99cbd8b568d29f51cbf461cdf5cf0a2605ed
---
M Vagrantfile
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/27/338027/1

diff --git a/Vagrantfile b/Vagrantfile
index 773bfc9..0e2f2ce 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -76,7 +76,7 @@
   config.vm.provider :hyperv do |_hyperv, override|
 override.vm.box = 'ira/leap'
 override.vm.network :private_network, ip: settings[:static_ip]
-   end
+  end
 
   # LXC provider. Enable wtih `--provider=lxc`
   # Requires vagrant-lxc plugin and Vagrant 1.7+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Fix Service[eventlogging-devserver]

[BryanDavis (Code Review)]

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

Change subject: Fix Service[eventlogging-devserver]
..

Fix Service[eventlogging-devserver]

I missed the 'systemd::' prefix in the first patch.

Change-Id: I4d1976d8518024ae767be9446aeaf1c045ac20f6
---
M puppet/modules/eventlogging/manifests/devserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/26/338026/1

diff --git a/puppet/modules/eventlogging/manifests/devserver.pp 
b/puppet/modules/eventlogging/manifests/devserver.pp
index ecfd0dc..0fdaf8b 100644
--- a/puppet/modules/eventlogging/manifests/devserver.pp
+++ b/puppet/modules/eventlogging/manifests/devserver.pp
@@ -8,7 +8,7 @@
 # Local variable for ease of use in service.upstart.erb template.
 $eventlogging_path = $::eventlogging::path
 
-service { 'eventlogging-devserver':
+systemd::service { 'eventlogging-devserver':
 ensure=> 'present',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: [Re-apply] Update OOjs UI to v0.19.2

[Jforrester (Code Review)]

Hello jenkins-bot, VolkerE,

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

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

to review the following change.


Change subject: [Re-apply] Update OOjs UI to v0.19.2
..

[Re-apply] Update OOjs UI to v0.19.2

Re-attempt for c0cdd705c5181cccb404451d612bb13863905f89.

This reverts commit 57ef8912f1e5ab6b42bb3242b4cfb8b36447487c.

Bug: T158141
Change-Id: If351020ee7f29d038eeea8258e0bd607c4134060
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/package.json
6 files changed, 113 insertions(+), 92 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/25/338025/1

diff --git a/composer.json b/composer.json
index f0cd9d7..eb1e070 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.19.1",
+   "oojs/oojs-ui": "0.19.2",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 411108d..595c8e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "bd584c21af40cc628648796b0ccf8e91",
-"content-hash": "008b82e482b471745b498860c2e038b4",
+"hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
+"content-hash": "17e19b0718d463c61c3be9db39fc18e2",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.19.1",
+"version": "v0.19.2",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
+"reference": "58fb445bc1f2323548b736b84af8409a13499107"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107;,
+"reference": "58fb445bc1f2323548b736b84af8409a13499107",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-02-08 00:17:30"
+"time": "2017-02-14 22:27:07"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 77eb7f8..fc8afc6 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,87 +1895,6 @@
 "description": "PHP port of the TextCat language guesser utility, see 
http://odur.let.rug.nl/~vannoord/TextCat/.;
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.19.1",
-"version_normalized": "0.19.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-"php": ">=5.5.9"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.6.0",
-"phpunit/phpunit": "4.8.21"
-},
-"time": "2017-02-08 00:17:30",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-"php/"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Timo Tijhof",
-"email": "krinklem...@gmail.com"
-},
-{
-"name": "Bartosz Dziewoński",
-"email": "matma@gmail.com"
-},
-{
-"name": 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Revert "Revert "Revert "Update OOjs UI to v0.19.2"""

[jenkins-bot (Code Review)]

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

Change subject: Revert "Revert "Revert "Update OOjs UI to v0.19.2"""
..


Revert "Revert "Revert "Update OOjs UI to v0.19.2"""

This reverts commit 4cb28cbcb348e985393d4b85ec2d3801aa3e1d5f.

Change-Id: I2a969f2a4c74b3a7a596be69882f816c3303a68f
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/package.json
6 files changed, 92 insertions(+), 113 deletions(-)

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



diff --git a/composer.json b/composer.json
index eb1e070..f0cd9d7 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.19.2",
+   "oojs/oojs-ui": "0.19.1",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 595c8e9..411108d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
-"content-hash": "17e19b0718d463c61c3be9db39fc18e2",
+"hash": "bd584c21af40cc628648796b0ccf8e91",
+"content-hash": "008b82e482b471745b498860c2e038b4",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.19.2",
+"version": "v0.19.1",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107"
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107;,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-02-14 22:27:07"
+"time": "2017-02-08 00:17:30"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index fc8afc6..77eb7f8 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,6 +1895,87 @@
 "description": "PHP port of the TextCat language guesser utility, see 
http://odur.let.rug.nl/~vannoord/TextCat/.;
 },
 {
+"name": "oojs/oojs-ui",
+"version": "v0.19.1",
+"version_normalized": "0.19.1.0",
+"source": {
+"type": "git",
+"url": "https://github.com/wikimedia/oojs-ui.git;,
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
+"shasum": ""
+},
+"require": {
+"mediawiki/at-ease": "1.1.0",
+"php": ">=5.5.9"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"mediawiki/mediawiki-codesniffer": "0.6.0",
+"phpunit/phpunit": "4.8.21"
+},
+"time": "2017-02-08 00:17:30",
+"type": "library",
+"installation-source": "dist",
+"autoload": {
+"classmap": [
+"php/"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Timo Tijhof",
+"email": "krinklem...@gmail.com"
+},
+{
+"name": "Bartosz Dziewoński",
+"email": "matma@gmail.com"
+},
+{
+"name": "Ed Sanders",
+"email": "esand...@wikimedia.org"
+},
+{
+

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[wmf/1.29.0-wmf.12]: Change warning link about type=general from phab to mediawik...

[jenkins-bot (Code Review)]

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

Change subject: Change warning link about type=general from phab to 
mediawiki.org
..


Change warning link about type=general from phab to mediawiki.org

Bug: T42284
Change-Id: Ibb5dcca242e75567ab2ee70b0836b2271fe171d0
(cherry picked from commit d1d8bd73df60e565da20323812d0e06c8967e3ad)
---
M GadgetHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/GadgetHooks.php b/GadgetHooks.php
index 28214d2..975c606 100644
--- a/GadgetHooks.php
+++ b/GadgetHooks.php
@@ -246,7 +246,7 @@
private static function makeTypelessWarning( $id ) {
return ResourceLoader::makeInlineScript( Xml::encodeJsCall( 
'mw.log.warn', [
"Gadget \"$id\" styles loaded twice. Migrate to 
type=general. " .
-   'See .'
+   'See 
.'
] ) );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb5dcca242e75567ab2ee70b0836b2271fe171d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: wmf/1.29.0-wmf.12
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Revert "Revert "Revert "Update OOjs UI to v0.19.2"""

[Jforrester (Code Review)]

Hello jenkins-bot, VolkerE,

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

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

to review the following change.


Change subject: Revert "Revert "Revert "Update OOjs UI to v0.19.2"""
..

Revert "Revert "Revert "Update OOjs UI to v0.19.2"""

This reverts commit 4cb28cbcb348e985393d4b85ec2d3801aa3e1d5f.

Change-Id: I2a969f2a4c74b3a7a596be69882f816c3303a68f
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/package.json
6 files changed, 92 insertions(+), 113 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/24/338024/1

diff --git a/composer.json b/composer.json
index eb1e070..f0cd9d7 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.19.2",
+   "oojs/oojs-ui": "0.19.1",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 595c8e9..411108d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
-"content-hash": "17e19b0718d463c61c3be9db39fc18e2",
+"hash": "bd584c21af40cc628648796b0ccf8e91",
+"content-hash": "008b82e482b471745b498860c2e038b4",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.19.2",
+"version": "v0.19.1",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107"
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107;,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-02-14 22:27:07"
+"time": "2017-02-08 00:17:30"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index fc8afc6..77eb7f8 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,6 +1895,87 @@
 "description": "PHP port of the TextCat language guesser utility, see 
http://odur.let.rug.nl/~vannoord/TextCat/.;
 },
 {
+"name": "oojs/oojs-ui",
+"version": "v0.19.1",
+"version_normalized": "0.19.1.0",
+"source": {
+"type": "git",
+"url": "https://github.com/wikimedia/oojs-ui.git;,
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
+"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
+"shasum": ""
+},
+"require": {
+"mediawiki/at-ease": "1.1.0",
+"php": ">=5.5.9"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"mediawiki/mediawiki-codesniffer": "0.6.0",
+"phpunit/phpunit": "4.8.21"
+},
+"time": "2017-02-08 00:17:30",
+"type": "library",
+"installation-source": "dist",
+"autoload": {
+"classmap": [
+"php/"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Timo Tijhof",
+"email": "krinklem...@gmail.com"
+},
+{
+"name": "Bartosz Dziewoński",
+"email": "matma@gmail.com"
+},
+{
+"name": "Ed Sanders",
+"email": 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Check that empty content is valid only on handlers that allo...

[Smalyshev (Code Review)]

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

Change subject: Check that empty content is valid only on handlers that allow 
direct editing.
..

Check that empty content is valid only on handlers that allow direct editing.

Bug: T157626
Change-Id: I843f25172b70111f8219eec9a853ac3138c6aff3
---
M tests/phpunit/structure/ContentHandlerSanityTest.php
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/338023/1

diff --git a/tests/phpunit/structure/ContentHandlerSanityTest.php 
b/tests/phpunit/structure/ContentHandlerSanityTest.php
index 98a0fbb..30bae78 100644
--- a/tests/phpunit/structure/ContentHandlerSanityTest.php
+++ b/tests/phpunit/structure/ContentHandlerSanityTest.php
@@ -45,9 +45,12 @@
$handlerClass = get_class( $handler );
$contentClass = get_class( $content );
 
-   $this->assertTrue(
-   $content->isValid(),
-   "$handlerClass::makeEmptyContent() did not return a 
valid content ($contentClass::isValid())"
-   );
+   if ( $handler->supportsDirectEditing() ) {
+   $this->assertTrue(
+   $content->isValid(),
+   "$handlerClass::makeEmptyContent() did not 
return a valid content ($contentClass::isValid())"
+   );
+   }
}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Add systemd template

[Paladox (Code Review)]

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

Change subject: Phabricator: Add systemd template
..

Phabricator: Add systemd template

This change only adds the template but does not hook it up to any puppet code 
yet.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/338022/1


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SecureSessions[master]: Convert SecureSessions to extension registration

[Reedy (Code Review)]

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

Change subject: Convert SecureSessions to extension registration
..


Convert SecureSessions to extension registration

Bug: T98668
Change-Id: Ifaeaff591d68ecc01c9be4a0e757d82dc0ed6e21
---
M SecureSessions.php
A extension.json
2 files changed, 45 insertions(+), 68 deletions(-)

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



diff --git a/SecureSessions.php b/SecureSessions.php
index 0f3e90b..c035ba8 100644
--- a/SecureSessions.php
+++ b/SecureSessions.php
@@ -1,71 +1,15 @@
 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @link https://www.mediawiki.org/wiki/Extension:SecureSessions
- * @ingroup Extensions
- * @author Tyler Romeo 
- * @copyright (c) 2012 by Tyler Romeo
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
3.0 or later
- */
-
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'SecureSessions',
-   'version' => '0.6.0',
-   'author' => 'Tyler Romeo',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:SecureSessions',
-   'descriptionmsg' => 'securesessions-desc'
-);
-
-/**
- * Set options for what properties to check on each user request. The value
- * should be an array with zero or more of the following keys:
- *  * 'ip' - Restrict session to an IP address
- *  * 'useragent' - Restrict session to the User Agent header
- *  * 'onesession' - When a user logs in, log out all other sessions
- * For each of these keys, it should be assigned to one of the following 
values:
- *  * true - Force this restriction on all users
- *  * null - Allow the user to decide on login
- *  * false - Disable this restriction
- * If this is set to the boolean value true, it is assumed to be an array
- * containing all of the above values. If it is set to the boolean value false,
- * it is assumed to be an empty array.
- */
-$wgEnhancedSessionAuth = true;
-
-/**
- * Whether to cycle the session ID on every request. There may be some 
performance
- * implications if your wiki is not using memcached sessions.
- */
-$wgSessionCycleId = false;
-
-// Setup for the extension.
-$wgAutoloadClasses['SecureSessions'] = __DIR__ . '/SecureSessions.hooks.php';
-$wgAutoloadClasses['SpecialSessions'] = __DIR__ . '/SpecialSessions.php';
-$wgExtensionFunctions[] = array( 'SecureSessions', 'setup' );
-$wgSpecialPages['Sessions'] = 'SpecialSessions';
-$wgMessagesDirs['SecureSessions'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['SecureSessions'] = __DIR__ . 
'/SecureSessions.i18n.php';
-
-if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-   require_once __DIR__ . '/vendor/autoload.php';
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'SecureSessions' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['SecureSessions'] = __DIR__ . '/i18n';
+   /*wfWarn(
+   'Deprecated PHP entry point used for SecureSessions extension. 
' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );*/
+   return;
+} else {
+   die( 'This version of the SecureSessions extension requires MediaWiki 
1.28+' );
 }
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..fb76b57
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,33 @@
+{
+   "name": "SecureSessions",
+   "version": "0.6.0",
+   "author": "Tyler Romeo",
+   "url": "https://www.mediawiki.org/wiki/Extension:SecureSessions;,
+   "descriptionmsg": "securesessions-desc",
+   "type": "other",
+   "ExtensionFunctions": [
+   "SecureSessions::setup"
+   ],
+   "SpecialPages": {
+   "Sessions": "SpecialSessions"
+   },
+   "MessagesDirs": {
+   "SecureSessions": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "SecureSessions": "SecureSessions.hooks.php",
+   "SpecialSessions": "SpecialSessions.php"
+ 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update Android Support Libraries to 25.1.1

[jenkins-bot (Code Review)]

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

Change subject: Update Android Support Libraries to 25.1.1
..


Update Android Support Libraries to 25.1.1

Also updates PasswordTextInputTest to resolve an exception thrown
beginning in 25.1.0 when passwordVisibilityToggleRequested() is called
outside a Looper thread.

Highlights for future reference:

== 25.1.1 ==

* Fragment transactions can now be optimized within and across
  transactions. Optimizing fragment transaction operations can eliminate
  operations that cancel. A side effect of this optimization is that
  fragments might have state changes out of the expected order. This
  optimization is disabled by default. To enable the optimization, call
  FragmentTransaction.setAllowOptimization(true).

* Fragments can now postpone their transitions and animations until they
  are ready using Fragment.postponeEnterTransition() and Fragment.
  startPostponedEnterTransition().

== 25.1.0 ==

* Snackbar has been refactored to allow apps to display custom content.
  BaseTransientBottomBar is the new base class that exposes the general
  sliding and animations behavior.

* Clients of nested RecyclerView widgets (for example, vertical scrolling
  list of horizontal scrolling lists) can get significant performance
  benefits by calling LinearLayoutManagger.setInitialPrefetchItemCount(n)
  to hint the inner RecyclerView widgets’ layout managers how many items
  to prepare before being scrolled on screen.

* Added ArraySet class to the v4 support library.  ArraySet is a generic
  set data structure that is designed to be more memory efficient than a
  traditional HashSet.

* APIs added for custom LayoutManager objects to enable prefetching
  during scrolls and flings
  - RecyclerView.LayoutManager.LayoutPrefetchRegistry()
  - RecyclerView.LayoutManager.collectAdjacentPrefetchPositions()
  - RecyclerView.LayoutManager.collectInitialPrefetchPositions()

Read more: https://developer.android.com/topic/libraries/support-library/
revisions.html

Bug: T154595
Change-Id: Ife5920898af3f1bb6e42a81db621a6260a6bac1d
---
M app/build.gradle
M 
app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
2 files changed, 14 insertions(+), 4 deletions(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index bfb00f5..a4cd6d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -159,7 +159,7 @@
 
 String okHttpVersion = '3.4.1'
 String retrofitVersion = '2.1.0'
-String supportVersion = '25.0.1'
+String supportVersion = '25.1.1'
 String espressoVersion = '2.2.2'
 String butterKnifeVersion = '8.4.0'
 String frescoVersion = '0.13.0'
diff --git 
a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
 
b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
index 9601c07..1e5ead5 100644
--- 
a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
+++ 
b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
@@ -16,6 +16,7 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.wikipedia.test.TestUtil.runOnMainSync;
 
 @SmallTest public class PasswordTextInputTest extends ViewTest {
 private PasswordTextInput subject;
@@ -28,7 +29,7 @@
 
 @Theory public void testIsPasswordVisible(@TestedOnBool boolean visible) {
 if (visible) {
-subject.passwordVisibilityToggleRequested();
+toggleVisibility();
 }
 assertThat(subject.isPasswordVisible(), is(visible));
 }
@@ -37,12 +38,21 @@
   @TestedOnBool boolean 
visible) {
 OnShowPasswordClickListener listener = nul ? null : 
mock(OnShowPasswordClickListener.class);
 if (visible) {
-subject.passwordVisibilityToggleRequested();
+toggleVisibility();
 }
 subject.setOnShowPasswordListener(listener);
-subject.passwordVisibilityToggleRequested();
+toggleVisibility();
 if (listener != null) {
 verify(listener).onShowPasswordClick(eq(!visible));
 }
 }
+
+private void toggleVisibility() {
+runOnMainSync(new Runnable() {
+@Override
+public void run() {
+subject.passwordVisibilityToggleRequested();
+}
+});
+}
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife5920898af3f1bb6e42a81db621a6260a6bac1d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

9cb1bb1 Amount related fixes for Benevity import.

Change-Id: Icea23c9b61094314a1e1226157d4e48eeb518861
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
2 files changed, 0 insertions(+), 333 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 91fe22e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<<< HEAD   (da6ba1 Merge branch 'master' into deployment)
-===
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contribution
-  WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contact
-  WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy 
Inc', 'Uncle Scrooge Inc') 
-  OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc', 
'Uncle Scrooge Inc')
-  OR first_name = 'Minnie' AND last_name = 'Mouse'
-  OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' => 
array_keys($countries['values'])));
-
-  }
-
-  /**
-   * Make sure we have the anonymous contact - like the live DB.
-   */
-  protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
-  'first_name' => 'Anonymous',
-  'last_name' => 'Anonymous',
-  'email' => 'fakeem...@wikimedia.org',
-  'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
-  $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
-  }
-
-  /**
-   * Test that all imports fail if the organization has multiple matches.
-   */
-  function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that all imports fail if the organization does not pre-exist.
-   */
-  function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that import passes for the contact if a single match is found.
-   */
-  function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that import passes for the Individual contact if a single match is 
found.
-   */
-  function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
-  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
-$contributions = 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Revert "Revert "Update OOjs UI to v0.19.2""

[jenkins-bot (Code Review)]

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

Change subject: Revert "Revert "Update OOjs UI to v0.19.2""
..


Revert "Revert "Update OOjs UI to v0.19.2""

This reverts commit bd327d8c373579ed5b2bd3266153db0ce8a02b53.

Change-Id: I49677918ae473d4913f07f7d25265bd1358c602b
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/package.json
6 files changed, 113 insertions(+), 92 deletions(-)

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



diff --git a/composer.json b/composer.json
index f0cd9d7..eb1e070 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.19.1",
+   "oojs/oojs-ui": "0.19.2",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 411108d..595c8e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "bd584c21af40cc628648796b0ccf8e91",
-"content-hash": "008b82e482b471745b498860c2e038b4",
+"hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
+"content-hash": "17e19b0718d463c61c3be9db39fc18e2",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.19.1",
+"version": "v0.19.2",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
+"reference": "58fb445bc1f2323548b736b84af8409a13499107"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107;,
+"reference": "58fb445bc1f2323548b736b84af8409a13499107",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-02-08 00:17:30"
+"time": "2017-02-14 22:27:07"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 77eb7f8..fc8afc6 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,87 +1895,6 @@
 "description": "PHP port of the TextCat language guesser utility, see 
http://odur.let.rug.nl/~vannoord/TextCat/.;
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.19.1",
-"version_normalized": "0.19.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-"php": ">=5.5.9"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.6.0",
-"phpunit/phpunit": "4.8.21"
-},
-"time": "2017-02-08 00:17:30",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-"php/"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Timo Tijhof",
-"email": "krinklem...@gmail.com"
-},
-{
-"name": "Bartosz Dziewoński",
-"email": "matma@gmail.com"
-},
-{
-"name": "Ed Sanders",
-"email": "esand...@wikimedia.org"
-},
-{
-"name": 

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[es5]: Merge remote-tracking branch 'origin/master' into es5

[jenkins-bot (Code Review)]

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

Change subject: Merge remote-tracking branch 'origin/master' into es5
..


Merge remote-tracking branch 'origin/master' into es5

Change-Id: I799e410ab8ad356f5d875f3a5be47433385bffcf
---
M includes/Search/ResultsType.php
M 
tests/unit/fixtures/searchText/boost_templates_001.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/boost_templates_002.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_001.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_002.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_003.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_004.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_005.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_006.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_007.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_008.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_009.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_010.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_011.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_012.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_013.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_014.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_015.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_016.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_017.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_018.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_019.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_020.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_021.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_022.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_023.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_024.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_025.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_026.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_027.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_028.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_029.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_030.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_031.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_032.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_033.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_034.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_035.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_036.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_037.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_038.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_039.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_040.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_041.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_042.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_043.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_044.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_045.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_046.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_047.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_048.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_049.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_050.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_051.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_052.fullyfeatured-interwiki.expected
M 
tests/unit/fixtures/searchText/browsertest_053.fullyfeatured-interwiki.expected
M 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (ac6db50ca)

[jenkins-bot (Code Review)]

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

Change subject: Update VE core submodule to master (ac6db50ca)
..


Update VE core submodule to master (ac6db50ca)

New changes:
efd3caa55 VisualDiff: Distinguish between annotation/character changes
e64a4df76 ve.ce.Surface.test: Gross workaround for failing tests
ac6db50ca Update OOjs UI to v0.19.2

Change-Id: I366d1ceee0c238e17d977d8aaa0ab6732eb7c82b
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/ve b/lib/ve
index 2f38291..ac6db50 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 2f38291c4c07157bb25d1d71b2972f82dd5b1c7b
+Subproject commit ac6db50cad8e3b47d0f52ef0e4073674d087cfc9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I366d1ceee0c238e17d977d8aaa0ab6732eb7c82b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Transclusion dialog: Add VE specific rules from OOjs UI

[VolkerE (Code Review)]

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

Change subject: Transclusion dialog: Add VE specific rules from OOjs UI
..

Transclusion dialog: Add VE specific rules from OOjs UI

Adding VE specific rules from OOjs UI in preparation of removing them
from the library.

Change-Id: I798717b60badb521d28f8f7a7036a99e5a26d61a
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
1 file changed, 9 insertions(+), 4 deletions(-)


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

diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
index 991f4a3..29b9151 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
@@ -48,11 +48,8 @@
overflow: hidden;
 }
 
-.ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout .oo-ui-fieldsetLayout 
> .oo-ui-labelElement-label {
-   display: none;
-}
-
 .ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout .oo-ui-fieldsetLayout 
> .oo-ui-iconElement-icon,
+.ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout .oo-ui-fieldsetLayout 
> .oo-ui-labelElement-label,
 .ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout 
.ve-ui-mwTransclusionDialog-removeButton,
 .ve-ui-mwTransclusionDialog-multiple .oo-ui-bookletLayout 
.ve-ui-mwTemplatePage-more,
 .ve-ui-mwTransclusionDialog-multiple .oo-ui-bookletLayout 
.ve-ui-mwParameterPage-more {
@@ -71,3 +68,11 @@
transition: all 250ms ease-in-out;
/* stylelint-enable no-unsupported-browser-features */
 }
+
+.ve-ui-mwTransclusionDialog 
.oo-ui-outlineOptionWidget.oo-ui-flaggedElement-empty .oo-ui-iconElement-icon {
+   opacity: 0.51;
+}
+
+.ve-ui-mwTransclusionDialog 
.oo-ui-outlineOptionWidget.oo-ui-flaggedElement-empty .oo-ui-labelElement-label 
{
+   color: #72777d;
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.12]: Add version to ChronologyProtector key

[jenkins-bot (Code Review)]

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

Change subject: Add version to ChronologyProtector key
..


Add version to ChronologyProtector key

This handles incompatible non-namespaced DBMasterPos values
still in cache by ignoring them. The cache value validation
has also been improved.

Bug: T158217
Change-Id: I0e25cd1390e72d8ee0c31e6bb24e9184cbbcf49f
(cherry picked from commit 96f35d42d78e97bb620ec8b6134b427bd793ed2c)
---
M includes/libs/rdbms/ChronologyProtector.php
1 file changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/includes/libs/rdbms/ChronologyProtector.php 
b/includes/libs/rdbms/ChronologyProtector.php
index 1c28188..8b1aabe 100644
--- a/includes/libs/rdbms/ChronologyProtector.php
+++ b/includes/libs/rdbms/ChronologyProtector.php
@@ -75,7 +75,7 @@
public function __construct( BagOStuff $store, array $client, $posTime 
= null ) {
$this->store = $store;
$this->clientId = md5( $client['ip'] . "\n" . $client['agent'] 
);
-   $this->key = $store->makeGlobalKey( __CLASS__, $this->clientId 
);
+   $this->key = $store->makeGlobalKey( __CLASS__, $this->clientId, 
'v1' );
$this->waitForPosTime = $posTime;
$this->logger = new NullLogger();
}
@@ -301,8 +301,9 @@
 
$min = null;
foreach ( $data['positions'] as $pos ) {
-   /** @var DBMasterPos $pos */
-   $min = $min ? min( $pos->asOfTime(), $min ) : 
$pos->asOfTime();
+   if ( $pos instanceof DBMasterPos ) {
+   $min = $min ? min( $pos->asOfTime(), $min ) : 
$pos->asOfTime();
+   }
}
 
return $min;
@@ -321,8 +322,10 @@
$curPositions = $curValue['positions'];
// Use the newest positions for each DB master
foreach ( $shutdownPositions as $db => $pos ) {
-   if ( !isset( $curPositions[$db] )
-   || $pos->asOfTime() > 
$curPositions[$db]->asOfTime()
+   if (
+   !isset( $curPositions[$db] ) ||
+   !( $curPositions[$db] instanceof 
DBMasterPos ) ||
+   $pos->asOfTime() > 
$curPositions[$db]->asOfTime()
) {
$curPositions[$db] = $pos;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e25cd1390e72d8ee0c31e6bb24e9184cbbcf49f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.12
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Aaron Schulz 
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] operations/puppet[production]: Revert "tools: Make DNS point to labsdb1004 and not 1005"

[Yuvipanda (Code Review)]

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

Change subject: Revert "tools: Make DNS point to labsdb1004 and not 1005"
..


Revert "tools: Make DNS point to labsdb1004 and not 1005"

Back at 1005

Bug: T123731

This reverts commit 5ab136b412aa83eaee1afd59ae5f8a90f71f8074.

Change-Id: Icce9c1d10fa1ee4b4632a848f33df4eb2e6fa87f
---
M hieradata/common/dnsrecursor/labsaliaser.yaml
M modules/role/templates/labs/dns/db_aliases.erb
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/common/dnsrecursor/labsaliaser.yaml 
b/hieradata/common/dnsrecursor/labsaliaser.yaml
index b8fc66b..6fc06be 100644
--- a/hieradata/common/dnsrecursor/labsaliaser.yaml
+++ b/hieradata/common/dnsrecursor/labsaliaser.yaml
@@ -2,6 +2,6 @@
 # Used for things that would ideally be in a .svc. DNS zone but
 # we do not have one. REMEMBER THE TRAILING DOT.
 dnsrecursor::labsaliaser::extra_records:
-  tools-db.tools.eqiad.wmflabs.: 10.64.37.8 # labsdb1004.eqiad.wmnet / tools-db
+  tools-db.tools.eqiad.wmflabs.: 10.64.37.9 # labsdb1005.eqiad.wmnet / tools-db
   tools-redis.tools.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
-  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
+  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
\ No newline at end of file
diff --git a/modules/role/templates/labs/dns/db_aliases.erb 
b/modules/role/templates/labs/dns/db_aliases.erb
index 69f2504..0dedba7 100644
--- a/modules/role/templates/labs/dns/db_aliases.erb
+++ b/modules/role/templates/labs/dns/db_aliases.erb
@@ -7,4 +7,4 @@
 <% @c3_dbs.each do |host| -%>
 <%= host %>3600IN  A   10.64.37.5
 <% end -%>
-tools  3600IN  A   10.64.37.8
+tools  3600IN  A   10.64.37.9

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Revert "Revert "Update OOjs UI to v0.19.2""

[Jforrester (Code Review)]

Hello jenkins-bot, VolkerE,

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

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

to review the following change.


Change subject: Revert "Revert "Update OOjs UI to v0.19.2""
..

Revert "Revert "Update OOjs UI to v0.19.2""

This reverts commit bd327d8c373579ed5b2bd3266153db0ce8a02b53.

Change-Id: I49677918ae473d4913f07f7d25265bd1358c602b
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/package.json
6 files changed, 113 insertions(+), 92 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/19/338019/1

diff --git a/composer.json b/composer.json
index f0cd9d7..eb1e070 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.19.1",
+   "oojs/oojs-ui": "0.19.2",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 411108d..595c8e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "bd584c21af40cc628648796b0ccf8e91",
-"content-hash": "008b82e482b471745b498860c2e038b4",
+"hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
+"content-hash": "17e19b0718d463c61c3be9db39fc18e2",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.19.1",
+"version": "v0.19.2",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
+"reference": "58fb445bc1f2323548b736b84af8409a13499107"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107;,
+"reference": "58fb445bc1f2323548b736b84af8409a13499107",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-02-08 00:17:30"
+"time": "2017-02-14 22:27:07"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 77eb7f8..fc8afc6 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,87 +1895,6 @@
 "description": "PHP port of the TextCat language guesser utility, see 
http://odur.let.rug.nl/~vannoord/TextCat/.;
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.19.1",
-"version_normalized": "0.19.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605;,
-"reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-"php": ">=5.5.9"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.6.0",
-"phpunit/phpunit": "4.8.21"
-},
-"time": "2017-02-08 00:17:30",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-"php/"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Timo Tijhof",
-"email": "krinklem...@gmail.com"
-},
-{
-"name": "Bartosz Dziewoński",
-"email": "matma@gmail.com"
-},
-{
-"name": "Ed Sanders",
-"email": 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[Eileen (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

9cb1bb1 Amount related fixes for Benevity import.

Change-Id: Icea23c9b61094314a1e1226157d4e48eeb518861
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
2 files changed, 0 insertions(+), 333 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/18/338018/1

diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 91fe22e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<<< HEAD   (da6ba1 Merge branch 'master' into deployment)
-===
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contribution
-  WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contact
-  WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy 
Inc', 'Uncle Scrooge Inc') 
-  OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc', 
'Uncle Scrooge Inc')
-  OR first_name = 'Minnie' AND last_name = 'Mouse'
-  OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' => 
array_keys($countries['values'])));
-
-  }
-
-  /**
-   * Make sure we have the anonymous contact - like the live DB.
-   */
-  protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
-  'first_name' => 'Anonymous',
-  'last_name' => 'Anonymous',
-  'email' => 'fakeem...@wikimedia.org',
-  'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
-  $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
-  }
-
-  /**
-   * Test that all imports fail if the organization has multiple matches.
-   */
-  function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that all imports fail if the organization does not pre-exist.
-   */
-  function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that import passes for the contact if a single match is found.
-   */
-  function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that import passes for the Individual contact if a single match is 
found.
-   */
-  function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
-  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
-$contributions = 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.12]: Adding Dashiki to wmf.12 in prep for deployment

[jenkins-bot (Code Review)]

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

Change subject: Adding Dashiki to wmf.12 in prep for deployment
..


Adding Dashiki to wmf.12 in prep for deployment

Change-Id: Ib151a78929085c3b81551400e88770b596532e92
---
M .gitmodules
A extensions/Dashiki
2 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index 2d812d4..150b8e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -666,3 +666,7 @@
path = vendor
url = https://gerrit.wikimedia.org/r/mediawiki/vendor
branch = wmf/1.29.0-wmf.12
+[submodule "extensions/Dashiki"]
+   path = extensions/Dashiki
+   url = gerrit:mediawiki/extensions/Dashiki
+   branch = wmf/1.29.0-wmf.12
diff --git a/extensions/Dashiki b/extensions/Dashiki
new file mode 16
index 000..6fc1320
--- /dev/null
+++ b/extensions/Dashiki
@@ -0,0 +1 @@
+Subproject commit 6fc13204e19058bcf194d9a26a2c3ddb751727a0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib151a78929085c3b81551400e88770b596532e92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.12
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] mediawiki...VisualEditor[master]: Update VE core submodule to master (ac6db50ca)

[Jforrester (Code Review)]

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

Change subject: Update VE core submodule to master (ac6db50ca)
..

Update VE core submodule to master (ac6db50ca)

New changes:
efd3caa55 VisualDiff: Distinguish between annotation/character changes
e64a4df76 ve.ce.Surface.test: Gross workaround for failing tests
ac6db50ca Update OOjs UI to v0.19.2

Change-Id: I366d1ceee0c238e17d977d8aaa0ab6732eb7c82b
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/ve b/lib/ve
index 2f38291..ac6db50 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 2f38291c4c07157bb25d1d71b2972f82dd5b1c7b
+Subproject commit ac6db50cad8e3b47d0f52ef0e4073674d087cfc9

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Amount related fixes for Benevity import.

[Eileen (Code Review)]

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

Change subject: Amount related fixes for Benevity import.
..


Amount related fixes for Benevity import.

In testing Leanne had some differences in her data set that were not being 
tested or handled :

1) I had only tested with '0' not '0.00'
2) I had not tested with the gift & matching gifts being different & checked 
the net amount

Bug: T115044
Change-Id: I523e19aff29ff26ab88f973fac1658b5d082c410
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
M sites/all/modules/offline2civicrm/tests/data/benevity.csv
3 files changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index cd37ea2..07095bb 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -116,8 +116,9 @@
   $contribution = wmf_civicrm_contribution_message_import($msg);
 }
 
-$matchedMsg = $msg;
-if (!empty($msg['matching_amount'])) {
+if (!empty($msg['matching_amount']) && $msg['matching_amount'] > 0) {
+  $matchedMsg = $msg;
+  unset($matchedMsg['net'], $matchedMsg['fee']);
   $matchedMsg['contact_id'] = $msg['employer_id'];
   $matchedMsg['soft_credit_to_id'] = ($msg['contact_id'] == 
$this->getAnonymousContactID() ? NULL : $msg['contact_id']);
   $matchedMsg['gross'] = $msg['matching_amount'];
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index f104586..556b264 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -274,7 +274,8 @@
 $this->assertEquals('All rows were imported', $messages['Result']);
 
 $contribution = $this->callAPISuccessGetSingle('Contribution', 
array('trxn_id' => 'BENEVITY trxn-WOOF'));
-$this->assertEquals(25, $contribution['total_amount']);
+$this->assertEquals(22, $contribution['total_amount']);
+$this->assertEquals(22, $contribution['net_amount']);
 
 $dogContact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
 $dogContributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => $dogContact['id']));
@@ -285,6 +286,7 @@
 // The first row has a matching contribution.
 $this->assertEquals(1, $orgContributions['count']);
 $this->assertEquals(25, 
$orgContributions['values'][$orgContributions['id']]['total_amount']);
+$this->assertEquals(25, 
$orgContributions['values'][$orgContributions['id']]['net_amount']);
 $this->assertEquals('Goofy Inc', 
$orgContributions['values'][$orgContributions['id']]['display_name']);
 $this->assertEquals($dogContact['id'], 
$orgContributions['values'][$orgContributions['id']]['soft_credit_to']);
 
diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv 
b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
index 1c8fda5..ec9c667 100644
--- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv
+++ b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
@@ -1,5 +1,5 @@
 Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last 
Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction 
ID,Donation Frequency,Donation Amount,Matched Amount,Total
-Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0,200
+Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200
 Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey 
Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200
-Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,25,25,50
+Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,22.00,25.00,47
 Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0,0.5,0.5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I523e19aff29ff26ab88f973fac1658b5d082c410
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.19.2

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.19.2
..


Update OOjs UI to v0.19.2

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.2

Change-Id: I2dbc0fb49cb500f8a378b5f9c8175fd1dabebf17
---
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-mediawiki.css
M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
M lib/oojs-ui/themes/apex/images/icons/eye.png
M lib/oojs-ui/themes/apex/images/icons/eye.svg
M lib/oojs-ui/themes/mediawiki/images/icons/eye-invert.png
M lib/oojs-ui/themes/mediawiki/images/icons/eye-invert.svg
M lib/oojs-ui/themes/mediawiki/images/icons/eye-progressive.png
M lib/oojs-ui/themes/mediawiki/images/icons/eye-progressive.svg
M lib/oojs-ui/themes/mediawiki/images/icons/eye.png
M lib/oojs-ui/themes/mediawiki/images/icons/eye.svg
88 files changed, 349 insertions(+), 335 deletions(-)

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



diff --git a/lib/oojs-ui/oojs-ui-apex-icons-alerts.css 
b/lib/oojs-ui/oojs-ui-apex-icons-alerts.css
index 60d32a5..04eb7b8 100644
--- a/lib/oojs-ui/oojs-ui-apex-icons-alerts.css
+++ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "zuul: point queue alarm to proper Graph panel"

[Dzahn (Code Review)]

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

Change subject: Revert "zuul: point queue alarm to proper Graph panel"
..


Revert "zuul: point queue alarm to proper Graph panel"

Icinga escapes ampersands in URL which render it useless.

This reverts commit ca9dca5dbdbeb3b74c37cc6f5670caf92ba9da78.

Change-Id: I64eba15ec402a0915982f28f702fef9da59a494f
---
M modules/zuul/manifests/monitoring/server.pp
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/modules/zuul/manifests/monitoring/server.pp 
b/modules/zuul/manifests/monitoring/server.pp
index fdf4e38..1ecbf7f 100644
--- a/modules/zuul/manifests/monitoring/server.pp
+++ b/modules/zuul/manifests/monitoring/server.pp
@@ -29,13 +29,11 @@
 nrpe_command  => '/usr/lib/nagios/plugins/check_tcp -H 127.0.0.1 -p 
4730 --timeout=2',
 }
 
-# HoltWinters window in minutes
-$check_window = 30
 monitoring::graphite_anomaly { 'zuul_gearman_wait_queue':
 ensure=> $ensure,
-description   => "Work requests waiting in Zuul Gearman server 
https://grafana.wikimedia.org/dashboard/db/zuul-gearman?panelId=20_window=${check_window}=now-${check_window}m=now;,
+description   => 'Work requests waiting in Zuul Gearman server 
https://grafana.wikimedia.org/dashboard/db/zuul-gearman',
 metric=> 'zuul.geard.queue.waiting',
-check_window  => $check_window,
+check_window  => 30,  # HoltWinters window in minutes
 # Alarms when metric is above the HoltWinters upper confidence band
 warning   => 5,
 critical  => 10,

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ve.ce.Surface.test: Gross workaround for failing tests

[jenkins-bot (Code Review)]

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

Change subject: ve.ce.Surface.test: Gross workaround for failing tests
..


ve.ce.Surface.test: Gross workaround for failing tests

When a ve.ui.Surface is created (e.g. with 
ve.test.utils.createSurfaceFromDocument),
it must remain attached to the DOM for at least one setTimeout() tick.

Also remove incorrect comments. There's one like this above that is
actually correct, these must have been copy-pasted.

Bug: T158141
Change-Id: I18302439b1e405b3b1a602cd5ca1b614c2ed9e1a
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index b6860fe..b782245 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -627,7 +627,6 @@
msg: 'Tab at end of table inserts new row'
},
{
-   // Create a full surface and return the view, 
as the UI surface is required for the insert action
htmlOrDoc: mergedCellsDoc,
rangeOrSelection: {
type: 'table',
@@ -640,7 +639,6 @@
msg: 'Up in first row of table moves out of 
table'
},
{
-   // Create a full surface and return the view, 
as the UI surface is required for the insert action
htmlOrDoc: mergedCellsDoc,
rangeOrSelection: {
type: 'table',
@@ -660,6 +658,12 @@
cases[ i ].expectedData, cases[ i 
].expectedRangeOrSelection, cases[ i ].msg
);
}
+
+   // Allow the real surface created with createSurfaceFromDocument for the
+   // 'Tab at end of table inserts new row' case to get properly 
initialized
+   // before we end the test and kill it.
+   // FIXME Oh no eww gross
+   setTimeout( assert.async(), 0 );
 } );
 
 QUnit.test( 'special key down: linear arrow keys', function ( assert ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18302439b1e405b3b1a602cd5ca1b614c2ed9e1a
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.12]: Add version to ChronologyProtector key

[Thcipriani (Code Review)]

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

Change subject: Add version to ChronologyProtector key
..

Add version to ChronologyProtector key

This handles incompatible non-namespaced DBMasterPos values
still in cache by ignoring them. The cache value validation
has also been improved.

Bug: T158217
Change-Id: I0e25cd1390e72d8ee0c31e6bb24e9184cbbcf49f
(cherry picked from commit 96f35d42d78e97bb620ec8b6134b427bd793ed2c)
---
M includes/libs/rdbms/ChronologyProtector.php
1 file changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/338016/1

diff --git a/includes/libs/rdbms/ChronologyProtector.php 
b/includes/libs/rdbms/ChronologyProtector.php
index 1c28188..8b1aabe 100644
--- a/includes/libs/rdbms/ChronologyProtector.php
+++ b/includes/libs/rdbms/ChronologyProtector.php
@@ -75,7 +75,7 @@
public function __construct( BagOStuff $store, array $client, $posTime 
= null ) {
$this->store = $store;
$this->clientId = md5( $client['ip'] . "\n" . $client['agent'] 
);
-   $this->key = $store->makeGlobalKey( __CLASS__, $this->clientId 
);
+   $this->key = $store->makeGlobalKey( __CLASS__, $this->clientId, 
'v1' );
$this->waitForPosTime = $posTime;
$this->logger = new NullLogger();
}
@@ -301,8 +301,9 @@
 
$min = null;
foreach ( $data['positions'] as $pos ) {
-   /** @var DBMasterPos $pos */
-   $min = $min ? min( $pos->asOfTime(), $min ) : 
$pos->asOfTime();
+   if ( $pos instanceof DBMasterPos ) {
+   $min = $min ? min( $pos->asOfTime(), $min ) : 
$pos->asOfTime();
+   }
}
 
return $min;
@@ -321,8 +322,10 @@
$curPositions = $curValue['positions'];
// Use the newest positions for each DB master
foreach ( $shutdownPositions as $db => $pos ) {
-   if ( !isset( $curPositions[$db] )
-   || $pos->asOfTime() > 
$curPositions[$db]->asOfTime()
+   if (
+   !isset( $curPositions[$db] ) ||
+   !( $curPositions[$db] instanceof 
DBMasterPos ) ||
+   $pos->asOfTime() > 
$curPositions[$db]->asOfTime()
) {
$curPositions[$db] = $pos;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e25cd1390e72d8ee0c31e6bb24e9184cbbcf49f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.12
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove apple touch icon

[jenkins-bot (Code Review)]

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

Change subject: Remove apple touch icon
..


Remove apple touch icon

Bug: T157393
Change-Id: Id397f147834309db1bca634a2a6e61cf8f07940e
---
M includes/skins/SkinMinerva.php
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 0b9be10..1501736 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -46,13 +46,8 @@
 * @return QuickTemplate
 */
protected function prepareQuickTemplate() {
-   $appleTouchIcon = $this->getConfig()->get( 'AppleTouchIcon' );
-
$out = $this->getOutput();
// add head items
-   if ( $appleTouchIcon !== false ) {
-   $out->addLink( [ 'rel' => 'apple-touch-icon', 'href' => 
$appleTouchIcon ] );
-   }
$out->addMeta( 'viewport', 'initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, ' .
'maximum-scale=5.0, width=device-width'
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id397f147834309db1bca634a2a6e61cf8f07940e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "zuul: point queue alarm to proper Graph panel"

[Hashar (Code Review)]

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

Change subject: Revert "zuul: point queue alarm to proper Graph panel"
..

Revert "zuul: point queue alarm to proper Graph panel"

Icinga escapes ampersands in URL which render it useless.

This reverts commit ca9dca5dbdbeb3b74c37cc6f5670caf92ba9da78.

Change-Id: I64eba15ec402a0915982f28f702fef9da59a494f
---
M modules/zuul/manifests/monitoring/server.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/338014/1

diff --git a/modules/zuul/manifests/monitoring/server.pp 
b/modules/zuul/manifests/monitoring/server.pp
index fdf4e38..1ecbf7f 100644
--- a/modules/zuul/manifests/monitoring/server.pp
+++ b/modules/zuul/manifests/monitoring/server.pp
@@ -29,13 +29,11 @@
 nrpe_command  => '/usr/lib/nagios/plugins/check_tcp -H 127.0.0.1 -p 
4730 --timeout=2',
 }
 
-# HoltWinters window in minutes
-$check_window = 30
 monitoring::graphite_anomaly { 'zuul_gearman_wait_queue':
 ensure=> $ensure,
-description   => "Work requests waiting in Zuul Gearman server 
https://grafana.wikimedia.org/dashboard/db/zuul-gearman?panelId=20_window=${check_window}=now-${check_window}m=now;,
+description   => 'Work requests waiting in Zuul Gearman server 
https://grafana.wikimedia.org/dashboard/db/zuul-gearman',
 metric=> 'zuul.geard.queue.waiting',
-check_window  => $check_window,
+check_window  => 30,  # HoltWinters window in minutes
 # Alarms when metric is above the HoltWinters upper confidence band
 warning   => 5,
 critical  => 10,

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Amount related fixes for Benevity import.

[Eileen (Code Review)]

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

Change subject: Amount related fixes for Benevity import.
..

Amount related fixes for Benevity import.

In testing Leanne had some differences in her data set that were not being 
tested or handled :

1) I had only tested with '0' not '0.00'
2) I had not tested with the gift & matching gifts being different & checked 
the net amount

Bug: T115044
Change-Id: I523e19aff29ff26ab88f973fac1658b5d082c410
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
M sites/all/modules/offline2civicrm/tests/data/benevity.csv
3 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/15/338015/1

diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index cd37ea2..07095bb 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -116,8 +116,9 @@
   $contribution = wmf_civicrm_contribution_message_import($msg);
 }
 
-$matchedMsg = $msg;
-if (!empty($msg['matching_amount'])) {
+if (!empty($msg['matching_amount']) && $msg['matching_amount'] > 0) {
+  $matchedMsg = $msg;
+  unset($matchedMsg['net'], $matchedMsg['fee']);
   $matchedMsg['contact_id'] = $msg['employer_id'];
   $matchedMsg['soft_credit_to_id'] = ($msg['contact_id'] == 
$this->getAnonymousContactID() ? NULL : $msg['contact_id']);
   $matchedMsg['gross'] = $msg['matching_amount'];
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index f104586..556b264 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -274,7 +274,8 @@
 $this->assertEquals('All rows were imported', $messages['Result']);
 
 $contribution = $this->callAPISuccessGetSingle('Contribution', 
array('trxn_id' => 'BENEVITY trxn-WOOF'));
-$this->assertEquals(25, $contribution['total_amount']);
+$this->assertEquals(22, $contribution['total_amount']);
+$this->assertEquals(22, $contribution['net_amount']);
 
 $dogContact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
 $dogContributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => $dogContact['id']));
@@ -285,6 +286,7 @@
 // The first row has a matching contribution.
 $this->assertEquals(1, $orgContributions['count']);
 $this->assertEquals(25, 
$orgContributions['values'][$orgContributions['id']]['total_amount']);
+$this->assertEquals(25, 
$orgContributions['values'][$orgContributions['id']]['net_amount']);
 $this->assertEquals('Goofy Inc', 
$orgContributions['values'][$orgContributions['id']]['display_name']);
 $this->assertEquals($dogContact['id'], 
$orgContributions['values'][$orgContributions['id']]['soft_credit_to']);
 
diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv 
b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
index 1c8fda5..ec9c667 100644
--- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv
+++ b/sites/all/modules/offline2civicrm/tests/data/benevity.csv
@@ -1,5 +1,5 @@
 Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last 
Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction 
ID,Donation Frequency,Donation Amount,Matched Amount,Total
-Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0,200
+Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker 
Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200
 Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey 
Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200
-Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,25,25,50
+Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared 
by donor,Not shared by donor,Not shared by 
donor,90210,,trxn-WOOF,One-time,22.00,25.00,47
 Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not 
shared by donor,Not shared by donor,Not shared by donor,Not shared by 
donor,90210,Very stingy,trxn-AARF,Recurring,0,0.5,0.5

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

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

___

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update mwdeploy group sudo rights for jessie

[Dzahn (Code Review)]

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

Change subject: Update mwdeploy group sudo rights for jessie
..


Update mwdeploy group sudo rights for jessie

Bug: T146656
Change-Id: I8a8831615d089a028f49f104e16b50f7890e0da1
---
M modules/mediawiki/manifests/users.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/mediawiki/manifests/users.pp 
b/modules/mediawiki/manifests/users.pp
index 2d6dcdf..d09716e 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -32,9 +32,9 @@
 sudo::user { 'mwdeploy':
 privileges => [
 "ALL = (${web},mwdeploy,l10nupdate) NOPASSWD: ALL",
-'ALL = (root) NOPASSWD: /sbin/restart hhvm',
+'ALL = (root) NOPASSWD: /usr/sbin/service hhvm restart',
 'ALL = (root) NOPASSWD: /usr/sbin/service apache2 start',
-'ALL = (root) NOPASSWD: /sbin/start hhvm',
+'ALL = (root) NOPASSWD: /usr/sbin/service hhvm start',
 'ALL = (root) NOPASSWD: /usr/sbin/apache2ctl graceful-stop',
 ],
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a8831615d089a028f49f104e16b50f7890e0da1
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Paladox 
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] mediawiki...JsonConfig[wmf/1.29.0-wmf.12]: Remove the '+' in 'CC0-1.0+'

[MaxSem (Code Review)]

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

Change subject: Remove the '+' in 'CC0-1.0+'
..

Remove the '+' in 'CC0-1.0+'

It implies future versions of the CC0 license, which doesn't make sense.

Bug: T154075
Change-Id: I2b8edfcc4b02e90da71793aaf0eb9013e661d091
(cherry picked from commit a05c5aab4d4c916fd49bb5d27e41c688d411e1e2)
---
M extension.json
M i18n/ast.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/fr.json
M i18n/he.json
M i18n/it.json
M i18n/ko.json
M i18n/lb.json
M i18n/mk.json
M i18n/nb.json
M i18n/pl.json
M i18n/pt.json
M i18n/qqq.json
M i18n/roa-tara.json
M i18n/uk.json
M i18n/vi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M includes/JCMapDataContentView.php
M includes/JCTabularContentView.php
M tests/phpunit/tabular-bad/bad-fields.json
M tests/phpunit/tabular-bad/bad-fields2.json
M tests/phpunit/tabular-bad/bad-header-symbol.json
M tests/phpunit/tabular-bad/bad-schema.json
M tests/phpunit/tabular-bad/bad-summary.json
M tests/phpunit/tabular-bad/bad-summary2.json
M tests/phpunit/tabular-bad/dup-field-name.json
M tests/phpunit/tabular-bad/extra-field.json
M tests/phpunit/tabular-bad/extra-schema.json
M tests/phpunit/tabular-bad/extra-top.json
M tests/phpunit/tabular-bad/no-field-name.json
M tests/phpunit/tabular-bad/no-field-type.json
M tests/phpunit/tabular-bad/no-fields.json
M tests/phpunit/tabular-bad/no-rows.json
M tests/phpunit/tabular-bad/no-schema.json
M tests/phpunit/tabular-bad/row-count-mismatch.json
M tests/phpunit/tabular-bad/row-vals-count.json
M tests/phpunit/tabular-bad/type-mismatch.json
M tests/phpunit/tabular-bad/unknown-type.json
M tests/phpunit/tabular-good/01.json
M tests/phpunit/tabular-good/02.json
M tests/phpunit/tabular-good/03.json
M tests/phpunit/tabular-good/04.json
M tests/phpunit/tabular-good/05.json
M tests/phpunit/tabular-good/06.json
M tests/phpunit/tabular-good/07.json
M tests/phpunit/tabular-good/08.json
49 files changed, 88 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig 
refs/changes/13/338013/1

diff --git a/extension.json b/extension.json
index b7cc0c0..3d39a68 100644
--- a/extension.json
+++ b/extension.json
@@ -161,7 +161,7 @@
"value": false
},
"JsonConfigAllowedLicenses": {
-   "value": [ "CC0-1.0+" ]
+   "value": [ "CC0-1.0" ]
},
"JsonConfigInterwikiPrefix": {
"value": "commons"
diff --git a/i18n/ast.json b/i18n/ast.json
index 7fc04e4..3b33ca7 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "númberu",
"jsonconfig-type-name-boolean": "lóxicu",
"jsonconfig-license": "Datos disponibles so la $1.",
-   "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero v1.0 
Universal o versión posterior",
-   "jsonconfig-license-copyrightwarning-CC0-1.0+": "Al guardar los 
cambeos, aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use 
Condiciones d'Usu], y aceutes de forma irrefugable lliberar la to contribución 
al dominiu públicu baxo llicencia 
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
-   "jsonconfig-license-notice-CC0-1.0+": "'''Nota:''' al editar esta 
páxina, aceutes lliberar la to contribución baxo llicencia 
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
+   "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero v1.0 
Universal o versión posterior",
+   "jsonconfig-license-copyrightwarning-CC0-1.0": "Al guardar los cambeos, 
aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use Condiciones 
d'Usu], y aceutes de forma irrefugable lliberar la to contribución al dominiu 
públicu baxo llicencia [https://creativecommons.org/publicdomain/zero/1.0/ 
CC0].",
+   "jsonconfig-license-notice-CC0-1.0": "'''Nota:''' al editar esta 
páxina, aceutes lliberar la to contribución baxo llicencia 
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
"right-jsonconfig-flush": "Tresformar JsonConfig pela API",
"action-jsonconfig-flush": "remanar JsonConfig pela API",
"apihelp-jsonconfig-description": "Permite l'accesu direutu al 
subsistema JsonConfig.",
diff --git a/i18n/de.json b/i18n/de.json
index c4f5525..abe6bf3 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "Zahl",
"jsonconfig-type-name-boolean": "boolesch",
"jsonconfig-license": "Die Daten sind verfügbar unter der Lizenz $1.",
-   "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero",
-   "jsonconfig-license-copyrightwarning-CC0-1.0+": "Mit dem Speichern von 
Änderungen stimmst du den [https://wikimediafoundation.org/wiki/Terms_of_Use/de 
Nutzungsbedingungen] und der unwiderruflichen Veröffentlichung deiner Beiträge 
unter der 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "tools: Make DNS point to labsdb1004 and not 1005"

[Yuvipanda (Code Review)]

Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "tools: Make DNS point to labsdb1004 and not 1005"
..

Revert "tools: Make DNS point to labsdb1004 and not 1005"

Back at 1005

Bug: T123731

This reverts commit 5ab136b412aa83eaee1afd59ae5f8a90f71f8074.

Change-Id: Icce9c1d10fa1ee4b4632a848f33df4eb2e6fa87f
---
M hieradata/common/dnsrecursor/labsaliaser.yaml
M modules/role/templates/labs/dns/db_aliases.erb
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/hieradata/common/dnsrecursor/labsaliaser.yaml 
b/hieradata/common/dnsrecursor/labsaliaser.yaml
index b8fc66b..6fc06be 100644
--- a/hieradata/common/dnsrecursor/labsaliaser.yaml
+++ b/hieradata/common/dnsrecursor/labsaliaser.yaml
@@ -2,6 +2,6 @@
 # Used for things that would ideally be in a .svc. DNS zone but
 # we do not have one. REMEMBER THE TRAILING DOT.
 dnsrecursor::labsaliaser::extra_records:
-  tools-db.tools.eqiad.wmflabs.: 10.64.37.8 # labsdb1004.eqiad.wmnet / tools-db
+  tools-db.tools.eqiad.wmflabs.: 10.64.37.9 # labsdb1005.eqiad.wmnet / tools-db
   tools-redis.tools.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
-  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
+  tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
\ No newline at end of file
diff --git a/modules/role/templates/labs/dns/db_aliases.erb 
b/modules/role/templates/labs/dns/db_aliases.erb
index 69f2504..0dedba7 100644
--- a/modules/role/templates/labs/dns/db_aliases.erb
+++ b/modules/role/templates/labs/dns/db_aliases.erb
@@ -7,4 +7,4 @@
 <% @c3_dbs.each do |host| -%>
 <%= host %>3600IN  A   10.64.37.5
 <% end -%>
-tools  3600IN  A   10.64.37.8
+tools  3600IN  A   10.64.37.9

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

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

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