[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: stylelint: Disable declaration-no-important for special case

[jenkins-bot (Code Review)]

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

Change subject: stylelint: Disable declaration-no-important for special case
..


stylelint: Disable declaration-no-important for special case

See comments in the code for details.

Change-Id: I5addeabc764e1b6ec0976718841b37a164a2bea4
---
M modules/widgets/common/ext.cx.column.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/widgets/common/ext.cx.column.less 
b/modules/widgets/common/ext.cx.column.less
index 8ff7a67..634caf7 100644
--- a/modules/widgets/common/ext.cx.column.less
+++ b/modules/widgets/common/ext.cx.column.less
@@ -37,7 +37,7 @@
// We cannot allow floating sections since it will interfere 
with
// section alignment. Even if the elements has inline style for
// floating, override it.
-   float: none !important;
+   float: none !important; /* stylelint-disable-line 
declaration-no-important */
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5addeabc764e1b6ec0976718841b37a164a2bea4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Pginer 
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]: graphite: split checks for carbon-relay frontend/local drops

[Filippo Giunchedi (Code Review)]

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

Change subject: graphite: split checks for carbon-relay frontend/local drops
..

graphite: split checks for carbon-relay frontend/local drops

Use "drops" metric and apply perSecond() instead of queued metrics, also split
into two checks for frontend/local relays.

Change-Id: I24310c499d8b5ba68d3a90202cf35cfe81803cc9
---
M modules/graphite/manifests/monitoring/graphite.pp
1 file changed, 15 insertions(+), 7 deletions(-)


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

diff --git a/modules/graphite/manifests/monitoring/graphite.pp 
b/modules/graphite/manifests/monitoring/graphite.pp
index 1bff44f..8ec2e4c 100644
--- a/modules/graphite/manifests/monitoring/graphite.pp
+++ b/modules/graphite/manifests/monitoring/graphite.pp
@@ -7,13 +7,21 @@
 # if there is any dropping of datapoints in their queues or errors otherwise.
 
 class graphite::monitoring::graphite {
-# is carbon-relay queue full? (i.e. dropping data)
-monitoring::graphite_threshold { 'carbon-relay_queue_full':
-description => 'carbon-relay queue full',
-metric  => 
'sumSeries(transformNull(carbon.relays.graphite1001-*.destinations.*.fullQueueDrops))',
-from=> '10minutes',
-warning => 200,
-critical=> 1000,
+monitoring::graphite_threshold { 'carbon-frontend-relay_drops':
+description => 'carbon-frontend-relay metric drops',
+metric  => 
'sumSeries(transformNull(perSecond(carbon.relays.graphite*_frontend.destinations.*.dropped)))',
+from=> '5minutes',
+warning => 25,
+critical=> 100,
+nagios_critical => false,
+}
+
+monitoring::graphite_threshold { 'carbon-local-relay_drops':
+description => 'carbon-local-relay metric drops',
+metric  => 
'sumSeries(transformNull(perSecond(carbon.relays.graphite*_local.destinations.*.dropped)))',
+from=> '5minutes',
+warning => 25,
+critical=> 100,
 nagios_critical => false,
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add "redirecció" as translation for the "redirect" keyword

[jenkins-bot (Code Review)]

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

Change subject: Add "redirecció" as translation for the "redirect" keyword
..


Add "redirecció" as translation for the "redirect" keyword

So that editors etc. prefer it over the Occitan translation.

While at it, remove old non-working bookstore URL.

Change-Id: Iee2c6844b9e324ee7811f337c02ab06b348b651b
---
M languages/messages/MessagesCa.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/languages/messages/MessagesCa.php 
b/languages/messages/MessagesCa.php
index cb26337..b38287e 100644
--- a/languages/messages/MessagesCa.php
+++ b/languages/messages/MessagesCa.php
@@ -128,6 +128,7 @@
 ];
 
 $magicWords = [
+   'redirect'  => [ '0', '#REDIRECCIÓ', '#REDIRECCIO', 
'#REDIRECT' ],
'numberofarticles'  => [ '1', 'NOMBRED\'ARTICLES', 
'NUMBEROFARTICLES' ],
'numberoffiles' => [ '1', 'NOMBRED\'ARXIUS', 
'NUMBEROFFILES' ],
'numberofusers' => [ '1', 'NOMBRED\'USUARIS', 
'NUMBEROFUSERS' ],
@@ -169,8 +170,7 @@
 $defaultDateFormat = 'dmy';
 
 $bookstoreList = [
-   'Catàleg Col·lectiu de les Universitats de Catalunya' => 
'http://ccuc.cbuc.es/cgi-bin/vtls.web.gateway?searchtype=control+numcard&searcharg=$1',
-   'Totselsllibres.com' => 
'http://www.totselsllibres.com/tel/publi/busquedaAvanzadaLibros.do?ISBN=$1',
+   'Catàleg Col·lectiu de les Universitats de Catalunya' => 
'http://ccuc.cbuc.cat/search*cat/X?SEARCH=$1',
'inherit' => true,
 ];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee2c6844b9e324ee7811f337c02ab06b348b651b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Toniher 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Update QUnit tests for modern standards

[Nikerabbit (Code Review)]

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

Change subject: Update QUnit tests for modern standards
..

Update QUnit tests for modern standards

* expect is no longer needed
* asyncTest/start/stop are no longer needed
** Given these tests only have one assertion each, async/done is also
** not necessary here.

Change-Id: I40064eedc7084484d2f6b6286ba056df7d42b507
---
M tests/qunit/ext.translate.parsers.test.js
M tests/qunit/ext.translate.special.pagemigration.test.js
2 files changed, 5 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/21/339121/1

diff --git a/tests/qunit/ext.translate.parsers.test.js 
b/tests/qunit/ext.translate.parsers.test.js
index 4c1231a..5867647 100644
--- a/tests/qunit/ext.translate.parsers.test.js
+++ b/tests/qunit/ext.translate.parsers.test.js
@@ -9,7 +9,7 @@
 
QUnit.module( 'ext.translate.parsers', QUnit.newMwEnvironment() );
 
-   QUnit.test( '-- External links', 3, function ( assert ) {
+   QUnit.test( '-- External links', function ( assert ) {
mw.config.set( 'wgArticlePath', '/wiki/$1' );
 
assert.strictEqual(
diff --git a/tests/qunit/ext.translate.special.pagemigration.test.js 
b/tests/qunit/ext.translate.special.pagemigration.test.js
index b3146cf..1b248a6 100644
--- a/tests/qunit/ext.translate.special.pagemigration.test.js
+++ b/tests/qunit/ext.translate.special.pagemigration.test.js
@@ -13,16 +13,13 @@
}
} ) );
 
-   QUnit.asyncTest( '-- Source units', function ( assert ) {
+   QUnit.test( '-- Source units', function ( assert ) {
var data = '{ "query": { "messagecollection": [ { "key": 
"key_",' +
' "definition": "definition_", "title": "title_" }, { 
"key": "key_1",' +
' "definition": "definition_1", "title": "title_1" } ] 
} }';
 
-   QUnit.expect( 1 );
-
mw.translate.getSourceUnits( 'Help:Special pages' ).done( 
function ( sourceUnits ) {
assert.strictEqual( 1, sourceUnits.length, 'Source 
units retrieved' );
-   QUnit.start();
} );
 
this.server.respond( function ( request ) {
@@ -30,14 +27,11 @@
} );
} );
 
-   QUnit.asyncTest( '-- Page does not exist', function ( assert ) {
+   QUnit.test( '-- Page does not exist', function ( assert ) {
var data = '{ "query": { "pages": { "-1": { "missing": "" } } } 
}';
-
-   QUnit.expect( 1 );
 
mw.translate.getFuzzyTimestamp( 'ugagagagagaga/uga' ).fail( 
function ( timestamp ) {
assert.strictEqual( undefined, timestamp, 'Page does 
not exist' );
-   QUnit.start();
} );
 
this.server.respond( function ( request ) {
@@ -45,15 +39,12 @@
} );
} );
 
-   QUnit.asyncTest( '-- Fuzzy timestamp', function ( assert ) {
+   QUnit.test( '-- Fuzzy timestamp', function ( assert ) {
var data = '{ "query": { "pages": { "19563": {"revisions": ' +
'[ {"timestamp": "2014-02-18T20:59:58Z" }, { 
"timestamp": "t2" } ] } } } }';
 
-   QUnit.expect( 1 );
-
mw.translate.getFuzzyTimestamp( 'Help:Special pages/fr' ).done( 
function ( timestamp ) {
assert.strictEqual( '2014-02-18T20:59:57.000Z', 
timestamp, 'Fuzzy timestamp retrieved' );
-   QUnit.start();
} );
 
this.server.respond( function ( request ) {
@@ -61,15 +52,13 @@
} );
} );
 
-   QUnit.asyncTest( '-- Split translation page', function ( assert ) {
+   QUnit.test( '-- Split translation page', function ( assert ) {
var data = '{ "query": { "pages": { "19563": { "revisions": ' +
'[ { "*": "unit1\\n\\nunit2\\n\\nunit3" } ] } } } }';
 
-   QUnit.expect( 1 );
mw.translate.splitTranslationPage( '2014-02-18T20:59:57.000Z', 
'Help:Special pages/fr' )
.done( function ( translationUnits ) {
assert.strictEqual( 3, translationUnits.length, 
'Translation page split into units' );
-   QUnit.start();
} );
 
this.server.respond( function ( request ) {
@@ -80,8 +69,6 @@
QUnit.test( '-- Align h2 headers', function ( assert ) {
var sourceUnits, translationUnits1, result1,
translationUnits2, result2;
-
-   QUnit.expect( 2 );
 
sourceUnits = [ { identifier: '1', definition: 'abc' }, { 
identifier: '2', definition: '==123==' },
{ identifier: '3', defini

[MediaWiki-commits] [Gerrit] oojs/ui[master]: BookletLayout: When continuous, properly make the inner Page...

[jenkins-bot (Code Review)]

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

Change subject: BookletLayout: When continuous, properly make the inner 
PageLayouts non-scrollable
..


BookletLayout: When continuous, properly make the inner PageLayouts 
non-scrollable

Background: (https://drafts.csswg.org/css-overflow-3/#overflow-properties)
* Setting 'overflow-x' or 'overflow-y' to a value other than the
  default 'visible' effectively makes the other one default to 'auto'.
  It follows that:
  * 'overflow-y: auto', if 'overflow-x' is not set, is equivalent
to 'overflow-y: auto; overflow-x: auto' (or just: 'overflow: auto').
  * 'overflow-y: hidden', if 'overflow-x' is not set, is equivalent
to 'overflow-y: hidden; overflow-x: auto'.

Changes:
* We were setting 'overflow-y: auto' in several places, apparently
  expecting 'overflow-x' to default to 'visible' or 'hidden' (hard to
  guess which), but this is just not the case. 'overflow-x' was always
  'auto'. Set it explicitly, without changing current behavior.
* We were setting 'overflow-y: hidden' in BookletLayout, apparently
  expecting 'overflow-x' to default to 'hidden', but this is not the
  case either. In this case however, it's important for the element
  not to be scrollable (we'd have nested scrollbars), so change
  overflow in both directions to 'hidden'. This resolves T157936.

Bug: T157936
Change-Id: I4f82d1cb71c560b0c2212b37c5c9e8e15f74e7be
---
M src/styles/layouts/BookletLayout.less
M src/styles/layouts/PanelLayout.less
2 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/src/styles/layouts/BookletLayout.less 
b/src/styles/layouts/BookletLayout.less
index 4fe9ea6..20c6fad 100644
--- a/src/styles/layouts/BookletLayout.less
+++ b/src/styles/layouts/BookletLayout.less
@@ -3,7 +3,8 @@
 .oo-ui-bookletLayout {
&-stackLayout {
&.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable {
-   overflow-y: hidden;
+   // Override from PanelLayout; only the StackLayout must 
be scrollable
+   overflow: hidden;
}
 
> .oo-ui-panelLayout {
@@ -19,7 +20,7 @@
left: 0;
right: 0;
bottom: 3em;
-   overflow-y: auto;
+   overflow: auto;
}
 
> .oo-ui-outlineControlsWidget {
diff --git a/src/styles/layouts/PanelLayout.less 
b/src/styles/layouts/PanelLayout.less
index a843f91..1a6d4e8 100644
--- a/src/styles/layouts/PanelLayout.less
+++ b/src/styles/layouts/PanelLayout.less
@@ -4,7 +4,7 @@
position: relative;
 
&-scrollable {
-   overflow-y: auto;
+   overflow: auto;
.oo-ui-force-gpu-composite-layer();
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f82d1cb71c560b0c2212b37c5c9e8e15f74e7be
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Etonkovidova 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update QUnit test for modern standards

[Nikerabbit (Code Review)]

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

Change subject: Update QUnit test for modern standards
..

Update QUnit test for modern standards

* expect is no longer needed
* start/stop is deprecated, replaced with async/done

Change-Id: I8275af21df73f1c35a51f9a0dcf5a1811cf73ad8
---
M tests/qunit/ext.uls.tests.js
1 file changed, 3 insertions(+), 16 deletions(-)


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

diff --git a/tests/qunit/ext.uls.tests.js b/tests/qunit/ext.uls.tests.js
index 4725966..731a9e6 100644
--- a/tests/qunit/ext.uls.tests.js
+++ b/tests/qunit/ext.uls.tests.js
@@ -23,14 +23,10 @@
QUnit.module( 'ext.uls', QUnit.newMwEnvironment() );
 
QUnit.test( 'Initial check', function ( assert ) {
-   QUnit.expect( 1 );
-
assert.ok( $.fn.uls, '$.fn.uls is defined' );
} );
 
QUnit.test( 'Custom langdb', function ( assert ) {
-   QUnit.expect( 1 );
-
// This is a custom non-standard language code used in MW.
// If it's not defined, then, for example,
// its direction cannot be acquired using the langdb utils.
@@ -38,9 +34,7 @@
} );
 
QUnit.test( 'User preferences', function ( assert ) {
-   var prefName, prefs, prefsToSave, readPrefs;
-
-   QUnit.expect( 2 );
+   var prefName, prefs, prefsToSave, readPrefs, done;
 
// 'gofanim' means "fonts" in Hebrew.
// Here it's used as a meaningless word, to test
@@ -64,24 +58,17 @@
'Correct value for the font name'
);
 
-   QUnit.stop();
+   done = assert.async();
prefs.save( function ( successSave ) {
-   QUnit.start();
assert.ok( successSave, 'Options saving API did not 
produce an error.' );
-
// Delete old options
prefs.set( prefName, undefined );
-   QUnit.stop();
-   prefs.save( function () {
-   QUnit.start();
-   } );
+   prefs.save( done );
} );
} );
 
QUnit.test( 'Common languages', function ( assert ) {
var i, foundTagalog, languagesInPH;
-
-   QUnit.expect( 1 );
 
// Bug 49847
foundTagalog = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8275af21df73f1c35a51f9a0dcf5a1811cf73ad8
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] operations/mediawiki-config[master]: db-codfw.php: Depool db2062

[jenkins-bot (Code Review)]

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

Change subject: db-codfw.php: Depool db2062
..


db-codfw.php: Depool db2062

db2062 needs an ALTER table

Bug: T132416
Change-Id: I9ee6fcf091839ed8ec4bfc80e5f420c4f59acb38
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 2 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 da44f55..0e0fa86 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -98,7 +98,7 @@
'db2042' => 50,  # C6 2.9TB 160GB, rc, log
'db2048' => 400, # C6 2.9TB 160GB,
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
-   'db2062' => 100, # B5 3.3TB 160GB, api
+#  'db2062' => 100, # B5 3.3TB 160GB, api #T132416
'db2069' => 100, # D6 3.3TB 160GB, api
'db2070' => 400, # C5 3.3TB 160GB
],
@@ -244,7 +244,7 @@
'db2055' => 1,
],
'api' => [
-   'db2062' => 1,
+#  'db2062' => 1,
'db2069' => 1,
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ee6fcf091839ed8ec4bfc80e5f420c4f59acb38
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] operations/mediawiki-config[master]: db-codfw.php: Depool db2062

[Marostegui (Code Review)]

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

Change subject: db-codfw.php: Depool db2062
..

db-codfw.php: Depool db2062

db2062 needs an ALTER table

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index da44f55..0e0fa86 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -98,7 +98,7 @@
'db2042' => 50,  # C6 2.9TB 160GB, rc, log
'db2048' => 400, # C6 2.9TB 160GB,
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
-   'db2062' => 100, # B5 3.3TB 160GB, api
+#  'db2062' => 100, # B5 3.3TB 160GB, api #T132416
'db2069' => 100, # D6 3.3TB 160GB, api
'db2070' => 400, # C5 3.3TB 160GB
],
@@ -244,7 +244,7 @@
'db2055' => 1,
],
'api' => [
-   'db2062' => 1,
+#  'db2062' => 1,
'db2069' => 1,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2055 restore db2048 weight

[jenkins-bot (Code Review)]

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

Change subject: db-codfw.php: Repool db2055 restore db2048 weight
..


db-codfw.php: Repool db2055 restore db2048 weight

db2055 and db2048 had their alter table finished

Bug: T132416
Change-Id: Iae2d0ae017dd894d82a9dafda30de7cf19cf93b0
---
M wmf-config/db-codfw.php
1 file changed, 4 insertions(+), 4 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 1bfc4b3..da44f55 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -96,8 +96,8 @@
'db2016' => 0,   # B6 2.9TB  96GB, master
'db2034' => 50,  # A5 2.9TB 160GB, rc, log
'db2042' => 50,  # C6 2.9TB 160GB, rc, log
-   'db2048' => 50, # C6 2.9TB 160GB, dump,vslow #temporary vslow 
T132416
-#  'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#T132416
+   'db2048' => 400, # C6 2.9TB 160GB,
+   'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
'db2062' => 100, # B5 3.3TB 160GB, api
'db2069' => 100, # D6 3.3TB 160GB, api
'db2070' => 400, # C5 3.3TB 160GB
@@ -238,10 +238,10 @@
'db2042' => 1,
],
'dump' => [
-   'db2048' => 1,
+   'db2055' => 1,
],
'vslow' => [
-   'db2048' => 1,
+   'db2055' => 1,
],
'api' => [
'db2062' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae2d0ae017dd894d82a9dafda30de7cf19cf93b0
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] operations/mediawiki-config[master]: db-codfw.php: Repool db2055 restore db2048 weight

[Marostegui (Code Review)]

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

Change subject: db-codfw.php: Repool db2055 restore db2048 weight
..

db-codfw.php: Repool db2055 restore db2048 weight

db2055 and db2048 had their alter table finished

Bug: T132416
Change-Id: Iae2d0ae017dd894d82a9dafda30de7cf19cf93b0
---
M wmf-config/db-codfw.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 1bfc4b3..da44f55 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -96,8 +96,8 @@
'db2016' => 0,   # B6 2.9TB  96GB, master
'db2034' => 50,  # A5 2.9TB 160GB, rc, log
'db2042' => 50,  # C6 2.9TB 160GB, rc, log
-   'db2048' => 50, # C6 2.9TB 160GB, dump,vslow #temporary vslow 
T132416
-#  'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow 
#T132416
+   'db2048' => 400, # C6 2.9TB 160GB,
+   'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
'db2062' => 100, # B5 3.3TB 160GB, api
'db2069' => 100, # D6 3.3TB 160GB, api
'db2070' => 400, # C5 3.3TB 160GB
@@ -238,10 +238,10 @@
'db2042' => 1,
],
'dump' => [
-   'db2048' => 1,
+   'db2055' => 1,
],
'vslow' => [
-   'db2048' => 1,
+   'db2055' => 1,
],
'api' => [
'db2062' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae2d0ae017dd894d82a9dafda30de7cf19cf93b0
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] apps...wikipedia[master]: Fix: don't require HTML formatting for notification strings

[Niedzielski (Code Review)]

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

Change subject: Fix: don't require HTML formatting for notification strings
..

Fix: don't require HTML formatting for notification strings

When English translations contain HTML tags, the translation tests
assume they're required. Add notification strings to the list of
exceptions as a workaround. The offending translations are already
merged because I must have tested the wrong patch this morning.

Change-Id: I6fde07cdb38d88d2a2aa2f91369e325162f118a3
---
M app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java 
b/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
index b6d940d..5c92a2a 100644
--- a/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
@@ -64,7 +64,10 @@
 // tag (html) parameters
 for (Res res : tagRes) {
 if (res.id == R.string.wp_stylized
-&& (lang.startsWith("iw") || lang.startsWith("he"))) {
+&& (lang.startsWith("iw") || lang.startsWith("he"))
+|| res.id == R.string.notification_talk
+|| res.id == R.string.notification_reverted
+|| res.id == R.string.notification_thanks) {
 // exceptions of the rule
 continue;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fde07cdb38d88d2a2aa2f91369e325162f118a3
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] mediawiki...Flow[wmf/1.29.0-wmf.13]: Import dump: support importing a board that exist in the farm

[Mattflaschen (Code Review)]

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

Change subject: Import dump: support importing a board that exist in the farm
..

Import dump: support importing a board that exist in the farm

When a board already exist, we generate new ids and
try to look users up with their global ids.

Bug: T154830
Change-Id: Ic493dc132dcf7dcd37115b22b0382346c815
(cherry picked from commit b5453d650cb01bef34712ce3d4e49e8a1a8beef2)
---
M includes/Dump/Exporter.php
M includes/Dump/Importer.php
M includes/Dump/flow-1.0.xsd
M includes/WorkflowLoaderFactory.php
4 files changed, 186 insertions(+), 8 deletions(-)


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

diff --git a/includes/Dump/Exporter.php b/includes/Dump/Exporter.php
index 75fe0ee..948b07f 100644
--- a/includes/Dump/Exporter.php
+++ b/includes/Dump/Exporter.php
@@ -73,6 +73,13 @@
protected $changeTypeProperty;
 
/**
+* To convert between local and global user ids
+*
+* @var \CentralIdLookup
+*/
+   protected $lookup;
+
+   /**
 * {@inheritDoc}
 */
function __construct( $db, $history = WikiExporter::CURRENT,
@@ -84,6 +91,8 @@
 
$this->changeTypeProperty = new ReflectionProperty( 
'Flow\Model\AbstractRevision', 'changeType' );
$this->changeTypeProperty->setAccessible( true );
+
+   $this->lookup = \CentralIdLookup::factory( 'CentralAuth' );
}
 
public static function schemaVersion() {
@@ -388,6 +397,22 @@
$format = $revision->getContentFormat();
$attribs['flags'] = 'utf-8,' . $format;
 
+   if ( $this->lookup ) {
+   $userIdFields = [ 'userid', 'treeoriguserid', 
'moduserid', 'edituserid' ];
+   foreach ( $userIdFields as $userIdField ) {
+   if ( isset( $attribs[ $userIdField ] ) ) {
+   $user = User::newFromId( $attribs[ 
$userIdField ] );
+   $globalUserId = 
$this->lookup->centralIdFromLocalUser(
+   $user,
+   \CentralIdLookup::AUDIENCE_RAW
+   );
+   if ( $globalUserId ) {
+   $attribs[ 'global' . 
$userIdField ] = $globalUserId;
+   }
+   }
+   }
+   }
+
$output = Xml::element(
'revision',
$attribs,
diff --git a/includes/Dump/Importer.php b/includes/Dump/Importer.php
index 9341017..0c8607c 100644
--- a/includes/Dump/Importer.php
+++ b/includes/Dump/Importer.php
@@ -4,6 +4,9 @@
 
 use Flow\Container;
 use Flow\Data\ManagerGroup;
+use Flow\DbFactory;
+use Flow\Import\HistoricalUIDGenerator;
+use Flow\Import\ImportException;
 use Flow\Model\AbstractRevision;
 use Flow\Model\Header;
 use Flow\Model\PostRevision;
@@ -42,10 +45,30 @@
protected $topicWorkflow;
 
/**
+* @var array Map of old to new IDs
+*/
+   protected $idMap = [];
+
+   /**
+* To convert between global and local user ids
+*
+* @var \CentralIdLookup
+*/
+   protected $lookup;
+
+   /**
+* Whether the current board is being imported in trans-wiki mode
+*
+* @var bool
+*/
+   protected $transWikiMode = false;
+
+   /**
 * @param WikiImporter $importer
 */
public function __construct( WikiImporter $importer ) {
$this->importer = $importer;
+   $this->lookup = \CentralIdLookup::factory( 'CentralAuth' );
}
 
/**
@@ -77,7 +100,12 @@
}
 
public function handleBoard() {
-   $id = $this->importer->nodeAttribute( 'id' );
+   $this->checkTransWikiMode(
+   $this->importer->nodeAttribute( 'id' ),
+   $this->importer->nodeAttribute( 'title' )
+   );
+
+   $id = $this->mapId( $this->importer->nodeAttribute( 'id' ) );
$this->importer->debug( 'Enter board handler for ' . $id );
 
$uuid = UUID::create( $id );
@@ -110,7 +138,7 @@
}
 
public function handleHeader() {
-   $id = $this->importer->nodeAttribute( 'id' );
+   $id = $this->mapId( $this->importer->nodeAttribute( 'id' ) );
$this->importer->debug( 'Enter description handler for ' . $id 
);
 
$metadata = array( 'workflow' => $this->boardWorkflow );
@@ -127,10 +155,10 @@
}
 
public function handleTopic() {
-

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: stylelint: Disable declaration-no-important for special case

[KartikMistry (Code Review)]

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

Change subject: stylelint: Disable declaration-no-important for special case
..

stylelint: Disable declaration-no-important for special case

See comments in the code for details.

Change-Id: I5addeabc764e1b6ec0976718841b37a164a2bea4
---
M modules/widgets/common/ext.cx.column.less
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/widgets/common/ext.cx.column.less 
b/modules/widgets/common/ext.cx.column.less
index 8ff7a67..634caf7 100644
--- a/modules/widgets/common/ext.cx.column.less
+++ b/modules/widgets/common/ext.cx.column.less
@@ -37,7 +37,7 @@
// We cannot allow floating sections since it will interfere 
with
// section alignment. Even if the elements has inline style for
// floating, override it.
-   float: none !important;
+   float: none !important; /* stylelint-disable-line 
declaration-no-important */
}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5addeabc764e1b6ec0976718841b37a164a2bea4
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] analytics/dashiki[master]: Fix style on worldmap

[Milimetric (Code Review)]

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

Change subject: Fix style on worldmap
..

Fix style on worldmap

NOTE: addition of large files in lib/data/ made the build super long.
We should exclude these files from the build by changing the gulp file.
Maybe it could dynamically just copy paste the stuff in that directory.

Change-Id: I52b5f0fdb3add8408c15b324f61252451c510984
---
M src/app/apis/wikimetrics.js
M src/components/visualizers/worldmap/bindings.js
M src/components/visualizers/worldmap/worldmap.js
M src/config-from-build.js
4 files changed, 94 insertions(+), 97 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki 
refs/changes/14/339114/1

diff --git a/src/app/apis/wikimetrics.js b/src/app/apis/wikimetrics.js
index a12644d..f6bb8d5 100644
--- a/src/app/apis/wikimetrics.js
+++ b/src/app/apis/wikimetrics.js
@@ -6,7 +6,6 @@
 define(function (require) {
 
 var siteConfig = require('config'),
-configApi = require('apis.config'),
 converterFinder = require('finders.converter'),
 uri = require('uri/URI'),
 TimeseriesData = require('models.timeseries');
diff --git a/src/components/visualizers/worldmap/bindings.js 
b/src/components/visualizers/worldmap/bindings.js
index c272fb3..9fb0280 100644
--- a/src/components/visualizers/worldmap/bindings.js
+++ b/src/components/visualizers/worldmap/bindings.js
@@ -1,30 +1,21 @@
-'use strict'
+'use strict';
 define(function (require) {
 var d3 = require('d3'),
 d3_color = require('d3-scale-chromatic'),
 ko = require('knockout'),
 topojson = require('topojson'),
 borders = require('data.world-50m'),
-isoCodes = require('data.country-codes');
+isoCodes = require('data.country-codes'),
+_ = require('lodash');
 
-ko.bindingHandlers.worldmap = {
-init: function (element) {
-initMap(element);
-},
-update: function (element, valueAccessor) {
-var values = ko.unwrap(valueAccessor());
-var data = values.data;
-var date = values.date;
-var buckets = 9;
-var palette = d3_color.schemeBlues[buckets];
-removeErrorBox(element);
-try {
-var currentData = getDataValues(data, date);
-drawMap(element, currentData, buckets, palette);
-} catch (error) {
-showError(element, error);
-}
-}
+function getZoomBehavior (features, path, projection) {
+return d3.behavior.zoom()
+.on('zoom',function() {
+features.attr('transform','translate(' +
+d3.event.translate.join(',') + ')scale(' + d3.event.scale + 
')');
+features.selectAll('path')
+.attr('d', path.projection(projection));
+});
 }
 
 function initMap (container) {
@@ -32,7 +23,7 @@
 var projection = path.projection(d3.geo.mercator());
 var svg = d3.select(container).append('svg');
 var g = svg.append('g');
-var features = g.selectAll('path').data(topojson.feature(borders, 
borders.objects.countries).features)
+var features = g.selectAll('path').data(topojson.feature(borders, 
borders.objects.countries).features);
 features.enter().append('path')
 .attr('stroke', '#aaa')
 .attr('stroke-width', '1px')
@@ -45,49 +36,14 @@
 svg.call(getZoomBehavior(features, path, projection));
 }
 
-function drawMap (container, currentData, buckets, palette) {
-var values = currentData.map(function(row) {
-// Temporarily assuming that the value we're after is the second 
column
-return row[1];
-});
-var min = d3.min(values);
-var max = d3.max(values);
-var scale = d3.scale.linear().domain([min, max]).range([0, buckets - 
1]);
-var dataByCountry = currentData.reduce(function(p,c) {
-p[c[0]] = c[1];
-return p;
-}, {})
-borders.objects.countries.geometries = 
borders.objects.countries.geometries.map(function (f) {
-f.properties = {
-color: getColor(dataByCountry, f, scale, palette)
-}
-return f;
-});
-_.defer(function () {
-var svg = d3.select(container).select('svg');
-var g = svg.select('g')
-var features = g.selectAll('path').data(topojson.feature(borders, 
borders.objects.countries).features)
-features.attr('fill', function (feature) {
-return feature.properties.color;
-});
-addLegend(container, palette, min, max);
-});
-}
-
-function getZoomBehavior (features, path, projection) {
-return d3.behavior.zoom()
-.on('zoom',function() {
-features.attr('transform'

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: make-wmf-branch: Don't make old version (-o) required

[jenkins-bot (Code Review)]

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

Change subject: make-wmf-branch: Don't make old version (-o) required
..


make-wmf-branch: Don't make old version (-o) required

This is almost always master, and if it's not, you can provide it.

Change-Id: If839ab4ec40154ce3e35b53e42fe24722a969258
---
M make-wmf-branch/MakeWmfBranch.php
M make-wmf-branch/make-wmf-branch
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index 289be09..fd7dc5a 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -9,7 +9,7 @@
 
function __construct( $newVersion, $oldVersion ) {
$this->newVersion = $newVersion;
-   $this->oldVersion = $oldVersion;
+   $this->oldVersion = $oldVersion ?: 'master';
$buildDir = sys_get_temp_dir() . '/make-wmf-branch';
 
require __DIR__ . '/default.conf';
diff --git a/make-wmf-branch/make-wmf-branch b/make-wmf-branch/make-wmf-branch
index 6057751..02230d8 100755
--- a/make-wmf-branch/make-wmf-branch
+++ b/make-wmf-branch/make-wmf-branch
@@ -6,7 +6,7 @@
 make-wmf-branch -n  -o  [-p wmf-clone-path]
 [-c extension-name]
 
-Example: make-wmf-branch -o master -n 1.27.0-wmf.9
+Example: make-wmf-branch -n 1.27.0-wmf.9
 
 Arguments:
 -h, --help  Show this message
@@ -46,7 +46,7 @@
 
 $storedArgs = array(
 array( 'n', 'new', 'newVersion', true ),
-array( 'o', 'old', 'oldVersion', true ),
+array( 'o', 'old', 'oldVersion', false ),
 array( 'p', 'path', 'clonePath', false ),
 array( 'c', 'continue-from', 'firstExtension', false ),
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If839ab4ec40154ce3e35b53e42fe24722a969258
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: 20after4 
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]: Tools: Enable PHP module mcrypt on Trusty execution nodes

[Andrew Bogott (Code Review)]

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

Change subject: Tools: Enable PHP module mcrypt on Trusty execution nodes
..


Tools: Enable PHP module mcrypt on Trusty execution nodes

On Trusty, due to a bug the package php5-mcrypt does not automatically
enable its module after installation.  This change works around that
by explicitly calling php5enmod.

Bug: T97857
Change-Id: Ic297647178b6bb37fd8bb1e4f8692cc6564b0345
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 9f077fe..ebd3bfb 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -141,6 +141,7 @@
 
 # PHP libraries
 'php5-cli',
+'php5-common',
 'php5-curl',
 'php5-gd',
 'php5-imagick',# T71078.
@@ -395,6 +396,13 @@
 source  => 'puppet:///modules/toollabs/php5.cron.d',
 require => Package['php5-cli'],
 }
+
+# Enable PHP mcrypt module (T97857).
+exec { 'tools_enable_php_mcrypt_module':
+command => '/usr/sbin/php5enmod mcrypt',
+unless  => '/usr/sbin/php5query -s apache2 -m mcrypt && 
/usr/sbin/php5query -s cli -m mcrypt',
+require => Package['php5-cli', 'php5-mcrypt'],
+}
 } elsif $::lsbdistcodename == 'jessie' {
 include ::toollabs::genpp::python_exec_jessie
 # No obvious package available for libgdal

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic297647178b6bb37fd8bb1e4f8692cc6564b0345
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tim Landscheidt 
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...PerformanceInspector[master]: view: Fix OOUI dialog name error

[jenkins-bot (Code Review)]

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

Change subject: view: Fix OOUI dialog name error
..


view: Fix OOUI dialog name error

Fixes "Windows must have a `name` static property defined" error.

A recent change in OOjs UI requires all windows to have a symbolic
name. Either set in the Dialog class via .static.name, or set
at run-time when calling addWindows().

Change-Id: I5400a029c97c17b132989c0f319115bc5f6a1f56
---
M modules/ext.PerformanceInspector.view.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/ext.PerformanceInspector.view.js 
b/modules/ext.PerformanceInspector.view.js
index 872251f..e2fdac2 100644
--- a/modules/ext.PerformanceInspector.view.js
+++ b/modules/ext.PerformanceInspector.view.js
@@ -9,6 +9,7 @@
 
OO.inheritClass( PerformanceDialog, OO.ui.ProcessDialog );
 
+   PerformanceDialog.static.name = 'PerformanceInspectorDialog';
PerformanceDialog.static.title = OO.ui.deferMsg( 
'performanceinspector-dialog-title' );
 
PerformanceDialog.static.actions = [ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5400a029c97c17b132989c0f319115bc5f6a1f56
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PerformanceInspector
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
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...Flow[master]: Import dump: support importing a board that exist in the farm

[jenkins-bot (Code Review)]

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

Change subject: Import dump: support importing a board that exist in the farm
..


Import dump: support importing a board that exist in the farm

When a board already exist, we generate new ids and
try to look users up with their global ids.

Bug: T154830
Change-Id: Ic493dc132dcf7dcd37115b22b0382346c815
---
M includes/Dump/Exporter.php
M includes/Dump/Importer.php
M includes/Dump/flow-1.0.xsd
M includes/WorkflowLoaderFactory.php
4 files changed, 186 insertions(+), 8 deletions(-)

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



diff --git a/includes/Dump/Exporter.php b/includes/Dump/Exporter.php
index 75fe0ee..948b07f 100644
--- a/includes/Dump/Exporter.php
+++ b/includes/Dump/Exporter.php
@@ -73,6 +73,13 @@
protected $changeTypeProperty;
 
/**
+* To convert between local and global user ids
+*
+* @var \CentralIdLookup
+*/
+   protected $lookup;
+
+   /**
 * {@inheritDoc}
 */
function __construct( $db, $history = WikiExporter::CURRENT,
@@ -84,6 +91,8 @@
 
$this->changeTypeProperty = new ReflectionProperty( 
'Flow\Model\AbstractRevision', 'changeType' );
$this->changeTypeProperty->setAccessible( true );
+
+   $this->lookup = \CentralIdLookup::factory( 'CentralAuth' );
}
 
public static function schemaVersion() {
@@ -388,6 +397,22 @@
$format = $revision->getContentFormat();
$attribs['flags'] = 'utf-8,' . $format;
 
+   if ( $this->lookup ) {
+   $userIdFields = [ 'userid', 'treeoriguserid', 
'moduserid', 'edituserid' ];
+   foreach ( $userIdFields as $userIdField ) {
+   if ( isset( $attribs[ $userIdField ] ) ) {
+   $user = User::newFromId( $attribs[ 
$userIdField ] );
+   $globalUserId = 
$this->lookup->centralIdFromLocalUser(
+   $user,
+   \CentralIdLookup::AUDIENCE_RAW
+   );
+   if ( $globalUserId ) {
+   $attribs[ 'global' . 
$userIdField ] = $globalUserId;
+   }
+   }
+   }
+   }
+
$output = Xml::element(
'revision',
$attribs,
diff --git a/includes/Dump/Importer.php b/includes/Dump/Importer.php
index 9341017..0c8607c 100644
--- a/includes/Dump/Importer.php
+++ b/includes/Dump/Importer.php
@@ -4,6 +4,9 @@
 
 use Flow\Container;
 use Flow\Data\ManagerGroup;
+use Flow\DbFactory;
+use Flow\Import\HistoricalUIDGenerator;
+use Flow\Import\ImportException;
 use Flow\Model\AbstractRevision;
 use Flow\Model\Header;
 use Flow\Model\PostRevision;
@@ -42,10 +45,30 @@
protected $topicWorkflow;
 
/**
+* @var array Map of old to new IDs
+*/
+   protected $idMap = [];
+
+   /**
+* To convert between global and local user ids
+*
+* @var \CentralIdLookup
+*/
+   protected $lookup;
+
+   /**
+* Whether the current board is being imported in trans-wiki mode
+*
+* @var bool
+*/
+   protected $transWikiMode = false;
+
+   /**
 * @param WikiImporter $importer
 */
public function __construct( WikiImporter $importer ) {
$this->importer = $importer;
+   $this->lookup = \CentralIdLookup::factory( 'CentralAuth' );
}
 
/**
@@ -77,7 +100,12 @@
}
 
public function handleBoard() {
-   $id = $this->importer->nodeAttribute( 'id' );
+   $this->checkTransWikiMode(
+   $this->importer->nodeAttribute( 'id' ),
+   $this->importer->nodeAttribute( 'title' )
+   );
+
+   $id = $this->mapId( $this->importer->nodeAttribute( 'id' ) );
$this->importer->debug( 'Enter board handler for ' . $id );
 
$uuid = UUID::create( $id );
@@ -110,7 +138,7 @@
}
 
public function handleHeader() {
-   $id = $this->importer->nodeAttribute( 'id' );
+   $id = $this->mapId( $this->importer->nodeAttribute( 'id' ) );
$this->importer->debug( 'Enter description handler for ' . $id 
);
 
$metadata = array( 'workflow' => $this->boardWorkflow );
@@ -127,10 +155,10 @@
}
 
public function handleTopic() {
-   $id = $this->importer->nodeAttribute( 'id' );
+   $id = $this->m

[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Fix comment

[jenkins-bot (Code Review)]

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

Change subject: Fix comment
..


Fix comment

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

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



diff --git a/includes/JCCache.php b/includes/JCCache.php
index d2e46cf..c352a65 100644
--- a/includes/JCCache.php
+++ b/includes/JCCache.php
@@ -18,7 +18,7 @@
 
/**
 * Constructor for JCCache
-* ** DO NOT USE directly - call JCSingleton::getCachedStore() instead. 
**
+* ** DO NOT USE directly - call JCSingleton::getContent() instead. **
 *
 * @param JCTitle $titleValue
 * @param JCContent $content

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba39b25a5ebe3d1f1918798e977fc1bda2195b94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: Yurik 
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]: resourceloader: Fix testMakeModuleResponseError() failure on...

[jenkins-bot (Code Review)]

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

Change subject: resourceloader: Fix testMakeModuleResponseError() failure on 
Travis
..


resourceloader: Fix testMakeModuleResponseError() failure on Travis

> 1) ResourceLoaderTest::testMakeModuleResponseError
> Failed asserting that '[e08c982d974548127cb5d7ce] Fatal exception of type 
> Exception'
> matches PCRE pattern "/Ferry not found/".
> .../ResourceLoaderTest.php:519

This happened on Travis CI, because ResourceLoader::formatException() behaves
differently based on $wgShowExceptionDetails. Which is enabled in Vagrant
and Jenkins, but disabled by default (and thus in Travis CI builds).

Bug: T75176
Change-Id: If15dd03213703b7b6ff899cad5e5569e2515b378
---
M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index cde1e5a..e0a82d0 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -18,6 +18,7 @@
// to avoid notices during testMakeModuleResponse for 
missing
// wgResourceLoaderLESSVars keys in extension hooks.
'wgHooks' => [],
+   'wgShowExceptionDetails' => true,
] );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If15dd03213703b7b6ff899cad5e5569e2515b378
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.language: Add unit tests for digit transform table

[jenkins-bot (Code Review)]

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

Change subject: mediawiki.language: Add unit tests for digit transform table
..


mediawiki.language: Add unit tests for digit transform table

Follows-up e8dd1f43fb169, e2834bacbde6.

Bug: T152800
Change-Id: I9ab824118f179b3b6d672d71b5ac8cf87c3b2fc8
---
M tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
1 file changed, 25 insertions(+), 0 deletions(-)

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



diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 2171f34..f777994 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -48,11 +48,36 @@
mw.language.setData( 'en', 'digitTransformTable', null );
mw.language.setData( 'en', 'separatorTransformTable', { ',': 
'.', '.': ',' } );
mw.config.set( 'wgUserLanguage', 'en' );
+   mw.config.set( 'wgTranslateNumerals', true );
 
assert.equal( mw.language.convertNumber( 1800 ), '1.800', 
'formatting' );
assert.equal( mw.language.convertNumber( '1.800', true ), 
'1800', 'unformatting' );
} );
 
+   QUnit.test( 'mw.language.convertNumber - digitTransformTable', function 
( assert ) {
+   mw.config.set( 'wgUserLanguage', 'hi' );
+   mw.config.set( 'wgTranslateNumerals', true );
+   mw.language.setData( 'hi', 'digitGroupingPattern', null );
+   mw.language.setData( 'hi', 'separatorTransformTable', { ',': 
'.', '.': ',' } );
+
+   // Example from Hindi (MessagesHi.php)
+   mw.language.setData( 'hi', 'digitTransformTable', {
+   0: '०',
+   1: '१',
+   2: '२'
+   } );
+
+   assert.equal( mw.language.convertNumber( 1200 ), '१.२००', 
'format' );
+   assert.equal( mw.language.convertNumber( '१.२००', true ), 
'1200', 'unformat from digit transform' );
+   assert.equal( mw.language.convertNumber( '1.200', true ), 
'1200', 'unformat plain' );
+
+   mw.config.set( 'wgTranslateNumerals', false );
+
+   assert.equal( mw.language.convertNumber( 1200 ), '1.200', 
'format (digit transform disabled)' );
+   assert.equal( mw.language.convertNumber( '१.२००', true ), 
'1200', 'unformat from digit transform (when disabled)' );
+   assert.equal( mw.language.convertNumber( '1.200', true ), 
'1200', 'unformat plain (digit transform disabled)' );
+   } );
+
function grammarTest( langCode, test ) {
// The test works only if the content language is opt.language
// because it requires [lang].js to be loaded.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ab824118f179b3b6d672d71b5ac8cf87c3b2fc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix button layout in ButtonGroup-/SelectWid...

[VolkerE (Code Review)]

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

Change subject: MediaWiki theme: Fix button layout in 
ButtonGroup-/SelectWidgets in IE 9
..

MediaWiki theme: Fix button layout in ButtonGroup-/SelectWidgets in IE 9

Applying `min-width` only on icon-only, framed ButtonWidgets.

Bug: T158728
Change-Id: I53f24a82dafa9287722dc5988877f829f4378c48
---
M src/themes/mediawiki/elements.less
1 file changed, 14 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/13/339113/1

diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 4e66de7..5ea0230 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -165,11 +165,21 @@
}
 
> .oo-ui-buttonElement-button {
-   padding: @padding-widget-default 1em;
-   min-height: @min-height-button-default;
-   min-width: @min-width-button-default;
-   border-radius: @border-radius-default;
position: relative;
+   min-height: @min-height-button-default;
+   border-radius: @border-radius-default;
+   padding: @padding-widget-default 1em;
+   }
+
+   &.oo-ui-iconElement > .oo-ui-buttonElement-button {
+   min-width: @min-width-button-default;
+   }
+
+   // Indirectly please IE 9 as it doesn't like `min-width` on all 
kinds of buttons
+   // See T158728
+   &.oo-ui-labelElement > .oo-ui-buttonElement-button,
+   &.oo-ui-indicatorElement > .oo-ui-buttonElement-button {
+   min-width: 0;
}
 
// Support `` from ButtonInputWidget

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Fix testMakeModuleResponseError() failure on...

[Krinkle (Code Review)]

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

Change subject: resourceloader: Fix testMakeModuleResponseError() failure on 
Travis
..

resourceloader: Fix testMakeModuleResponseError() failure on Travis

> 1) ResourceLoaderTest::testMakeModuleResponseError
> Failed asserting that '[e08c982d974548127cb5d7ce] Fatal exception of type 
> Exception'
> matches PCRE pattern "/Ferry not found/".
> .../ResourceLoaderTest.php:519

This happened on Travis CI, because ResourceLoader::formatException() behaves
differently based on $wgShowExceptionDetails. Which is enabled in Vagrant
and Jenkins, but disabled by default (and thus in Travis CI builds).

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


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

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index cde1e5a..e0a82d0 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -18,6 +18,7 @@
// to avoid notices during testMakeModuleResponse for 
missing
// wgResourceLoaderLESSVars keys in extension hooks.
'wgHooks' => [],
+   'wgShowExceptionDetails' => true,
] );
}
 

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

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

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

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

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
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(-)

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



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: merged
Gerrit-Change-Id: Icd5df8c83930849cb3438393f99ff88654d187a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Guard against runtime creation of undeclared properties

[jenkins-bot (Code Review)]

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

Change subject: Guard against runtime creation of undeclared properties
..


Guard against runtime creation of undeclared properties

And fix the bugs which were thus detected.

Also fix an error in TokenGeneratorHandler.

Change-Id: Ica8ebc5ea910e6093e330e90c3e58f9ae167595a
---
A src/PropGuard.php
M src/Serializer/Serializer.php
M src/Serializer/SerializerNode.php
M src/Tokenizer/Attribute.php
M src/Tokenizer/TokenGeneratorHandler.php
M src/Tokenizer/Tokenizer.php
M src/TreeBuilder/Element.php
M src/TreeBuilder/InsertionMode.php
M src/TreeBuilder/Marker.php
M src/TreeBuilder/TreeBuilder.php
M tests/phpunit/SerializerNodeDestructionTest.php
11 files changed, 81 insertions(+), 5 deletions(-)

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



diff --git a/src/PropGuard.php b/src/PropGuard.php
new file mode 100644
index 000..00c3c4d
--- /dev/null
+++ b/src/PropGuard.php
@@ -0,0 +1,21 @@
+$name = $value;
+   }
+   }
+}
diff --git a/src/Serializer/Serializer.php b/src/Serializer/Serializer.php
index 65da72e..ad7ec8d 100644
--- a/src/Serializer/Serializer.php
+++ b/src/Serializer/Serializer.php
@@ -1,6 +1,7 @@
 errorCallback = $errorCallback;
}
 
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
+
/**
 * Get the final string. This can only be called after endDocument() is 
received.
 */
diff --git a/src/Serializer/SerializerNode.php 
b/src/Serializer/SerializerNode.php
index f19b20e..2944732 100644
--- a/src/Serializer/SerializerNode.php
+++ b/src/Serializer/SerializerNode.php
@@ -1,6 +1,7 @@
 attrs = $attrs;
$this->void = $void;
}
+
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
 }
diff --git a/src/Tokenizer/Attribute.php b/src/Tokenizer/Attribute.php
index b53e3c0..293b075 100644
--- a/src/Tokenizer/Attribute.php
+++ b/src/Tokenizer/Attribute.php
@@ -1,6 +1,7 @@
 localName = $localName;
$this->value = $value;
}
+
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
 }
diff --git a/src/Tokenizer/TokenGeneratorHandler.php 
b/src/Tokenizer/TokenGeneratorHandler.php
index 4d05b73..29f94f0 100644
--- a/src/Tokenizer/TokenGeneratorHandler.php
+++ b/src/Tokenizer/TokenGeneratorHandler.php
@@ -16,7 +16,7 @@
];
}
 
-   public function endDocument() {
+   public function endDocument( $pos ) {
$this->tokens[] = [ 'type' => 'endDocument' ];
}
 
diff --git a/src/Tokenizer/Tokenizer.php b/src/Tokenizer/Tokenizer.php
index f571aba..78b2383 100644
--- a/src/Tokenizer/Tokenizer.php
+++ b/src/Tokenizer/Tokenizer.php
@@ -2,6 +2,7 @@
 
 namespace RemexHtml\Tokenizer;
 use RemexHtml\HTMLData;
+use RemexHtml\PropGuard;
 
 /**
  * HTML 5 tokenizer
@@ -67,6 +68,8 @@
protected $ignoreErrors;
protected $ignoreCharRefs;
protected $ignoreNulls;
+   protected $skipPreprocess;
+   protected $appropriateEndTag;
protected $listener;
protected $state;
protected $preprocessed;
@@ -110,6 +113,10 @@
$this->skipPreprocess = !empty( $options['skipPreprocess'] );
}
 
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
+
public function setEnableCdataCallback( $cb ) {
$this->enableCdataCallback = $cb;
}
diff --git a/src/TreeBuilder/Element.php b/src/TreeBuilder/Element.php
index c571a12..56d0ff5 100644
--- a/src/TreeBuilder/Element.php
+++ b/src/TreeBuilder/Element.php
@@ -2,6 +2,7 @@
 
 namespace RemexHtml\TreeBuilder;
 use RemexHtml\HTMLData;
+use RemexHtml\PropGuard;
 use RemexHtml\Tokenizer\Attributes;
 
 /**
@@ -54,6 +55,12 @@
 * Internal to CachingStack. A link in the scope list.
 */
public $nextScope;
+
+   /**
+* Internal to CachingStack and SimpleStack. The current stack index, or
+* null if the element is not in the stack.
+*/
+   public $stackIndex;
 
/**
 * Internal to ActiveFormattingElements.
@@ -118,6 +125,10 @@
$this->attrs = $attrs;
}
 
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
+
/**
 * Is the element a MathML text integration point?
 *
diff --git a/src/TreeBuilder/InsertionMode.php 
b/src/TreeBuilder/InsertionMode.php
index 9b4e6b8..5d4cd08 100644
--- a/src/TreeBuilder/InsertionMode.php
+++ b/src/TreeBuilder/InsertionMode.php
@@ -1,6 +1,7 @@
 dispatcher = $dispatcher;
}
 
+   public function __set( $name, $value )

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Some Serializer changes to support extending it

[jenkins-bot (Code Review)]

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

Change subject: Some Serializer changes to support extending it
..


Some Serializer changes to support extending it

RemexCompatMunger (in MediaWiki core) makes some changes to the tree
mutation event stream before passing the events on to Serializer. Add
some facilities for this.

* Add getParentNode() and getRootNode()
* Add SerializerNode::$snData for user data
* Allow Serializer methods to take a SerializerNode for $refElement

Change-Id: I913eb3a8f430b2510bd3e3a9753af5ea4018e555
---
M src/Serializer/Serializer.php
M src/Serializer/SerializerNode.php
2 files changed, 50 insertions(+), 24 deletions(-)

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



diff --git a/src/Serializer/Serializer.php b/src/Serializer/Serializer.php
index a31adeb..51e66b9 100644
--- a/src/Serializer/Serializer.php
+++ b/src/Serializer/Serializer.php
@@ -70,6 +70,20 @@
return $this->result;
}
 
+   /**
+* Get the root SerializerNode.
+*/
+   public function getRootNode() {
+   return $this->root;
+   }
+
+   /**
+* Get the parent SerializerNode of a given SerializerNode
+*/
+   public function getParentNode( SerializerNode $node ) {
+   return $this->nodes[$node->parentId];
+   }
+
public function startDocument( $fragmentNamespace, $fragmentName ) {
$this->root = new SerializerNode( 0, 0, '', '', new 
PlainAttributes, false );
$this->nodes = [ $this->root ];
@@ -96,16 +110,28 @@
$this->nextNodeId = 0;
}
 
+   private function interpretPlacement( $preposition, $refElement ) {
+   if ( $preposition === TreeBuilder::ROOT ) {
+   return [ $this->root, null ];
+   }
+   if ( $refElement instanceof Element ) {
+   $refNode = $refElement->userData;
+   } elseif ( $refElement instanceof SerializerNode ) {
+   $refNode = $refElement;
+   } else {
+   throw new SerializerError( "Invalid type of ref 
element" );
+   }
+   if ( $preposition === TreeBuilder::BEFORE ) {
+   return [ $this->nodes[$refNode->parentId], $refNode ];
+   } else {
+   return [ $refNode, $refNode ];
+   }
+   }
+
public function characters( $preposition, $refElement, $text, $start, 
$length,
$sourceStart, $sourceLength
) {
-   if ( $preposition === TreeBuilder::ROOT ) {
-   $parent = $this->root;
-   } elseif ( $preposition === TreeBuilder::BEFORE ) {
-   $parent = $this->nodes[$refElement->userData->parentId];
-   } else {
-   $parent = $refElement->userData;
-   }
+   list( $parent, $refNode ) = $this->interpretPlacement( 
$preposition, $refElement );
$encoded = (string)$this->formatter->characters( $parent, 
$text, $start, $length );
 
$children =& $parent->children;
@@ -114,7 +140,6 @@
 
if ( $preposition === TreeBuilder::BEFORE ) {
// Insert before element
-   $refNode = $refElement->userData;
if ( $lastChild !== $refNode ) {
$refIndex = array_search( $refNode, $children, 
true );
throw new SerializerError( "invalid insert 
position $refIndex/$lastChildIndex" );
@@ -131,16 +156,20 @@
}
}
 
+   /**
+* Insert an element
+*
+* @param integer $preposition
+* @param Element|SerializerNode|null $refElement
+* @param Element $element
+* @param bool $void
+* @param integer $sourceStart
+* @param integer $sourceLength
+*/
public function insertElement( $preposition, $refElement, Element 
$element, $void,
$sourceStart, $sourceLength
) {
-   if ( $preposition === TreeBuilder::ROOT ) {
-   $parent = $this->root;
-   } elseif ( $preposition === TreeBuilder::BEFORE ) {
-   $parent = $this->nodes[$refElement->userData->parentId];
-   } else {
-   $parent = $refElement->userData;
-   }
+   list( $parent, $refNode ) = $this->interpretPlacement( 
$preposition, $refElement );
$children =& $parent->children;
$lastChildIndex = count( $children ) - 1;
$lastChild = $lastChildIndex >= 0 ? $children[$lastChildIndex] 
: null;
@@ -168,7 +197,6 @@
 
if ( $

[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Fix comment

[MaxSem (Code Review)]

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

Change subject: Fix comment
..

Fix comment

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig 
refs/changes/11/339111/1

diff --git a/includes/JCCache.php b/includes/JCCache.php
index d2e46cf..c352a65 100644
--- a/includes/JCCache.php
+++ b/includes/JCCache.php
@@ -18,7 +18,7 @@
 
/**
 * Constructor for JCCache
-* ** DO NOT USE directly - call JCSingleton::getCachedStore() instead. 
**
+* ** DO NOT USE directly - call JCSingleton::getContent() instead. **
 *
 * @param JCTitle $titleValue
 * @param JCContent $content

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Test the 'minify' task in CI

[Jforrester (Code Review)]

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

Change subject: build: Test the 'minify' task in CI
..

build: Test the 'minify' task in CI

Using the same hack for VisualEditor, which avoids slowing down developers
whilst maintaining integrity of the repo.

Change-Id: I40fcdb075db0ee0664598e1b396431c66077b702
---
M Gruntfile.js
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/10/339110/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 7a930e4..46bb2b8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -514,8 +514,17 @@
// Run this before opening "tests/index.php"
grunt.registerTask( 'prep-test', [ 'lint', 'git-build', 'build-tests' ] 
);
 
-   grunt.registerTask( 'test', [ 'prep-test', 'karma:main', 'karma:other' 
] );
+   grunt.registerTask( '_test', [ 'prep-test', 'karma:main', 'karma:other' 
] );
+   grunt.registerTask( '_ci', [ '_test', 'minify' ] );
grunt.registerTask( 'demos', [ 'clean:demos', 'copy:demos', 
'exec:demos' ] );
 
+   /* eslint-disable no-process-env */
+   if ( process.env.JENKINS_HOME ) {
+   grunt.registerTask( 'test', '_ci' );
+   } else {
+   grunt.registerTask( 'test', '_test' );
+   }
+   /* eslint-enable no-process-env */
+
grunt.registerTask( 'default', 'test' );
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40fcdb075db0ee0664598e1b396431c66077b702
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] mediawiki...Wikibase[master]: Fix documentation comment for EntityDataUriManager::getDocUrl()

[jenkins-bot (Code Review)]

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

Change subject: Fix documentation comment for EntityDataUriManager::getDocUrl()
..


Fix documentation comment for EntityDataUriManager::getDocUrl()

According to Title::getFullURL() the returned value should be a string.
Found by PHPStan.

Change-Id: I05a0cd62966c1529939f8fa993fb23d9e4482856
---
M repo/includes/LinkedData/EntityDataUriManager.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/repo/includes/LinkedData/EntityDataUriManager.php 
b/repo/includes/LinkedData/EntityDataUriManager.php
index bc955d8..50e7cff 100644
--- a/repo/includes/LinkedData/EntityDataUriManager.php
+++ b/repo/includes/LinkedData/EntityDataUriManager.php
@@ -172,7 +172,7 @@
 * @param string|null $format   The (normalized) format name, or ''
 * @param int $revision
 *
-* @return Title
+* @return string
 */
public function getDocUrl( EntityId $id, $format = '', $revision = 0 ) {
$params = '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05a0cd62966c1529939f8fa993fb23d9e4482856
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 
Gerrit-Reviewer: Fomafix 
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]: Increase size of categorylinks.cl_collation column

[Kaldari (Code Review)]

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

Change subject: Increase size of categorylinks.cl_collation column
..

Increase size of categorylinks.cl_collation column

Bug: T158724
Change-Id: I031fd09681aeba872098a9154cbff1f80b4ffda9
---
M includes/installer/MysqlUpdater.php
A maintenance/archives/patch-categorylinks-collation-modify.sql
M maintenance/tables.sql
3 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/339109/1

diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index 49bfac1..0db0349 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -299,6 +299,7 @@
[ 'addField', 'externallinks', 'el_index_60', 
'patch-externallinks-el_index_60.sql' ],
[ 'dropIndex', 'user_groups', 'ug_user_group', 
'patch-user_groups-primary-key.sql' ],
[ 'addField', 'user_groups', 'ug_expiry', 
'patch-user_groups-ug_expiry.sql' ],
+   [ 'modifyField', 'categorylinks', 'cl_collation', 
'patch-categorylinks-collation-modify.sql' ],
];
}
 
diff --git a/maintenance/archives/patch-categorylinks-collation-modify.sql 
b/maintenance/archives/patch-categorylinks-collation-modify.sql
new file mode 100644
index 000..9d080f9
--- /dev/null
+++ b/maintenance/archives/patch-categorylinks-collation-modify.sql
@@ -0,0 +1,6 @@
+--
+-- patch-categorylinks-collation-modify.sql
+--
+-- Bugs T158724, T146341. This patch increases the maximum size of 
cl_collation.
+ALTER TABLE /*$wgDBprefix*/categorylinks
+   MODIFY COLUMN cl_collation varbinary(50) NOT NULL default '';
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 892f799..3720ab9 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -606,7 +606,7 @@
   -- yet updated.  '' means no collation, this is a legacy row that needs to be
   -- updated by updateCollation.php.  In the future, it might be possible to
   -- specify different collations per category.
-  cl_collation varbinary(32) NOT NULL default '',
+  cl_collation varbinary(50) NOT NULL default '',
 
   -- Stores whether cl_from is a category, file, or other page, so we can
   -- paginate the three categories separately.  This never has to be updated

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] icons: Remove 'beta' and 'ribbonPrize' icons

[VolkerE (Code Review)]

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

Change subject: [BREAKING CHANGE] icons: Remove 'beta' and 'ribbonPrize' icons
..

[BREAKING CHANGE] icons: Remove 'beta' and 'ribbonPrize' icons

Icons 'beta' and 'ribbonPrize' got deprecated in v0.18.3, it's time
to remove them.

Change-Id: I3cab41eab6a15212c6403b4298b1c8f0b8303823
---
M src/themes/apex/icons-interactions.json
M src/themes/mediawiki/icons-interactions.json
2 files changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/08/339108/1

diff --git a/src/themes/apex/icons-interactions.json 
b/src/themes/apex/icons-interactions.json
index 449cb77..9dab856 100644
--- a/src/themes/apex/icons-interactions.json
+++ b/src/themes/apex/icons-interactions.json
@@ -8,7 +8,6 @@
}
},
"images": {
-   "beta": { "file": "images/icons/beta.svg" },
"betaLaunch": { "file": 
"images/icons/logo-wikimediaDiscovery.svg" },
"bookmark": { "file": {
"ltr": "images/icons/bookmark-ltr.svg",
@@ -45,7 +44,6 @@
"ltr": "images/icons/printer-ltr.svg",
"rtl": "images/icons/printer-rtl.svg"
} },
-   "ribbonPrize": { "file": "images/icons/ribbonPrize.svg" },
"sun": { "file": {
"ltr": "images/icons/sun-ltr.svg",
"rtl": "images/icons/sun-rtl.svg"
diff --git a/src/themes/mediawiki/icons-interactions.json 
b/src/themes/mediawiki/icons-interactions.json
index e040ffb..c30c56e 100644
--- a/src/themes/mediawiki/icons-interactions.json
+++ b/src/themes/mediawiki/icons-interactions.json
@@ -22,7 +22,6 @@
}
},
"images": {
-   "beta": { "file": "images/icons/beta.svg" },
"betaLaunch": { "file": 
"images/icons/logo-wikimediaDiscovery.svg" },
"bookmark": { "file": {
"ltr": "images/icons/bookmark-ltr.svg",
@@ -59,7 +58,6 @@
"ltr": "images/icons/printer-ltr.svg",
"rtl": "images/icons/printer-rtl.svg"
} },
-   "ribbonPrize": { "file": "images/icons/ribbonPrize.svg" },
"sun": { "file": {
"ltr": "images/icons/sun-ltr.svg",
"rtl": "images/icons/sun-rtl.svg"

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Fixes for iDEAL/PSR-6 caching

[Ejegg (Code Review)]

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

Change subject: Fixes for iDEAL/PSR-6 caching
..

Fixes for iDEAL/PSR-6 caching

Autoload, constructor name and visibility, break statement

Bug: T128692
Change-Id: I8d6bf9c2fbaf73fb7e6f917fdabfead61238584d
---
M extension.json
M gateway_common/LocalClusterPsr6Cache.php
M globalcollect_gateway/globalcollect.adapter.php
3 files changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index dc2b360..b693bed 100644
--- a/extension.json
+++ b/extension.json
@@ -87,6 +87,7 @@
"GatewayType": "gateway_common/GatewayType.php",
"IsoDate": "gateway_common/IsoDate.php",
"DataValidator": "gateway_common/DataValidator.php",
+   "LocalClusterPsr6Cache": 
"gateway_common/LocalClusterPsr6Cache.php",
"LogPrefixProvider": "gateway_common/LogPrefixProvider.php",
"MessageUtils": "gateway_common/MessageUtils.php",
"NationalCurrencies": "gateway_common/NationalCurrencies.php",
diff --git a/gateway_common/LocalClusterPsr6Cache.php 
b/gateway_common/LocalClusterPsr6Cache.php
index e485987..f5b6655 100644
--- a/gateway_common/LocalClusterPsr6Cache.php
+++ b/gateway_common/LocalClusterPsr6Cache.php
@@ -14,7 +14,7 @@
  * (no constructor-parameters need to be specified)
  */
 class LocalClusterPsr6Cache extends BagOStuffPsrCache {
-   function __construct__() {
+   public function __construct() {
$mainCache = ObjectCache::getLocalClusterInstance();
parent::__construct( $mainCache );
}
diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index e362617..3527c96 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1630,6 +1630,7 @@
break;
case 'rtbt':
$this->getBankList();
+   break;
}
 
// Use staged data so we pick up tricksy -_country variants

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d6bf9c2fbaf73fb7e6f917fdabfead61238584d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix documentation comment for MessageParameterFormatter::for...

[Ricordisamoa (Code Review)]

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

Change subject: Fix documentation comment for 
MessageParameterFormatter::formatValueList()
..

Fix documentation comment for MessageParameterFormatter::formatValueList()

The returned value is a string.
Found by PHPStan.

Change-Id: I468e4cd4a2cf8c9c2b0f4c64b15d92747720e932
---
M repo/includes/Localizer/MessageParameterFormatter.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/Localizer/MessageParameterFormatter.php 
b/repo/includes/Localizer/MessageParameterFormatter.php
index 01a5c41..d1140a6 100644
--- a/repo/includes/Localizer/MessageParameterFormatter.php
+++ b/repo/includes/Localizer/MessageParameterFormatter.php
@@ -92,7 +92,7 @@
/**
 * @param array $values
 *
-* @return string[]
+* @return string
 */
private function formatValueList( array $values ) {
$formatted = array();

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix documentation comment for EntityDataUriManager::getDocUrl()

[Ricordisamoa (Code Review)]

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

Change subject: Fix documentation comment for EntityDataUriManager::getDocUrl()
..

Fix documentation comment for EntityDataUriManager::getDocUrl()

According to Title::getFullURL() the returned value should be a string.
Found by PHPStan.

Change-Id: I05a0cd62966c1529939f8fa993fb23d9e4482856
---
M repo/includes/LinkedData/EntityDataUriManager.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/LinkedData/EntityDataUriManager.php 
b/repo/includes/LinkedData/EntityDataUriManager.php
index bc955d8..50e7cff 100644
--- a/repo/includes/LinkedData/EntityDataUriManager.php
+++ b/repo/includes/LinkedData/EntityDataUriManager.php
@@ -172,7 +172,7 @@
 * @param string|null $format   The (normalized) format name, or ''
 * @param int $revision
 *
-* @return Title
+* @return string
 */
public function getDocUrl( EntityId $id, $format = '', $revision = 0 ) {
$params = '';

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Fix ApiMainTest::testExceptionErrors and use $wgShowDBE...

[jenkins-bot (Code Review)]

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

Change subject: API: Fix ApiMainTest::testExceptionErrors and use 
$wgShowDBErrorBacktrace
..


API: Fix ApiMainTest::testExceptionErrors and use $wgShowDBErrorBacktrace

Apparently Jenkins sets $wgShowExceptionDetails to true but travis
doesn't. The test should make sure it's set since it depends on it.

And apparently no one ever added $wgShowDBErrorBacktrace to the API.
Let's do that too.

Change-Id: I0793eda349426b265a47900cdeb87bb920b5c291
---
M includes/api/ApiMain.php
M tests/phpunit/includes/api/ApiMainTest.php
2 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 59227d9..9e00830 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1116,7 +1116,9 @@
)
);
} else {
-   if ( $config->get( 'ShowExceptionDetails' ) ) {
+   if ( $config->get( 'ShowExceptionDetails' ) &&
+   ( !$e instanceof DBError || $config->get( 
'ShowDBErrorBacktrace' ) )
+   ) {
$result->addContentValue(
$path,
'trace',
diff --git a/tests/phpunit/includes/api/ApiMainTest.php 
b/tests/phpunit/includes/api/ApiMainTest.php
index eff41e3..9060dfb 100644
--- a/tests/phpunit/includes/api/ApiMainTest.php
+++ b/tests/phpunit/includes/api/ApiMainTest.php
@@ -451,7 +451,10 @@
$context->setRequest( new FauxRequest( [ 'errorformat' => 
'plaintext' ] ) );
$context->setLanguage( 'en' );
$context->setConfig( new MultiConfig( [
-   new HashConfig( [ 'ShowHostnames' => true, 
'ShowSQLErrors' => false ] ),
+   new HashConfig( [
+   'ShowHostnames' => true, 'ShowSQLErrors' => 
false,
+   'ShowExceptionDetails' => true, 
'ShowDBErrorBacktrace' => true,
+   ] ),
$context->getConfig()
] ) );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0793eda349426b265a47900cdeb87bb920b5c291
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Gergő Tisza 
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...Wikibase[master]: Fix documentation comment for ChangeOpAliases property $action

[Ricordisamoa (Code Review)]

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

Change subject: Fix documentation comment for ChangeOpAliases property $action
..

Fix documentation comment for ChangeOpAliases property $action

It is a string. The type is checked in the constructor.
Found by PHPStan.

Change-Id: I9810126732f5166c9de189383aa21eb29fffd5a8
---
M repo/includes/ChangeOp/ChangeOpAliases.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/ChangeOp/ChangeOpAliases.php 
b/repo/includes/ChangeOp/ChangeOpAliases.php
index a6ca8a3..6ab889d 100644
--- a/repo/includes/ChangeOp/ChangeOpAliases.php
+++ b/repo/includes/ChangeOp/ChangeOpAliases.php
@@ -30,7 +30,7 @@
private $aliases;
 
/**
-* @var array
+* @var string
 */
private $action;
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: For the mode switch tool, show a different tooltip when disa...

[Jforrester (Code Review)]

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

Change subject: For the mode switch tool, show a different tooltip when disabled
..

For the mode switch tool, show a different tooltip when disabled

Bug: T158723
Change-Id: I8c397e9b10c51d78c0b0f18c494ca9f36400d23e
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
4 files changed, 18 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index a5132f7..5a4a5ea 100644
--- a/extension.json
+++ b/extension.json
@@ -319,7 +319,8 @@
"tooltip-ca-editsource",
"tooltip-ca-ve-edit",
"visualeditor-ca-editsource-section",
-   "visualeditor-mweditmodeve-tool"
+   "visualeditor-mweditmodeve-tool",
+   "visualeditor-mweditmodeve-tool-unavailable"
],
"position": "top"
},
@@ -1144,6 +1145,7 @@
"visualeditor-mweditmodeve-showagain",
"visualeditor-mweditmodeve-title",
"visualeditor-mweditmodeve-tool",
+   "visualeditor-mweditmodeve-tool-unavailable",
"visualeditor-mweditmodeve-warning",
"visualeditor-mweditmodewt-popup-body",
"visualeditor-mweditmodewt-popup-title",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 5dfe4c6..f1db1c4 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -285,6 +285,7 @@
"visualeditor-mweditmodeve-showagain": "Don't show this message again",
"visualeditor-mweditmodeve-title": "Switch to visual editing?",
"visualeditor-mweditmodeve-tool": "Switch to visual editing",
+   "visualeditor-mweditmodeve-tool-unavailable": "Visual editing is not 
available",
"visualeditor-mweditmodeve-warning": "You are switching to visual 
editing.\nDo you want to continue?",
"visualeditor-mweditmodewt-popup-body": "You can switch back to source 
editing at any time by clicking on this icon.",
"visualeditor-mweditmodewt-popup-title": "You have switched to visual 
editing",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 6a138e3..8cb78fb 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -298,6 +298,7 @@
"visualeditor-mweditmodeve-showagain": "Label for the checkboxes to not 
show one of the 'switched to visual mode' or 'switched to source mode' popups 
again",
"visualeditor-mweditmodeve-title": "Title of dialog to confirm 
switching to visual mode.",
"visualeditor-mweditmodeve-tool": "Label for tool that changes edit 
mode to visual editing.",
+   "visualeditor-mweditmodeve-tool-unavailable": "Label for tool that 
changes edit mode to visual editing when it is not available.",
"visualeditor-mweditmodeve-warning": "Warning message show before 
changing edit mode to visual editing. It may allow the user to keep the changes 
using the message {{msg-mw|Visualeditor-mweditmodesource-warning-switch}}, or 
instaed that they'd need to start source editing from scratch using 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch-discard}}.",
"visualeditor-mweditmodewt-popup-body": "Body text of popup shown after 
switching to visual mode from source mode",
"visualeditor-mweditmodewt-popup-title": "Title of popup shown after 
switching to visual mode from source mode",
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
index 375c7ac..7c26b11 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
@@ -131,9 +131,21 @@
  * @inheritdoc
  */
 ve.ui.MWEditModeVisualTool.prototype.onUpdateState = function () {
+   var isVisualModeAvailable = ve.init.target.isModeAvailable( 'visual' );
+
// Parent method
ve.ui.MWEditModeVisualTool.super.prototype.onUpdateState.apply( this, 
arguments );
 
-   this.setDisabled( !ve.init.target.isModeAvailable( 'visual' ) );
+   if ( this.isDisabled() ) {
+   if ( isVisualModeAvailable ) {
+   this.setTitle( OO.ui.msg( 
'visualeditor-mweditmodeve-tool' ) );
+   this.setDisabled( false );
+   }
+   } else {
+   if ( !isVisualModeAvailable ) {
+   this.setTitle( OO.ui.msg( 
'visualeditor-mweditmodeve-tool-unavailable' ) );
+  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add dm.FilterItem unit tests

[Mooeypoo (Code Review)]

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

Change subject: Add dm.FilterItem unit tests
..

Add dm.FilterItem unit tests

Change-Id: I7198f38c6ce2a85c0dc5f88d5f2a5c4b43ee4663
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
M tests/qunit/QUnitTestResources.php
A tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js
3 files changed, 193 insertions(+), 0 deletions(-)


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

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
index 39c7667..4253aaf 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
@@ -58,6 +58,20 @@
/* Methods */
 
/**
+* Return the representation of the state of this item.
+*
+* @return {Object} State of the object
+*/
+   mw.rcfilters.dm.FilterItem.prototype.getState = function () {
+   return {
+   selected: this.isSelected(),
+   included: this.isIncluded(),
+   conflicted: this.isConflicted(),
+   fullyCovered: this.isFullyCovered()
+   };
+   };
+
+   /**
 * Get the name of this filter
 *
 * @return {string} Filter name
diff --git a/tests/qunit/QUnitTestResources.php 
b/tests/qunit/QUnitTestResources.php
index 1278ecb..94d25ee 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -94,6 +94,7 @@

'tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js',

'tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js',

'tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js',
+   
'tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js',

'tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js',

'tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js',

'tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js',
diff --git 
a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js 
b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js
new file mode 100644
index 000..5e1d715
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js
@@ -0,0 +1,178 @@
+( function ( mw, $ ) {
+   QUnit.module( 'mediawiki.rcfilters - FilterItem' );
+
+   QUnit.test( 'Initializing filter item', function ( assert ) {
+   var group1 = new mw.rcfilters.dm.FilterGroup( 'group1' );
+
+   item = new mw.rcfilters.dm.FilterItem( 'filter1', group1 );
+   assert.equal(
+   item.getName(),
+   'filter1',
+   'Filter name is retained.'
+   );
+   assert.equal(
+   item.getGroupName(),
+   'group1',
+   'Group name is retained.'
+   );
+
+   item = new mw.rcfilters.dm.FilterItem(
+   'filter1',
+   group1,
+   {
+   label: 'test label',
+   description: 'test description',
+   }
+   );
+   assert.equal(
+   item.getLabel(),
+   'test label',
+   'Label information is retained.'
+   );
+   assert.equal(
+   item.getLabel(),
+   'test label',
+   'Description information is retained.'
+   );
+
+   item = new mw.rcfilters.dm.FilterItem(
+   'filter1',
+   group1,
+   {
+   selected: true
+   }
+   );
+   assert.equal(
+   item.isSelected(),
+   true,
+   'Item can be selected in the config.'
+   );
+   item.toggleSelected( true );
+   assert.equal(
+   item.isSelected(),
+   true,
+   'Item can toggle its selected state.'
+   );
+
+   // Subsets
+   item = new mw.rcfilters.dm.FilterItem(
+   'filter1',
+   group1,
+   {
+

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: category.py: remove not relevant docstring (Monobook)

[jenkins-bot (Code Review)]

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

Change subject: category.py: remove not relevant docstring (Monobook)
..


category.py: remove not relevant docstring (Monobook)

Removed not relevant docstring part.

"""
Important:
 * this bot is written to work with the MonoBook skin, so make sure
 * your bot account uses this skin
"""

Bug: T86351
Change-Id: If39b9b2f259fcf429143b617b96492a248d11baf
---
M scripts/category.py
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/scripts/category.py b/scripts/category.py
index 93bf7aa..fce3c7b 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -855,10 +855,6 @@
 you to find out what the article is about and in which other categories it
 currently is.
 
-Important:
- * this bot is written to work with the MonoBook skin, so make sure your 
bot
-   account uses this skin
-
 """
 
 def __init__(self, catTitle, catDB, namespaces=None):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If39b9b2f259fcf429143b617b96492a248d11baf
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
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...Wikibase[master]: Fix documentation comment for SpecialRedirectEntity::getForm...

[Ricordisamoa (Code Review)]

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

Change subject: Fix documentation comment for 
SpecialRedirectEntity::getFormElements()
..

Fix documentation comment for SpecialRedirectEntity::getFormElements()

The returned value is always an array.
Found by PHPStan.
Leftover from commit 4c93d7ba13f14f95bd724fd6581f7cdc938bded5

Change-Id: I73eecbaa7f910c951186701fd26a1debbe9fb585
---
M repo/includes/Specials/SpecialRedirectEntity.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/Specials/SpecialRedirectEntity.php 
b/repo/includes/Specials/SpecialRedirectEntity.php
index 55c0998..9343fb4 100644
--- a/repo/includes/Specials/SpecialRedirectEntity.php
+++ b/repo/includes/Specials/SpecialRedirectEntity.php
@@ -185,7 +185,7 @@
/**
 * Returns the form elements.
 *
-* @return string
+* @return array
 */
protected function getFormElements() {
return array(

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: make-wmf-branch: Don't make old version (-o) required

[Chad (Code Review)]

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

Change subject: make-wmf-branch: Don't make old version (-o) required
..

make-wmf-branch: Don't make old version (-o) required

This is almost always master, and if it's not, you can provide it.

Change-Id: If839ab4ec40154ce3e35b53e42fe24722a969258
---
M make-wmf-branch/MakeWmfBranch.php
M make-wmf-branch/make-wmf-branch
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/01/339101/1

diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index 289be09..fd7dc5a 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -9,7 +9,7 @@
 
function __construct( $newVersion, $oldVersion ) {
$this->newVersion = $newVersion;
-   $this->oldVersion = $oldVersion;
+   $this->oldVersion = $oldVersion ?: 'master';
$buildDir = sys_get_temp_dir() . '/make-wmf-branch';
 
require __DIR__ . '/default.conf';
diff --git a/make-wmf-branch/make-wmf-branch b/make-wmf-branch/make-wmf-branch
index 6057751..cf7e9ad 100755
--- a/make-wmf-branch/make-wmf-branch
+++ b/make-wmf-branch/make-wmf-branch
@@ -46,7 +46,7 @@
 
 $storedArgs = array(
 array( 'n', 'new', 'newVersion', true ),
-array( 'o', 'old', 'oldVersion', true ),
+array( 'o', 'old', 'oldVersion', false ),
 array( 'p', 'path', 'clonePath', false ),
 array( 'c', 'continue-from', 'firstExtension', false ),
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If839ab4ec40154ce3e35b53e42fe24722a969258
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Fix ApiMainTest::testExceptionErrors and use $wgShowDBE...

[Anomie (Code Review)]

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

Change subject: API: Fix ApiMainTest::testExceptionErrors and use 
$wgShowDBErrorBacktrace
..

API: Fix ApiMainTest::testExceptionErrors and use $wgShowDBErrorBacktrace

Apparently Jenkins sets $wgShowExceptionDetails to true but travis
doesn't. The test should make sure it's set since it depends on it.

And apparently no one ever added $wgShowDBErrorBacktrace to the API.
Let's do that too.

Change-Id: I0793eda349426b265a47900cdeb87bb920b5c291
---
M includes/api/ApiMain.php
M tests/phpunit/includes/api/ApiMainTest.php
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/339099/1

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 59227d9..9e00830 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1116,7 +1116,9 @@
)
);
} else {
-   if ( $config->get( 'ShowExceptionDetails' ) ) {
+   if ( $config->get( 'ShowExceptionDetails' ) &&
+   ( !$e instanceof DBError || $config->get( 
'ShowDBErrorBacktrace' ) )
+   ) {
$result->addContentValue(
$path,
'trace',
diff --git a/tests/phpunit/includes/api/ApiMainTest.php 
b/tests/phpunit/includes/api/ApiMainTest.php
index eff41e3..9060dfb 100644
--- a/tests/phpunit/includes/api/ApiMainTest.php
+++ b/tests/phpunit/includes/api/ApiMainTest.php
@@ -451,7 +451,10 @@
$context->setRequest( new FauxRequest( [ 'errorformat' => 
'plaintext' ] ) );
$context->setLanguage( 'en' );
$context->setConfig( new MultiConfig( [
-   new HashConfig( [ 'ShowHostnames' => true, 
'ShowSQLErrors' => false ] ),
+   new HashConfig( [
+   'ShowHostnames' => true, 'ShowSQLErrors' => 
false,
+   'ShowExceptionDetails' => true, 
'ShowDBErrorBacktrace' => true,
+   ] ),
$context->getConfig()
] ) );
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Declare SummaryFormatter property $stringNormalizer as private

[Ricordisamoa (Code Review)]

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

Change subject: Declare SummaryFormatter property $stringNormalizer as private
..

Declare SummaryFormatter property $stringNormalizer as private

It is currently set in the constructor without being declared.
Found by PHPStan.

Change-Id: I5fd5d3ae2a09e5268db7932ff00d39c1fed10b18
---
M repo/includes/SummaryFormatter.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/SummaryFormatter.php 
b/repo/includes/SummaryFormatter.php
index a875ecd..92dbcb0 100644
--- a/repo/includes/SummaryFormatter.php
+++ b/repo/includes/SummaryFormatter.php
@@ -48,6 +48,11 @@
private $idParser;
 
/**
+* @var StringNormalizer
+*/
+   private $stringNormalizer;
+
+   /**
 * @param EntityIdFormatter $idFormatter Please note that the magic 
label substitution we apply
 * on top of this only works in case this returns links without 
display text.
 * @param ValueFormatter $valueFormatter

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Make checkboxen smaller whilst retaining cl...

[Jforrester (Code Review)]

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

Change subject: MediaWiki theme: Make checkboxen smaller whilst retaining 
clickarea
..

MediaWiki theme: Make checkboxen smaller whilst retaining clickarea

Bug: T86003
Change-Id: I520ecf0cc5c0eb42d557cd02793bbdf72f60e040
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/97/339097/1

diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 560a25a..0556d47 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -141,6 +141,7 @@
 @background-color-input-binary-active: @color-progressive-active;
 @background-color-input-binary-on: @color-progressive;
 @size-input-binary: 20 / @oo-ui-font-size-browser / @oo-ui-font-size-default; 
// equals `1.5625em`≈`20px` at base `font-size: 12.8px`
+@size-input-binary-inner: 16 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `1.25em`≈`16px` at base `font-size: 12.8px`
 @border-input-binary: @border-width-default solid @border-color-input-binary;
 @border-color-input-binary: @border-color-default-active;
 @border-color-input-binary-active: @color-progressive-active;
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index ee884a9..6bce1b3 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -411,7 +411,7 @@
// `` element is visually replaced by `span` that 
follows
[type='checkbox'] {
position: relative;
-   // Needed for Firefox mobile (See bug 71750 to workaround 
default Firefox stylesheet)
+   // Needed for Firefox mobile (See T73750 to workaround default 
Firefox stylesheet)
max-width: none;
// Ensure the invisible input takes up the required width
width: @size-input-binary;
@@ -433,8 +433,9 @@
.oo-ui-box-sizing( border-box );
position: absolute;
left: 0;
-   width: @size-input-binary;
-   height: @size-input-binary;
+   margin: ( @size-input-binary - @size-input-binary-inner 
) / 2 0 0 ( @size-input-binary - @size-input-binary-inner ) / 2;
+   width: @size-input-binary-inner;
+   height: @size-input-binary-inner;
border: @border-input-binary;
border-radius: @border-radius-default;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I520ecf0cc5c0eb42d557cd02793bbdf72f60e040
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] mediawiki/core[master]: build: Update HHVM for Travis to 3.12

[Krinkle (Code Review)]

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

Change subject: build: Update HHVM for Travis to 3.12
..

build: Update HHVM for Travis to 3.12

Travis defaults 'hhvm' to 3.6.6 for back-compat, however newer
versions are available. The latest supported version on Travis is 3.12,
per .
This also matches the version currently used in wmf production.

Change-Id: I1c562f61acf83aa7f558b2e11a6af81d13523dea
---
M .travis.yml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/339096/1

diff --git a/.travis.yml b/.travis.yml
index 9738605..80769dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
 - env: dbtype=postgres
   php: 5.5
 - env: dbtype=mysql
-  php: hhvm
+  php: hhvm-3.12
 - env: dbtype=mysql
   php: 7
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ORES review tool in cswiki

[Ladsgroup (Code Review)]

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

Change subject: Enable ORES review tool in cswiki
..

Enable ORES review tool in cswiki

After deploying these actions need to be done in the given order:
1- Create tables ores_model and ores_classification (see sql folder in the 
extension)
(mwscript maintenance/sql.php --wiki=cswiki 
extensions/ORES/sql/(ores_model|ores_classification).sql
2- Run this maintenance script: 
extensions/ORES/maintenance/CheckModelVersions.php
It should take a second to finish
3- Run this maintenance script: extensions/ORES/maintenance/PopulateDatabase.php
This one may take a minute or two.

Bug: T151611
Change-Id: I915b0aa2dbae854735c70a3a563ce936e8e4fa35
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5e306a9..04a08f3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17662,6 +17662,7 @@
'trwiki' => true, // T139992
'plwiki' => true, // T140005
'enwiki' => true, // T140003
+   'cswiki' => true, // T151611
 ],
 'wgOresModels' => [
'default' => [
@@ -17681,6 +17682,7 @@
'trwiki' => [ 'hard' => 0.20, 'soft' => 0.58, 'softest' => 0.92 ], // 
T139992
'plwiki' => [ 'hard' => 0.19, 'soft' => 0.41, 'softest' => 0.92 ], // 
T140005
'enwiki' => [ 'hard' => 0.17, 'soft' => 0.49, 'softest' => 0.96 ], // 
T140003
+   'cswiki' => [ 'hard' => 0.45, 'soft' => 0.8, 'softest' => 0.88 ], // 
T151611
 ],
 'wgOresEnabledNamespaces' => [
'default' => [],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Reuse SetZoneAccess in addWiki, save seperate step in wiki c...

[jenkins-bot (Code Review)]

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

Change subject: Reuse SetZoneAccess in addWiki, save seperate step in wiki 
creation
..


Reuse SetZoneAccess in addWiki, save seperate step in wiki creation

Tidy up some other code/indents as going along.

Add some type hints

Change-Id: I87298e444141cd3959c76eebc8e3683666bd4d89
---
M addWiki.php
1 file changed, 44 insertions(+), 10 deletions(-)

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



diff --git a/addWiki.php b/addWiki.php
index c648025..13c89a0 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -142,6 +142,7 @@
// Initialise Echo cluster if applicable.
// It will create the Echo tables in the main database if
// extension1 is not in use.
+   /** @var Database $echoDbW */
$echoDbW = MWEchoDbFactory::newFromDefault()->getEchoDb( 
DB_MASTER );
$echoDbW->query( "SET storage_engine=InnoDB" );
$echoDbW->query( "CREATE DATABASE IF NOT EXISTS $dbName" );
@@ -233,12 +234,24 @@
# Populate sites table
$sitesPopulation = $this->runChild(
'Wikibase\PopulateSitesTable',
-   __DIR__ . 
'/../Wikidata/extensions/Wikibase/lib/maintenance/populateSitesTable.php'
+   
"$IP/extensions/Wikidata/extensions/Wikibase/lib/maintenance/populateSitesTable.php"
);
 
$sitesPopulation->mOptions[ 'site-group' ] = $site;
$sitesPopulation->mOptions[ 'force-protocol' ] = 'https';
$sitesPopulation->execute();
+
+   // Sets up the filebackend zones
+   $setZones = $this->runChild(
+   'SetZoneAccess',
+   
"$IP/extensions/WikimediaMaintenance/filebackend/setZoneAccess.php"
+   );
+
+   $setZones->mOptions['backend'] = 'local-multiwrite';
+   if ( $this->isPrivate( $dbName ) ) {
+   $setZones->mOptions['private'] = 1;
+   }
+   $setZones->execute();
 
# Clear MassMessage cache (bug 60075)
global $wgMemc, $wgConf;
@@ -257,6 +270,11 @@
$this->output( "Done. sync the config as in 
https://wikitech.wikimedia.org/wiki/Add_a_wiki#MediaWiki_configuration"; );
}
 
+   /**
+* @param string $ucsite
+* @param string $name
+* @return string
+*/
private function getFirstArticle( $ucsite, $name ) {
return < "donate",
-   "utm_medium" => "sidebar",
-   "utm_campaign" => $domain,
-   "uselang" => $language
-   ) );
+   $linkurl = "https://donate.wikimedia.org/?"; . http_build_query(
+   [
+   "utm_source" => "donate",
+   "utm_medium" => "sidebar",
+   "utm_campaign" => $domain,
+   "uselang" => $language
+   ]
+   );
 
return $article->doEditContent(
ContentHandler::makeContent( $linkurl, $title ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87298e444141cd3959c76eebc8e3683666bd4d89
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ORES review tool in cswiki

[jenkins-bot (Code Review)]

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

Change subject: Enable ORES review tool in cswiki
..


Enable ORES review tool in cswiki

After deploying these actions need to be done in the given order:
1- Create tables ores_model and ores_classification (see sql folder in the 
extension)
(mwscript maintenance/sql.php --wiki=cswiki 
extensions/ORES/sql/(ores_model|ores_classification).sql
2- Run this maintenance script: 
extensions/ORES/maintenance/CheckModelVersions.php
It should take a second to finish
3- Run this maintenance script: extensions/ORES/maintenance/PopulateDatabase.php
This one may take a minute or two.

Bug: T151611
Change-Id: I915b0aa2dbae854735c70a3a563ce936e8e4fa35
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2f20298..43b900d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17669,6 +17669,7 @@
'trwiki' => true, // T139992
'plwiki' => true, // T140005
'enwiki' => true, // T140003
+   'cswiki' => true, // T151611
 ],
 'wgOresModels' => [
'default' => [
@@ -17688,6 +17689,7 @@
'trwiki' => [ 'hard' => 0.20, 'soft' => 0.58, 'softest' => 0.92 ], // 
T139992
'plwiki' => [ 'hard' => 0.19, 'soft' => 0.41, 'softest' => 0.92 ], // 
T140005
'enwiki' => [ 'hard' => 0.17, 'soft' => 0.49, 'softest' => 0.96 ], // 
T140003
+   'cswiki' => [ 'hard' => 0.45, 'soft' => 0.8, 'softest' => 0.88 ], // 
T151611
 ],
 'wgOresEnabledNamespaces' => [
'default' => [],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I915b0aa2dbae854735c70a3a563ce936e8e4fa35
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
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] wikimedia...jouncebot[master]: Fix flake8 E128 warnings

[jenkins-bot (Code Review)]

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

Change subject: Fix flake8 E128 warnings
..


Fix flake8 E128 warnings

Fix line continuation indent warnings and enable checks for them in the
future. This gives us full PEP8/flake8 compatibility.

Change-Id: I79145d2daed5013d8e0c92022494fcf20d60577f
---
M deploypage.py
M tox.ini
2 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/deploypage.py b/deploypage.py
index 5f33d1f..c792efc 100644
--- a/deploypage.py
+++ b/deploypage.py
@@ -31,7 +31,8 @@
 # Things I hate about the MW API right here...
 # This is getting the full URL of the deployments page so we can create
 # nice links in IRC messages
-page_url_result = mwcon.api('query',
+page_url_result = mwcon.api(
+'query',
 **{'titles': 'Deployments', 'prop': 'info', 'inprop': 'url'})
 idx = page_url_result['query']['pages'].keys()[0]
 self.page_url = page_url_result['query']['pages'][idx]['fullurl']
@@ -91,7 +92,8 @@
 owners = map(lambda x: x.text, item.xpath(self.XPATH_OWNERS))
 owners = filter(lambda x: x != 'irc-nickname', owners)
 
-item_obj = DeployItem(id, '%s#%s' % (self.page_url, id),
+item_obj = DeployItem(
+id, '%s#%s' % (self.page_url, id),
 start_time, end_time, window, deployers, owners)
 
 deploy_items[start_time].append(item_obj)
diff --git a/tox.ini b/tox.ini
index 82b3007..11c9061 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,6 @@
 [flake8]
 count = 1
 exclude = bin,lib,include,.venv,.tox,dist,doc,build,*.egg
-ignore = E128
 show-pep8 = 1
 show-source = 1
 statistics = 1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79145d2daed5013d8e0c92022494fcf20d60577f
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/bots/jouncebot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...jouncebot[master]: Run flake8 on both python2 and python3

[jenkins-bot (Code Review)]

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

Change subject: Run flake8 on both python2 and python3
..


Run flake8 on both python2 and python3

Follow up to I89370a4

Change-Id: Ie8abe9934b2afe59333a238b1d01a38f118d6e93
---
M tox.ini
1 file changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/tox.ini b/tox.ini
index 11c9061..2f2ea87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py2, py3, flake8
+envlist = py2, py3
 
 [flake8]
 count = 1
@@ -14,12 +14,10 @@
 detailed-errors=1
 with-doctest=1
 
-[testenv:flake8]
-commands = flake8
-deps = flake8
-
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/tests/requirements.txt
-commands = nosetests {posargs}
+commands =
+flake8
+nosetests {posargs}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8abe9934b2afe59333a238b1d01a38f118d6e93
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bots/jouncebot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Zppix 
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...PerformanceInspector[master]: [WIP] Initial POC for detecting unused images in style rules

[Krinkle (Code Review)]

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

Change subject: [WIP] Initial POC for detecting unused images in style rules
..

[WIP] Initial POC for detecting unused images in style rules

Bug: T121144
Change-Id: Ibe91fbfb581f836a793a7bcd297415959c73f233
---
M modules/collectors/ext.PerformanceInspector.modulescss.js
M modules/css/ext.PerformanceInspector.css
M modules/templates/modulescss.mustache
3 files changed, 139 insertions(+), 23 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PerformanceInspector 
refs/changes/95/339095/1

diff --git a/modules/collectors/ext.PerformanceInspector.modulescss.js 
b/modules/collectors/ext.PerformanceInspector.modulescss.js
index 253578b..470747e 100644
--- a/modules/collectors/ext.PerformanceInspector.modulescss.js
+++ b/modules/collectors/ext.PerformanceInspector.modulescss.js
@@ -4,50 +4,105 @@
 
function toView( name, stats, index ) {
return {
-   name: name,
-   selectors: mw.msg( 
'performanceinspector-modules-css-used-selectors-values', stats.total !== 0 ?
-   ( stats.matched / 
stats.total * 100 ).toFixed( 2 ) + '%' : null, stats.matched, stats.total ),
-   unmatchedSelectors: stats.unmatched,
-   index: index
-   };
+   name: name,
+   selectors: mw.msg( 
'performanceinspector-modules-css-used-selectors-values', stats.total !== 0 ?
+   ( stats.matched / stats.total * 
100 ).toFixed( 2 ) + '%' : null, stats.matched, stats.total ),
+   unmatchedSelectors: stats.unmatched,
+   index: index
+   };
}
-   function auditSelectors( css ) {
-   var selectors = { total: 0, matched: 0, unmatched: [] },
-   style = document.createElement( 'style' 
);
+
+   function toImageView( name, stats, index ) {
+   return {
+   name: name,
+   used: mw.msg( 
'performanceinspector-modules-css-used-selectors-values', stats.total !== 0 ?
+   ( stats.used / stats.total * 
100 ).toFixed( 2 ) + '%' : '100%', stats.used, stats.total ),
+   unusedImages: stats.unused,
+   index: index
+   };
+   }
+
+   function dashCase( str ) {
+   return str.replace( /([A-Z])/g, function ( all, letter 
) {
+   return '-' + letter.toLowerCase();
+   } );
+   }
+
+   function analyze( css ) {
+   var result = {
+   rules: {
+   total: 0, matched: 0, 
unmatched: []
+   },
+   images: {
+   total: 0, used: 0, unused: []
+   }
+   },
+   style = document.createElement( 'style' ),
+   urlRegex = 
/url\(\s*[\'"]?([^\)\'"]*?)[\'"]?\s*\)/g;
style.textContent = css;
document.body.appendChild( style );
$.each( style.sheet.cssRules, function ( index, rule ) {
+   var prop, urlMatches, images = [];
+   function mapUrlMatch( url ) {
+   return { prop: dashCase( prop ), url: 
url };
+   }
// Only pickup CSSStyleRule
-   if ( rule.selectorText !== undefined ) {
-   selectors.total++;
+   if ( rule.style && rule.selectorText ) {
+   result.rules.total++;
+   for ( prop in rule.style ) {
+   if ( prop === 'cssText' ) {
+   continue;
+   }
+   // Ignore default/empty values 
and numerical values
+   urlMatches = rule.style[ prop ] 
&&
+   typeof rule.style[ prop 
] 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: sshd-phab service config needs to be a template

[Dzahn (Code Review)]

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

Change subject: sshd-phab service config needs to be a template
..


sshd-phab service config needs to be a template

Can't use variables (erb) with plain file source => references

Change-Id: I2ec5deb3b2257880e34c6609a73a9121d7039b34
---
M modules/phabricator/manifests/vcs.pp
R modules/phabricator/templates/sshd-phab.conf.erb
R modules/phabricator/templates/sshd-phab.service.erb
3 files changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/modules/phabricator/manifests/vcs.pp 
b/modules/phabricator/manifests/vcs.pp
index 7581970..7cb5ea6 100644
--- a/modules/phabricator/manifests/vcs.pp
+++ b/modules/phabricator/manifests/vcs.pp
@@ -27,7 +27,6 @@
 $ssh_hook_path = '/usr/local/lib/phabricator-ssh-hook.sh'
 $sshd_config = '/etc/ssh/sshd_config.phabricator'
 
-
 user { $vcs_user:
 gid=> 'phd',
 shell  => '/bin/sh',
@@ -95,14 +94,14 @@
 
 if $::initsystem == 'upstart' {
 $init_file = '/etc/init/ssh-phab.conf'
-$init_soorce = 'puppet:///modules/phabricator/sshd-phab.conf'
+$init_template = 'phabricator/sshd-phab.conf.erb'
 } else {
 $init_file = '/etc/systemd/system/ssh-phab.service'
-$init_source = 'puppet:///modules/phabricator/sshd-phab.service'
+$init_template = 'phabricator/sshd-phab.service.erb'
 }
 
 file { $init_file:
-source  => $init_source,
+content => template($init_template),
 mode=> '0644',
 owner   => 'root',
 group   => 'root',
diff --git a/modules/phabricator/files/sshd-phab.conf 
b/modules/phabricator/templates/sshd-phab.conf.erb
similarity index 100%
rename from modules/phabricator/files/sshd-phab.conf
rename to modules/phabricator/templates/sshd-phab.conf.erb
diff --git a/modules/phabricator/files/sshd-phab.service 
b/modules/phabricator/templates/sshd-phab.service.erb
similarity index 100%
rename from modules/phabricator/files/sshd-phab.service
rename to modules/phabricator/templates/sshd-phab.service.erb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ec5deb3b2257880e34c6609a73a9121d7039b34
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Do not send 'exception-json' channel to logstash

[jenkins-bot (Code Review)]

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

Change subject: Do not send 'exception-json' channel to logstash
..


Do not send 'exception-json' channel to logstash

Step 2 of switching over from 'exception-json' (a pre-PSR-3 hack)
to 'exception'.

Bug: T136849
Depends-On: I7372dbff9e6fceb0852747348bdfe9bed3756258
Change-Id: I782c96dac1181d12267fa610345e8743866bcded
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c179747..2f20298 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4677,7 +4677,7 @@
'EventBus' => [ 'logstash' => false ], // T150106, temporarily 
disable to logstash (bd808)
'EventLogging' => 'debug',
'exception' => 'debug',
-   'exception-json' => 'debug',
+   'exception-json' => [ 'logstash' => false ],
'exec' => 'debug',
'ExternalStoreDB' => 'debug',
'fatal' => 'debug',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I782c96dac1181d12267fa610345e8743866bcded
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
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/mediawiki-config[master]: Send 'exception' channel to logstash

[jenkins-bot (Code Review)]

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

Change subject: Send 'exception' channel to logstash
..


Send 'exception' channel to logstash

Step 1 of switching over from 'exception-json' (a pre-PSR-3 hack)
to 'exception'.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a826046..c179747 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4676,7 +4676,7 @@
'es-hit' => 'debug',
'EventBus' => [ 'logstash' => false ], // T150106, temporarily 
disable to logstash (bd808)
'EventLogging' => 'debug',
-   'exception' => [ 'logstash' => false ],
+   'exception' => 'debug',
'exception-json' => 'debug',
'exec' => 'debug',
'ExternalStoreDB' => 'debug',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36b73528ca66da5138e7ac7110ab4505a466
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
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] wikimedia...jouncebot[master]: Use IB3 library

[jenkins-bot (Code Review)]

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

Change subject: Use IB3 library
..


Use IB3 library

Use the IB3 library () to handle basic bot
behaviors:
* SASL auth
* SSL connection security
* Server pings for connection liveness checks
* NickServ REGAIN
* Disconnect on protocol error
* Rejoin on ban/kick
* Lenient UTF-8 message decoding

Change-Id: Ib72ef65fc88d839a6d5486357fc69742de78f991
---
M DefaultConfig.yaml
M jouncebot.py
M requirements.txt
3 files changed, 56 insertions(+), 80 deletions(-)

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



diff --git a/DefaultConfig.yaml b/DefaultConfig.yaml
index 9268050..43483d2 100644
--- a/DefaultConfig.yaml
+++ b/DefaultConfig.yaml
@@ -3,7 +3,7 @@
 
 irc:
   server: chat.freenode.net
-  port: 6667
+  port: 6697
   channel: "#wikimedia-operations"
   nick: jouncebot
   realname: "https://wikitech.wikimedia.org/wiki/Tool:Jouncebot";
diff --git a/jouncebot.py b/jouncebot.py
index f2edf16..46bd3bb 100755
--- a/jouncebot.py
+++ b/jouncebot.py
@@ -2,17 +2,19 @@
 # -*- coding: utf-8 -*-
 """IRC bot to poke people when their deploy windows are up"""
 
+import argparse
 import configloader
 import datetime
 import deploypage
-import irc.bot
-import irc.buffer
-import irc.client
+import ib3
+import ib3.auth
+import ib3.connection
+import ib3.mixins
+import ib3.nick
 import irc.strings
 import logging
 import logging.handlers
 import mwclient
-import optparse
 import os
 import pytz
 import random
@@ -33,7 +35,16 @@
 return u'%s%s%s' % (', '.join(items), sep, last)
 
 
-class JounceBot(irc.bot.SingleServerIRCBot):
+class JounceBot(
+ib3.auth.SASL,
+ib3.connection.SSL,
+ib3.mixins.DisconnectOnError,
+ib3.mixins.PingServer,
+ib3.mixins.RejoinOnBan,
+ib3.mixins.RejoinOnKick,
+ib3.nick.Regain,
+ib3.Bot
+):
 
 def __init__(self, config, logger, deploy_page):
 self.config = config
@@ -51,53 +62,21 @@
 if self.config['debug']:
 self.brain['debug'] = self.do_command_debug
 
-# Don't even get me started on how stupid a pattern this is
-irc.client.ServerConnection.buffer_class = \
-irc.buffer.LenientDecodingLineBuffer
-
-irc.bot.SingleServerIRCBot.__init__(
-self,
-[(self.config['irc']['server'], self.config['irc']['port'])],
-self.config['irc']['nick'],
-self.config['irc']['realname']
+super(JounceBot, self).__init__(
+server_list=[
+(self.config['irc']['server'], self.config['irc']['port']),
+],
+nickname=self.config['irc']['nick'],
+realname=self.config['irc']['realname'],
+ident_password=self.config['irc']['password'],
+channels=[self.channel],
 )
-
-def on_nicknameinuse(self, conn, event):
-self.logger.warning(
-"Requested nickname %s already in use, appending _" %
-conn.get_nickname())
-conn.nick(self.config['irc']['nick'] + "_")
-conn.execute_delayed(30, self.do_reclaim_nick)
-
-def do_reclaim_nick(self):
-nick = self.connection.get_nickname()
-if nick != self.config['irc']['nick']:
-self.connection.nick(self.config['irc']['nick'])
-self.logger.info("Nickname changed to default.")
 
 def on_welcome(self, conn, event):
 self.logger.info("Connected to server")
-self.do_identify()
 self.logger.info(
 "Getting information about the wiki and starting event handler")
 self.deploy_page.start(self.on_deployment_event)
-
-def on_error(self, conn, event):
-self.logger.warning('%s: %s' % (event.source, event.arguments[0]))
-
-def on_privnotice(self, conn, event):
-msg = event.arguments[0]
-self.logger.warning('%s: %s' % (event.source, msg))
-
-if event.source.nick == "NickServ":
-if "NickServ identify" in msg:
-self.do_identify()
-elif "Invalid password" in msg:
-sys.exit("Invalid password. Check settings")
-elif "You are now identified" in msg:
-self.logger.debug("Login succeeded")
-self.logger.info("Attempting to join channel %s", self.channel)
-conn.join(self.channel)
 
 def on_join(self, conn, event):
 nick = event.source.nick
@@ -110,19 +89,13 @@
 def on_pubmsg(self, conn, event):
 msg_parts = event.arguments[0].split(" ", 1)
 if len(msg_parts) > 1:
-handle = re.match(r"^([a-z0-9_\-\|]+)",
+handle = re.match(
+r"^([a-z0-9_\-\|]+)",
 irc.strings.lower(msg_parts[0]))
 nick = irc.strings.lower(self.conn

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: clean.py: Minor abstraction of param handling

[Chad (Code Review)]

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

Change subject: clean.py: Minor abstraction of param handling
..

clean.py: Minor abstraction of param handling

I want to eventually make this give you a list of branches
to operate on (clean these y/n) when you give it a plain
`scap clean`

Change-Id: I033f0819c5b97e6da9bad75b47000f08e2b807a5
---
M scap/plugins/clean.py
1 file changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py
index 6964142..9838434 100644
--- a/scap/plugins/clean.py
+++ b/scap/plugins/clean.py
@@ -32,11 +32,11 @@
   help='Only keep static assets (CSS/JS and the like).')
 def main(self, *extra_args):
 """ Clean old branches from the cluster for space savings! """
+self.cleanup_branch(self.arguments.branch, self.arguments.keep_static)
 
-stage_dir = os.path.join(self.config['stage_dir'],
- 'php-%s' % self.arguments.branch)
-deploy_dir = os.path.join(self.config['deploy_dir'],
-  'php-%s' % self.arguments.branch)
+def cleanup_branch(self, branch, keep_static):
+stage_dir = os.path.join(self.config['stage_dir'], 'php-%s' % branch)
+deploy_dir = os.path.join(self.config['deploy_dir'], 'php-%s' % branch)
 
 # Prune junk from masters owned by l10nupdate
 self.execute_remote(
@@ -50,14 +50,14 @@
 self.execute_remote(
 'clean-masters',
 self._get_master_list(),
-self.clean_command(stage_dir)
+self.clean_command(stage_dir, keep_static)
 )
 
 # Update apaches
 self.execute_remote(
 'clean-apaches',
 self._get_target_list(),
-self.clean_command(deploy_dir)
+self.clean_command(deploy_dir, keep_static)
 )
 
 def execute_remote(self, description, targets, command):
@@ -71,9 +71,9 @@
 if failed:
 self.get_logger().warning('%d had clean errors', failed)
 
-def clean_command(self, path):
+def clean_command(self, path, keep_static):
 regex = '".*\.(%s)"' % ('|'.join(STATIC_TYPES))
-if self.arguments.keep_static:
+if keep_static:
 return ['find', path, '-type', 'f', '-regextype', 'posix-extended',
 '-not', '-regex', regex, '-delete']
 else:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Fix error displaying in setZoneAccess

[jenkins-bot (Code Review)]

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

Change subject: Fix error displaying in setZoneAccess
..


Fix error displaying in setZoneAccess

Warnings and Errors are stored the same place

Functions aren't get*Array either

Change-Id: I7b48c877330c28460aeb29630241ad4c106db113
---
M filebackend/setZoneAccess.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/filebackend/setZoneAccess.php b/filebackend/setZoneAccess.php
index 1a3ed87..2dc80ca 100644
--- a/filebackend/setZoneAccess.php
+++ b/filebackend/setZoneAccess.php
@@ -40,7 +40,7 @@
}
$this->output( "done.\n" );
if ( !$status->isOK() ) {
-   print_r( array_merge( $status->getErrorsArray(), 
$status->getWarningsArray() ) );
+   print_r( $status->getErrors() );
}
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b48c877330c28460aeb29630241ad4c106db113
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set $wgSoftBlockRanges

[jenkins-bot (Code Review)]

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

Change subject: Set $wgSoftBlockRanges
..


Set $wgSoftBlockRanges

Use the global added in I6c11a6b9 to block ranges that we shouldn't be
seeing anonymous edits from.

Looking at anon edits from all the IP ranges in this patch to our public
wikis since 2015-01-01T00:00:00Z that haven't been deleted or had the
username revision-deleted, I see 160 edits from 127.0.0.1, one from a
Labs public IP on dawiki, and (not counting testwiki, test2wiki, or
testwikidatawiki which are used for CI) 10027 edits from 10.68.0.0/16.

Bug: T154698
Change-Id: I74f5f4a307f5a847aac7a87e7a4a0da07f71741e
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 70 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d31b6f1..bbbaeef 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3296,6 +3296,64 @@
 
 $wgApplyIpBlocksToXff = true;
 
+// Soft-block private IPs and other shared resources.
+// Note this has no effect on edits from traffic proxied through any of these
+// IPs with a trusted XFF header, only edits where MediaWiki is actually going
+// to attribute the edit (or other logged action) to one of these IPs, e.g.
+// that it would show up on [[Special:Contributions/127.0.0.1]].
+$wgSoftBlockRanges = array_merge(
+   [
+   // Ranges that aren't supposed to be publicly routable
+   '0.0.0.0/8', // "This host on this network" (RFC 6890)
+   // 10.0.0.0/8 is handled below, don't add it here.
+   '100.64.0.0/10', // "Shared address space" for internal routing 
(RFC 6598)
+   '127.0.0.0/8', // Loopback
+   '169.254.0.0/16', // Link local
+   '172.16.0.0/12', // Private
+   '192.0.0.0/24', // IETF Protocol Assignments (RFC 6890)
+   '192.0.2.0/24', // Documentation
+   '192.168.0.0/16', // Private
+   '198.18.0.0/15', // Benchmarking (RFC 2544)
+   '198.51.100.0/24', // Documentation
+   '203.0.113.0/24', // Documentation
+   '240.0.0.0/4', // Reserved (RFC 1112)
+   '::/128', // Unspecified address
+   '::1/128', // Loopback
+   ':::0:0/96', // IPv4 mapped (these should be coming in as 
IPv4, not IPv6)
+   '100::/64', // Discard-only address block
+   '2001:2::/48', // Benchmarking
+   '2001:db8::/32', // Documentation
+   '2001:10::/28', // ORCHID (RFC 4843)
+   'fc00::/7', // Local communications, not globally routable (RFC 
4193)
+   'fe80::/10', // Link-local
+
+   // We shouldn't be getting edits via multicast either
+   '224.0.0.0/4',
+   'ff00::/8',
+   ],
+
+   // Addresses used by WMF, people should log in to edit from them 
directly.
+   $wgSquidServersNoPurge
+);
+if ( $wmgAllowLabsAnonEdits ) {
+   // CI makes anonymous edits on some wikis, so don't block Labs 
(10.68.0.0/16).
+   // The rest of 10.0.0.0/8 is ok to block.
+   $wgSoftBlockRanges = array_merge( $wgSoftBlockRanges, [
+   '10.0.0.0/10',
+   '10.64.0.0/14',
+   '10.69.0.0/16',
+   '10.70.0.0/15',
+   '10.72.0.0/13',
+   '10.80.0.0/12',
+   '10.96.0.0/11',
+   '10.128.0.0/9',
+   ] );
+} else {
+   // Labs shouldn't be editing anonymously on most wikis, so we can block
+   // anonymous edits from the whole /8.
+   $wgSoftBlockRanges[] = '10.0.0.0/8';
+}
+
 // On Special:Version, link to useful release notes
 $wgHooks['SpecialVersionVersionUrl'][] = function( $wgVersion, &$versionUrl ) {
$matches = [];
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 06af9a5..421e50b 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -572,5 +572,10 @@
'wgPageImagesLeadSectionOnly' => [
'default' => true,
],
+
+   // Probably no point in blocking Tool Labs edits to Beta Labs
+   'wmgAllowLabsAnonEdits' => [
+   'default' => true,
+   ],
];
 } # wmflLabsSettings()
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5e306a9..a826046 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16898,6 +16898,13 @@
'private' => false,
 ],
 
+'wmgAllowLabsAnonEdits' =>

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Add OO.ui.Element.static.getScrollLeft

[jenkins-bot (Code Review)]

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

Change subject: Add OO.ui.Element.static.getScrollLeft
..


Add OO.ui.Element.static.getScrollLeft

Different browsers have differing implementations of the 'scrollLeft'
property for RTL content. This function smooths out these browser
inconsistencies and produces a result consistent with Firefox's
'scrollLeft', which seems the sanest.

Scroll type code based on ,
copyright 2012 Wei-Ko Kao, licensed under the MIT License.

Our current usages of 'scrollLeft' are probably all wrong in RTL.
I filed T158708 about fixing them.

Change-Id: I161c2e92fd3904b1159be2f0581915a4bbe98d6c
---
M AUTHORS.txt
M src/Element.js
2 files changed, 65 insertions(+), 0 deletions(-)

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



diff --git a/AUTHORS.txt b/AUTHORS.txt
index b888a32..a17f3a4 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -42,4 +42,5 @@
 Sucheta Ghoshal 
 Thalia Chan 
 Volker Eckl 
+Wei-Ko Kao 
 Željko Filipin 
diff --git a/src/Element.js b/src/Element.js
index b47f5c4..f3041a3 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -517,6 +517,70 @@
 };
 
 /**
+ * Get the number of pixels that an element's content is scrolled to the left.
+ *
+ * Adapted from .
+ * Original code copyright 2012 Wei-Ko Kao, licensed under the MIT License.
+ *
+ * This function smooths out browser inconsistencies (nicely described in the 
README at
+ * ) and produces a result 
consistent
+ * with Firefox's 'scrollLeft', which seems the sanest.
+ *
+ * @static
+ * @method
+ * @param {HTMLElement} el Element to measure
+ * @return {number} Scroll position from the left.
+ *  If the element's direction is LTR, this is a positive number between `0` 
(initial scroll position)
+ *  and `el.scrollWidth - el.clientWidth` (furthest possible scroll position).
+ *  If the element's direction is RTL, this is a negative number between `0` 
(initial scroll position)
+ *  and `-el.scrollWidth + el.clientWidth` (furthest possible scroll position).
+ */
+OO.ui.Element.static.getScrollLeft = ( function () {
+   var rtlScrollType = null;
+
+   function test() {
+   var $definer = $( 'A' ),
+   definer = $definer[ 0 ];
+
+   $definer.appendTo( 'body' );
+   if ( definer.scrollLeft > 0 ) {
+   // Safari, Chrome
+   rtlScrollType = 'default';
+   } else {
+   definer.scrollLeft = 1;
+   if ( definer.scrollLeft === 0 ) {
+   // Firefox, old Opera
+   rtlScrollType = 'negative';
+   } else {
+   // Internet Explorer, Edge
+   rtlScrollType = 'reverse';
+   }
+   }
+   $definer.remove();
+   }
+
+   return function getScrollLeft( el ) {
+   var
+   scrollLeft = el.scrollLeft,
+   direction = $( el ).css( 'direction' );
+
+   if ( rtlScrollType === null ) {
+   test();
+   }
+
+   if ( direction === 'rtl' ) {
+   if ( rtlScrollType === 'reverse' ) {
+   scrollLeft = -scrollLeft;
+   } else if ( rtlScrollType === 'default' ) {
+   scrollLeft = scrollLeft - el.scrollWidth + 
el.clientWidth;
+   }
+   }
+
+   return scrollLeft;
+   };
+}() );
+
+/**
  * Get scrollable object parent
  *
  * documentElement can't be used to get or set the scrollTop

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I161c2e92fd3904b1159be2f0581915a4bbe98d6c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
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] wikimedia...jouncebot[master]: Use POST when fetching parsed HTML for wikitext

[jenkins-bot (Code Review)]

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

Change subject: Use POST when fetching parsed HTML for wikitext
..


Use POST when fetching parsed HTML for wikitext

The mwclient library made an internal change in v0.8.2 that switched the
Site.parse() method from using POST to GET. This in turn fails when the
wikitext to be parsed does not fix in the URI limit of the webserver.
Work around this library bug by explicitly requesting action=parse via
POST.

Bug: T158715
Change-Id: Ia4746d1329f93798db46e0b34db959332282134e
---
M deploypage.py
M requirements.txt
2 files changed, 20 insertions(+), 8 deletions(-)

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



diff --git a/deploypage.py b/deploypage.py
index b75da0d..5f33d1f 100644
--- a/deploypage.py
+++ b/deploypage.py
@@ -68,8 +68,18 @@
 
 self.logger.debug(
 "Collecting new deployment information from the server")
-tree = lxml.etree.fromstring(
-self._get_page_html(), lxml.etree.HTMLParser())
+html = self._get_page_html()
+if not html:
+self.logger.error('Failed to get any page content.')
+return
+
+try:
+tree = lxml.etree.HTML(html)
+except lxml.etree.XMLSyntaxError:
+self.logger.exception('Failed to parse Deployment page')
+self.logger.error('Invalid HTML? "%s"', html)
+return
+
 for item in tree.xpath(self.XPATH_ITEM):
 id = item.get('id')
 times = item.xpath(self.XPATH_TIMES)
@@ -123,11 +133,13 @@
 
 def _get_page_html(self):
 try:
-return self.mwcon.parse(
-self.mwcon.pages[self.page].edit())['text']['*']
-except Exception as ex:
-self.logger.error(
-"Could not fetch page due to exception: " + repr(ex))
+# T158715: Use a raw POST instead of 'parse'
+return self.mwcon.post(
+'parse',
+text=self.mwcon.pages[self.page].text()
+)['parse']['text']['*']
+except Exception:
+self.logger.exception("Could not fetch page due to exception")
 return ""
 
 def _reparse_on_timer(self):
diff --git a/requirements.txt b/requirements.txt
index 9468d4e..74e0a48 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 irc
 lxml
-mwclient
+mwclient>=0.8.2
 python-dateutil
 pytz
 pyyaml

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4746d1329f93798db46e0b34db959332282134e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bots/jouncebot
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] maps...deploy[master]: Update kartotherian to 650a7b5

[MaxSem (Code Review)]

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

Change subject: Update kartotherian to 650a7b5
..

Update kartotherian to 650a7b5

List of changes:
xxx Update node module dependencies

Change-Id: If8c192ea4b9e1c485cd3ee08512d7d82fb0565e6
---
M node_modules/fstream/node_modules/rimraf/bin.js
M node_modules/fstream/node_modules/rimraf/package.json
M node_modules/fstream/node_modules/rimraf/rimraf.js
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
D 
node_modules/kartotherian-geoshapes/node_modules/topojson/node_modules/shapefile/node_modules/iconv-lite/README.md~
M node_modules/kartotherian-geoshapes/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-maki/package.json
M node_modules/kartotherian-overzoom/package.json
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M 
node_modules/kartotherian-snapshot/node_modules/geojson-mapnikify/node_modules/request/node_modules/aws-sign2/package.json
M 
node_modules/kartotherian-snapshot/node_modules/geojson-mapnikify/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M 
node_modules/kartotherian-snapshot/node_modules/geojson-mapnikify/node_modules/request/node_modules/stringstream/package.json
M 
node_modules/kartotherian-snapshot/node_modules/geojson-mapnikify/node_modules/request/node_modules/tunnel-agent/package.json
M node_modules/kartotherian-snapshot/node_modules/wikimedia-mapdata/package.json
M node_modules/kartotherian-snapshot/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/mime-types/node_modules/mime-db/db.json
M node_modules/mime-types/node_modules/mime-db/package.json
M node_modules/mime-types/package.json
M node_modules/ms/package.json
M node_modules/node-pre-gyp/lib/node-pre-gyp.js
M node_modules/node-pre-gyp/lib/util/abi_crosswalk.json
M node_modules/node-pre-gyp/node_modules/nopt/node_modules/abbrev/abbrev.js
M node_modules/node-pre-gyp/node_modules/nopt/node_modules/abbrev/package.json
M node_modules/node-pre-gyp/node_modules/nopt/package.json
D node_modules/node-pre-gyp/node_modules/npmlog/CHANGELOG.md~
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/buffer-shims/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/inherits/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/process-nextick-args/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/util-deprecate/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/are-we-there-yet/package.json
D 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/README.md~
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/package.json
M node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/index.js
D 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/.bin/supports-color
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/aproba/index.js
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/aproba/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/package.json
M 
node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
M 
node_modules/node-pre-gyp/node_modules/npmlog

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix SiteConfiguration array merge syntax

[jenkins-bot (Code Review)]

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

Change subject: Fix SiteConfiguration array merge syntax
..


Fix SiteConfiguration array merge syntax

'+' prefixes only work before wiki names, not configuration variable names.
(And it's not needed anyway since there is no en-rtl wiki in production.)

This bug spent an impressive time in production, almost two years since
I721c3640, without anyone noticing, so maybe it works sometimes? Or SiteConfig
changed recently? Sometimes it causes PHP warnings, but it's very erratic when
that happens.

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

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 8dace44..06af9a5 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -367,7 +367,7 @@
'default' => true,
],
 
-   '+wmgExtraLanguageNames' => [
+   'wmgExtraLanguageNames' => [
'default' => [],
'en_rtlwiki' => [ 'en-rtl' => 'English (rtl)' ],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9682388f6f56788dc51217b0673f97c6741eda1b
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
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/mediawiki-config[master]: Fix Sentry URL scheme on beta

[jenkins-bot (Code Review)]

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

Change subject: Fix Sentry URL scheme on beta
..


Fix Sentry URL scheme on beta

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

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 11fccac..8dace44 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -385,7 +385,7 @@
'default' => true,
],
'wmgSentryDsn' => [
-   'default' => 
'http://c357be0613e24340a96aeaa28dde0...@sentry-beta.wmflabs.org/4',
+   'default' => 
'https://c357be0613e24340a96aeaa28dde0...@sentry-beta.wmflabs.org/4',
],
 
'wgUploadThumbnailRenderHttpCustomHost' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a8ff03409a790d2d9143c59473427e00ec6fe5
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
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] wikimedia...jouncebot[master]: Use POST when fetching parsed HTML for wikitext

[BryanDavis (Code Review)]

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

Change subject: Use POST when fetching parsed HTML for wikitext
..

Use POST when fetching parsed HTML for wikitext

The mwclient library made an internal change in v0.8.2 that switched the
Site.parse() method from using POST to GET. This in turn fails when the
wikitext to be parsed does not fix in the URI limit of the webserver.
Work around this library bug by explicitly requesting action=parse via
POST.

Bug: T158715
Change-Id: Ia4746d1329f93798db46e0b34db959332282134e
---
M deploypage.py
M requirements.txt
2 files changed, 20 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bots/jouncebot 
refs/changes/92/339092/1

diff --git a/deploypage.py b/deploypage.py
index b75da0d..5f33d1f 100644
--- a/deploypage.py
+++ b/deploypage.py
@@ -68,8 +68,18 @@
 
 self.logger.debug(
 "Collecting new deployment information from the server")
-tree = lxml.etree.fromstring(
-self._get_page_html(), lxml.etree.HTMLParser())
+html = self._get_page_html()
+if not html:
+self.logger.error('Failed to get any page content.')
+return
+
+try:
+tree = lxml.etree.HTML(html)
+except lxml.etree.XMLSyntaxError:
+self.logger.exception('Failed to parse Deployment page')
+self.logger.error('Invalid HTML? "%s"', html)
+return
+
 for item in tree.xpath(self.XPATH_ITEM):
 id = item.get('id')
 times = item.xpath(self.XPATH_TIMES)
@@ -123,11 +133,13 @@
 
 def _get_page_html(self):
 try:
-return self.mwcon.parse(
-self.mwcon.pages[self.page].edit())['text']['*']
-except Exception as ex:
-self.logger.error(
-"Could not fetch page due to exception: " + repr(ex))
+# T158715: Use a raw POST instead of 'parse'
+return self.mwcon.post(
+'parse',
+text=self.mwcon.pages[self.page].text()
+)['parse']['text']['*']
+except Exception:
+self.logger.exception("Could not fetch page due to exception")
 return ""
 
 def _reparse_on_timer(self):
diff --git a/requirements.txt b/requirements.txt
index 9468d4e..74e0a48 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 irc
 lxml
-mwclient
+mwclient>=0.8.2
 python-dateutil
 pytz
 pyyaml

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4746d1329f93798db46e0b34db959332282134e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bots/jouncebot
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]: Fix PageViewInfo config

[jenkins-bot (Code Review)]

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

Change subject: Fix PageViewInfo config
..


Fix PageViewInfo config

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

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 2213167..11fccac 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -543,7 +543,7 @@
'wmgUsePageViewInfo' => [
'default' => true,
],
-   'wgPageViewInfoDomain' => [
+   'wgPageViewInfoWikimediaDomain' => [
'default' => 'en.wikipedia.org',
],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I132360373a6fbd61c94223a7d03638a541cf46ff
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
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...WikimediaEvents[wmf/1.29.0-wmf.13]: Turn off sister search AB test.

[jenkins-bot (Code Review)]

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

Change subject: Turn off sister search AB test.
..


Turn off sister search AB test.

This partially reverts commit
ed0e515e4a64cbf062ae6b387360acc52c65db1b and
a89355a1b43d4cd1c9f4ec3746cae7d4933b6ec0.

This keeps the new 'validBuckets' variable to list which buckets
should be used for a subtest, along with the new distinction of
interwiki (textcat) clicks from standard clicks. For that purpose
this also keeps the new TestSearchSatisfaction2 schema revision.

Bug: T157942
Change-Id: Iae52ac601fbb1603d804a7f0e131dbb73bf95e66
(cherry picked from commit e87fdecfc6afe735c33c2d02efcfa744f9b926d9)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 4 insertions(+), 60 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index a44a4a0..494ac8d 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,39 +113,13 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   // List of valid sub-test buckets
-   validBuckets = [
-   'recall_sidebar_results',
-   'random_sidebar_results',
-   'no_sidebar'
-   ],
-   // Sampling to use when choosing which users 
should participate in test
+   // No sub-tests currently running
+   validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Currently unused, but 
provides a place
// to handle wiki-specific 
sampling
subTests = {
-   fawiki: {
-   // 1 in 10 
users search sessions will be recorded
-   // by event 
logging
-   test: 10,
-   // 1 in 2 (of 
the 1 in 10) will be bucketed into
-   // the 
sub-test. The other 1 in 2 are reserved for
-   // dashboarding.
-   subTest: 2
-   },
-   itwiki: {
-   test: 50,
-   subTest: 2
-   },
-   cawiki: {
-   test: 10,
-   subTest: 2
-   },
-   plwiki: {
-   test: 50,
-   subTest: 2
-   }
};
 
if ( subTests[ dbName ] ) {
@@ -207,7 +181,7 @@
return;
}
 
-   if ( sampleSize.subTest !== null && oneIn( 
sampleSize.subTest ) ) {
+   if ( sampleSize.subTest !== null && !oneIn( 
sampleSize.subTest ) ) {
session.set( 'subTest', chooseBucket( 
validBuckets ) );
}
}
@@ -478,7 +452,7 @@
return function ( action, extraData ) {
var scrollTop = $( window ).scrollTop(),
evt = {
-   // searchResultPage, visitPage, 
checkin, click, iwclick or ssclick
+   // searchResultPage, visitPage, 
checkin, click or iwclick
action: action,
// source of the action, either s

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.29.0-wmf.12]: Turn off sister search AB test.

[jenkins-bot (Code Review)]

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

Change subject: Turn off sister search AB test.
..


Turn off sister search AB test.

This partially reverts commit
ed0e515e4a64cbf062ae6b387360acc52c65db1b and
a89355a1b43d4cd1c9f4ec3746cae7d4933b6ec0.

This keeps the new 'validBuckets' variable to list which buckets
should be used for a subtest, along with the new distinction of
interwiki (textcat) clicks from standard clicks. For that purpose
this also keeps the new TestSearchSatisfaction2 schema revision.

Bug: T157942
Change-Id: Iae52ac601fbb1603d804a7f0e131dbb73bf95e66
(cherry picked from commit e87fdecfc6afe735c33c2d02efcfa744f9b926d9)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 4 insertions(+), 60 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index a44a4a0..494ac8d 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,39 +113,13 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   // List of valid sub-test buckets
-   validBuckets = [
-   'recall_sidebar_results',
-   'random_sidebar_results',
-   'no_sidebar'
-   ],
-   // Sampling to use when choosing which users 
should participate in test
+   // No sub-tests currently running
+   validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Currently unused, but 
provides a place
// to handle wiki-specific 
sampling
subTests = {
-   fawiki: {
-   // 1 in 10 
users search sessions will be recorded
-   // by event 
logging
-   test: 10,
-   // 1 in 2 (of 
the 1 in 10) will be bucketed into
-   // the 
sub-test. The other 1 in 2 are reserved for
-   // dashboarding.
-   subTest: 2
-   },
-   itwiki: {
-   test: 50,
-   subTest: 2
-   },
-   cawiki: {
-   test: 10,
-   subTest: 2
-   },
-   plwiki: {
-   test: 50,
-   subTest: 2
-   }
};
 
if ( subTests[ dbName ] ) {
@@ -207,7 +181,7 @@
return;
}
 
-   if ( sampleSize.subTest !== null && oneIn( 
sampleSize.subTest ) ) {
+   if ( sampleSize.subTest !== null && !oneIn( 
sampleSize.subTest ) ) {
session.set( 'subTest', chooseBucket( 
validBuckets ) );
}
}
@@ -478,7 +452,7 @@
return function ( action, extraData ) {
var scrollTop = $( window ).scrollTop(),
evt = {
-   // searchResultPage, visitPage, 
checkin, click, iwclick or ssclick
+   // searchResultPage, visitPage, 
checkin, click or iwclick
action: action,
// source of the action, either s

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Mention $wgRateLimitsExcludedIPs semantics change in release...

[jenkins-bot (Code Review)]

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

Change subject: Mention $wgRateLimitsExcludedIPs semantics change in release 
notes
..


Mention $wgRateLimitsExcludedIPs semantics change in release notes

Follow-up for I727c19214.

Bug: T156983
Change-Id: I845d2acc2284a107d4bacd526e7598bade118d0a
---
M RELEASE-NOTES-1.29
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 13406d6..a739821 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -32,6 +32,7 @@
   new features that rely on the schema changes to the user_groups table. This
   feature flag will likely be removed before 1.29 is released.
 * (T158474) "Unknown user" has been added to $wgReservedUsernames.
+* (T156983) $wgRateLimitsExcludedIPs now accepts CIDR ranges as well as single 
IPs.
 
 === New features in 1.29 ===
 * (T5233) A cookie can now be set when a user is autoblocked, to track that 
user

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I845d2acc2284a107d4bacd526e7598bade118d0a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: clean.py: Rework command execution, reduce code dupe

[jenkins-bot (Code Review)]

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

Change subject: clean.py: Rework command execution, reduce code dupe
..


clean.py: Rework command execution, reduce code dupe

Change-Id: I4cd7ae94ea14292ae72e859c8dbc6c3d8f096519
---
M scap/plugins/clean.py
1 file changed, 17 insertions(+), 19 deletions(-)

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



diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py
index e04da83..661b92a 100644
--- a/scap/plugins/clean.py
+++ b/scap/plugins/clean.py
@@ -18,31 +18,29 @@
 """ Clean old branches from the cluster for space savings! """
 
 # Update masters
-with log.Timer('clean-masters', self.get_stats()):
-clean_job = ssh.Job(self._get_master_list(),
-user=self.config['ssh_user'])
-clean_job.exclude_hosts([socket.getfqdn()])
-clean_job.shuffle()
-clean_job.command(self.clean_command(self.config['stage_dir']))
-clean_job.progress(log.reporter('clean-masters',
-   self.config['fancy_progress']))
-succeeded, failed = clean_job.run()
-if failed:
-self.get_logger().warning(
-'%d masters had clean errors', failed)
+self.execute_remote(
+'clean-masters',
+self._get_master_list(),
+self.clean_command(self.config['stage_dir'])
+)
 
 # Update apaches
-with log.Timer('clean-apaches', self.get_stats()):
-clean_job = ssh.Job(self._get_target_list(),
-user=self.config['ssh_user'])
+self.execute_remote(
+'clean-apaches',
+self._get_target_list(),
+self.clean_command(self.config['deploy_dir'])
+)
+
+def execute_remote(self, description, targets, command):
+with log.Timer(description, self.get_stats()):
+clean_job = ssh.Job(targets, user=self.config['ssh_user'])
 clean_job.shuffle()
-clean_job.command(self.clean_command(self.config['deploy_dir']))
-clean_job.progress(log.reporter('clean-apaches',
+clean_job.command(command)
+clean_job.progress(log.reporter(description,
self.config['fancy_progress']))
 succeeded, failed = clean_job.run()
 if failed:
-self.get_logger().warning(
-'%d apaches had clean errors', failed)
+self.get_logger().warning('%d had clean errors', failed)
 
 def clean_command(self, location):
 path = os.path.join(location, 'php-%s' % self.arguments.branch)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cd7ae94ea14292ae72e859c8dbc6c3d8f096519
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
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] oojs/ui[master]: README: Encourage direct release in the instructions

[jenkins-bot (Code Review)]

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

Change subject: README: Encourage direct release in the instructions
..


README: Encourage direct release in the instructions

Change-Id: Ie8456a913d06faf9a405b963f3864a411516ee32
---
M README.md
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/README.md b/README.md
index dd7f4c9..64ebc56 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,5 @@
 $ git remote update
 $ git checkout origin/master
 $ git tag "vX.X.X"
-$ npm run publish-build && git push --tags
-$ npm publish
+$ npm run publish-build && git push --tags && npm publish
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8456a913d06faf9a405b963f3864a411516ee32
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Add SetZoneAccess to AutoloadClasses for later reuse in addWiki

[Reedy (Code Review)]

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

Change subject: Add SetZoneAccess to AutoloadClasses for later reuse in addWiki
..

Add SetZoneAccess to AutoloadClasses for later reuse in addWiki

Requires wfLoadExtension( 'WikimediaMaintenance' ); adding to CommonSettings.php

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/87/339087/1

diff --git a/extension.json b/extension.json
index 194c7e3..4a72ba8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,4 +1,7 @@
 {
"name": "WikimediaMaintenance",
+   "AutoloadClasses": {
+   "SetZoneAccess": "filebackend/setZoneAccess.php"
+   },
"manifest_version": 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87298e444141cd3959c76eebc8e3683666bd4d89
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Convert all arrays to short array syntax

[Reedy (Code Review)]

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

Change subject: Convert all arrays to short array syntax
..

Convert all arrays to short array syntax

Change-Id: I199280ac0b36dff97d17520b3afb4e7fad9ead40
---
M addWiki.php
M bug-53687/fixOrphans.php
M checkTranscacheEmpty.php
M cleanupBug31576.php
M cleanupBug41615.php
M cleanupPageProps.php
M cleanupT92775.php
M createExtensionTables.php
M createHumanReadableProjectNameFiles.php
M dumpInterwiki.php
M filebackend/measureZoneSizes.php
M filebackend/setZoneAccess.php
M fixBeXOldRenames.php
M fixBug41778.php
M fixCleanupTitles/revertCleanupTitles.php
M fixJobQueueExplosion.php
M fixUsabilityPrefs.php
M fixUsabilityPrefs2.php
M getJobQueueLengths.php
M getPageCounts.php
M importUseModWikipedia.php
M makeSizeDBLists.php
M migrateWlmUploads.php
M ourUsers.php
M passwordAudit.php
M purgeStaleMemcachedText.php
M rcParamsTypeCheck.php
M renameInvalidUsernames.php
M renameWiki.php
M sanityCheck.php
M storage/testRctComplete.php
M unsuppressCrossWiki.php
32 files changed, 334 insertions(+), 398 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/86/339086/1

diff --git a/addWiki.php b/addWiki.php
index c648025..589f6e2 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -87,7 +87,7 @@
null,
null,
__METHOD__,
-   array( $this, 'noExecuteCommands' )
+   [ $this, 'noExecuteCommands' ]
);
$dbw->sourceFile( 
"$IP/extensions/AntiSpoof/sql/patch-antispoof.mysql.sql" );
$dbw->sourceFile( "$IP/extensions/Babel/babel.sql" );
@@ -152,18 +152,18 @@
if ( is_array( $wgDefaultExternalStore ) ) {
$stores = $wgDefaultExternalStore;
} elseif ( $wgDefaultExternalStore ) {
-   $stores = array( $wgDefaultExternalStore );
+   $stores = [ $wgDefaultExternalStore ];
} else {
-   $stores = array();
+   $stores = [];
}
 
// Flow External Store (may be the same, so there is an 
array_unique)
if ( is_array( $wgFlowExternalStore ) ) {
$flowStores = $wgFlowExternalStore;
} elseif ( $wgFlowExternalStore ) {
-   $flowStores = array( $wgFlowExternalStore );
+   $flowStores = [ $wgFlowExternalStore ];
} else {
-   $flowStores = array();
+   $flowStores = [];
}
 
$stores = array_unique( array_merge( $stores, $flowStores ) );
@@ -171,7 +171,7 @@
if ( count( $stores ) ) {
global $wgDBuser, $wgDBpassword, $wgExternalServers;
foreach ( $stores as $storeURL ) {
-   $m = array();
+   $m = [];
if ( !preg_match( '!^DB://(.*)$!', $storeURL, 
$m ) ) {
continue;
}
@@ -302,12 +302,11 @@
 
// There is likely a better way to create the link, but it 
seems like one
// cannot count on interwiki links at this point
-   $linkurl = "https://donate.wikimedia.org/?"; . http_build_query( 
array(
+   $linkurl = "https://donate.wikimedia.org/?"; . http_build_query( 
[
"utm_source" => "donate",
"utm_medium" => "sidebar",
"utm_campaign" => $domain,
-   "uselang" => $language
-   ) );
+   "uselang" => $language ] );
 
return $article->doEditContent(
ContentHandler::makeContent( $linkurl, $title ),
diff --git a/bug-53687/fixOrphans.php b/bug-53687/fixOrphans.php
index 475520e..2197228 100644
--- a/bug-53687/fixOrphans.php
+++ b/bug-53687/fixOrphans.php
@@ -23,7 +23,7 @@
}
$dbw = wfGetDB( DB_MASTER );
 
-   $verifyPairs = array(
+   $verifyPairs = [
'ar_comment' => 'rev_comment',
'ar_user' => 'rev_user',
'ar_user_text' => 'rev_user_text',
@@ -34,8 +34,7 @@
'ar_len' => 'rev_len',
'ar_page_id' => 'rev_page',
'ar_parent_id' => 'rev_parent_id',
-   'ar_sha1' => 'rev_sha1',
-   );
+   'ar_sha1' => 'rev_sha1', ];
 
while ( !feof( $f ) ) {
$line = fgets( $f );
@@ -52,23 +51,23 @@
$this->error( "XXX: ERRO

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Look up iDEAL banks, provide PSR6 to SmashPig

[jenkins-bot (Code Review)]

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

Change subject: Look up iDEAL banks, provide PSR6 to SmashPig
..


Look up iDEAL banks, provide PSR6 to SmashPig

Override SmashPig's 'cache' configuration key with the
LocalClusterPsr6Cache to allow SmasPig objects to use Mediawiki's
local cluster BagOStuff cache.

The test code has to know about SmashPig Configuration, but it
can cleanly mock the top-level library object.

Bug: T128692
Change-Id: I9013355c7cc57d632f3ba7c7a55cb75ce2aca843
---
M DonationInterface.class.php
M README.txt
M composer.json
M composer.lock
M gateway_common/GatewayPage.php
A gateway_common/LocalClusterPsr6Cache.php
M gateway_common/donation.api.php
M globalcollect_gateway/globalcollect.adapter.php
M tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
9 files changed, 195 insertions(+), 7 deletions(-)

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



diff --git a/DonationInterface.class.php b/DonationInterface.class.php
index 6cdcf1d..40a5648 100644
--- a/DonationInterface.class.php
+++ b/DonationInterface.class.php
@@ -1,5 +1,8 @@
  array(), //all countries
 )
 
+Caching:
+To let SmashPig objects use Mediawiki's local cluster BagOStuff cache, add this
+to your SmashPig configuration under key 'cache':
+ class: LocalClusterPsr6Cache
+(no constructor-parameters need to be specified)
+
  Form appearance and content 
 
 Besides these settings, please see DonationInterfaceFormSettings.php
diff --git a/composer.json b/composer.json
index 717ffa5..d62654a 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,8 @@
"zordius/lightncandy": "0.23",
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"symfony/yaml": "^2.8",
-   "wikimedia/smash-pig": "dev-master"
+   "wikimedia/smash-pig": "dev-master",
+   "addshore/psr-6-mediawiki-bagostuff-adapter": "0.1"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2"
diff --git a/composer.lock b/composer.lock
index 013a6a4..c941554 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,54 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
 "This file is @generated automatically"
 ],
-"hash": "ee3f90702fff3bcc172baabd6f541eb5",
-"content-hash": "c80503673255d9fe80c09a081876776e",
+"hash": "4ed6aa117f3e06e6da4a259e398fd6f8",
+"content-hash": "0b276b857fa6d06ce5b977f9dfa9431d",
 "packages": [
+{
+"name": "addshore/psr-6-mediawiki-bagostuff-adapter",
+"version": "0.1",
+"source": {
+"type": "git",
+"url": 
"https://github.com/addshore/psr-6-mediawiki-bagostuff-adapter.git";,
+"reference": "92f3bb69bf3e7f51b8b66ae74b6a4a291637354c"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/addshore/psr-6-mediawiki-bagostuff-adapter/zipball/92f3bb69bf3e7f51b8b66ae74b6a4a291637354c";,
+"reference": "92f3bb69bf3e7f51b8b66ae74b6a4a291637354c",
+"shasum": ""
+},
+"require": {
+"psr/cache": "^1.0.0"
+},
+"require-dev": {
+"cache/integration-tests": "~0.9.1",
+"jakub-onderka/php-parallel-lint": "^0.9.2",
+"mediawiki/mediawiki-codesniffer": "^0.7.2",
+"phpunit/phpunit": "~4.8.0|~5.3.0"
+},
+"type": "library",
+"autoload": {
+"psr-4": {
+"Addshore\\Psr\\Cache\\MWBagOStuffAdapter\\": "src/"
+}
+},
+"notification-url": "https://packagist.org/downloads/";,
+"license": [
+"GPL-2.0+"
+],
+"authors": [
+{
+"name": "Addshore"
+}
+],
+"description": "A MediaWiki BagOStuff PSR-6 adapter library",
+"keywords": [
+"cache",
+"mediawiki"
+],
+"time": "2017-02-16 14:33:59"
+},
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
 "version": "dev-master",
@@ -456,6 +501,52 @@
 "time": "2016-06-16 16:22:20"
 },
 {
+"name": "psr/cache",
+"version": "1.0.1",
+"source": {
+"type": "git",
+"url": "https://github.com/php-fig/cache.git";,
+"reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/php-fi

[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Add support for chemical formulae in VisualEditor

[jenkins-bot (Code Review)]

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

Change subject: Add support for chemical formulae in VisualEditor
..


Add support for chemical formulae in VisualEditor

The chemical and mathematical formula inspectors and dialogs
have a lot of similar functionality, and the common parts are
now moved to the common MWLatex class.

MWMath* classes now inherit from MWLatex*, and so do
the new MWChem* classes.

Bug: T153365
Change-Id: I4452ceca55197fda5f1e1293a5741c6f5fb7c245
---
C MathChemSymbolsDataModule.php
R MathMathSymbolsDataModule.php
M extension.json
M i18n/en.json
M i18n/qqq.json
A modules/ve-math/chemSymbols.json
R modules/ve-math/mathSymbols.json
M modules/ve-math/tools/makeSvgsAndCss.js
A modules/ve-math/ve.ce.MWChemNode.js
R modules/ve-math/ve.ce.MWLatexNode.css
A modules/ve-math/ve.ce.MWLatexNode.js
M modules/ve-math/ve.ce.MWMathNode.js
A modules/ve-math/ve.dm.MWChemNode.js
A modules/ve-math/ve.dm.MWLatexNode.js
M modules/ve-math/ve.dm.MWMathNode.js
A modules/ve-math/ve.ui.MWChemContextItem.js
A modules/ve-math/ve.ui.MWChemDialog.js
A modules/ve-math/ve.ui.MWChemDialogTool.js
A modules/ve-math/ve.ui.MWChemInspector.js
A modules/ve-math/ve.ui.MWChemSymbols.css
A modules/ve-math/ve.ui.MWLatexContextItem.js
A modules/ve-math/ve.ui.MWLatexDialog.css
A modules/ve-math/ve.ui.MWLatexDialog.js
R modules/ve-math/ve.ui.MWLatexIcons.css
A modules/ve-math/ve.ui.MWLatexInspector.css
A modules/ve-math/ve.ui.MWLatexInspector.js
R modules/ve-math/ve.ui.MWLatexPage.css
R modules/ve-math/ve.ui.MWLatexPage.js
M modules/ve-math/ve.ui.MWMathContextItem.js
D modules/ve-math/ve.ui.MWMathDialog.css
M modules/ve-math/ve.ui.MWMathDialog.js
M modules/ve-math/ve.ui.MWMathDialogTool.js
D modules/ve-math/ve.ui.MWMathInspector.css
M modules/ve-math/ve.ui.MWMathInspector.js
M modules/ve-math/ve.ui.MWMathSymbols.css
35 files changed, 2,394 insertions(+), 1,497 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4452ceca55197fda5f1e1293a5741c6f5fb7c245
Gerrit-PatchSet: 18
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: TheDJ 
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...WikimediaMaintenance[master]: Fix error displaying in setZoneAccess

[Reedy (Code Review)]

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

Change subject: Fix error displaying in setZoneAccess
..

Fix error displaying in setZoneAccess

Warnings and Errors are stored the same place

Functions aren't get*Array either

Change-Id: I7b48c877330c28460aeb29630241ad4c106db113
---
M filebackend/setZoneAccess.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/85/339085/1

diff --git a/filebackend/setZoneAccess.php b/filebackend/setZoneAccess.php
index 1a3ed87..2dc80ca 100644
--- a/filebackend/setZoneAccess.php
+++ b/filebackend/setZoneAccess.php
@@ -40,7 +40,7 @@
}
$this->output( "done.\n" );
if ( !$status->isOK() ) {
-   print_r( array_merge( $status->getErrorsArray(), 
$status->getWarningsArray() ) );
+   print_r( $status->getErrors() );
}
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b48c877330c28460aeb29630241ad4c106db113
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Mention $wgRateLimitsExcludedIPs semantics change in release...

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339084 )

Change subject: Mention $wgRateLimitsExcludedIPs semantics change in release 
notes
..

Mention $wgRateLimitsExcludedIPs semantics change in release notes

Follow-up for I727c19214.

Bug: T156983
Change-Id: I845d2acc2284a107d4bacd526e7598bade118d0a
---
M RELEASE-NOTES-1.29
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/339084/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 13406d6..29f1591 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -32,6 +32,7 @@
   new features that rely on the schema changes to the user_groups table. This
   feature flag will likely be removed before 1.29 is released.
 * (T158474) "Unknown user" has been added to $wgReservedUsernames.
+* $wgRateLimitsExcludedIPs now accepts CIDR ranges as well as single IPs.
 
 === New features in 1.29 ===
 * (T5233) A cookie can now be set when a user is autoblocked, to track that 
user

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I845d2acc2284a107d4bacd526e7598bade118d0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Encourage direct release in the instructions

[Jforrester (Code Review)]

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

Change subject: README: Encourage direct release in the instructions
..

README: Encourage direct release in the instructions

Change-Id: Ie8456a913d06faf9a405b963f3864a411516ee32
---
M README.md
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/339083/1

diff --git a/README.md b/README.md
index dd7f4c9..64ebc56 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,5 @@
 $ git remote update
 $ git checkout origin/master
 $ git tag "vX.X.X"
-$ npm run publish-build && git push --tags
-$ npm publish
+$ npm run publish-build && git push --tags && npm publish
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8456a913d06faf9a405b963f3864a411516ee32
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] mediawiki...PerformanceInspector[master]: build: Replace jscs/jshint with eslint and make pass

[Krinkle (Code Review)]

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

Change subject: build: Replace jscs/jshint with eslint and make pass
..

build: Replace jscs/jshint with eslint and make pass

Per T118941.

Change-Id: Iff79501de8d80a860eebb4a6e31dc8fca3285505
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/collectors/ext.PerformanceInspector.imagesize.js
M modules/collectors/ext.PerformanceInspector.modulescss.js
M modules/collectors/ext.PerformanceInspector.newpp.js
M package.json
9 files changed, 39 insertions(+), 59 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PerformanceInspector 
refs/changes/82/339082/1

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..3dd3086
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,17 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true,
+   "qunit": true
+   },
+   "globals": {
+   "OO": false,
+   "mw": false
+   },
+   "rules": {
+   "dot-notation": [ "error", { "allowKeywords": true } ],
+   "valid-jsdoc": 0,
+   "indent": 0
+   }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 8305d61..000
--- a/.jscsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-   "preset": "wikimedia",
-   "es3": true
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index f414e48..000
--- a/.jshintrc
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "freeze": true,
-   "latedef": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-   "strict": false,
-
-   // Relaxing
-   "es5": false,
-
-   // Environment
-   "browser": true,
-   "jquery": true,
-
-   "globals": {
-   "mediaWiki": false,
-   "OO": false,
-   "require": false,
-   "module": false,
-   "moment": false
-   }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 18101d6..be270bd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,22 +1,17 @@
-/*jshint node:true */
+/* eslint-env node */
 module.exports = function ( grunt ) {
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-   grunt.loadNpmTasks( 'grunt-jsonlint' );
-   grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
var conf = grunt.file.readJSON( 'extension.json' );
 
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
grunt.initConfig( {
-   jshint: {
-   options: {
-   jshintrc: true
-   },
+   eslint: {
all: [
-   'modules/'
+   'modules/**/*.js',
+   'tests/**/*.js'
]
-   },
-   jscs: {
-   src: '<%= jshint.all %>'
},
banana: conf.MessagesDirs,
jsonlint: {
@@ -27,6 +22,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/collectors/ext.PerformanceInspector.imagesize.js 
b/modules/collectors/ext.PerformanceInspector.imagesize.js
index ced9ada..dc987b5 100644
--- a/modules/collectors/ext.PerformanceInspector.imagesize.js
+++ b/modules/collectors/ext.PerformanceInspector.imagesize.js
@@ -68,7 +68,7 @@
} );
}
for ( i = 0; i < img.length; i++ ) {
-   if ( img[ i ].currentSrc && img[ i 
].currentSrc.indexOf( 'data:image' ) === -1  ) {
+   if ( img[ i ].currentSrc && img[ i 
].currentSrc.indexOf( 'data:image' ) === -1 ) {
promises.push( fetchContent( img[ i 
].currentSrc ) );
}
}
@@ -96,12 +96,12 @@
url: 
values[ i ].url,

sizeRaw: sizeRaw,
size: 
humanSize( sizeRaw ),
-   

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Switch to 2.1.5RC

[jenkins-bot (Code Review)]

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

Change subject: Switch to 2.1.5RC
..


Switch to 2.1.5RC

Change-Id: Ibfa05bb29669495b13d83e6a70b2184431e05f6e
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pom.xml b/pom.xml
index 80147e8..8087ec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
   
 
   
-2.1.4
+2.1.5-SNAPSHOT
 9.2.9.v20150224
 UTF-8
 2.7.12

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: clean.py: Remove useless underscore from method name

[jenkins-bot (Code Review)]

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

Change subject: clean.py: Remove useless underscore from method name
..


clean.py: Remove useless underscore from method name

Change-Id: If9351b7461ed8bad26dcf98ff990772367d45c04
---
M scap/plugins/clean.py
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py
index 556348a..e04da83 100644
--- a/scap/plugins/clean.py
+++ b/scap/plugins/clean.py
@@ -23,7 +23,7 @@
 user=self.config['ssh_user'])
 clean_job.exclude_hosts([socket.getfqdn()])
 clean_job.shuffle()
-clean_job.command(self._clean_command(self.config['stage_dir']))
+clean_job.command(self.clean_command(self.config['stage_dir']))
 clean_job.progress(log.reporter('clean-masters',
self.config['fancy_progress']))
 succeeded, failed = clean_job.run()
@@ -36,7 +36,7 @@
 clean_job = ssh.Job(self._get_target_list(),
 user=self.config['ssh_user'])
 clean_job.shuffle()
-clean_job.command(self._clean_command(self.config['deploy_dir']))
+clean_job.command(self.clean_command(self.config['deploy_dir']))
 clean_job.progress(log.reporter('clean-apaches',
self.config['fancy_progress']))
 succeeded, failed = clean_job.run()
@@ -44,7 +44,7 @@
 self.get_logger().warning(
 '%d apaches had clean errors', failed)
 
-def _clean_command(self, location):
+def clean_command(self, location):
 path = os.path.join(location, 'php-%s' % self.arguments.branch)
 if self.arguments.l10n_only:
 path = os.path.join(path, 'cache', 'l10n', '*.cdb')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9351b7461ed8bad26dcf98ff990772367d45c04
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Zppix 
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]: toolserver_legacy: Use Redirect instead of RedirectMatch

[Dzahn (Code Review)]

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

Change subject: toolserver_legacy: Use Redirect instead of RedirectMatch
..


toolserver_legacy: Use Redirect instead of RedirectMatch

Change-Id: Ic79292fdc3c1d54ba58b32aaa157e74d81533143
---
M modules/toolserver_legacy/templates/www.toolserver.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toolserver_legacy/templates/www.toolserver.org.erb 
b/modules/toolserver_legacy/templates/www.toolserver.org.erb
index 0657086..3fd77d5 100644
--- a/modules/toolserver_legacy/templates/www.toolserver.org.erb
+++ b/modules/toolserver_legacy/templates/www.toolserver.org.erb
@@ -214,7 +214,7 @@
 Redirect 301 /~magnus/geohack https://tools.wmflabs.org/geohack
 Redirect 301 /~magnus/geo https://tools.wmflabs.org/geohack
 Redirect 301 /~magnus/joanjoc/sugart.php 
https://tools.wmflabs.org/joanjoc/sugart.php
-RedirectMatch 301 \/~magnus\/(.*) https://tools.wmflabs.org/magnustools/$1
+Redirect 301 /~magnus https://tools.wmflabs.org/magnustools
 Redirect 301 /~master https://tools.wmflabs.org/wiwosm
 Redirect 303 /~mathbot https://tools.wmflabs.org/mathbot/
 Redirect 301 /~multichill/coordinates.php 
https://tools.wmflabs.org/locator/coordinates.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic79292fdc3c1d54ba58b32aaa157e74d81533143
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: DatGuy 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Tim Landscheidt 
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...PerformanceInspector[master]: dialog: Fix missing 'name' attribute for OOjs UI windows

[Krinkle (Code Review)]

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

Change subject: dialog: Fix missing 'name' attribute for OOjs UI windows
..

dialog: Fix missing 'name' attribute for OOjs UI windows

A recent change in OOjs UI requires all windows to have a symbolic
name. Either set in the Dialog class via .static.name, or set
at run-time when calling addWindows().

> Error: Windows must have a `name` static property defined
> https://doc.wikimedia.org/oojs-ui/master/js/#!/api/OO.ui.WindowManager-method-addWindows

Change-Id: Iaecc85001ce8330f9c1321da23561c49d02a59b0
---
M modules/ext.PerformanceInspector.startup.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PerformanceInspector 
refs/changes/81/339081/1

diff --git a/modules/ext.PerformanceInspector.startup.js 
b/modules/ext.PerformanceInspector.startup.js
index 99f4293..c932c17 100644
--- a/modules/ext.PerformanceInspector.startup.js
+++ b/modules/ext.PerformanceInspector.startup.js
@@ -49,7 +49,7 @@
}, summary, views );
 
$( 'body' ).append( 
windowManager.$element );
-   windowManager.addWindows( [ 
dialog ] );
+   windowManager.addWindows( { 
performanceInspector: dialog } );
windowManager.openWindow( 
dialog );
} );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaecc85001ce8330f9c1321da23561c49d02a59b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PerformanceInspector
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Hygiene: do not pollute the `mw` namespace

[Bmansurov (Code Review)]

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

Change subject: Hygiene: do not pollute the `mw` namespace
..

Hygiene: do not pollute the `mw` namespace

Use module.exports for the gateway. This will allow us to move
utility functions outside the init script in future patches.

Bug: T157700
Change-Id: Ie26a7bd78e1511dc12c1ee6b0b69b71c38c8a9f3
---
M resources/ext.relatedArticles.readMore.bootstrap/index.js
M resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
M tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
3 files changed, 8 insertions(+), 11 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles 
refs/changes/79/339079/1

diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js 
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index bf53014..0289300 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -1,6 +1,6 @@
 ( function ( $, mw ) {
-
-   var relatedPages = new mw.relatedPages.RelatedPagesGateway(
+   var RelatedPagesGateway = require( 
'ext.relatedArticles.readMore.gateway' ),
+   relatedPagesGateway = new RelatedPagesGateway(
new mw.Api(),
mw.config.get( 'wgPageName' ),
mw.config.get( 'wgRelatedArticles' ),
@@ -25,6 +25,7 @@
 * @return {boolean}
 */
function isEnabledForCurrentUser() {
+   return true;
var bucket,
samplingRate = mw.config.get( 
'wgRelatedArticlesEnabledSamplingRate', 1 );
 
@@ -58,7 +59,7 @@
// to avoid PHP exceptions when Cards not 
installed
// which should never happen given the if 
statement.
mw.loader.using( [ 'ext.cards', 
'ext.relatedArticles.readMore' ] ),
-   relatedPages.getForCurrentPage( LIMIT )
+   relatedPagesGateway.getForCurrentPage( LIMIT )
).done( function ( _, pages ) {
if ( pages.length ) {
mw.track( 'ext.relatedArticles.init', 
pages );
diff --git 
a/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js 
b/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
index 9e69cd4..74c18a6 100644
--- a/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
+++ b/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
@@ -1,8 +1,4 @@
 ( function ( $, mw ) {
-
-   // FIXME: Move into separate file as this module becomes larger.
-   mw.relatedPages = {};
-
/**
 * @class RelatedPagesGateway
 * @param {mw.Api} api
@@ -108,5 +104,5 @@
return result && result.query && result.query.pages ? 
result.query.pages : [];
}
 
-   mw.relatedPages.RelatedPagesGateway = RelatedPagesGateway;
+   module.exports = RelatedPagesGateway;
 }( jQuery, mediaWiki ) );
diff --git 
a/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js 
b/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
index c2b2f32..d89083b 100644
--- 
a/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
+++ 
b/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
@@ -1,5 +1,5 @@
-( function ( M, $ ) {
-   var RelatedPagesGateway = mw.relatedPages.RelatedPagesGateway,
+( function ( $ ) {
+   var RelatedPagesGateway = require( 
'ext.relatedArticles.readMore.gateway' ),
relatedPages = {
query: {
pages: [
@@ -90,4 +90,4 @@
} );
} );
 
-}( mw.mobileFrontend, jQuery ) );
+}( jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie26a7bd78e1511dc12c1ee6b0b69b71c38c8a9f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Extract a utility function to a separate testable module

[Bmansurov (Code Review)]

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

Change subject: Extract a utility function to a separate testable module
..

Extract a utility function to a separate testable module

Add unit tests too.
Bug: T157700

Change-Id: I4d19cf15b4585a6c005750726ed79e1bd879e8c3
---
M extension.json
M includes/Hooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
A resources/ext.relatedArticles.readMore.util/index.js
A tests/qunit/ext.relatedArticles.readMore.util/test_index.js
5 files changed, 89 insertions(+), 32 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles 
refs/changes/80/339080/1

diff --git a/extension.json b/extension.json
index 7aff868..841a12f 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,18 @@
"desktop"
]
},
+   "ext.relatedArticles.readMore.util": {
+   "scripts": [
+   
"resources/ext.relatedArticles.readMore.util/index.js"
+   ],
+   "dependencies": [
+   "oojs"
+   ],
+   "targets": [
+   "mobile",
+   "desktop"
+   ]
+   },
"ext.relatedArticles.readMore.bootstrap": {
"scripts": [

"resources/ext.relatedArticles.readMore.bootstrap/index.js"
@@ -83,6 +95,7 @@
"mediawiki.api",
"mediawiki.Uri",
"mediawiki.viewport",
+   "ext.relatedArticles.readMore.util",
"ext.relatedArticles.readMore.gateway",
"jquery.throttle-debounce"
],
diff --git a/includes/Hooks.php b/includes/Hooks.php
index a785ae6..e265e7b 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -99,6 +99,15 @@
'ext.relatedArticles.readMore.gateway',
],
];
+
+   $modules['qunit']['ext.relatedArticles.readMore.util.tests'] = 
$boilerplate + [
+   'scripts' => [
+   
'ext.relatedArticles.readMore.util/test_index.js',
+   ],
+   'dependencies' => [
+   'ext.relatedArticles.readMore.util',
+   ],
+   ];
return true;
}
 }
diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js 
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index 0289300..08d039b 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -7,42 +7,12 @@
mw.config.get( 'wgRelatedArticlesUseCirrusSearch' ),
mw.config.get( 'wgRelatedArticlesOnlyUseCirrusSearch' )
),
+   util = require( 'ext.relatedArticles.readMore.util' ),
LIMIT = 3,
debouncedLoad = $.debounce( 100, function () {
loadRelatedArticles();
} ),
$window = $( window );
-
-   /**
-* Is RelatedArticles extension enabled for current user
-*
-* Returns true if the user opted into the beta feature, otherwise
-* user's session ID is used to determine the eligibility for 
RelatedArticles functionality,
-* based on the value of wgRelatedArticlesEnabledSamplingRate
-* thus the function will result the same outcome as long as the browser
-* hasn't been restarted or the cookie hasn't been cleared.
-*
-* @return {boolean}
-*/
-   function isEnabledForCurrentUser() {
-   return true;
-   var bucket,
-   samplingRate = mw.config.get( 
'wgRelatedArticlesEnabledSamplingRate', 1 );
-
-   if ( mw.config.get( 'wgRelatedArticlesBetaFeatureEnabled' ) ) {
-   return true;
-   }
-
-   bucket = mw.experiments.getBucket( {
-   name: 'ext.relatedArticles.visibility',
-   enabled: true,
-   buckets: {
-   control: 1 - samplingRate,
-   A: samplingRate
-   }
-   }, mw.user.sessionId() );
-   return bucket === 'A';
-   }
 
/**
 * Load related articles when the user scrolls past half of the window 
height.
@@ -72,7 +42,7 @@
}
}
 
-   if ( isEnabledForCurr

[MediaWiki-commits] [Gerrit] maps/kartotherian[master]: Switch to upstream service-runner

[Ppchelko (Code Review)]

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

Change subject: Switch to upstream service-runner
..

Switch to upstream service-runner

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


  git pull ssh://gerrit.wikimedia.org:29418/maps/kartotherian 
refs/changes/78/339078/1

diff --git a/package.json b/package.json
index d4b099b..5342890 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,7 @@
 "express": "^4.13.4",
 "js-yaml": "^3.6.0",
 "preq": "^0.4.11",
-"service-runner": "git+https://github.com/nyurik/service-runner.git";
-,
+"service-runner": "^2.2.1",
 "heapdump": "*",
 "node-pre-gyp": "~0.6.25",
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c45a28274e9230604f0b9d34c653996f3bf1de6
Gerrit-PatchSet: 1
Gerrit-Project: maps/kartotherian
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Fix CachingStack::dump

[jenkins-bot (Code Review)]

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

Change subject: Fix CachingStack::dump
..


Fix CachingStack::dump

Change-Id: I8d84da0440b05e47226252c975dfbc4a68aa5d54
---
M src/TreeBuilder/CachingStack.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/src/TreeBuilder/CachingStack.php b/src/TreeBuilder/CachingStack.php
index d501f47..74112e1 100644
--- a/src/TreeBuilder/CachingStack.php
+++ b/src/TreeBuilder/CachingStack.php
@@ -406,10 +406,10 @@
public function dump() {
return parent::dump() .
$this->scopeDump( self::SCOPE_DEFAULT, 'In scope' ) .
-   $this->scopeDump( self::SCOPE_DEFAULT, 'In list scope' 
) .
-   $this->scopeDump( self::SCOPE_DEFAULT, 'In button 
scope' ) .
-   $this->scopeDump( self::SCOPE_DEFAULT, 'In table scope' 
) .
-   $this->scopeDump( self::SCOPE_DEFAULT, 'In select 
scope' ) . "\n";
+   $this->scopeDump( self::SCOPE_LIST, 'In list scope' ) .
+   $this->scopeDump( self::SCOPE_BUTTON, 'In button scope' 
) .
+   $this->scopeDump( self::SCOPE_TABLE, 'In table scope' ) 
.
+   $this->scopeDump( self::SCOPE_SELECT, 'In select scope' 
) . "\n";
}
 
private function scopeDump( $scopeId, $scopeName ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d84da0440b05e47226252c975dfbc4a68aa5d54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Composer updates: ext-mbstring, add gitattributes

[jenkins-bot (Code Review)]

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

Change subject: Composer updates: ext-mbstring, add gitattributes
..


Composer updates: ext-mbstring, add gitattributes

Change-Id: I66a8da97f78d3012c95056953bd557c13ea18290
---
A .gitattributes
M composer.json
2 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..412d375
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,11 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.gitreview export-ignore
+/Doxyfile export-ignore
+/composer.json export-ignore
+/doc export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore
+/bin export-ignore
+/src/FuzzTest export-ignore
diff --git a/composer.json b/composer.json
index 78a2ca3..356c9dd 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
}
],
"require": {
+   "ext-mbstring": "*",
"wikimedia/utfnormal": "1.*"
},
"require-dev": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66a8da97f78d3012c95056953bd557c13ea18290
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...jouncebot[master]: Python3 compat

[jenkins-bot (Code Review)]

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

Change subject: Python3 compat
..


Python3 compat

Add python3 to tox tests and fix small incompatibilities

Change-Id: I89370a4d41f55ecc77b7b830e056d47cb474c034
---
M tests/lint_tests.py
M tox.ini
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/tests/lint_tests.py b/tests/lint_tests.py
index 5329424..f9e7ab6 100644
--- a/tests/lint_tests.py
+++ b/tests/lint_tests.py
@@ -7,9 +7,9 @@
 
 def lint_yaml(path):
 try:
-obj = yaml.safe_load(file(path, 'r'))
+obj = yaml.safe_load(open(path, 'r'))
 assert obj, "Parse failed for %s: empty result" % path
-except yaml.error.YAMLError, exc:
+except yaml.error.YAMLError as exc:
 assert False, "YAML parse error in %s: %s" % (path, exc)
 
 
diff --git a/tox.ini b/tox.ini
index f1a4bc6..82b3007 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27, flake8
+envlist = py2, py3, flake8
 
 [flake8]
 count = 1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89370a4d41f55ecc77b7b830e056d47cb474c034
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bots/jouncebot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[es5]: Update Elastica to 5.1.0

[EBernhardson (Code Review)]

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

Change subject: Update Elastica to 5.1.0
..

Update Elastica to 5.1.0

Change-Id: I5edb7118e87418e8ff5a78ca540d0cf9c13ee793
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/installed.json
M ruflin/elastica/CHANGELOG.md
M ruflin/elastica/Makefile
M ruflin/elastica/README.md
M ruflin/elastica/composer.json
M ruflin/elastica/lib/Elastica/AbstractUpdateAction.php
M ruflin/elastica/lib/Elastica/Aggregation/ScriptedMetric.php
M ruflin/elastica/lib/Elastica/Bulk/Action/AbstractDocument.php
M ruflin/elastica/lib/Elastica/Bulk/Action/IndexDocument.php
M ruflin/elastica/lib/Elastica/Client.php
M ruflin/elastica/lib/Elastica/Index.php
M ruflin/elastica/lib/Elastica/Query/AbstractGeoShape.php
M ruflin/elastica/lib/Elastica/Query/BoolQuery.php
M ruflin/elastica/lib/Elastica/Query/ConstantScore.php
M ruflin/elastica/lib/Elastica/Query/GeoDistanceRange.php
M ruflin/elastica/lib/Elastica/Query/GeoShapeProvided.php
M ruflin/elastica/lib/Elastica/Query/GeohashCell.php
M ruflin/elastica/lib/Elastica/Query/HasParent.php
M ruflin/elastica/lib/Elastica/Query/Indices.php
M ruflin/elastica/lib/Elastica/Query/Match.php
M ruflin/elastica/lib/Elastica/Query/MatchPhrase.php
M ruflin/elastica/lib/Elastica/Query/MatchPhrasePrefix.php
D ruflin/elastica/lib/Elastica/Query/Missing.php
D ruflin/elastica/lib/Elastica/Query/TopChildren.php
M ruflin/elastica/lib/Elastica/QueryBuilder.php
M ruflin/elastica/lib/Elastica/QueryBuilder/DSL.php
M ruflin/elastica/lib/Elastica/QueryBuilder/DSL/Query.php
M ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version240.php
M ruflin/elastica/lib/Elastica/Script/AbstractScript.php
M ruflin/elastica/lib/Elastica/Script/Script.php
M ruflin/elastica/lib/Elastica/Script/ScriptFile.php
A ruflin/elastica/lib/Elastica/Script/ScriptId.php
M ruflin/elastica/lib/Elastica/SearchableInterface.php
M ruflin/elastica/lib/Elastica/Tool/CrossIndex.php
M ruflin/elastica/lib/Elastica/Transport/Guzzle.php
M ruflin/elastica/lib/Elastica/Transport/Http.php
M ruflin/elastica/lib/Elastica/Transport/HttpAdapter.php
M ruflin/elastica/lib/Elastica/Transport/Null.php
M ruflin/elastica/lib/Elastica/Type.php
M ruflin/elastica/lib/Elastica/Type/Mapping.php
M ruflin/elastica/lib/Elastica/Util.php
44 files changed, 628 insertions(+), 649 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/77/339077/1

diff --git a/composer.json b/composer.json
index 9289d7f..7e5e37e 100644
--- a/composer.json
+++ b/composer.json
@@ -13,20 +13,23 @@
"type": "package",
"package": {
"name": "ruflin/elastica",
-   "version": "5.0.0",
+   "version": "5.1.0",
"dist": {
-   "url": 
"https://github.com/ruflin/Elastica/archive/5.0.0.zip";,
+   "url": 
"https://github.com/ruflin/Elastica/archive/5.1.0.zip";,
"type": "zip"
},
"source": {
"url": 
"https://github.com/ruflin/Elastica.git";,
"type": "git",
-   "reference": "tags/5.0.0"
+   "reference": "tags/5.1.0"
},
"autoload": {
"psr-4": {
"Elastica\\": "lib/Elastica/"
}
+   },
+   "require": {
+   "php": ">=5.5.0 <5.6.0"
}
}
}
@@ -52,7 +55,7 @@
"pear/pear-core-minimal": "1.10.1",
"pear/pear_exception": "1.0.0",
"php": ">=5.5.9",
-   "ruflin/elastica": "5.0.0",
+   "ruflin/elastica": "5.1.0",
"pimple/pimple": "3.0.2",
"psr/log": "1.0.2",
"stil/gd-text":  "1.0.0",
diff --git a/composer.lock b/composer.lock
index c234ebe..d1bc64b 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": "87ea1c529b568e3723c696a62a0ffda3",
-"content-hash": "ba9956a7e43e7d91d510fed0e29edb04",
+"hash": "b402f41955c4c7c743ae7f80765b3e46",
+"content-hash": "b01ea70effa5647f643e7bb7859ee838",
 "packages": [
 {
 "name": "composer/semver",
@@ -11

[MediaWiki-commits] [Gerrit] mediawiki...ExternalArticles[master]: Switch to HTTPS URL

[jenkins-bot (Code Review)]

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

Change subject: Switch to HTTPS URL
..


Switch to HTTPS URL

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

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



diff --git a/extension.json b/extension.json
index a5c3421..5648a78 100644
--- a/extension.json
+++ b/extension.json
@@ -1,12 +1,12 @@
 {
"name": "ExternalArticles",
-   "version": "0.4.0",
+   "version": "0.4.1",
"author": [
"Nathan Perry",
"Alvinos",
"Sam Wilson"
],
-   "url": "http://www.mediawiki.org/wiki/Extension:ExternalArticles";,
+   "url": "https://www.mediawiki.org/wiki/Extension:ExternalArticles";,
"descriptionmsg": "externalarticles-desc",
"type": "extension",
"AutoloadClasses": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34caa1304aecf4330ca646d278a242de6fb7a313
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ExternalArticles
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
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] wikimedia...jouncebot[master]: Run flake8 on both python2 and python3

[BryanDavis (Code Review)]

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

Change subject: Run flake8 on both python2 and python3
..

Run flake8 on both python2 and python3

Follow up to I89370a4

Change-Id: Ie8abe9934b2afe59333a238b1d01a38f118d6e93
---
M tox.ini
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bots/jouncebot 
refs/changes/76/339076/1

diff --git a/tox.ini b/tox.ini
index 11c9061..2f2ea87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py2, py3, flake8
+envlist = py2, py3
 
 [flake8]
 count = 1
@@ -14,12 +14,10 @@
 detailed-errors=1
 with-doctest=1
 
-[testenv:flake8]
-commands = flake8
-deps = flake8
-
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/tests/requirements.txt
-commands = nosetests {posargs}
+commands =
+flake8
+nosetests {posargs}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8abe9934b2afe59333a238b1d01a38f118d6e93
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bots/jouncebot
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/core[master]: mediawiki.requestIdleCallback: Re-enable use of native reque...

[Krinkle (Code Review)]

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

Change subject: mediawiki.requestIdleCallback: Re-enable use of native 
requestIdleCallback
..

mediawiki.requestIdleCallback: Re-enable use of native requestIdleCallback

Follows-up 63416b009fb82e, which disabled this due to a Chrome
bug that caused it to sometimes not schedule callbacks for a period
upto 30 seconds.



This issue since been closed and I can no longer reproduce it
using a demo at .

Change-Id: I4e8dc21e6106e1d2474daed0f25712fd5a7e46f8
---
M resources/src/mediawiki/mediawiki.requestIdleCallback.js
1 file changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/339075/1

diff --git a/resources/src/mediawiki/mediawiki.requestIdleCallback.js 
b/resources/src/mediawiki/mediawiki.requestIdleCallback.js
index d414232..6a6aa15 100644
--- a/resources/src/mediawiki/mediawiki.requestIdleCallback.js
+++ b/resources/src/mediawiki/mediawiki.requestIdleCallback.js
@@ -43,12 +43,11 @@
 *  immediate execution after this amount of time (in milliseconds) if 
it didn't run
 *  by that time.
 */
-   mw.requestIdleCallback = mw.requestIdleCallbackInternal;
-   /*
-   // XXX: Polyfill disabled due to 
https://bugs.chromium.org/p/chromium/issues/detail?id=647870
-   mw.requestIdleCallback = window.requestIdleCallback
+   mw.requestIdleCallback = window.requestIdleCallback ?
// Bind because it throws TypeError if context is not window
-   ? window.requestIdleCallback.bind( window )
-   : mw.requestIdleCallbackInternal;
-   */
+   window.requestIdleCallback.bind( window ) :
+   mw.requestIdleCallbackInternal;
+   // Note: Polyfill was previously disabled due to
+   // https://bugs.chromium.org/p/chromium/issues/detail?id=647870
+   // See also 
 }( mediaWiki ) );

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add mgmt and production DNS for ms-be2028-ms-be2039

[Dzahn (Code Review)]

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

Change subject: Add mgmt and production DNS for ms-be2028-ms-be2039
..


Add mgmt and production DNS for ms-be2028-ms-be2039

Bug: T158337

Change-Id: Ieb523eb2bca913b4f084ce5cff28a1db927b7a12
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 72 insertions(+), 1 deletion(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e1689f5..d71ff0c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2607,6 +2607,9 @@
 85  1H IN PTR   mc2021.codfw.wmnet.
 86  1H IN PTR   mc2022.codfw.wmnet.
 87  1H IN PTR   db2034.codfw.wmnet.
+88  1H IN PTR   ms-be2028.codfw.wmnet.
+89  1H IN PTR   ms-be2029.codfw.wmnet.
+90  1H IN PTR   ms-be2030.codfw.wmnet.
 
 119 1H IN PTR   rdb2001.codfw.wmnet.
 120 1H IN PTR   rdb2002.codfw.wmnet.
@@ -2665,7 +2668,9 @@
 10  1H IN PTR   db2022.codfw.wmnet.
 11  1H IN PTR   db2023.codfw.wmnet.
 12  1H IN PTR   db2024.codfw.wmnet.
-
+13  1H IN PTR   ms-be2031.codfw.wmnet.
+14  1H IN PTR   ms-be2032.codfw.wmnet.
+15  1H IN PTR   ms-be2033.codfw.wmnet.
 16  1H IN PTR   db2028.codfw.wmnet.
 17  1H IN PTR   db2029.codfw.wmnet.
 18  1H IN PTR   db2030.codfw.wmnet.
@@ -3042,6 +3047,9 @@
 161 1H IN PTR   mc2029.codfw.wmnet.
 162 1H IN PTR   mc2030.codfw.wmnet.
 163 1H IN PTR   mc2031.codfw.wmnet.
+164 1H IN PTR   ms-be2034.codfw.wmnet.
+165 1H IN PTR   ms-be2035.codfw.wmnet.
+166 1H IN PTR   ms-be2036.codfw.wmnet.
 
 $ORIGIN 33.192.{{ zonename }}.
 1   1H IN PTR   vl2019-eth2.lvs2001.codfw.wmnet.
@@ -3139,6 +3147,9 @@
 78  1H IN PTR   mc2034.codfw.wmnet.
 79  1H IN PTR   mc2035.codfw.wmnet.
 80  1H IN PTR   mc2036.codfw.wmnet.
+81  1H IN PTR   ms-be2037.codfw.wmnet.
+82  1H IN PTR   ms-be2038.codfw.wmnet.
+83  1H IN PTR   ms-be2039.codfw.wmnet.
 
 $ORIGIN 49.192.{{ zonename }}.
 1   1H IN PTR   vl2020-eth3.lvs2001.codfw.wmnet.
@@ -4209,6 +4220,30 @@
 17  1H IN PTR  wmf6518.mgmt.codfw.wmnet.
 18  1H IN PTR  mc2036.mgmt.codfw.wmnet.
 18  1H IN PTR  wmf6519.mgmt.codfw.wmnet.
+19  1H IN PTR  ms-be2028.mgmt.codfw.wmnet.
+19  1H IN PTR  wmf6520.mgmt.codfw.wmnet.
+20  1H IN PTR  ms-be2029.mgmt.codfw.wmnet.
+20  1H IN PTR  wmf6521.mgmt.codfw.wmnet.
+21  1H IN PTR  ms-be2030.mgmt.codfw.wmnet.
+21  1H IN PTR  wmf6522.mgmt.codfw.wmnet.
+22  1H IN PTR  ms-be2031.mgmt.codfw.wmnet.
+22  1H IN PTR  wmf6523.mgmt.codfw.wmnet.
+23  1H IN PTR  ms-be2032.mgmt.codfw.wmnet.
+23  1H IN PTR  wmf6524.mgmt.codfw.wmnet.
+24  1H IN PTR  ms-be2033.mgmt.codfw.wmnet.
+24  1H IN PTR  wmf6525.mgmt.codfw.wmnet.
+25  1H IN PTR  ms-be2034.mgmt.codfw.wmnet.
+25  1H IN PTR  wmf6526.mgmt.codfw.wmnet.
+26  1H IN PTR  ms-be2035.mgmt.codfw.wmnet.
+26  1H IN PTR  wmf6527.mgmt.codfw.wmnet.
+27  1H IN PTR  ms-be2036.mgmt.codfw.wmnet.
+27  1H IN PTR  wmf6528.mgmt.codfw.wmnet.
+28  1H IN PTR  ms-be2037.mgmt.codfw.wmnet.
+28  1H IN PTR  wmf6529.mgmt.codfw.wmnet.
+29  1H IN PTR  ms-be2038.mgmt.codfw.wmnet.
+29  1H IN PTR  wmf6530.mgmt.codfw.wmnet.
+30  1H IN PTR  ms-be2039.mgmt.codfw.wmnet.
+30  1H IN PTR  wmf6531.mgmt.codfw.wmnet.
 
 ; 10.195.0.0/25 - frack.codfw subnets
 $ORIGIN 0.195.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 28b583c..edd7dfa 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2539,6 +2539,18 @@
 ms-be2025   1H  IN A10.192.48.61
 ms-be2026   1H  IN A10.192.48.62
 ms-be2027   1H  IN A10.192.48.63
+ms-be2028   1H  IN A10.192.0.88
+ms-be2029   1H  IN A10.192.0.89
+ms-be2030   1H  IN A10.192.0.90
+ms-be2031   1H  IN A10.192.16.13
+ms-be2032   1H  IN A10.192.16.14
+ms-be2033   1H  IN A10.192.16.15
+ms-be2034   1H  IN A10.192.32.164
+ms-be2035   1H  IN A10.192.32.165
+ms-be2036   1H  IN A10.192.32.166
+ms-be2037   1H  IN A10.192.48.81
+ms-be2038   1H  IN A10.192.48.82
+ms-be2039   1H  IN A10.192.48.83
 ms-fe2001   1H  IN A10.192.0.23
 ms-fe2002   1H  IN A10.192.0.24
 ms-fe2003   1H  IN A10.192.16.25
@@ -3236,6 +3248,18 @@
 ms-be2025   1H  IN A10.193.1.141
 ms-be2026   1H  IN A10.193.1.142
 ms-be2027   1H  IN A10.193.1.143
+ms-be2028   1H  IN A10.193.3.19
+ms-be2029   1H  IN A10.193.3.20
+ms-be2030   1H  IN A10.193.3.21
+ms-be2031   1H  IN A10.193.3.22
+ms-be2032   1H  IN A10.193.3.23
+ms-be2033   1H  IN A10.193.3.24
+ms-be2034   1H  IN A10.193.3.25
+ms-be2035   1H  IN A10.193.3.26
+ms-be2036   1H  IN A10.193.3.27
+ms-be2037   1H  IN A10.193.3.28
+ms-be2038   1H  IN A10.193.3.29
+ms-be2039   1H  IN A10.193.3.30
 ms-fe2001   1H  IN A10.193.1.33
 ms-fe2002   1H  IN A10.193.1.34
 ms-fe2003   1H  IN A10.193.1.35
@@ -3975,6 +39

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Add notifications for tools.zppixbot and quarrybot-enwiki

[Zppix (Code Review)]

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

Change subject: Add notifications for tools.zppixbot and quarrybot-enwiki
..

Add notifications for tools.zppixbot and quarrybot-enwiki

Change-Id: I086f9b5a27902426c97f066c5f00583701032454
---
M channels.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/74/339074/2

diff --git a/channels.yaml b/channels.yaml
index a7a8976..3e43f9d 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -264,6 +264,9 @@
 - ProofreadPage
 "#wikimedia-lta":
 - Tool-Labs-tools-LTA-Knowledgebase
+"##Zppix-Wikimedia":
+   -Tool-Labs-tools-Zppixbot
+-QuarryBot-enwiki
 
 firehose-channel: '#mediawiki-feed'
 default-channel: '#wikimedia-dev'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I086f9b5a27902426c97f066c5f00583701032454
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Zppix 

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

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

[VolkerE (Code Review)]

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

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

Update OOjs UI to v0.19.3

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

Change-Id: Iffee866dad895fa98941b26a75c12e4faf425543
---
M lib/oojs-ui/i18n/br.json
M lib/oojs-ui/i18n/mg.json
M lib/oojs-ui/i18n/nn.json
M lib/oojs-ui/i18n/yi.json
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
A lib/oojs-ui/oojs-ui-apex.js.map
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
A lib/oojs-ui/oojs-ui-core.js.map
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
A lib/oojs-ui/oojs-ui-mediawiki.js.map
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
A lib/oojs-ui/oojs-ui-toolbars.js.map
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
A lib/oojs-ui/oojs-ui-widgets.js.map
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
A lib/oojs-ui/oojs-ui-windows.js.map
M lib/oojs-ui/themes/apex/images/icons/articles-ltr.png
M lib/oojs-ui/themes/apex/images/icons/articles-rtl.png
M lib/oojs-ui/themes/apex/images/icons/info.png
M lib/oojs-ui/themes/apex/images/icons/listBullet-rtl.png
M lib/oojs-ui/themes/apex/images/icons/noWikiText-ltr.png
M lib/oojs-ui/themes/apex/images/icons/noWikiText-rtl.png
M lib/oojs-ui/themes/apex/images/icons/printer-ltr-invert.png
M lib/oojs-ui/themes/apex/images/icons/printer-ltr.

[MediaWiki-commits] [Gerrit] mediawiki...ExternalArticles[master]: Switch to HTTPS URL

[Samwilson (Code Review)]

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

Change subject: Switch to HTTPS URL
..

Switch to HTTPS URL

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExternalArticles 
refs/changes/72/339072/1

diff --git a/extension.json b/extension.json
index a5c3421..d9b29d3 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
"Alvinos",
"Sam Wilson"
],
-   "url": "http://www.mediawiki.org/wiki/Extension:ExternalArticles";,
+   "url": "https://www.mediawiki.org/wiki/Extension:ExternalArticles";,
"descriptionmsg": "externalarticles-desc",
"type": "extension",
"AutoloadClasses": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34caa1304aecf4330ca646d278a242de6fb7a313
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExternalArticles
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Use mw.requestIdleCallback for startup toast

[Krinkle (Code Review)]

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

Change subject: Hygiene: Use mw.requestIdleCallback for startup toast
..

Hygiene: Use mw.requestIdleCallback for startup toast

It has been available for a while now.

Also, fix it to actually schedule showPending, instead of calling
it immediately on module load. It was passing undefined (return
value of showPending) to $(), which does nothing.

Change-Id: I667362fdd779e70454e0415e9a856c1f6f834807
---
M resources/mobile.startup/toast.js
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/resources/mobile.startup/toast.js 
b/resources/mobile.startup/toast.js
index bdd6414..eee77ff 100644
--- a/resources/mobile.startup/toast.js
+++ b/resources/mobile.startup/toast.js
@@ -8,8 +8,7 @@
 * @class
 */
Toast = function Toast() {
-   // FIXME: Use mw.requestIdleCallback, once it's available 
(T111456)
-   $( this._showPending() );
+   mw.requestIdleCallback( this._showPending );
};
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: fix problem with redirect keyword, removing old non-working ...

[Toniher (Code Review)]

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

Change subject: fix problem with redirect keyword, removing old non-working 
bookstore url
..

fix problem with redirect keyword, removing old non-working bookstore url

Change-Id: Iee2c6844b9e324ee7811f337c02ab06b348b651b
---
M languages/messages/MessagesCa.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/339070/1

diff --git a/languages/messages/MessagesCa.php 
b/languages/messages/MessagesCa.php
index cb26337..b38287e 100644
--- a/languages/messages/MessagesCa.php
+++ b/languages/messages/MessagesCa.php
@@ -128,6 +128,7 @@
 ];
 
 $magicWords = [
+   'redirect'  => [ '0', '#REDIRECCIÓ', '#REDIRECCIO', 
'#REDIRECT' ],
'numberofarticles'  => [ '1', 'NOMBRED\'ARTICLES', 
'NUMBEROFARTICLES' ],
'numberoffiles' => [ '1', 'NOMBRED\'ARXIUS', 
'NUMBEROFFILES' ],
'numberofusers' => [ '1', 'NOMBRED\'USUARIS', 
'NUMBEROFUSERS' ],
@@ -169,8 +170,7 @@
 $defaultDateFormat = 'dmy';
 
 $bookstoreList = [
-   'Catàleg Col·lectiu de les Universitats de Catalunya' => 
'http://ccuc.cbuc.es/cgi-bin/vtls.web.gateway?searchtype=control+numcard&searcharg=$1',
-   'Totselsllibres.com' => 
'http://www.totselsllibres.com/tel/publi/busquedaAvanzadaLibros.do?ISBN=$1',
+   'Catàleg Col·lectiu de les Universitats de Catalunya' => 
'http://ccuc.cbuc.cat/search*cat/X?SEARCH=$1',
'inherit' => true,
 ];
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: Remove now-duplicate parser function suffix()

[Tim Landscheidt (Code Review)]

Hello Giuseppe Lavagetto,

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

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

to review the following change.


Change subject: ganglia: Remove now-duplicate parser function suffix()
..

ganglia: Remove now-duplicate parser function suffix()

stdlib was upgraded to 4.15.0 with
5c04d25eee93d64a63ebf5da0b0c581b1696b896.  That change included a new
parser function suffix() that had been added previously to the ganglia
module.

This change removes the now-duplicate instance in the ganglia module.

Change-Id: Idc9580d71260619a739ed84573e7aaef08a8e0a6
---
D modules/ganglia/lib/puppet/parser/functions/suffix.rb
1 file changed, 0 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/339069/1

diff --git a/modules/ganglia/lib/puppet/parser/functions/suffix.rb 
b/modules/ganglia/lib/puppet/parser/functions/suffix.rb
deleted file mode 100644
index f7792d6..000
--- a/modules/ganglia/lib/puppet/parser/functions/suffix.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# suffix.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:suffix, :type => :rvalue, :doc => <<-EOS
-This function applies a suffix to all elements in an array.
-
-*Examples:*
-
-suffix(['a','b','c'], 'p')
-
-Will return: ['ap','bp','cp']
-EOS
-  ) do |arguments|
-
-# Technically we support two arguments but only first is mandatory ...
-raise(Puppet::ParseError, "suffix(): Wrong number of arguments " +
-  "given (#{arguments.size} for 1)") if arguments.size < 1
-
-array = arguments[0]
-
-unless array.is_a?(Array)
-  raise Puppet::ParseError, "suffix(): expected first argument to be an 
Array, got #{array.inspect}"
-end
-
-suffix = arguments[1] if arguments[1]
-
-if suffix
-  unless suffix.is_a? String
-raise Puppet::ParseError, "suffix(): expected second argument to be a 
String, got #{suffix.inspect}"
-  end
-end
-
-# Turn everything into string same as join would do ...
-result = array.collect do |i|
-  i = i.to_s
-  suffix ? i + suffix : i
-end
-
-return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc9580d71260619a739ed84573e7aaef08a8e0a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Switch to 2.1.5RC

[Smalyshev (Code Review)]

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

Change subject: Switch to 2.1.5RC
..

Switch to 2.1.5RC

Change-Id: Ibfa05bb29669495b13d83e6a70b2184431e05f6e
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/pom.xml b/pom.xml
index 80147e8..8087ec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
   
 
   
-2.1.4
+2.1.5-SNAPSHOT
 9.2.9.v20150224
 UTF-8
 2.7.12

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

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

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