[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Unify `padding` across widgets and variablize

[VolkerE (Code Review)]

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

Change subject: MediaWiki theme: Unify `padding` across widgets and variablize
..

MediaWiki theme: Unify `padding` across widgets and variablize

Unifying `padding` & positioning of labels/icons/indicators across
widgets and centralize through Less variables. Widgets affected:
 - ButtonElement
 - ComboboxInputWidget
 - DropdownWidget
 - SelectFileWidget
 - TextInputWidget

Also:
 - Moving `padding` up in Apex and MediaWiki theme from SelectFileWidget.less
 - Cleaning up unnecessary b/c obsolete or duplicated properties across widgets

CapsuleMultiselect, DecoratedOption, MenuOption, MenuSectionOption &
SearchWidget, and further work on ButtonElement will be accomplished in
follow-up patches.

Change-Id: I3981a628dba03faea90019a8d26e797ed3a2fab7
---
M src/styles/widgets/SelectFileWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
5 files changed, 103 insertions(+), 96 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/344305/1

diff --git a/src/styles/widgets/SelectFileWidget.less 
b/src/styles/widgets/SelectFileWidget.less
index a7dcb73..2a050a6 100644
--- a/src/styles/widgets/SelectFileWidget.less
+++ b/src/styles/widgets/SelectFileWidget.less
@@ -119,12 +119,6 @@
 
.oo-ui-selectFileWidget-fileName {
display: block;
-   padding-top: 0.5em;
-   padding-right: @size-icon + 0.5em;
-   }
-
-   .oo-ui-selectFileWidget-clearButton {
-   right: 0.5em;
}
}
 
@@ -180,10 +174,6 @@
&-notsupported {
&.oo-ui-selectFileWidget-dropTarget {
height: auto;
-
-   .oo-ui-selectFileWidget-label {
-   padding: 1em;
-   }
}
}
 
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 7f39148..b78d5ce 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -894,6 +894,12 @@
}
}
 
+   &-notsupported {
+   .oo-ui-selectFileWidget-label {
+   padding: 1em;
+   }
+   }
+
&-dropTarget {
background-color: @background-color-main;
border: 1px solid #aaa;
@@ -911,6 +917,15 @@
overflow: inherit;
white-space: normal;
}
+
+   .oo-ui-selectFileWidget-fileName {
+   padding-top: 0.5em;
+   padding-right: @size-icon + 0.5em;
+   }
+
+   .oo-ui-selectFileWidget-clearButton {
+   right: 0.5em;
+   }
}
 
&-empty.oo-ui-selectFileWidget-dropTarget {
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 1048ed4..97c05d7 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -62,7 +62,7 @@
 
 // Box Sizes
 @min-width-button-default: 40 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.125em`≈`40px` at base `font-size: 12.8px`
-@min-width-button-combo-widget: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `2.5em`≈`32px` at base `font-size: 12.8px`
+@min-width-button-combo-widget: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `2.5em`≈`32px`
 @min-height-button-default: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 @min-height-toggleswitch: 26px; // equals `16px` @size-toggleswitch-grip-min + 
4px*2 distance top/bottom + 1px*2 border top/bottom
 @max-width-default: 50em;
@@ -73,16 +73,16 @@
 @size-button-default: @size-default;
 @size-icon-min: 24px; // values used for `min-height` are defined in `px`, see 
T130691
 @size-indicator-min: 12px;
-@size-icon: 24 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `1.875em`≈`24px` at base `font-size: 12.8px`
-@size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `0.9375em`≈`12px` at base `font-size: 12.8px`
+@size-icon: 24 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `1.875em`≈`24px`
+@size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `0.9375em`≈`12px`
 @size-toggleswitch-grip-min: 16px;
-@size-dialog-bar-top: 44 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.4375em`≈`44px` at base `font-size: 
12.8px`
+@size-dialog-bar-top: 44 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.4375em`≈`44px`
 
 @width-button-combo-widget: @min-width-button-combo-widget;
 
 @height-icon-element: 100%;
 

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Reduce direct dependencies between various classes

[jenkins-bot (Code Review)]

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

Change subject: Reduce direct dependencies between various classes
..


Reduce direct dependencies between various classes

Change-Id: I1609d017751911acfa02128a10603ffa7b7bf351
---
M extension.json
M modules/tools/mw.cx.tools.DictionaryTool.js
M modules/tools/mw.cx.tools.FormatterTool.js
M modules/tools/mw.cx.tools.InstructionsTool.js
M modules/tools/mw.cx.tools.LinkTool.js
M modules/tools/mw.cx.tools.MachineTranslationTool.js
M modules/tools/mw.cx.tools.ReferenceTool.js
M modules/tools/mw.cx.tools.SearchTool.js
M modules/tools/mw.cx.tools.TemplateTool.js
M modules/tools/mw.cx.tools.TranslationTool.js
M modules/tools/mw.cx.tools.TranslationToolFactory.js
M modules/ui/mw.cx.ui.TranslationView.js
M modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.TemplateTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
20 files changed, 187 insertions(+), 157 deletions(-)

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



diff --git a/extension.json b/extension.json
index 14f65e4..3a39f3d 100644
--- a/extension.json
+++ b/extension.json
@@ -1415,13 +1415,15 @@
"cx-publish-button-publishing"
],
"dependencies": [
-   "mw.cx.dm.Translation",
-   "mw.cx.ui.TranslationUnits",
-   "mw.cx.ui.Header",
-   "mw.cx.ui.Columns",
"ext.cx.model",
+   "ext.cx.sitemapper",
"ext.cx.util",
-   "ext.cx.sitemapper"
+   "mw.cx.dm.Translation",
+   "mw.cx.tools.TranslationToolFactory",
+   "mw.cx.tools",
+   "mw.cx.ui.Columns",
+   "mw.cx.ui.Header",
+   "mw.cx.ui.TranslationUnits"
]
},
"mw.cx.ui.TranslationView.legacy": {
@@ -1742,14 +1744,14 @@
},
"mw.cx.tools": {
"dependencies": [
-   "mw.cx.tools.MachineTranslationTool",
-   "mw.cx.tools.SearchTool",
-   "mw.cx.tools.ReferenceTool",
-   "mw.cx.tools.InstructionsTool",
"mw.cx.tools.DictionaryTool",
-   "mw.cx.tools.TemplateTool",
+   "mw.cx.tools.FormatterTool",
+   "mw.cx.tools.InstructionsTool",
"mw.cx.tools.LinkTool",
-   "mw.cx.tools.FormatterTool"
+   "mw.cx.tools.MachineTranslationTool",
+   "mw.cx.tools.ReferenceTool",
+   "mw.cx.tools.SearchTool",
+   "mw.cx.tools.TemplateTool"
]
},
"mw.cx.tools.MachineTranslationTool": {
@@ -1881,7 +1883,6 @@
"tools/mw.cx.tools.TranslationTool.js"
],
"dependencies": [
-   "mw.cx.tools.TranslationToolFactory",
"mw.cx.ui.TranslationToolWidget"
]
},
diff --git a/modules/tools/mw.cx.tools.DictionaryTool.js 
b/modules/tools/mw.cx.tools.DictionaryTool.js
index 52ffdb6..ac35d22 100644
--- a/modules/tools/mw.cx.tools.DictionaryTool.js
+++ b/modules/tools/mw.cx.tools.DictionaryTool.js
@@ -4,17 +4,13 @@
  * @class
  * @extends mw.cx.tools.TranslationTool
  * @constructor
- * @param {mw.cx.ui.TranslationUnit} ui
+ * @param {mw.cx.dm.TranslationUnit} model
  * @param {Object} config
  */
-mw.cx.tools.DictionaryTool = function CXDictionaryTool( ui, config ) {
+mw.cx.tools.DictionaryTool = function CXDictionaryTool( model, config ) {
config.order = 3;
config.title = 'Dictionary';
-   // Parent constructor
-   mw.cx.tools.DictionaryTool.super.call( this, ui, config );
-   this.ui.connect( this, {
-   select: 'onSelect'
-   } );
+   mw.cx.tools.DictionaryTool.super.call( this, model, config );
 };
 
 /* Inheritance */
@@ -43,7 

[MediaWiki-commits] [Gerrit] mediawiki...Cards[master]: tests: Don't assume synchronous jQuery.Deferred

[jenkins-bot (Code Review)]

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

Change subject: tests: Don't assume synchronous jQuery.Deferred
..


tests: Don't assume synchronous jQuery.Deferred

Non-test code in Cards uses promises correctly, but this test
assumed a synchronous callback if the promise was manually
resolved before adding the callback. This is undocumented behaviour
that is incompatible with native Promise.

jQuery 3 changes this behaviour and enforces them to be async.
In many cases, this fixes bugs, but in this case it causes a few
tests to fail because the assertions happen too late.

Fix by make sure the test waits for it by using assert.async(),
or by returning the promise to QUnit.



Bug: T124742
Change-Id: I36aac668c5eb71f19cee827d3d89ef079f739721
---
M tests/qunit/CardsGateway.js
1 file changed, 9 insertions(+), 5 deletions(-)

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



diff --git a/tests/qunit/CardsGateway.js b/tests/qunit/CardsGateway.js
index f522f7a..5fcdd86 100644
--- a/tests/qunit/CardsGateway.js
+++ b/tests/qunit/CardsGateway.js
@@ -7,7 +7,7 @@
QUnit.test( '#getCards resolves with empty list of cards when no titles 
are given', 1, function ( assert ) {
var cards = new CardsGateway( { api: new mw.Api() } );
 
-   cards.getCards( [] ).then( function ( cards ) {
+   return cards.getCards( [] ).then( function ( cards ) {
assert.ok( cards.cardViews.length === 0 );
} );
} );
@@ -60,7 +60,7 @@
 
this.sandbox.stub( api, 'get' ).returns( $.Deferred().resolve( 
result ) );
 
-   cards.getCards( [ 'One', 'Two', 'Three', 'Four' ] ).then( 
function ( cards ) {
+   return cards.getCards( [ 'One', 'Two', 'Three', 'Four' ] 
).then( function ( cards ) {
assert.ok( cards.cardViews.length === 4 );
 
// One: no extract; no thumbnail.
@@ -98,13 +98,16 @@
QUnit.test( '#getCards resolves with empty list of cards when the API 
call fails', 2, function ( assert ) {
var api = new mw.Api(),
cards = new CardsGateway( { api: api } ),
-   getStub = this.sandbox.stub( api, 'get' );
+   getStub = this.sandbox.stub( api, 'get' ),
+   done1 = assert.async(),
+   done2 = assert.async();
 
getStub.returns( $.Deferred().reject() );
 
cards.getCards( [ 'Foo' ] ).then( function ( cards ) {
assert.ok( cards.cardViews.length === 0 );
-   } );
+   } )
+   .always( done1 );
 
// The API call can succeed but return no results, which should
// also be handled as a failure.
@@ -114,6 +117,7 @@
 
cards.getCards( [ 'Foo' ] ).then( function ( cards ) {
assert.ok( cards.cardViews.length === 0 );
-   } );
+   } )
+   .always( done2 );
} );
 }( jQuery ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36aac668c5eb71f19cee827d3d89ef079f739721
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cards
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: Fix password keyword arg in mwopenstackclients

[BryanDavis (Code Review)]

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

Change subject: openstack: Fix password keyword arg in mwopenstackclients
..

openstack: Fix password keyword arg in mwopenstackclients

The password keyword arg was incorrectly being assigned to the username
member. The `clients` class has also been renamed to `Clients` to match
common Python convention. A lowercase alias is retained for backwards
compatibility with existing consumers.

Change-Id: I134bb2ba150516454501466d5f364dddfb09c0cd
---
M modules/openstack/files/mwopenstackclients.py
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/344304/1

diff --git a/modules/openstack/files/mwopenstackclients.py 
b/modules/openstack/files/mwopenstackclients.py
index 5d4d094..ddf273f 100644
--- a/modules/openstack/files/mwopenstackclients.py
+++ b/modules/openstack/files/mwopenstackclients.py
@@ -8,7 +8,7 @@
 from novaclient import client as nova_client
 
 
-class clients(object):
+class Clients(object):
 # envfile should be a puppetized environment file like observerenv.sh.
 #
 #  If envfile is not specified, specific creds can be passed in as
@@ -42,7 +42,7 @@
 self.username = os.environ.get('OS_USERNAME', None)
 
 if password:
-self.username = password
+self.password = password
 else:
 self.password = os.environ.get('OS_PASSWORD', None)
 
@@ -129,3 +129,7 @@
 def globalimages(self):
 client = self.glanceclient()
 return [i for i in client.images.list()]
+
+
+# Alias class for back-compat with old consumers
+clients = Clients

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

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

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

[MediaWiki-commits] [Gerrit] performance/WebPageTest[master]: Test article to article Elizabeth_I_of_England

[jenkins-bot (Code Review)]

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

Change subject: Test article to article Elizabeth_I_of_England
..


Test article to article Elizabeth_I_of_England

Let us add a test that goes from one article to
one article. We try with Chrome on desktop first
and if that is ok, lets add Firefox/IE.

Bug: T159109
Change-Id: I36e38356d1ed2cd18e354aa0dbee99ff415d4a44
---
M scripts/batch/second-view-desktop.txt
M scripts/batch/second-view-mobile.txt
A scripts/wptscripts/second-view-desktop-enwiki-elizabeth.txt
A scripts/wptscripts/second-view-mobile-enwiki-elizabeth.txt
4 files changed, 26 insertions(+), 4 deletions(-)

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



diff --git a/scripts/batch/second-view-desktop.txt 
b/scripts/batch/second-view-desktop.txt
index 56861fe..7369dd9 100644
--- a/scripts/batch/second-view-desktop.txt
+++ b/scripts/batch/second-view-desktop.txt
@@ -11,8 +11,10 @@
 # Example (make sure to change WMF_WPT_KEY)
 # $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_RUNS=1 
WMF_WPT_LOCATION=us-west-1 bin/index.js --batch 
./scripts/scripts/second-view-desktop.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-second --runs 
<%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --timeline true --bodies true 
--reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-second-facebook 
--runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --timeline true --bodies true 
--reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label firefox-second --runs 
<%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label 
firefox-second-facebook --runs <%WPT_RUNS> --first true --endpoint 
<%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook-second 
--reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie-second --runs 
<%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie-second-facebook 
--runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label 
chrome-second-elizabeth --runs <%WPT_RUNS> --first true --endpoint 
<%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Elizabeth-second 
--timeline true --bodies true --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-elizabeth.txt
diff --git a/scripts/batch/second-view-mobile.txt 
b/scripts/batch/second-view-mobile.txt
index 85ee6d0..5767548 100644
--- a/scripts/batch/second-view-mobile.txt
+++ b/scripts/batch/second-view-mobile.txt
@@ -9,4 +9,6 @@
 # Example (make sure to change WMF_WPT_KEY)
 # $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_MOBILE_RUNS=1 
WMF_WPT_LOCATION=us-west-1 bin/index.js --batch 
./scripts/batch/second-view-mobile.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-mobile-second 
--runs <%WPT_MOBILE_RUNS> --first true --emulateMobile true --endpoint 
<%STATSV_ENDPOINT> --connectivity 3GFast --timeline true --bodies true 
--namespace webpagetest.enwiki-mobile.anonymous.Facebook-second --reporter 
statsv ./scripts/wptscripts/second-view-mobile-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label 
chrome-mobile-second-facebook --runs <%WPT_MOBILE_RUNS> --first true 
--emulateMobile true --endpoint <%STATSV_ENDPOINT> --connectivity 3GFast 

[MediaWiki-commits] [Gerrit] performance/WebPageTest[master]: Test article to article Elizabeth_I_of_England

[Phedenskog (Code Review)]

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

Change subject: Test article to article Elizabeth_I_of_England
..

Test article to article Elizabeth_I_of_England

Let us add a test that goes from one article to
one article. We try with Chrome on desktop first
and if that is ok, lets add Firefox/IE.

Bug: T159109
Change-Id: I36e38356d1ed2cd18e354aa0dbee99ff415d4a44
---
M scripts/batch/second-view-desktop.txt
M scripts/batch/second-view-mobile.txt
A scripts/wptscripts/second-view-desktop-enwiki-elizabeth.txt
A scripts/wptscripts/second-view-mobile-enwiki-elizabeth.txt
4 files changed, 26 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest 
refs/changes/03/344303/1

diff --git a/scripts/batch/second-view-desktop.txt 
b/scripts/batch/second-view-desktop.txt
index 56861fe..7369dd9 100644
--- a/scripts/batch/second-view-desktop.txt
+++ b/scripts/batch/second-view-desktop.txt
@@ -11,8 +11,10 @@
 # Example (make sure to change WMF_WPT_KEY)
 # $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_RUNS=1 
WMF_WPT_LOCATION=us-west-1 bin/index.js --batch 
./scripts/scripts/second-view-desktop.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-second --runs 
<%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --timeline true --bodies true 
--reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-second-facebook 
--runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --timeline true --bodies true 
--reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label firefox-second --runs 
<%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label 
firefox-second-facebook --runs <%WPT_RUNS> --first true --endpoint 
<%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook-second 
--reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie-second --runs 
<%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie-second-facebook 
--runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki.anonymous.Facebook-second --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt
+
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label 
chrome-second-elizabeth --runs <%WPT_RUNS> --first true --endpoint 
<%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Elizabeth-second 
--timeline true --bodies true --reporter statsv 
./scripts/wptscripts/second-view-desktop-enwiki-elizabeth.txt
diff --git a/scripts/batch/second-view-mobile.txt 
b/scripts/batch/second-view-mobile.txt
index 85ee6d0..5767548 100644
--- a/scripts/batch/second-view-mobile.txt
+++ b/scripts/batch/second-view-mobile.txt
@@ -9,4 +9,6 @@
 # Example (make sure to change WMF_WPT_KEY)
 # $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_MOBILE_RUNS=1 
WMF_WPT_LOCATION=us-west-1 bin/index.js --batch 
./scripts/batch/second-view-mobile.txt
 
---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-mobile-second 
--runs <%WPT_MOBILE_RUNS> --first true --emulateMobile true --endpoint 
<%STATSV_ENDPOINT> --connectivity 3GFast --timeline true --bodies true 
--namespace webpagetest.enwiki-mobile.anonymous.Facebook-second --reporter 
statsv ./scripts/wptscripts/second-view-mobile-enwiki-facebook.txt
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label 
chrome-mobile-second-facebook --runs <%WPT_MOBILE_RUNS> --first true 
--emulateMobile true --endpoint <%STATSV_ENDPOINT> --connectivity 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add skin, language, and variant to user_properties_anon

[Reedy (Code Review)]

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

Change subject: Add skin, language, and variant to user_properties_anon
..

Add skin, language, and variant to user_properties_anon

Bug: T152043
Change-Id: Id4841993435708da5f416a68550883194a532a42
---
M modules/role/files/labs/db/views/maintain-meta_p.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/344302/1

diff --git a/modules/role/files/labs/db/views/maintain-meta_p.py 
b/modules/role/files/labs/db/views/maintain-meta_p.py
index 71b75e4..cdab9f7 100644
--- a/modules/role/files/labs/db/views/maintain-meta_p.py
+++ b/modules/role/files/labs/db/views/maintain-meta_p.py
@@ -351,7 +351,7 @@
 ops.write_execute("START TRANSACTION;")
 ops.write_execute("DELETE FROM meta_p.properties_anon_whitelist;")
 # This is hardcoded for now
-ops.write_execute("INSERT INTO meta_p.properties_anon_whitelist VALUES 
('gadget-%');")
+ops.write_execute("INSERT INTO meta_p.properties_anon_whitelist VALUES 
('gadget-%','language,'skin','variant');")
 ops.write_execute("COMMIT;")
 
 if __name__ == '__main__':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4841993435708da5f416a68550883194a532a42
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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]: RemexCompatMunger: fix a couple of memory leaks

[jenkins-bot (Code Review)]

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

Change subject: RemexCompatMunger: fix a couple of memory leaks
..


RemexCompatMunger: fix a couple of memory leaks

Change-Id: I47578b3f73320e84a157417c288de97b5d26e18f
---
M includes/tidy/RemexCompatMunger.php
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/includes/tidy/RemexCompatMunger.php 
b/includes/tidy/RemexCompatMunger.php
index d5f5c28..dbcf568 100644
--- a/includes/tidy/RemexCompatMunger.php
+++ b/includes/tidy/RemexCompatMunger.php
@@ -229,7 +229,6 @@
 * @param integer $sourceStart
 * @param integer $sourceLength
 */
-
public function insertElement( $preposition, $refElement, Element 
$element, $void,
$sourceStart, $sourceLength
) {
@@ -248,9 +247,10 @@
$newParent = $this->serializer->getParentNode( $parent 
);
$parent = $newParent;
$parentData = $parent->snData;
+   $pElement = $parentData->childPElement;
$parentData->childPElement = null;
$newRef = $refElement->userData;
-   // FIXME cannot call endTag() since we don't have an 
Element
+   $this->endTag( $pElement, $sourceStart, 0 );
} elseif ( $under && $parentData->isSplittable
&& (bool)$parentData->ancestorPNode !== $inline
) {
@@ -425,7 +425,13 @@
}
 
public function endTag( Element $element, $sourceStart, $sourceLength ) 
{
+   $data = $element->userData->snData;
+   if ( $data->childPElement ) {
+   $this->endTag( $data->childPElement, $sourceStart, 0 );
+   }
$this->serializer->endTag( $element, $sourceStart, 
$sourceLength );
+   $element->userData->snData = null;
+   $element->userData = null;
}
 
public function doctype( $name, $public, $system, $quirks, 
$sourceStart, $sourceLength ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47578b3f73320e84a157417c288de97b5d26e18f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
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...parsoid[master]: T161178: Apply defined classes to galleries

[jenkins-bot (Code Review)]

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

Change subject: T161178: Apply defined classes to galleries
..


T161178: Apply defined classes to galleries

 * This directly applies user supplied data without sanitization, but it
   doesn't look like sanitizeTagAttrs would modify the value anyways,
   and uses the dom methods to add it.

 * Fixes the test case at,
   /en.wikipedia.org/v3/page/html/List_of_active_Royal_Navy_ships/769959069

Change-Id: I787fb58cb14a1bae2d0cb323a064a292779db5cc
---
M lib/ext/Gallery/index.js
M lib/ext/Gallery/modes.js
M tests/parserTests.txt
3 files changed, 37 insertions(+), 10 deletions(-)

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



diff --git a/lib/ext/Gallery/index.js b/lib/ext/Gallery/index.js
index ecc04d1..39ceaeb 100644
--- a/lib/ext/Gallery/index.js
+++ b/lib/ext/Gallery/index.js
@@ -32,6 +32,7 @@
 
this.showfilename = (attrs.showfilename !== undefined);
this.caption = attrs.caption;
+   this.class = attrs.class;
 };
 
 // FIXME: This is too permissive.  The php implementation only calls
diff --git a/lib/ext/Gallery/modes.js b/lib/ext/Gallery/modes.js
index 5aee524..1f7c7a4 100644
--- a/lib/ext/Gallery/modes.js
+++ b/lib/ext/Gallery/modes.js
@@ -16,10 +16,18 @@
 Traditional.prototype.padding = { thumb: 30, box: 5, border: 8 };
 
 Traditional.prototype.ul = function(opts, doc) {
-   var padding = this.padding;
var ul = doc.createElement('ul');
-   ul.setAttribute('class', 'gallery mw-gallery-' + opts.mode);
+   var cl = 'gallery mw-gallery-' + opts.mode;
+   if (opts.class) { cl += ' ' + opts.class; }
+   ul.setAttribute('class', cl);
+   doc.body.appendChild(ul);
+   this.perRow(opts, ul);
+   return ul;
+};
+
+Traditional.prototype.perRow = function(opts, ul) {
if (opts.imagesPerRow > 0) {
+   var padding = this.padding;
var total = opts.imageWidth + padding.thumb + padding.box + 
padding.border;
total *= opts.imagesPerRow;
ul.setAttribute('style', [
@@ -27,8 +35,6 @@
'_width: ' + total + 'px;',
].join(' '));
}
-   doc.body.appendChild(ul);
-   return ul;
 };
 
 Traditional.prototype.caption = function(opts, doc, ul, caption) {
@@ -144,12 +150,7 @@
 Packed.prototype.scale = 1.5;
 Packed.prototype.padding = { thumb: 0, box: 2, border: 8 };
 
-Packed.prototype.ul = function(opts, doc) {
-   var ul = doc.createElement('ul');
-   ul.setAttribute('class', 'gallery mw-gallery-' + opts.mode);
-   doc.body.appendChild(ul);
-   return ul;
-};
+Packed.prototype.perRow = function() {};
 
 Packed.prototype.dimensions = function(opts) {
return coreutil.format('x%dpx', Math.trunc(opts.imageHeight * 
this.scale));
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 04a7261..2b8d9d4 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -19659,6 +19659,31 @@
 !! end
 
 !! test
+Gallery with class attribute
+!! options
+parsoid={
+  "nativeGallery": true
+}
+!! wikitext
+
+File:Foobar.jpg
+
+!! html/php
+
+   
+   http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>
+   
+   
+   
+
+
+!! html/parsoid
+
+
+
+!! end
+
+!! test
 HTML Hex character encoding (spells the word "JavaScript")
 !! options
 parsoid=wt2html,wt2wt,html2html

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I787fb58cb14a1bae2d0cb323a064a292779db5cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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/core[master]: Update RemexHtml to 1.0.1

[jenkins-bot (Code Review)]

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

Change subject: Update RemexHtml to 1.0.1
..


Update RemexHtml to 1.0.1

For a bug fix

Depends-On: I4421afbfa52d7711d9369398891e91ae09db50c9
Change-Id: I5285c0b1c6f42891c002637cd3e4bd2f54615940
---
M RELEASE-NOTES-1.29
M composer.json
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 2380e9f..bd75eb7 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -69,6 +69,7 @@
 * Updated psr/log from v1.0.0 to v1.0.2.
 * Update Moment.js from v2.8.4 to v2.15.0.
 * Updated oyejorge/less.php from v1.7.0.10 to v1.7.0.13.
+* Added wikimedia/remex-html v1.0.1.
 
  New external libraries 
 
diff --git a/composer.json b/composer.json
index df699bc..cd8f310 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"wikimedia/ip-set": "1.1.0",
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/relpath": "1.0.3",
-   "wikimedia/remex-html": "1.0.0",
+   "wikimedia/remex-html": "1.0.1",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5285c0b1c6f42891c002637cd3e4bd2f54615940
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update RemexHtml to 1.0.1

[jenkins-bot (Code Review)]

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

Change subject: Update RemexHtml to 1.0.1
..


Update RemexHtml to 1.0.1

https://github.com/wikimedia/mediawiki-libs-RemexHtml/compare/1.0.0...1.0.1

Change-Id: I4421afbfa52d7711d9369398891e91ae09db50c9
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
R wikimedia/remex-html/RemexHtml/DOM/DOMBuilder.php
R wikimedia/remex-html/RemexHtml/DOM/DOMFormatter.php
R wikimedia/remex-html/RemexHtml/DOM/DOMSerializer.php
R wikimedia/remex-html/RemexHtml/DOM/DOMUtils.php
R wikimedia/remex-html/RemexHtml/GenerateDataFiles.php
R wikimedia/remex-html/RemexHtml/HTMLData.php
R wikimedia/remex-html/RemexHtml/PropGuard.php
R wikimedia/remex-html/RemexHtml/Serializer/AbstractSerializer.php
R wikimedia/remex-html/RemexHtml/Serializer/DepurateFormatter.php
R wikimedia/remex-html/RemexHtml/Serializer/FastFormatter.php
R wikimedia/remex-html/RemexHtml/Serializer/Formatter.php
R wikimedia/remex-html/RemexHtml/Serializer/HtmlFormatter.php
R wikimedia/remex-html/RemexHtml/Serializer/Serializer.php
R wikimedia/remex-html/RemexHtml/Serializer/SerializerError.php
R wikimedia/remex-html/RemexHtml/Serializer/SerializerNode.php
R wikimedia/remex-html/RemexHtml/Serializer/TestFormatter.php
R wikimedia/remex-html/RemexHtml/Tokenizer/Attribute.php
R wikimedia/remex-html/RemexHtml/Tokenizer/Attributes.php
R wikimedia/remex-html/RemexHtml/Tokenizer/LazyAttributes.php
R wikimedia/remex-html/RemexHtml/Tokenizer/PlainAttributes.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TestTokenHandler.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenGenerator.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenGeneratorHandler.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenHandler.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenSerializer.php
R wikimedia/remex-html/RemexHtml/Tokenizer/Tokenizer.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenizerError.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/ActiveFormattingElements.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterAfterBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterAfterFrameset.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterFrameset.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterHead.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/BeforeHead.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/BeforeHtml.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/CachingStack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/DestructTracer.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/DestructTracerNode.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/DispatchTracer.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Dispatcher.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Element.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/ForeignAttributes.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/FormattingElement.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InCaption.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InCell.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InColumnGroup.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InForeignContent.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InFrameset.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InHead.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InHeadNoscript.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InPre.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InRow.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InSelect.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InSelectInTable.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTable.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTableBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTableText.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTemplate.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTextarea.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Initial.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InsertionMode.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Marker.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/SimpleStack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Stack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TemplateModeStack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Text.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeBuilder.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeBuilderError.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeHandler.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeMutationTracer.php
77 files changed, 231 insertions(+), 218 deletions(-)

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



diff --git a/composer.json 

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Fix various docblock formatting

[Samwilson (Code Review)]

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

Change subject: Fix various docblock formatting
..

Fix various docblock formatting

This fixes some errors in docblock formatting to bring things into
line with MediaWiki coding standards (not all of which are yet
caught by phpcs).

Change-Id: I06b7fc3a9fe09e412b3200b597ce01ef7e7d5ae3
---
M LoginNotify.hooks.php
M LoginNotify_body.php
2 files changed, 47 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify 
refs/changes/01/344301/1

diff --git a/LoginNotify.hooks.php b/LoginNotify.hooks.php
index f560f0e..7f4a304 100644
--- a/LoginNotify.hooks.php
+++ b/LoginNotify.hooks.php
@@ -16,9 +16,9 @@
/**
 * Add LoginNotify events to Echo
 *
-* @param $notifications array of Echo notifications
-* @param $notificationCategories array of Echo notification categories
-* @param $icons array of icon details
+* @param string[] &$notifications Array of Echo notifications
+* @param string[] &$notificationCategories Array of Echo notification 
categories
+* @param string[] &$icons Array of icon details
 * @return bool
 */
public static function onBeforeCreateEchoEvent(
@@ -83,9 +83,9 @@
 * Old hook for pre 1.27 or wikis with auth manager disabled.
 *
 * @todo Doesn't catcha captcha or throttle failures
-* @param $user User User in question
-* @param $pass String password
-* @param $retval int LoginForm constant (e.g. LoginForm::SUCCESS)
+* @param User $user User in question.
+* @param string $pass The password (parameter not used).
+* @param integer $retval A LoginForm constant (e.g. 
LoginForm::SUCCESS).
 */
public static function onLoginAuthenticateAudit( User $user, $pass, 
$retval ) {
if ( $retval === LoginForm::WRONG_PASS ) {
@@ -98,9 +98,9 @@
/**
 * Hook for login auditing post 1.27
 *
-* @param $ret AuthenticationResponse Is login succesful?
-* @param $user User|null User object on successful auth
-* @param $username String Username for failed attempts.
+* @param AuthenticationResponse $ret Is login successful?
+* @param User|null $user User object on successful auth
+* @param string $username Username for failed attempts.
 */
public static function onAuthManagerLoginAuthenticateAudit(
AuthenticationResponse $ret, $user, $username
@@ -123,6 +123,12 @@
// statuses.
}
 
+   /**
+* Handle a successful login (clear the attempt counter, send a notice, 
and record the
+* current IP address as known).
+*
+* @param User $user The user who logged in.
+*/
public static function doSuccessfulLogin( User $user ) {
$loginNotify = new LoginNotify();
$loginNotify->clearCounters( $user );
@@ -130,6 +136,11 @@
$loginNotify->setCurrentAddressAsKnown( $user );
}
 
+   /**
+* Handle a failed login (record the failure).
+*
+* @param User $user The user that failed to log in.
+*/
public static function doFailedLogin( User $user ) {
$loginNotify = new LoginNotify();
$loginNotify->recordFailure( $user );
@@ -140,8 +151,8 @@
 *
 * Set a cookie saying this is a known computer when creating an 
account.
 *
-* @todo This still sets cookies if user creates account well logged in 
as someone else.
-* @param User $user
+* @todo This still sets cookies if user creates an account while 
logged in as someone else.
+* @param User $user The user that has been created.
 * @param boolean $byMail Account created by email
 */
public static function onAddNewAccount( User $user, $byMail ) {
@@ -173,8 +184,8 @@
 * This is a bit hacky. Used to be able to set a different
 * default for admins then other users
 *
-* @param $user User
-* @param &$options array
+* @param User $user The user in question.
+* @param mixed[] &$options The options.
 * @return bool
 */
public static function onUserLoadOptions( User $user, array &$options ) 
{
@@ -215,8 +226,8 @@
 * @todo This is a bit icky. Need to decide if we really want to do 
this.
 * @todo If someone explicitly enables, gets admin rights, gets 
de-admined,
 *   this will then disable the preference, which is definitely 
non-ideal.
-* @param $user User
-* @param &$options array
+* @param User $user The user that is being saved.
+* @param mixed[] &$options The options.
 * @return 

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add localClientDatabases for propagated Wikidata changes

[jenkins-bot (Code Review)]

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

Change subject: Add localClientDatabases for propagated Wikidata changes
..


Add localClientDatabases for propagated Wikidata changes

This allows you to run:

mwscript 
extensions/WikidataBuildResources/extensions/Wikibase/repo/maintenance/dispatchChanges.php
 --wiki=wikidatawiki

to send Wikidata changes to the client wikis.

Change-Id: I2dc29e0a75142f0dea86ce44325fdb77978c9c1a
---
M puppet/modules/role/templates/wikidata/shared.php.erb
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/templates/wikidata/shared.php.erb 
b/puppet/modules/role/templates/wikidata/shared.php.erb
index eddc348..b4949a8 100644
--- a/puppet/modules/role/templates/wikidata/shared.php.erb
+++ b/puppet/modules/role/templates/wikidata/shared.php.erb
@@ -1,6 +1,8 @@
 define( 'WB_NS_PROPERTY', 122 );
 define( 'WB_NS_PROPERTY_TALK', 123 );
 
+require_once "<%= scope['::mediawiki::multiwiki::script_dir'] %>/dblist.php";
+
 // Tell Wikibase which namespace to use for which kind of entity.
 // WikibaseClient wikis also need to know how this is configured on
 // WikibaseRepo wikis that it accesses, thus these are shared settings.
@@ -20,6 +22,14 @@
 
$wgWBRepoSettings['entityNamespaces'] = $wgWBEntityNamespaces;
$wgExtraNamespaces = $wgWBNamespaces + $wgExtraNamespaces;
+
+   $wgWBRepoSettings['localClientDatabases'] = [];
+   foreach ( $wgLocalDatabases as $db ) {
+   if ( $db !== 'wikidatawiki' ) {
+   $wgWBRepoSettings['localClientDatabases'][] = $db;
+   }
+   }
+
 } else {
$wgWBClientSettings['siteGlobalID'] = 'enwiki';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2dc29e0a75142f0dea86ce44325fdb77978c9c1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mooeypoo 
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]: bacula: add file sets for librenms, torrus, smokeping

[Dzahn (Code Review)]

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

Change subject: bacula: add file sets for librenms,torrus,smokeping
..


bacula: add file sets for librenms,torrus,smokeping

Bug: T125020
Change-Id: I75e83c2a63dd98345b32648af8f14a988e6e117d
---
M modules/role/manifests/backup/director.pp
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/backup/director.pp 
b/modules/role/manifests/backup/director.pp
index 60b8629..94fb46a 100644
--- a/modules/role/manifests/backup/director.pp
+++ b/modules/role/manifests/backup/director.pp
@@ -217,6 +217,18 @@
 includes => [ '/srv/backups/m2' ]
 }
 
+bacula::director::fileset { 'librenms':
+includes => [ '/var/lib/librenms' ]
+}
+
+bacula::director::fileset { 'torrus':
+includes => [ '/var/lib/torrus', '/var/cache/torrus' ]
+}
+
+bacula::director::fileset { 'smokeping':
+includes => [ '/var/lib/smokeping', '/var/cache/smokeping' ]
+}
+
 # The console should be on the director
 class { 'bacula::console':
 director   => $::fqdn,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: bacula: add file sets for librenms, torrus, smokeping

[Dzahn (Code Review)]

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

Change subject: bacula: add file sets for librenms,torrus,smokeping
..

bacula: add file sets for librenms,torrus,smokeping

Bug: T125020
Change-Id: I75e83c2a63dd98345b32648af8f14a988e6e117d
---
M modules/role/manifests/backup/director.pp
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/344300/1

diff --git a/modules/role/manifests/backup/director.pp 
b/modules/role/manifests/backup/director.pp
index 60b8629..06e5979 100644
--- a/modules/role/manifests/backup/director.pp
+++ b/modules/role/manifests/backup/director.pp
@@ -217,6 +217,18 @@
 includes => [ '/srv/backups/m2' ]
 }
 
+bacula::director::fileset { 'librenms':
+includes => [ '/var/lib/librenms' ]
+}
+
+bacula::director::fileset { 'torrus':
+includes => [ '/var/lib/torrus, '/var/cache/torrus' ]
+}
+
+bacula::director::fileset { 'smokeping':
+includes => [ '/var/lib/smokeping', '/var/cache/smokeping' ]
+}
+
 # The console should be on the director
 class { 'bacula::console':
 director   => $::fqdn,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1001: add host to Bacula backups

[Dzahn (Code Review)]

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

Change subject: netmon1001: add host to Bacula backups
..


netmon1001: add host to Bacula backups

Bug: T125020
Change-Id: I0f5575f58e0e2757bf80384f9fc473fbb7efffa7
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 263700a..d64f0e2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2280,7 +2280,7 @@
 # network monitoring tool server
 node 'netmon1001.wikimedia.org' {
 role(rancid::server, librenms, servermon::wmf, torrus, smokeping,
-  network::monitor)
+  network::monitor, backup::host)
 include ::standard
 include ::passwords::network
 include ::base::firewall

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1001 migration: additional paths to backup

[Dzahn (Code Review)]

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

Change subject: netmon1001 migration: additional paths to backup
..


netmon1001 migration: additional paths to backup

Bug: T125020
Change-Id: I503b188ef1891750ca30fec2723085045c934c80
---
M modules/role/manifests/netmon/migration.pp
1 file changed, 32 insertions(+), 7 deletions(-)

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



diff --git a/modules/role/manifests/netmon/migration.pp 
b/modules/role/manifests/netmon/migration.pp
index 86e5c0a..0308bd7 100644
--- a/modules/role/manifests/netmon/migration.pp
+++ b/modules/role/manifests/netmon/migration.pp
@@ -13,25 +13,50 @@
 
 file { [ '/srv/netmon1001',
 '/srv/netmon1001/librenms',
+'/srv/netmon1001/librenms/var',
+'/srv/netmon1001/librenms/var/lib',
+'/srv/netmon1001/librenms/var/lib/librenms',
 '/srv/netmon1001/smokeping',
-'/srv/netmon1001/torrus' ]:
+'/srv/netmon1001/smokeping/var',
+'/srv/netmon1001/smokeping/var/lib',
+'/srv/netmon1001/smokeping/var/lib/smokeping',
+'/srv/netmon1001/smokeping/var/cache',
+'/srv/netmon1001/smokeping/var/cache/smokeping',
+'/srv/netmon1001/torrus',
+'/srv/netmon1001/torrus/var',
+'/srv/netmon1001/torrus/var/cache',
+'/srv/netmon1001/torrus/var/cache/torrus',
+'/srv/netmon1001/torrus/var/lib',
+'/srv/netmon1001/torrus/var/lib/torrus', ]:
 ensure => 'directory',
 }
 
-rsync::server::module { 'librenms':
-path=> '/srv/netmon1001/librenms',
+rsync::server::module { 'librenms-lib':
+path=> '/srv/netmon1001/librenms/var/lib/librenms',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }
 
-rsync::server::module { 'smokeping':
-path=> '/srv/netmon1001/smokeping',
+rsync::server::module { 'smokeping-lib':
+path=> '/srv/netmon1001/smokeping/var/lib/smokeping',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }
 
-rsync::server::module { 'torrus':
-path=> '/srv/netmon1001/torrus',
+rsync::server::module { 'smokeping-cache':
+path=> '/srv/netmon1001/smokeping/var/cache/smokeping',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'torrus-lib':
+path=> '/srv/netmon1001/torrus/var/lib/torrus',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'torrus-cache':
+path=> '/srv/netmon1001/torrus/var/cache/torrus',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1001: add host to Bacula backups

[Dzahn (Code Review)]

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

Change subject: netmon1001: add host to Bacula backups
..

netmon1001: add host to Bacula backups

Bug: T125020
Change-Id: I0f5575f58e0e2757bf80384f9fc473fbb7efffa7
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/344299/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 263700a..d64f0e2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2280,7 +2280,7 @@
 # network monitoring tool server
 node 'netmon1001.wikimedia.org' {
 role(rancid::server, librenms, servermon::wmf, torrus, smokeping,
-  network::monitor)
+  network::monitor, backup::host)
 include ::standard
 include ::passwords::network
 include ::base::firewall

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1001 migration: additional paths to backup

[Dzahn (Code Review)]

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

Change subject: netmon1001 migration: additional paths to backup
..

netmon1001 migration: additional paths to backup

Bug: T125020
Change-Id: I503b188ef1891750ca30fec2723085045c934c80
---
M modules/role/manifests/netmon/migration.pp
1 file changed, 32 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/344298/1

diff --git a/modules/role/manifests/netmon/migration.pp 
b/modules/role/manifests/netmon/migration.pp
index 86e5c0a..0308bd7 100644
--- a/modules/role/manifests/netmon/migration.pp
+++ b/modules/role/manifests/netmon/migration.pp
@@ -13,25 +13,50 @@
 
 file { [ '/srv/netmon1001',
 '/srv/netmon1001/librenms',
+'/srv/netmon1001/librenms/var',
+'/srv/netmon1001/librenms/var/lib',
+'/srv/netmon1001/librenms/var/lib/librenms',
 '/srv/netmon1001/smokeping',
-'/srv/netmon1001/torrus' ]:
+'/srv/netmon1001/smokeping/var',
+'/srv/netmon1001/smokeping/var/lib',
+'/srv/netmon1001/smokeping/var/lib/smokeping',
+'/srv/netmon1001/smokeping/var/cache',
+'/srv/netmon1001/smokeping/var/cache/smokeping',
+'/srv/netmon1001/torrus',
+'/srv/netmon1001/torrus/var',
+'/srv/netmon1001/torrus/var/cache',
+'/srv/netmon1001/torrus/var/cache/torrus',
+'/srv/netmon1001/torrus/var/lib',
+'/srv/netmon1001/torrus/var/lib/torrus', ]:
 ensure => 'directory',
 }
 
-rsync::server::module { 'librenms':
-path=> '/srv/netmon1001/librenms',
+rsync::server::module { 'librenms-lib':
+path=> '/srv/netmon1001/librenms/var/lib/librenms',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }
 
-rsync::server::module { 'smokeping':
-path=> '/srv/netmon1001/smokeping',
+rsync::server::module { 'smokeping-lib':
+path=> '/srv/netmon1001/smokeping/var/lib/smokeping',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }
 
-rsync::server::module { 'torrus':
-path=> '/srv/netmon1001/torrus',
+rsync::server::module { 'smokeping-cache':
+path=> '/srv/netmon1001/smokeping/var/cache/smokeping',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'torrus-lib':
+path=> '/srv/netmon1001/torrus/var/lib/torrus',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'torrus-cache':
+path=> '/srv/netmon1001/torrus/var/cache/torrus',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add MusikAnimal to CREDITS

[jenkins-bot (Code Review)]

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

Change subject: Add MusikAnimal to CREDITS
..


Add MusikAnimal to CREDITS

Ran maintenance/updateCredits.php which determines new contributors
using git log. Found 1.

Change-Id: I0d3a2626051ca058ea391c39550d4c1d19f4f133
---
M CREDITS
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/CREDITS b/CREDITS
index 6a51e08..80d4e0e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -434,6 +434,7 @@
 * MrBlueSky
 * MrPete
 * Mukunda Modell
+* MusikAnimal
 * Mwalker
 * mwjames
 * mybugs.mail

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d3a2626051ca058ea391c39550d4c1d19f4f133
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EddieGP 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: EddieGP 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Remove support for old branch names

[jenkins-bot (Code Review)]

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

Change subject: Remove support for old branch names
..


Remove support for old branch names

Branches were named wmf/1.27wmf18 and are now named like
wmf/1.27-wmf.18. Remove the old style.

Change-Id: Id68c680c2093e2639a2a35e0548d9ffc827fc138
---
M make-deploy-notes/uploadChangelog.php
1 file changed, 1 insertion(+), 11 deletions(-)

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



diff --git a/make-deploy-notes/uploadChangelog.php 
b/make-deploy-notes/uploadChangelog.php
index 5ddbb5c..5656b7e 100644
--- a/make-deploy-notes/uploadChangelog.php
+++ b/make-deploy-notes/uploadChangelog.php
@@ -77,17 +77,7 @@
} else {
$minor--;
}
-   // wmf branches in the 1.26 release cycle and prior has another version
-   // notation
-   // FIXME: This is useful for the time we change to semver and can
-   // (probably) be removed after
-   // four or five wmf-versions, or after REL1_27 was released.
-   if ( $major <= 26 ) {
-   return "wmf/1.{$major}wmf{$minor}";
-   } else {
-   // anything else (higher and equal 1.27) uses new semver 
notation
-   return "wmf/1.{$major}.0-wmf.{$minor}";
-   }
+   return "wmf/1.{$major}.0-wmf.{$minor}";
 }
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id68c680c2093e2639a2a35e0548d9ffc827fc138
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: EddieGP 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fixed sorting, setting of limit for getAllPagesForCategory()

[Yaron Koren (Code Review)]

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

Change subject: Fixed sorting, setting of limit for getAllPagesForCategory()
..


Fixed sorting, setting of limit for getAllPagesForCategory()

Change-Id: I3ba899bbd8546aeb31b755ef8ff370139e978d89
---
M includes/PF_ValuesUtils.php
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/includes/PF_ValuesUtils.php b/includes/PF_ValuesUtils.php
index 220af18..423eb5c 100644
--- a/includes/PF_ValuesUtils.php
+++ b/includes/PF_ValuesUtils.php
@@ -144,7 +144,9 @@
 * SMW's SMWInlineQuery::includeSubcategories()
 */
public static function getAllPagesForCategory( $top_category, 
$num_levels, $substring = null ) {
-   if ( 0 == $num_levels ) return $top_category;
+   if ( 0 == $num_levels ) {
+   return $top_category;
+   }
global $wgPageFormsMaxAutocompleteValues, 
$wgPageFormsUseDisplayTitle;
 
$db = wfGetDB( DB_SLAVE );
@@ -198,7 +200,10 @@
$columns,
$conditions,
__METHOD__,
-   'SORT BY cl_sortkey',
+   $options = array(
+   'ORDER BY' => 'cl_type, 
cl_sortkey',
+   'LIMIT' => 
$wgPageFormsMaxAutocompleteValues
+   ),
$join );
if ( $res ) {
while ( $res && $row = $db->fetchRow( 
$res ) ) {
@@ -234,11 +239,6 @@
} else {

$sortkeys[ $cur_value ] = $cur_value;
}
-   }
-   // return if we've 
reached the maximum number of allowed values
-   if ( count( $pages ) > 
$wgPageFormsMaxAutocompleteValues ) {
-   
array_multisort( $sortkeys, $pages );
-   return $pages;
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ba899bbd8546aeb31b755ef8ff370139e978d89
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add localClientDatabases for propagated Wikidata changes

[Mattflaschen (Code Review)]

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

Change subject: Add localClientDatabases for propagated Wikidata changes
..

Add localClientDatabases for propagated Wikidata changes

This allows you to run:

mwscript 
extensions/WikidataBuildResources/extensions/Wikibase/repo/maintenance/dispatchChanges.php
 --wiki=wikidatawiki

to send Wikidata changes to the client wikis.

Change-Id: I2dc29e0a75142f0dea86ce44325fdb77978c9c1a
---
M puppet/modules/role/templates/wikidata/shared.php.erb
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/97/344297/1

diff --git a/puppet/modules/role/templates/wikidata/shared.php.erb 
b/puppet/modules/role/templates/wikidata/shared.php.erb
index eddc348..b4949a8 100644
--- a/puppet/modules/role/templates/wikidata/shared.php.erb
+++ b/puppet/modules/role/templates/wikidata/shared.php.erb
@@ -1,6 +1,8 @@
 define( 'WB_NS_PROPERTY', 122 );
 define( 'WB_NS_PROPERTY_TALK', 123 );
 
+require_once "<%= scope['::mediawiki::multiwiki::script_dir'] %>/dblist.php";
+
 // Tell Wikibase which namespace to use for which kind of entity.
 // WikibaseClient wikis also need to know how this is configured on
 // WikibaseRepo wikis that it accesses, thus these are shared settings.
@@ -20,6 +22,14 @@
 
$wgWBRepoSettings['entityNamespaces'] = $wgWBEntityNamespaces;
$wgExtraNamespaces = $wgWBNamespaces + $wgExtraNamespaces;
+
+   $wgWBRepoSettings['localClientDatabases'] = [];
+   foreach ( $wgLocalDatabases as $db ) {
+   if ( $db !== 'wikidatawiki' ) {
+   $wgWBRepoSettings['localClientDatabases'][] = $db;
+   }
+   }
+
 } else {
$wgWBClientSettings['siteGlobalID'] = 'enwiki';
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fixed sorting, setting of limit for getAllPagesForCategory()

[Yaron Koren (Code Review)]

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

Change subject: Fixed sorting, setting of limit for getAllPagesForCategory()
..

Fixed sorting, setting of limit for getAllPagesForCategory()

Change-Id: I3ba899bbd8546aeb31b755ef8ff370139e978d89
---
M includes/PF_ValuesUtils.php
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/includes/PF_ValuesUtils.php b/includes/PF_ValuesUtils.php
index 220af18..423eb5c 100644
--- a/includes/PF_ValuesUtils.php
+++ b/includes/PF_ValuesUtils.php
@@ -144,7 +144,9 @@
 * SMW's SMWInlineQuery::includeSubcategories()
 */
public static function getAllPagesForCategory( $top_category, 
$num_levels, $substring = null ) {
-   if ( 0 == $num_levels ) return $top_category;
+   if ( 0 == $num_levels ) {
+   return $top_category;
+   }
global $wgPageFormsMaxAutocompleteValues, 
$wgPageFormsUseDisplayTitle;
 
$db = wfGetDB( DB_SLAVE );
@@ -198,7 +200,10 @@
$columns,
$conditions,
__METHOD__,
-   'SORT BY cl_sortkey',
+   $options = array(
+   'ORDER BY' => 'cl_type, 
cl_sortkey',
+   'LIMIT' => 
$wgPageFormsMaxAutocompleteValues
+   ),
$join );
if ( $res ) {
while ( $res && $row = $db->fetchRow( 
$res ) ) {
@@ -234,11 +239,6 @@
} else {

$sortkeys[ $cur_value ] = $cur_value;
}
-   }
-   // return if we've 
reached the maximum number of allowed values
-   if ( count( $pages ) > 
$wgPageFormsMaxAutocompleteValues ) {
-   
array_multisort( $sortkeys, $pages );
-   return $pages;
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ba899bbd8546aeb31b755ef8ff370139e978d89
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: First attempt at handing 'dbname' for foreign connections

[Mattflaschen (Code Review)]

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

Change subject: WIP: First attempt at handing 'dbname' for foreign connections
..

WIP: First attempt at handing 'dbname' for foreign connections

This connects to the right DB but triggers:

Bug: T161190
Change-Id: Ia4f793ef4672b219539a98ea02fe558d52512d11
Warning: Destructor threw an object exception: exception 
'InvalidArgumentException' with message 
'Wikimedia\Rdbms\LoadBalancer::reuseConnection: connection 0/external not 
found; it may have already been freed.' in 
/vagrant/mediawiki/includes/libs/rdbms/loadbalancer/LoadBalancer.php:671
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/344295/1

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 6878712..276ef42 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -815,6 +815,9 @@
$server['serverIndex'] = $i;
$server['foreignPoolRefCount'] = 0;
$server['foreign'] = true;
+   if ( isset( $server['dbname'] ) ) {
+   $dbName = $server['dbname'];
+   }
$conn = $this->reallyOpenConnection( $server, $dbName );
if ( !$conn->isOpen() ) {
$this->connLogger->warning( __METHOD__ . ": 
connection error for $i/$domain" );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Fix qqq for linker-page-edit

[jenkins-bot (Code Review)]

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

Change subject: Fix qqq for linker-page-edit
..


Fix qqq for linker-page-edit

The 'linker-page-title-edit-template' message no longer exists.

Change-Id: I8ca588a81ca9e3728f8bbce4c4b33c5b2b2d8814
---
M i18n/qqq.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/qqq.json b/i18n/qqq.json
index a723533..40ef9a1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -30,7 +30,7 @@
"linter-category-self-closed-tag-desc": "Description of category",
"linter-numerrors": "Shown after a category link to indicate how many 
errors are in that category. $1 is the number of errors, and can be used for 
PLURAL.\n{{Identical|Error}}",
"linker-page-title-edit": "Used in a table cell. $1 is a link to the 
page, $2 is pipe separated links to the edit and history pages, the link text 
is {{msg-mw|linker-page-edit}} and {{msg-mw|linker-page-history}}",
-   "linker-page-edit": "Link text for edit link in 
{{msg-mw|linker-page-title-edit}} and 
{{msg-mw|linker-page-title-edit-template}}\n{{Identical|Edit}}",
+   "linker-page-edit": "Link text for edit link in 
{{msg-mw|linker-page-title-edit}}\n{{Identical|Edit}}",
"linker-page-history": "Link text for history link in 
{{msg-mw|linker-page-title-edit}}",
"linter-heading-errors": "Heading on 
[[Special:LintErrors]]\n{{Identical|Error}}",
"linter-heading-warnings": "Heading on 
[[Special:LintErrors]]\n{{Identical|Warning}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ca588a81ca9e3728f8bbce4c4b33c5b2b2d8814
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Add link to history on Special:LintErrors

[jenkins-bot (Code Review)]

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

Change subject: Add link to history on Special:LintErrors
..


Add link to history on Special:LintErrors

Bug: T160607
Change-Id: Ifd2ef33dd7477722691c8f2e570b7ac1af206135
---
M i18n/en.json
M i18n/qqq.json
M includes/LintErrorsPager.php
3 files changed, 14 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 283dfe0..7f1d800 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -29,6 +29,7 @@
"linter-numerrors": "($1 {{PLURAL:$1|error|errors}})",
"linker-page-title-edit": "$1 ($2)",
"linker-page-edit": "edit",
+   "linker-page-history": "history",
"linter-heading-errors": "Errors",
"linter-heading-warnings": "Warnings",
"pageinfo-linter": "Lint errors",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d2d9e30..a723533 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -29,8 +29,9 @@
"linter-category-self-closed-tag": "Name of lint error category. See 
[[:mw:Help:Extension:Linter/self-closed-tag]]",
"linter-category-self-closed-tag-desc": "Description of category",
"linter-numerrors": "Shown after a category link to indicate how many 
errors are in that category. $1 is the number of errors, and can be used for 
PLURAL.\n{{Identical|Error}}",
-   "linker-page-title-edit": "Used in a table cell. $1 is a link to the 
page, $2 is a link to edit that page, the link text is 
{{msg-mw|linker-page-edit}}",
+   "linker-page-title-edit": "Used in a table cell. $1 is a link to the 
page, $2 is pipe separated links to the edit and history pages, the link text 
is {{msg-mw|linker-page-edit}} and {{msg-mw|linker-page-history}}",
"linker-page-edit": "Link text for edit link in 
{{msg-mw|linker-page-title-edit}} and 
{{msg-mw|linker-page-title-edit-template}}\n{{Identical|Edit}}",
+   "linker-page-history": "Link text for history link in 
{{msg-mw|linker-page-title-edit}}",
"linter-heading-errors": "Heading on 
[[Special:LintErrors]]\n{{Identical|Error}}",
"linter-heading-warnings": "Heading on 
[[Special:LintErrors]]\n{{Identical|Warning}}",
"pageinfo-linter": "Heading on ?action=info for a page if it has lint 
errors",
diff --git a/includes/LintErrorsPager.php b/includes/LintErrorsPager.php
index e4b49f1..e65a8de 100644
--- a/includes/LintErrorsPager.php
+++ b/includes/LintErrorsPager.php
@@ -96,7 +96,17 @@
[ 'action' => 'edit', 'lintid' => 
$lintError->lintId, ]
);
 
-   return $this->msg( 'linker-page-title-edit' 
)->rawParams( $viewLink, $editLink )->escaped();
+   $historyLink = $this->linkRenderer->makeLink(
+   $title,
+   $this->msg( 'linker-page-history' 
)->text(),
+   [],
+   [ 'action' => 'history' ]
+   );
+
+   $editHistLinks = 
$this->getLanguage()->pipeList( [ $editLink, $historyLink ] );
+   return $this->msg( 'linker-page-title-edit' )
+   ->rawParams( $viewLink, $editHistLinks )
+   ->escaped();
case 'details':
$hasNameCats = [ 'obsolete-tag', 
'missing-end-tag', 'self-closed-tag' ];
if ( in_array( $this->category, $hasNameCats ) 
&& isset( $lintError->params['name'] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd2ef33dd7477722691c8f2e570b7ac1af206135
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1001 migration: separate rsync modules for each app

[Dzahn (Code Review)]

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

Change subject: netmon1001 migration: separate rsync modules for each app
..


netmon1001 migration: separate rsync modules for each app

We want to rsync app data for librenms, smokeping and torrus
while we migrate netmon1001. Not all of it is in /srv, some
is in /var. Have a separate rsync module for each app to keep it
clean.

Bug: T125020
Change-Id: I014a512a7db3e6c796b24c3f7c678938e1ed2801
---
M modules/role/manifests/netmon/migration.pp
1 file changed, 18 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/manifests/netmon/migration.pp 
b/modules/role/manifests/netmon/migration.pp
index 01628fb..86e5c0a 100644
--- a/modules/role/manifests/netmon/migration.pp
+++ b/modules/role/manifests/netmon/migration.pp
@@ -11,12 +11,27 @@
 
 include rsync::server
 
-file { '/srv/netmon1001':
+file { [ '/srv/netmon1001',
+'/srv/netmon1001/librenms',
+'/srv/netmon1001/smokeping',
+'/srv/netmon1001/torrus' ]:
 ensure => 'directory',
 }
 
-rsync::server::module { 'netmon1001':
-path=> '/srv/netmon1001',
+rsync::server::module { 'librenms':
+path=> '/srv/netmon1001/librenms',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'smokeping':
+path=> '/srv/netmon1001/smokeping',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'torrus':
+path=> '/srv/netmon1001/torrus',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update RemexHtml to 1.0.1

[Reedy (Code Review)]

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

Change subject: Update RemexHtml to 1.0.1
..

Update RemexHtml to 1.0.1

https://github.com/wikimedia/mediawiki-libs-RemexHtml/compare/1.0.0...1.0.1

Change-Id: I4421afbfa52d7711d9369398891e91ae09db50c9
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
R wikimedia/remex-html/RemexHtml/DOM/DOMBuilder.php
R wikimedia/remex-html/RemexHtml/DOM/DOMFormatter.php
R wikimedia/remex-html/RemexHtml/DOM/DOMSerializer.php
R wikimedia/remex-html/RemexHtml/DOM/DOMUtils.php
R wikimedia/remex-html/RemexHtml/GenerateDataFiles.php
R wikimedia/remex-html/RemexHtml/HTMLData.php
R wikimedia/remex-html/RemexHtml/PropGuard.php
R wikimedia/remex-html/RemexHtml/Serializer/AbstractSerializer.php
R wikimedia/remex-html/RemexHtml/Serializer/DepurateFormatter.php
R wikimedia/remex-html/RemexHtml/Serializer/FastFormatter.php
R wikimedia/remex-html/RemexHtml/Serializer/Formatter.php
R wikimedia/remex-html/RemexHtml/Serializer/HtmlFormatter.php
R wikimedia/remex-html/RemexHtml/Serializer/Serializer.php
R wikimedia/remex-html/RemexHtml/Serializer/SerializerError.php
R wikimedia/remex-html/RemexHtml/Serializer/SerializerNode.php
R wikimedia/remex-html/RemexHtml/Serializer/TestFormatter.php
R wikimedia/remex-html/RemexHtml/Tokenizer/Attribute.php
R wikimedia/remex-html/RemexHtml/Tokenizer/Attributes.php
R wikimedia/remex-html/RemexHtml/Tokenizer/LazyAttributes.php
R wikimedia/remex-html/RemexHtml/Tokenizer/PlainAttributes.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TestTokenHandler.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenGenerator.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenGeneratorHandler.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenHandler.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenSerializer.php
R wikimedia/remex-html/RemexHtml/Tokenizer/Tokenizer.php
R wikimedia/remex-html/RemexHtml/Tokenizer/TokenizerError.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/ActiveFormattingElements.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterAfterBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterAfterFrameset.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterFrameset.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/AfterHead.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/BeforeHead.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/BeforeHtml.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/CachingStack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/DestructTracer.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/DestructTracerNode.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/DispatchTracer.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Dispatcher.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Element.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/ForeignAttributes.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/FormattingElement.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InCaption.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InCell.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InColumnGroup.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InForeignContent.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InFrameset.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InHead.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InHeadNoscript.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InPre.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InRow.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InSelect.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InSelectInTable.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTable.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTableBody.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTableText.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTemplate.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InTextarea.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Initial.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/InsertionMode.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Marker.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/SimpleStack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Stack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TemplateModeStack.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/Text.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeBuilder.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeBuilderError.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeHandler.php
R wikimedia/remex-html/RemexHtml/TreeBuilder/TreeMutationTracer.php
77 files changed, 231 insertions(+), 218 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/94/344294/1

diff --git a/composer.json b/composer.json

[MediaWiki-commits] [Gerrit] sandbox[master]: Test

[EddieGP (Code Review)]

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

Change subject: Test
..


Test

Change-Id: I140b8a7d7db1504f36d42b2fd764e3625c1b0ba4
---
D CodeReview.txt
D CodeReview2.txt
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/CodeReview.txt b/CodeReview.txt
deleted file mode 100644
index e69de29..000
--- a/CodeReview.txt
+++ /dev/null
diff --git a/CodeReview2.txt b/CodeReview2.txt
deleted file mode 100644
index e69de29..000
--- a/CodeReview2.txt
+++ /dev/null

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I140b8a7d7db1504f36d42b2fd764e3625c1b0ba4
Gerrit-PatchSet: 1
Gerrit-Project: sandbox
Gerrit-Branch: master
Gerrit-Owner: EddieGP 
Gerrit-Reviewer: EddieGP 

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

[MediaWiki-commits] [Gerrit] sandbox[master]: Test

[EddieGP (Code Review)]

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

Change subject: Test
..

Test

Change-Id: I140b8a7d7db1504f36d42b2fd764e3625c1b0ba4
---
D CodeReview.txt
D CodeReview2.txt
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/sandbox refs/changes/93/344293/1

diff --git a/CodeReview.txt b/CodeReview.txt
deleted file mode 100644
index e69de29..000
--- a/CodeReview.txt
+++ /dev/null
diff --git a/CodeReview2.txt b/CodeReview2.txt
deleted file mode 100644
index e69de29..000
--- a/CodeReview2.txt
+++ /dev/null

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I140b8a7d7db1504f36d42b2fd764e3625c1b0ba4
Gerrit-PatchSet: 1
Gerrit-Project: sandbox
Gerrit-Branch: master
Gerrit-Owner: EddieGP 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Follow-up to f88daf367f37 - finished removing "show week num...

[Yaron Koren (Code Review)]

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

Change subject: Follow-up to f88daf367f37 - finished removing "show week 
numbers"
..


Follow-up to f88daf367f37 - finished removing "show week numbers"

Change-Id: I4c585b96d719d4889986147ac87617acf893fa5b
---
M includes/forminputs/PF_DatePickerInput.php
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/includes/forminputs/PF_DatePickerInput.php 
b/includes/forminputs/PF_DatePickerInput.php
index 3952c1b..67ce5b0 100644
--- a/includes/forminputs/PF_DatePickerInput.php
+++ b/includes/forminputs/PF_DatePickerInput.php
@@ -628,11 +628,6 @@
'type' => 'string',
'description' => wfMessage( 
'pf-datepicker-highlightdates' )->text()
);
-   $params[$wgPageFormsDatePickerSettings["ShowWeekNumbers"]?'hide 
week numbers':'show week numbers'] = array(
-   'name' => 
$wgPageFormsDatePickerSettings["ShowWeekNumbers"]?'hide week numbers':'show 
week numbers',
-   'type' => 'boolean',
-   'description' => wfMessage( 
'pf-datepicker-showweeknumbers' )->text()
-   );
 
return $params;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c585b96d719d4889986147ac87617acf893fa5b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1001 migration: separate rsync modules for each app

[Dzahn (Code Review)]

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

Change subject: netmon1001 migration: separate rsync modules for each app
..

netmon1001 migration: separate rsync modules for each app

We want to rsync app data for librenms, smokeping and torrus
while we migrate netmon1001. Not all of it is in /srv, some
is in /var. Have a separate rsync module for each app to keep it
clean.

Bug: T125020
Change-Id: I014a512a7db3e6c796b24c3f7c678938e1ed2801
---
M modules/role/manifests/netmon/migration.pp
1 file changed, 18 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/344292/1

diff --git a/modules/role/manifests/netmon/migration.pp 
b/modules/role/manifests/netmon/migration.pp
index 01628fb..23710ce 100644
--- a/modules/role/manifests/netmon/migration.pp
+++ b/modules/role/manifests/netmon/migration.pp
@@ -11,12 +11,27 @@
 
 include rsync::server
 
-file { '/srv/netmon1001':
+file { [ '/srv/netmon1001',
+ '/srv/netmon1001/librenms',
+ '/srv/netmon1001/smokeping',
+ '/srv/netmon1001/torrus' }:
 ensure => 'directory',
 }
 
-rsync::server::module { 'netmon1001':
-path=> '/srv/netmon1001',
+rsync::server::module { 'librenms':
+path=> '/srv/netmon1001/librenms',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'smokeping':
+path=> '/srv/netmon1001/librenms',
+read_only   => 'no',
+hosts_allow => $sourceip,
+}
+
+rsync::server::module { 'torrus':
+path=> '/srv/netmon1001/torrus',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Update VE core submodule to master (0cc3ded3d)

New changes:
9e27aeaed When indexing originalDomElements for ve.dm.Annotations, disregard 
child nodes
ce3618d86 DiffElement: Ensure del/ins tags encapsulate annotation changes
0cc3ded3d i18n: Add a default alignment value

Bug: T160839
Change-Id: If8500f521f1347daa87a7583e231c1dcbe1525d5
---
M extension.json
M lib/ve
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index d00767f..752422d 100644
--- a/extension.json
+++ b/extension.json
@@ -912,6 +912,7 @@
"visualeditor-aliencontextitem-title",
"visualeditor-aliennode-tooltip",
"visualeditor-align-widget-center",
+   "visualeditor-align-widget-default",
"visualeditor-align-widget-left",
"visualeditor-align-widget-right",
"visualeditor-alignablecontextitem-title",
diff --git a/lib/ve b/lib/ve
index f294778..0cc3ded 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit f294778e68810d004208067e3c0310e0b1ef2e2f
+Subproject commit 0cc3ded3de806e9dbf744b6733d2f29aae916904

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8500f521f1347daa87a7583e231c1dcbe1525d5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
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[master]: RCFilters: Log click actions on RC page and on pages linked ...

[Catrope (Code Review)]

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

Change subject: RCFilters: Log click actions on RC page and on pages linked 
from there
..

RCFilters: Log click actions on RC page and on pages linked from there

This logs clicks on the diff, history, page, user page, user talk,
user contribs, user block and rollback links on Special:Recentchanges,
and also clicks on those links (as well as edit, undo, thank and patrol)
on pages reached by clicking a link on the RC page.

The latter is done by adding ?fromrc=1 to the URL of the link
as it is clicked.

Bug: T158458
Change-Id: I1a79088f344908758e00c97599cdeebf4ad1789a
---
M extension.json
A modules/ext.wikimediaEvents.recentChangesClicks.js
2 files changed, 110 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/91/344291/1

diff --git a/extension.json b/extension.json
index 302754f..28b5927 100644
--- a/extension.json
+++ b/extension.json
@@ -139,6 +139,11 @@
"schema": "ChangesListHighlights",
"revision": 16449602
},
+   "schema.ChangesListClickTracking": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "ChangesListClickTracking",
+   "revision": 16484895
+   },
"ext.wikimediaEvents": {
"scripts": [
"ext.wikimediaEvents.events.js",
@@ -168,13 +173,16 @@
},
"ext.wikimediaEvents.loggedin": {
"scripts": [
-   "ext.wikimediaEvents.deprecate.js"
+   "ext.wikimediaEvents.deprecate.js",
+   "ext.wikimediaEvents.recentChangesClicks.js"
],
"targets": [
"desktop",
"mobile"
],
-   "dependencies": []
+   "dependencies": [
+   "mediawiki.user"
+   ]
}
},
"ResourceFileModulePaths": {
diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
new file mode 100644
index 000..fc3eadf
--- /dev/null
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -0,0 +1,100 @@
+/*!
+ * Track clicks on the Recentchanges page
+ *
+ * @see https://meta.wikimedia.org/wiki/Schema:ChangesListClickTracking
+ * @author Roan Kattouw 
+ */
+( function ( $, mw ) {
+   var linkTypes = {
+   '.mw-changeslist-diff': 'diff',
+   '.mw-changeslist-history': 'history',
+   '.mw-changeslist-title': 'page',
+   '.mw-userlink': 'user',
+   '.mw-usertoollinks-talk': 'talk',
+   '.mw-usertoollinks-contribs': 'contribs',
+   '.mw-usertoollinks-block': 'block',
+   '.mw-rollback-link a': 'rollback',
+   '.mw-diff-edit a': 'edit',
+   '.mw-diff-undo a': 'undo',
+   '.mw-thanks-thank-link': 'thank',
+   '.patrollink a': 'patrol'
+   };
+
+   $( function () {
+   var uri = new mw.Uri();
+
+   function trackClick( type, fromPage ) {
+   mw.track( 'event.ChangesListClickTracking', {
+   linkType: type,
+   enhancedFiltersEnabled: !!mw.user.options.get( 
'rcenhancedfilters' ),
+   userId: mw.user.getId(),
+   sessionId: mw.user.sessionId(),
+   fromPage: fromPage,
+   fromQuery: uri.getQueryString()
+   } );
+   }
+
+   function getPageType() {
+   if ( uri.query.action === 'history' ) {
+   return 'history';
+   } else if ( uri.query.diff !== undefined ) {
+   return 'diff';
+   }
+   return 'page';
+   }
+
+   if ( $( 'body' ).hasClass( 'mw-special-Recentchanges' ) ) {
+   $( '.mw-changeslist' ).on( 'click', 'a[href]', function 
( e ) {
+   var selector,
+   type = 'unknown',
+   $link = $( this ),
+   target = new mw.Uri( $link.attr( 'href' 
) );
+   if ( e.which === 3 ) {
+   return;
+   }
+
+ 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RemexCompatMunger: fix a couple of memory leaks

[Tim Starling (Code Review)]

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

Change subject: RemexCompatMunger: fix a couple of memory leaks
..

RemexCompatMunger: fix a couple of memory leaks

Change-Id: I47578b3f73320e84a157417c288de97b5d26e18f
---
M includes/tidy/RemexCompatMunger.php
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/344289/1

diff --git a/includes/tidy/RemexCompatMunger.php 
b/includes/tidy/RemexCompatMunger.php
index d5f5c28..dbcf568 100644
--- a/includes/tidy/RemexCompatMunger.php
+++ b/includes/tidy/RemexCompatMunger.php
@@ -229,7 +229,6 @@
 * @param integer $sourceStart
 * @param integer $sourceLength
 */
-
public function insertElement( $preposition, $refElement, Element 
$element, $void,
$sourceStart, $sourceLength
) {
@@ -248,9 +247,10 @@
$newParent = $this->serializer->getParentNode( $parent 
);
$parent = $newParent;
$parentData = $parent->snData;
+   $pElement = $parentData->childPElement;
$parentData->childPElement = null;
$newRef = $refElement->userData;
-   // FIXME cannot call endTag() since we don't have an 
Element
+   $this->endTag( $pElement, $sourceStart, 0 );
} elseif ( $under && $parentData->isSplittable
&& (bool)$parentData->ancestorPNode !== $inline
) {
@@ -425,7 +425,13 @@
}
 
public function endTag( Element $element, $sourceStart, $sourceLength ) 
{
+   $data = $element->userData->snData;
+   if ( $data->childPElement ) {
+   $this->endTag( $data->childPElement, $sourceStart, 0 );
+   }
$this->serializer->endTag( $element, $sourceStart, 
$sourceLength );
+   $element->userData->snData = null;
+   $element->userData = null;
}
 
public function doctype( $name, $public, $system, $quirks, 
$sourceStart, $sourceLength ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47578b3f73320e84a157417c288de97b5d26e18f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add benchmarkTidy.php, to benchmark tidy drivers

[Tim Starling (Code Review)]

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

Change subject: Add benchmarkTidy.php, to benchmark tidy drivers
..

Add benchmarkTidy.php, to benchmark tidy drivers

Change-Id: I254793fc55c57a98c07ae1e4c27e6005965c9a20
---
M includes/parser/MWTidy.php
A maintenance/benchmarks/benchmarkTidy.php
2 files changed, 76 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/344290/1

diff --git a/includes/parser/MWTidy.php b/includes/parser/MWTidy.php
index 01bf2d0..ffc884e 100644
--- a/includes/parser/MWTidy.php
+++ b/includes/parser/MWTidy.php
@@ -83,7 +83,7 @@
/**
 * @return bool|\MediaWiki\Tidy\TidyDriverBase
 */
-   protected static function singleton() {
+   public static function singleton() {
global $wgUseTidy, $wgTidyInternal, $wgTidyConf, $wgDebugTidy, 
$wgTidyConfig,
$wgTidyBin, $wgTidyOpts;
 
diff --git a/maintenance/benchmarks/benchmarkTidy.php 
b/maintenance/benchmarks/benchmarkTidy.php
new file mode 100644
index 000..3219e6c
--- /dev/null
+++ b/maintenance/benchmarks/benchmarkTidy.php
@@ -0,0 +1,75 @@
+addOption( 'file', 'A filename which contains the input 
text', true, true );
+   $this->addOption( 'driver', 'The Tidy driver name, or false to 
use the configured instance',
+   false,  true );
+   $this->addOption( 'tidy-config', 'JSON encoded value for the 
tidy configuration array',
+   false, true );
+   }
+
+   public function execute() {
+   $html = file_get_contents( $this->getOption( 'file' ) );
+   if ( $html === false ) {
+   $this->error( "Unable to open input file", 1 );
+   }
+   if ( $this->hasOption( 'driver' ) || $this->hasOption( 
'tidy-config' ) ) {
+   $config = json_decode( $this->getOption( 'tidy-config', 
'{}' ), true );
+   if ( !is_array( $config ) ) {
+   $this->error( "Invalid JSON tidy config", 1 );
+   }
+   $config += [ 'driver' => $this->getOption( 'driver', 
'RemexHtml' ) ];
+   $driver = MWTidy::factory( $config );
+   } else {
+   $driver = MWTidy::singleton();
+   }
+
+   $this->benchmark( $driver, $html );
+   }
+
+   private function benchmark( $driver, $html ) {
+   global $wgContLang;
+
+   $times = [];
+   $innerCount = 10;
+   $outerCount = 10;
+   for ( $j = 1; $j <= $outerCount; $j++ ) {
+   $t = microtime( true );
+   for ( $i = 0; $i < $innerCount; $i++ ) {
+   $driver->tidy( $html );
+   print $wgContLang->formatSize( 
memory_get_usage( true ) ) . "\n";
+   }
+   $t = ( ( microtime( true ) - $t ) / $innerCount ) * 
1000;
+   $times[] = $t;
+   print "Run $j: $t\n";
+   }
+   print "\n";
+
+   sort( $times, SORT_NUMERIC );
+   $n = $outerCount;
+   $min = $times[0];
+   $max = end( $times );
+   if ( $n % 2 ) {
+   $median = $times[ ( $n - 1 ) / 2 ];
+   } else {
+   $median = ( $times[$n / 2] + $times[$n / 2 - 1] ) / 2;
+   }
+   $mean = array_sum( $times ) / $n;
+
+   print "Minimum: $min ms\n";
+   print "Median: $median ms\n";
+   print "Mean: $mean ms\n";
+   print "Maximum: $max ms\n";
+   print "Memory usage: " .
+   $wgContLang->formatSize( memory_get_usage( true ) ) . 
"\n";
+   print "Peak memory usage: " .
+   $wgContLang->formatSize( memory_get_peak_usage( true ) 
) . "\n";
+   }
+}
+
+$maintClass = 'BenchmarkTidy';
+require RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I254793fc55c57a98c07ae1e4c27e6005965c9a20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update RemexHtml to 1.0.1

[Tim Starling (Code Review)]

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

Change subject: Update RemexHtml to 1.0.1
..

Update RemexHtml to 1.0.1

For a bug fix

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/344288/1

diff --git a/composer.json b/composer.json
index df699bc..cd8f310 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"wikimedia/ip-set": "1.1.0",
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/relpath": "1.0.3",
-   "wikimedia/remex-html": "1.0.0",
+   "wikimedia/remex-html": "1.0.1",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5285c0b1c6f42891c002637cd3e4bd2f54615940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Follow-up to f88daf367f37 - finished removing "show week num...

[Yaron Koren (Code Review)]

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

Change subject: Follow-up to f88daf367f37 - finished removing "show week 
numbers"
..

Follow-up to f88daf367f37 - finished removing "show week numbers"

Change-Id: I4c585b96d719d4889986147ac87617acf893fa5b
---
M includes/forminputs/PF_DatePickerInput.php
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/includes/forminputs/PF_DatePickerInput.php 
b/includes/forminputs/PF_DatePickerInput.php
index 3952c1b..67ce5b0 100644
--- a/includes/forminputs/PF_DatePickerInput.php
+++ b/includes/forminputs/PF_DatePickerInput.php
@@ -628,11 +628,6 @@
'type' => 'string',
'description' => wfMessage( 
'pf-datepicker-highlightdates' )->text()
);
-   $params[$wgPageFormsDatePickerSettings["ShowWeekNumbers"]?'hide 
week numbers':'show week numbers'] = array(
-   'name' => 
$wgPageFormsDatePickerSettings["ShowWeekNumbers"]?'hide week numbers':'show 
week numbers',
-   'type' => 'boolean',
-   'description' => wfMessage( 
'pf-datepicker-showweeknumbers' )->text()
-   );
 
return $params;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c585b96d719d4889986147ac87617acf893fa5b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Remove support for old branch names

[EddieGP (Code Review)]

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

Change subject: Remove support for old branch names
..

Remove support for old branch names

Branches were named wmf/1.27wmf18 and are now named like
wmf/1.27-wmf.18. Remove the old style.

Change-Id: Id68c680c2093e2639a2a35e0548d9ffc827fc138
---
M make-deploy-notes/uploadChangelog.php
1 file changed, 1 insertion(+), 11 deletions(-)


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

diff --git a/make-deploy-notes/uploadChangelog.php 
b/make-deploy-notes/uploadChangelog.php
index 5ddbb5c..5656b7e 100644
--- a/make-deploy-notes/uploadChangelog.php
+++ b/make-deploy-notes/uploadChangelog.php
@@ -77,17 +77,7 @@
} else {
$minor--;
}
-   // wmf branches in the 1.26 release cycle and prior has another version
-   // notation
-   // FIXME: This is useful for the time we change to semver and can
-   // (probably) be removed after
-   // four or five wmf-versions, or after REL1_27 was released.
-   if ( $major <= 26 ) {
-   return "wmf/1.{$major}wmf{$minor}";
-   } else {
-   // anything else (higher and equal 1.27) uses new semver 
notation
-   return "wmf/1.{$major}.0-wmf.{$minor}";
-   }
+   return "wmf/1.{$major}.0-wmf.{$minor}";
 }
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Basic PHPLint support

[jenkins-bot (Code Review)]

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

Change subject: Basic PHPLint support
..


Basic PHPLint support

Move src to a directory named after the namespace RemexHtml, to support
PHPLint's idea of autoloading.

Ran PHPLint 3.0 and fixed a few minor issues. There are still many, many
errors, and it's not a goal to fix them. But I was able to verify that there
are no unintentional missing breaks, or variables accessed before their
assignment.

Change-Id: Icb269d934a80bdfe0332c0003c854bffdc58eb71
---
M .gitattributes
M Doxyfile
R RemexHtml/DOM/DOMBuilder.php
R RemexHtml/DOM/DOMFormatter.php
R RemexHtml/DOM/DOMSerializer.php
R RemexHtml/DOM/DOMUtils.php
R RemexHtml/FuzzTest/CharacterSalad.php
R RemexHtml/FuzzTest/FuzzData.php
R RemexHtml/FuzzTest/FuzzTest.php
R RemexHtml/FuzzTest/Html5Depurate.php
R RemexHtml/FuzzTest/TokenSalad.php
R RemexHtml/FuzzTest/Utils.php
R RemexHtml/FuzzTest/validatornu-dictionary
R RemexHtml/GenerateDataFiles.php
R RemexHtml/HTMLData.php
R RemexHtml/PropGuard.php
R RemexHtml/Serializer/AbstractSerializer.php
R RemexHtml/Serializer/DepurateFormatter.php
R RemexHtml/Serializer/FastFormatter.php
R RemexHtml/Serializer/Formatter.php
R RemexHtml/Serializer/HtmlFormatter.php
R RemexHtml/Serializer/Serializer.php
R RemexHtml/Serializer/SerializerError.php
R RemexHtml/Serializer/SerializerNode.php
R RemexHtml/Serializer/TestFormatter.php
R RemexHtml/Tokenizer/Attribute.php
R RemexHtml/Tokenizer/Attributes.php
R RemexHtml/Tokenizer/LazyAttributes.php
R RemexHtml/Tokenizer/PlainAttributes.php
R RemexHtml/Tokenizer/TestTokenHandler.php
R RemexHtml/Tokenizer/TokenGenerator.php
R RemexHtml/Tokenizer/TokenGeneratorHandler.php
R RemexHtml/Tokenizer/TokenHandler.php
R RemexHtml/Tokenizer/TokenSerializer.php
R RemexHtml/Tokenizer/Tokenizer.php
R RemexHtml/Tokenizer/TokenizerError.php
R RemexHtml/TreeBuilder/ActiveFormattingElements.php
R RemexHtml/TreeBuilder/AfterAfterBody.php
R RemexHtml/TreeBuilder/AfterAfterFrameset.php
R RemexHtml/TreeBuilder/AfterBody.php
R RemexHtml/TreeBuilder/AfterFrameset.php
R RemexHtml/TreeBuilder/AfterHead.php
R RemexHtml/TreeBuilder/BeforeHead.php
R RemexHtml/TreeBuilder/BeforeHtml.php
R RemexHtml/TreeBuilder/CachingStack.php
R RemexHtml/TreeBuilder/DestructTracer.php
R RemexHtml/TreeBuilder/DestructTracerNode.php
R RemexHtml/TreeBuilder/DispatchTracer.php
R RemexHtml/TreeBuilder/Dispatcher.php
R RemexHtml/TreeBuilder/Element.php
R RemexHtml/TreeBuilder/ForeignAttributes.php
R RemexHtml/TreeBuilder/FormattingElement.php
R RemexHtml/TreeBuilder/InBody.php
R RemexHtml/TreeBuilder/InCaption.php
R RemexHtml/TreeBuilder/InCell.php
R RemexHtml/TreeBuilder/InColumnGroup.php
R RemexHtml/TreeBuilder/InForeignContent.php
R RemexHtml/TreeBuilder/InFrameset.php
R RemexHtml/TreeBuilder/InHead.php
R RemexHtml/TreeBuilder/InHeadNoscript.php
R RemexHtml/TreeBuilder/InPre.php
R RemexHtml/TreeBuilder/InRow.php
R RemexHtml/TreeBuilder/InSelect.php
R RemexHtml/TreeBuilder/InSelectInTable.php
R RemexHtml/TreeBuilder/InTable.php
R RemexHtml/TreeBuilder/InTableBody.php
R RemexHtml/TreeBuilder/InTableText.php
R RemexHtml/TreeBuilder/InTemplate.php
R RemexHtml/TreeBuilder/InTextarea.php
R RemexHtml/TreeBuilder/Initial.php
R RemexHtml/TreeBuilder/InsertionMode.php
R RemexHtml/TreeBuilder/Marker.php
R RemexHtml/TreeBuilder/SimpleStack.php
R RemexHtml/TreeBuilder/Stack.php
R RemexHtml/TreeBuilder/TemplateModeStack.php
R RemexHtml/TreeBuilder/Text.php
R RemexHtml/TreeBuilder/TreeBuilder.php
R RemexHtml/TreeBuilder/TreeBuilderError.php
R RemexHtml/TreeBuilder/TreeHandler.php
R RemexHtml/TreeBuilder/TreeMutationTracer.php
M composer.json
M phpcs.xml
M phpunit.xml.dist
A tests/phplint/autoload.php
A tests/phplint/phplint
85 files changed, 49 insertions(+), 20 deletions(-)

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



diff --git a/.gitattributes b/.gitattributes
index 412d375..f324a6c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,4 +8,4 @@
 /phpunit.xml.dist export-ignore
 /tests export-ignore
 /bin export-ignore
-/src/FuzzTest export-ignore
+/RemexHtml/FuzzTest export-ignore
diff --git a/Doxyfile b/Doxyfile
index dadf865..0ec1b29 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -9,7 +9,7 @@
 JAVADOC_AUTOBRIEF  = YES
 QT_AUTOBRIEF   = YES
 WARN_NO_PARAMDOC   = YES
-INPUT  = README.md src/
+INPUT  = README.md RemexHtml/
 FILE_PATTERNS  = *.php
 RECURSIVE  = YES
 USE_MDFILE_AS_MAINPAGE = README.md
diff --git a/src/DOM/DOMBuilder.php b/RemexHtml/DOM/DOMBuilder.php
similarity index 100%
rename from src/DOM/DOMBuilder.php
rename to RemexHtml/DOM/DOMBuilder.php
diff --git a/src/DOM/DOMFormatter.php b/RemexHtml/DOM/DOMFormatter.php
similarity index 87%
rename from src/DOM/DOMFormatter.php
rename to 

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Switch RdfRepository to use Jetty HTTP client

[Smalyshev (Code Review)]

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

Change subject: Switch RdfRepository to use Jetty HTTP client
..

Switch RdfRepository to use Jetty HTTP client

Change-Id: I2aa30dd82012999075fd15ea28432733a2004ad7
---
M src/build/forbidden/core.txt
M tools/pom.xml
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
3 files changed, 123 insertions(+), 89 deletions(-)


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

diff --git a/src/build/forbidden/core.txt b/src/build/forbidden/core.txt
index 8f4926b..371104e 100644
--- a/src/build/forbidden/core.txt
+++ b/src/build/forbidden/core.txt
@@ -17,7 +17,6 @@
 java.util.Collections#sort(java.util.List)
 java.util.Collections#sort(java.util.List,java.util.Comparator)
 
-java.io.StringReader#(java.lang.String) @ Use FastStringReader instead
 
 @defaultMessage Only use wait / notify when really needed try to use 
concurrency primitives, latches or callbacks instead.
 java.lang.Object#wait()
diff --git a/tools/pom.xml b/tools/pom.xml
index 923fb63..32c6e0b 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -55,10 +55,6 @@
   commons-lang3
 
 
-  org.apache.httpcomponents
-  httpclient
-
-
   org.openrdf.sesame
   sesame-query
 
@@ -87,6 +83,14 @@
   testTools
   test
 
+
+  org.apache.httpcomponents
+  httpclient
+
+
+   org.eclipse.jetty
+   jetty-client
+
   
 
   
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index 88b..cc605b3 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -3,9 +3,8 @@
 import static com.google.common.io.Resources.getResource;
 import static org.wikidata.query.rdf.tool.FilteredStatements.filtered;
 
-import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
@@ -17,6 +16,9 @@
 import java.util.Locale;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -24,18 +26,16 @@
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.NoConnectionReuseStrategy;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpProxy;
+import org.eclipse.jetty.client.ProxyConfiguration;
+import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.util.FormContentProvider;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.util.Fields;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -62,7 +62,6 @@
 import com.google.common.base.Charsets;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.google.common.io.CharStreams;
 import com.google.common.io.Resources;
 
 /**
@@ -79,9 +78,8 @@
 /**
  * Http connection pool for the rdf repository.
  */
-private final CloseableHttpClient client = 
HttpClients.custom().setMaxConnPerRoute(100).setMaxConnTotal(100)
-.setConnectionReuseStrategy(new NoConnectionReuseStrategy())
-.build();
+private final HttpClient httpClient;
+
 /**
  * URI for the wikibase rdf repository.
  */
@@ -136,21 +134,23 @@
 private int delay = 1000;
 
 /**
- * Allow subclass access to the HTTP client.
+ * Configuration name for proxy host.
  */
-protected CloseableHttpClient client() {
-return client;
-}
-
+private static final String HTTP_PROXY = "http.proxyHost";
 /**
- * HTTP request configuration.
+ * Configuration name for proxy port.
  */
-private RequestConfig requestConfig;
+

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: i18n: Add a default alignment value

[jenkins-bot (Code Review)]

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

Change subject: i18n: Add a default alignment value
..


i18n: Add a default alignment value

Change-Id: Ic3f2a941a55cbd8e23e0291b53080af985c09933
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 86073e8..6dc422f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,6 +20,7 @@
"visualeditor-aliencontextitem-title": "Item",
"visualeditor-aliennode-tooltip": "Sorry, this element can only be 
edited in source mode for now.",
"visualeditor-align-widget-center": "Center",
+   "visualeditor-align-widget-default": "Default",
"visualeditor-align-widget-left": "Left",
"visualeditor-align-widget-right": "Right",
"visualeditor-alignablecontextitem-title": "Alignment",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index fee70c0..79c810a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -28,6 +28,7 @@
"visualeditor-aliencontextitem-title": "Title for the context item for 
unidentifiable nodes\n{{Identical|Item}}",
"visualeditor-aliennode-tooltip": "Tooltip for items that VisualEditor 
cannot edit",
"visualeditor-align-widget-center": "Label for aligning text to the 
center.\n{{Related|Visualeditor-align-widget}}\n{{Identical|Center}}",
+   "visualeditor-align-widget-default": "Label for aligning text to the 
default 
direction.\n{{Related|Visualeditor-align-widget}}\n{{Identical|Default}}",
"visualeditor-align-widget-left": "Label for aligning text to the 
left.\n{{Related|Visualeditor-align-widget}}\n{{Identical|Left}}",
"visualeditor-align-widget-right": "Label for aligning text to the 
right.\n\n{{Related|Visualeditor-align-widget}}\n{{Identical|Right}}",
"visualeditor-alignablecontextitem-title": "Title for the context item 
for alignable nodes\n{{Identical|Alignment}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3f2a941a55cbd8e23e0291b53080af985c09933
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T161178: Apply defined classes to galleries

[Arlolra (Code Review)]

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

Change subject: T161178: Apply defined classes to galleries
..

T161178: Apply defined classes to galleries

 * This directly applies user supplied data without sanitization, but it
   doesn't look like sanitizeTagAttrs would modify the value anyways,
   and uses the dom methods to add it.

 * Fixes the test case at,
   /en.wikipedia.org/v3/page/html/List_of_active_Royal_Navy_ships/769959069

Change-Id: I787fb58cb14a1bae2d0cb323a064a292779db5cc
---
M lib/ext/Gallery/index.js
M lib/ext/Gallery/modes.js
M tests/parserTests.txt
3 files changed, 37 insertions(+), 10 deletions(-)


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

diff --git a/lib/ext/Gallery/index.js b/lib/ext/Gallery/index.js
index ecc04d1..39ceaeb 100644
--- a/lib/ext/Gallery/index.js
+++ b/lib/ext/Gallery/index.js
@@ -32,6 +32,7 @@
 
this.showfilename = (attrs.showfilename !== undefined);
this.caption = attrs.caption;
+   this.class = attrs.class;
 };
 
 // FIXME: This is too permissive.  The php implementation only calls
diff --git a/lib/ext/Gallery/modes.js b/lib/ext/Gallery/modes.js
index 5aee524..1f7c7a4 100644
--- a/lib/ext/Gallery/modes.js
+++ b/lib/ext/Gallery/modes.js
@@ -16,10 +16,18 @@
 Traditional.prototype.padding = { thumb: 30, box: 5, border: 8 };
 
 Traditional.prototype.ul = function(opts, doc) {
-   var padding = this.padding;
var ul = doc.createElement('ul');
-   ul.setAttribute('class', 'gallery mw-gallery-' + opts.mode);
+   var cl = 'gallery mw-gallery-' + opts.mode;
+   if (opts.class) { cl += ' ' + opts.class; }
+   ul.setAttribute('class', cl);
+   doc.body.appendChild(ul);
+   this.perRow(opts, ul);
+   return ul;
+};
+
+Traditional.prototype.perRow = function(opts, ul) {
if (opts.imagesPerRow > 0) {
+   var padding = this.padding;
var total = opts.imageWidth + padding.thumb + padding.box + 
padding.border;
total *= opts.imagesPerRow;
ul.setAttribute('style', [
@@ -27,8 +35,6 @@
'_width: ' + total + 'px;',
].join(' '));
}
-   doc.body.appendChild(ul);
-   return ul;
 };
 
 Traditional.prototype.caption = function(opts, doc, ul, caption) {
@@ -144,12 +150,7 @@
 Packed.prototype.scale = 1.5;
 Packed.prototype.padding = { thumb: 0, box: 2, border: 8 };
 
-Packed.prototype.ul = function(opts, doc) {
-   var ul = doc.createElement('ul');
-   ul.setAttribute('class', 'gallery mw-gallery-' + opts.mode);
-   doc.body.appendChild(ul);
-   return ul;
-};
+Packed.prototype.perRow = function() {};
 
 Packed.prototype.dimensions = function(opts) {
return coreutil.format('x%dpx', Math.trunc(opts.imageHeight * 
this.scale));
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 04a7261..2b8d9d4 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -19659,6 +19659,31 @@
 !! end
 
 !! test
+Gallery with class attribute
+!! options
+parsoid={
+  "nativeGallery": true
+}
+!! wikitext
+
+File:Foobar.jpg
+
+!! html/php
+
+   
+   http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>
+   
+   
+   
+
+
+!! html/parsoid
+
+
+
+!! end
+
+!! test
 HTML Hex character encoding (spells the word "JavaScript")
 !! options
 parsoid=wt2html,wt2wt,html2html

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: [WIP] Add CC-BY endpoints

[Smalyshev (Code Review)]

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

Change subject: [WIP] Add CC-BY endpoints
..

[WIP] Add CC-BY endpoints

Change-Id: I75118bccf976f4fc414c05dfdc9dd627a1551844
---
M copyright.html
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/copyright.html b/copyright.html
index 2077507..d1cc7ab 100644
--- a/copyright.html
+++ b/copyright.html
@@ -21,10 +21,25 @@
 
 Query data on this site may also include information for the following sources:
 
+ 
  http://labs.europeana.eu/api/linked-open-data-sparql-endpoint;>Europeana
  http://nomisma.org/;>Nomisma.org
  http://data.cervantesvirtual.com/about;>Biblioteca Virtual 
Miguel de Cervantes
  http://datos.bne.es/sparql?help=intro;>Biblioteca Nacional de 
España
+
+ http://data.bnf.fr/about/;>Bibliothèque nationale de France  
+ http://wiki.dbpedia.org/OnlineAccess;>DBPedia
+ http://rdf.insee.fr/;>INSEE
+ http://data.camera.it/data/en/linked-data/;>Italian Chamber of 
Deputies
+ http://opendatacommunities.org/sparql;>UK Department for 
Communities and Local Government
+ http://statistics.data.gov.uk/sparql;>UK Office for National 
Statistics
+ http://data.ordnancesurvey.co.uk/docs/sparql;>UK ordnance 
survey
+ http://www.wikipathways.org/index.php/Help:WikiPathways_Sparql_queries;>WikiPathways
+
+ http://sparql.uniprot.org;>Universal Protein Resource
+ 
+ 
+   
 
 
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add ParserMigration

[jenkins-bot (Code Review)]

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

Change subject: Add ParserMigration
..


Add ParserMigration

Change-Id: I0afc58e50f77e67e851bc860ee8198a5607a38e4
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 6a770ee..d136626 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -100,6 +100,7 @@
"PageTriage",
"PageViewInfo",
"ParserFunctions",
+   "ParserMigration",
"ParsoidBatchAPI",
"PdfHandler",
"Petition",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0afc58e50f77e67e851bc860ee8198a5607a38e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cards[master]: tests: Don't assume synchronous jQuery.Deferred

[Krinkle (Code Review)]

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

Change subject: tests: Don't assume synchronous jQuery.Deferred
..

tests: Don't assume synchronous jQuery.Deferred

Non-test code in Cards uses promises correctly, but this test
assumed a synchronous callback if the promise was manually
resolved before adding the callback. This is undocumented behaviour
that is incompatible with native Promise.

jQuery 3 changes this behaviour and enforces them to be async.
In many cases, this fixes bugs, but in this case it causes a few
tests to fail because the assertions happen too late.

Fix by make sure the test waits for it by using assert.async(),
or by returning the promise to QUnit.



Bug: T124742
Change-Id: I36aac668c5eb71f19cee827d3d89ef079f739721
---
M tests/qunit/CardsGateway.js
1 file changed, 9 insertions(+), 5 deletions(-)


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

diff --git a/tests/qunit/CardsGateway.js b/tests/qunit/CardsGateway.js
index f522f7a..5fcdd86 100644
--- a/tests/qunit/CardsGateway.js
+++ b/tests/qunit/CardsGateway.js
@@ -7,7 +7,7 @@
QUnit.test( '#getCards resolves with empty list of cards when no titles 
are given', 1, function ( assert ) {
var cards = new CardsGateway( { api: new mw.Api() } );
 
-   cards.getCards( [] ).then( function ( cards ) {
+   return cards.getCards( [] ).then( function ( cards ) {
assert.ok( cards.cardViews.length === 0 );
} );
} );
@@ -60,7 +60,7 @@
 
this.sandbox.stub( api, 'get' ).returns( $.Deferred().resolve( 
result ) );
 
-   cards.getCards( [ 'One', 'Two', 'Three', 'Four' ] ).then( 
function ( cards ) {
+   return cards.getCards( [ 'One', 'Two', 'Three', 'Four' ] 
).then( function ( cards ) {
assert.ok( cards.cardViews.length === 4 );
 
// One: no extract; no thumbnail.
@@ -98,13 +98,16 @@
QUnit.test( '#getCards resolves with empty list of cards when the API 
call fails', 2, function ( assert ) {
var api = new mw.Api(),
cards = new CardsGateway( { api: api } ),
-   getStub = this.sandbox.stub( api, 'get' );
+   getStub = this.sandbox.stub( api, 'get' ),
+   done1 = assert.async(),
+   done2 = assert.async();
 
getStub.returns( $.Deferred().reject() );
 
cards.getCards( [ 'Foo' ] ).then( function ( cards ) {
assert.ok( cards.cardViews.length === 0 );
-   } );
+   } )
+   .always( done1 );
 
// The API call can succeed but return no results, which should
// also be handled as a failure.
@@ -114,6 +117,7 @@
 
cards.getCards( [ 'Foo' ] ).then( function ( cards ) {
assert.ok( cards.cardViews.length === 0 );
-   } );
+   } )
+   .always( done2 );
} );
 }( jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36aac668c5eb71f19cee827d3d89ef079f739721
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cards
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...VisualEditor[master]: ve.dm.MWImageNode#describeChanges: Ignore borderImage noise ...

[Jforrester (Code Review)]

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

Change subject: ve.dm.MWImageNode#describeChanges: Ignore borderImage noise 
from the model
..

ve.dm.MWImageNode#describeChanges: Ignore borderImage noise from the model

Also follow-up 335b56728a by adding the visualeditor-changedesc-align
i18n which was missed.

Change-Id: I801f66c0028f71cf2cdbcb8f1675ba1f5a3cde31
---
M extension.json
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
2 files changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index d00767f..8cee265 100644
--- a/extension.json
+++ b/extension.json
@@ -1789,6 +1789,7 @@
"diffMatchPatch"
],
"messages": [
+   "visualeditor-changedesc-align",
"visualeditor-changedesc-changed",
"visualeditor-changedesc-image-size",
"visualeditor-changedesc-language",
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index 1314bde..7d1f081 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -91,6 +91,10 @@
}
for ( key in attributeChanges ) {
if ( customKeys.indexOf( key ) === -1 ) {
+   if ( key === 'borderImage' && 
!attributeChanges.borderImage.from && !attributeChanges.borderImage.to ) {
+   // Skip noise from the data model
+   continue;
+   }
change = this.describeChange( key, attributeChanges[ 
key ] );
descriptions.push( change );
}
@@ -101,6 +105,9 @@
 ve.dm.MWImageNode.static.describeChange = function ( key, change ) {
if ( key === 'align' ) {
return ve.msg( 'visualeditor-changedesc-align',
+   // Messages used:
+   // visualeditor-align-widget-left, 
visualeditor-align-widget-right,
+   // visualeditor-align-widget-center, 
visualeditor-align-widget-default
ve.msg( 'visualeditor-align-widget-' + change.from ),
ve.msg( 'visualeditor-align-widget-' + change.to )
);

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add ParserMigration

[Tim Starling (Code Review)]

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

Change subject: Add ParserMigration
..

Add ParserMigration

Change-Id: I0afc58e50f77e67e851bc860ee8198a5607a38e4
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 6a770ee..d136626 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -100,6 +100,7 @@
"PageTriage",
"PageViewInfo",
"ParserFunctions",
+   "ParserMigration",
"ParsoidBatchAPI",
"PdfHandler",
"Petition",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0afc58e50f77e67e851bc860ee8198a5607a38e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: mwv: separate require_package usage from File precondition

[jenkins-bot (Code Review)]

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

Change subject: mwv: separate require_package usage from File precondition
..


mwv: separate require_package usage from File precondition

Since 655a94a require_package actually creates an ordering dependency
between the package and the enclosing class. This can cause problems if
the enclosing class also in some way creates a 'before' ordering
dependency on Exec[apt-get update] or anything else that is
a precondition of installing the package. The particular cycle being
broken here is one that is only triggered when NFS shares are used and
::mwv places a 'before' condition on all File resources.

Bug: T161127
Change-Id: I6af63f8d6f01db14cc784fe735877c6ce5652a92
---
M puppet/hieradata/common.yaml
M puppet/hieradata/provider/lxc.yaml
A puppet/modules/mwv/manifests/cachefilesd.pp
M puppet/modules/mwv/manifests/init.pp
A puppet/modules/mwv/manifests/packages.pp
5 files changed, 55 insertions(+), 40 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 3fa4128..eacaaba 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -8,8 +8,8 @@
 mwv::etc_dir: /etc/mw-vagrant
 mwv::services_dir: /vagrant/srv
 mwv::vendor_dir: /srv
-mwv::enable_cachefilesd: true
 mwv::tld: '.local.wmftest.net'
+mwv::cachefilesd::enable: true
 
 three_d::three_d_2png_dir: /var/3d2png
 
diff --git a/puppet/hieradata/provider/lxc.yaml 
b/puppet/hieradata/provider/lxc.yaml
index 67fc3ef..3845f11 100644
--- a/puppet/hieradata/provider/lxc.yaml
+++ b/puppet/hieradata/provider/lxc.yaml
@@ -1,3 +1,3 @@
 ---
 # Disable cachefilesd usage
-mwv::enable_cachefilesd: false
+mwv::cachefilesd::enable: false
diff --git a/puppet/modules/mwv/manifests/cachefilesd.pp 
b/puppet/modules/mwv/manifests/cachefilesd.pp
new file mode 100644
index 000..61608e5
--- /dev/null
+++ b/puppet/modules/mwv/manifests/cachefilesd.pp
@@ -0,0 +1,37 @@
+# == Class: mwv::cachefilesd
+#
+# Cachefilesd is a service that can be used to cache NFS files locally inside
+# the VM to improve read performance at the cost of some delay for seeing
+# changes made on the NFS server for recently cached files.
+#
+# === Parameters
+#
+# [*enable_cachefilesd*]
+#   Enable cachefilesd service
+#
+class mwv::cachefilesd (
+$enable,
+) {
+$ensure = $enable ? {
+true => 'present',
+default => 'absent',
+}
+
+package { 'cachefilesd':
+ensure => $ensure,
+}
+
+if $enable {
+# Support the `nfs_cache` setting with cachefilesd
+file { '/etc/default/cachefilesd':
+content => "RUN=yes\nSTARTTIME=5\n",
+require => Package['cachefilesd'],
+}
+
+service { 'cachefilesd':
+ensure=> 'running',
+require   => Package['cachefilesd'],
+subscribe => File['/etc/default/cachefilesd'],
+}
+}
+}
diff --git a/puppet/modules/mwv/manifests/init.pp 
b/puppet/modules/mwv/manifests/init.pp
index 4285f2a..9c19aa1 100644
--- a/puppet/modules/mwv/manifests/init.pp
+++ b/puppet/modules/mwv/manifests/init.pp
@@ -8,7 +8,6 @@
 #   Root directory for general file storage
 #
 # [*etc_dir*]
-#
 #   /etc/ directory to use for storing MW-Vagrant-specific configuration files
 #   which need not to be shared with the host (example: '/etc/mw-vagrant').
 #
@@ -17,9 +16,6 @@
 #
 # [*vendor_dir*]
 #   Root directory for provisioning 3rd party services (eg Redis storage)
-#
-# [*enable_cachefilesd*]
-#   Enable cachefilesd service
 #
 # [*tld*]
 #   Top level domain to use when creating hostnames. Value should include
@@ -30,12 +26,13 @@
 $etc_dir,
 $services_dir,
 $vendor_dir,
-$enable_cachefilesd,
 $tld,
 ) {
 include ::apt
 include ::env
 include ::git
+include ::mwv::packages
+include ::mwv::cachefilesd
 
 file { $etc_dir:
 ensure => directory,
@@ -68,37 +65,4 @@
 } -> File <| |>
 }
 
-package { 'python-pip': } -> Package <| provider == pip |>
-
-# Install common development tools
-require_package('build-essential', 'python-dev', 'ruby-dev')
-
-# Remove chef if it is installed in the base image
-# Bug: 67693
-package { [ 'chef', 'chef-zero' ]:
-  ensure => absent,
-}
-
-if $enable_cachefilesd {
-# Support the `nfs_cache` setting with cachefilesd
-package { 'cachefilesd':
-ensure => present,
-}
-
-file { '/etc/default/cachefilesd':
-content => "RUN=yes\nSTARTTIME=5\n",
-require => Package['cachefilesd'],
-}
-
-service { 'cachefilesd':
-ensure=> running,
-require   => Package['cachefilesd'],
-subscribe => File['/etc/default/cachefilesd'],
-}
-} 

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Pass environment variables to the subprocess

[Awight (Code Review)]

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

Change subject: Pass environment variables to the subprocess
..

Pass environment variables to the subprocess

Change-Id: I28e47729b3ee0d7f5566e530eaa032767347a101
TODO: Needs a test
---
M README.md
M processcontrol/job_wrapper.py
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/79/344279/1

diff --git a/README.md b/README.md
index e53da2c..4ad5e7c 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,10 @@
 # Optional timeout in seconds, after which your job will be
 # aborted.  Defaults to 10 minutes, JobWrapper.DEFAULT_TIMEOUT
 timeout: 30
+
+# Optional environment variables.
+environment:
+   PYTHONPATH: /usr/share/invisible/pie
 ```
 
 Running
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 99fad1c..e57278e 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -30,12 +30,17 @@
 if not self.config.has("schedule"):
 self.enabled = False
 
+if self.config.has("environment"):
+self.environment = self.config.get("environment")
+else:
+self.environment = {}
+
 def run(self):
 lock.begin(job_tag=self.name)
 
 command = shlex.split(self.config.get("command"))
 
-self.process = subprocess.Popen(command, stdout=subprocess.PIPE, 
stderr=subprocess.PIPE)
+self.process = subprocess.Popen(command, stdout=subprocess.PIPE, 
stderr=subprocess.PIPE, env=self.environment)
 timer = threading.Timer(self.timeout, self.fail_timeout)
 timer.start()
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28e47729b3ee0d7f5566e530eaa032767347a101
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: i18n: Add a default alignment value

[Jforrester (Code Review)]

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

Change subject: i18n: Add a default alignment value
..

i18n: Add a default alignment value

Change-Id: Ic3f2a941a55cbd8e23e0291b53080af985c09933
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/78/344278/1

diff --git a/i18n/en.json b/i18n/en.json
index 86073e8..6dc422f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,6 +20,7 @@
"visualeditor-aliencontextitem-title": "Item",
"visualeditor-aliennode-tooltip": "Sorry, this element can only be 
edited in source mode for now.",
"visualeditor-align-widget-center": "Center",
+   "visualeditor-align-widget-default": "Default",
"visualeditor-align-widget-left": "Left",
"visualeditor-align-widget-right": "Right",
"visualeditor-alignablecontextitem-title": "Alignment",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index fee70c0..79c810a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -28,6 +28,7 @@
"visualeditor-aliencontextitem-title": "Title for the context item for 
unidentifiable nodes\n{{Identical|Item}}",
"visualeditor-aliennode-tooltip": "Tooltip for items that VisualEditor 
cannot edit",
"visualeditor-align-widget-center": "Label for aligning text to the 
center.\n{{Related|Visualeditor-align-widget}}\n{{Identical|Center}}",
+   "visualeditor-align-widget-default": "Label for aligning text to the 
default 
direction.\n{{Related|Visualeditor-align-widget}}\n{{Identical|Default}}",
"visualeditor-align-widget-left": "Label for aligning text to the 
left.\n{{Related|Visualeditor-align-widget}}\n{{Identical|Left}}",
"visualeditor-align-widget-right": "Label for aligning text to the 
right.\n\n{{Related|Visualeditor-align-widget}}\n{{Identical|Right}}",
"visualeditor-alignablecontextitem-title": "Title for the context item 
for alignable nodes\n{{Identical|Alignment}}",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: mwv: separate require_package usage from File precondition

[BryanDavis (Code Review)]

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

Change subject: mwv: separate require_package usage from File precondition
..

mwv: separate require_package usage from File precondition

Since 655a94a require_package actually creates an ordering dependency
between the package and the enclosing class. This can cause problems if
the enclosing class also in some way creates a 'before' ordering
dependency on Exec[apt-get update] or anything else that is
a precondition of installing the package. The particular cycle being
broken here is one that is only triggered when NFS shares are used and
::mwv places a 'before' condition on all File resources.

Bug: T161127
Change-Id: I6af63f8d6f01db14cc784fe735877c6ce5652a92
---
M puppet/hieradata/common.yaml
M puppet/hieradata/provider/lxc.yaml
A puppet/modules/mwv/manifests/cachefilesd.pp
M puppet/modules/mwv/manifests/init.pp
A puppet/modules/mwv/manifests/packages.pp
5 files changed, 55 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/77/344277/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 3fa4128..eacaaba 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -8,8 +8,8 @@
 mwv::etc_dir: /etc/mw-vagrant
 mwv::services_dir: /vagrant/srv
 mwv::vendor_dir: /srv
-mwv::enable_cachefilesd: true
 mwv::tld: '.local.wmftest.net'
+mwv::cachefilesd::enable: true
 
 three_d::three_d_2png_dir: /var/3d2png
 
diff --git a/puppet/hieradata/provider/lxc.yaml 
b/puppet/hieradata/provider/lxc.yaml
index 67fc3ef..3845f11 100644
--- a/puppet/hieradata/provider/lxc.yaml
+++ b/puppet/hieradata/provider/lxc.yaml
@@ -1,3 +1,3 @@
 ---
 # Disable cachefilesd usage
-mwv::enable_cachefilesd: false
+mwv::cachefilesd::enable: false
diff --git a/puppet/modules/mwv/manifests/cachefilesd.pp 
b/puppet/modules/mwv/manifests/cachefilesd.pp
new file mode 100644
index 000..61608e5
--- /dev/null
+++ b/puppet/modules/mwv/manifests/cachefilesd.pp
@@ -0,0 +1,37 @@
+# == Class: mwv::cachefilesd
+#
+# Cachefilesd is a service that can be used to cache NFS files locally inside
+# the VM to improve read performance at the cost of some delay for seeing
+# changes made on the NFS server for recently cached files.
+#
+# === Parameters
+#
+# [*enable_cachefilesd*]
+#   Enable cachefilesd service
+#
+class mwv::cachefilesd (
+$enable,
+) {
+$ensure = $enable ? {
+true => 'present',
+default => 'absent',
+}
+
+package { 'cachefilesd':
+ensure => $ensure,
+}
+
+if $enable {
+# Support the `nfs_cache` setting with cachefilesd
+file { '/etc/default/cachefilesd':
+content => "RUN=yes\nSTARTTIME=5\n",
+require => Package['cachefilesd'],
+}
+
+service { 'cachefilesd':
+ensure=> 'running',
+require   => Package['cachefilesd'],
+subscribe => File['/etc/default/cachefilesd'],
+}
+}
+}
diff --git a/puppet/modules/mwv/manifests/init.pp 
b/puppet/modules/mwv/manifests/init.pp
index 4285f2a..9c19aa1 100644
--- a/puppet/modules/mwv/manifests/init.pp
+++ b/puppet/modules/mwv/manifests/init.pp
@@ -8,7 +8,6 @@
 #   Root directory for general file storage
 #
 # [*etc_dir*]
-#
 #   /etc/ directory to use for storing MW-Vagrant-specific configuration files
 #   which need not to be shared with the host (example: '/etc/mw-vagrant').
 #
@@ -17,9 +16,6 @@
 #
 # [*vendor_dir*]
 #   Root directory for provisioning 3rd party services (eg Redis storage)
-#
-# [*enable_cachefilesd*]
-#   Enable cachefilesd service
 #
 # [*tld*]
 #   Top level domain to use when creating hostnames. Value should include
@@ -30,12 +26,13 @@
 $etc_dir,
 $services_dir,
 $vendor_dir,
-$enable_cachefilesd,
 $tld,
 ) {
 include ::apt
 include ::env
 include ::git
+include ::mwv::packages
+include ::mwv::cachefilesd
 
 file { $etc_dir:
 ensure => directory,
@@ -68,37 +65,4 @@
 } -> File <| |>
 }
 
-package { 'python-pip': } -> Package <| provider == pip |>
-
-# Install common development tools
-require_package('build-essential', 'python-dev', 'ruby-dev')
-
-# Remove chef if it is installed in the base image
-# Bug: 67693
-package { [ 'chef', 'chef-zero' ]:
-  ensure => absent,
-}
-
-if $enable_cachefilesd {
-# Support the `nfs_cache` setting with cachefilesd
-package { 'cachefilesd':
-ensure => present,
-}
-
-file { '/etc/default/cachefilesd':
-content => "RUN=yes\nSTARTTIME=5\n",
-require => Package['cachefilesd'],
-}
-
-service { 'cachefilesd':
-ensure=> running,
-require   => Package['cachefilesd'],
-subscribe => File['/etc/default/cachefilesd'],
-}
-} 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy ParserMigration extension

[Tim Starling (Code Review)]

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

Change subject: Deploy ParserMigration extension
..

Deploy ParserMigration extension

A tool to compare RemexHtml output with Tidy. RemexHtml is already
available in vendor/ in 1.29.0-wmf.14 and later.

Also fix a comment which was accidentally moved away from its correct
location.

Bug: T141586
Change-Id: Id3c43149d8fecd0cfaa028403c64e7005db40144
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
3 files changed, 21 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5cc2092..cf4be9a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3515,12 +3515,25 @@
};
 }
 
-# THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED
-#
-# REALLY ... we're not kidding here ... NO EXTENSIONS AFTER
+if ( $wmgUseParserMigration ) {
+   wfLoadExtension( 'ParserMigration' );
+   $wgParserMigrationTidiers = [
+   [
+   'driver' => 'RaggettInternalHHVM',
+   'tidyConfigFile' => $wgTidyConf,
+   ],
+   [
+   'driver' => 'RemexHtml',
+   ],
+   ];
+}
 
 if ( $wmfRealm === 'labs' ) {
require( "$wmfConfigDir/CommonSettings-labs.php" );
 }
 
+# THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED
+#
+# REALLY ... we're not kidding here ... NO EXTENSIONS AFTER
+
 require( "$wmfConfigDir/ExtensionMessages-$wmgVersionNumber.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 116d96a..98db17e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18385,6 +18385,10 @@
'foundationwiki' => true,
 ],
 
+'wmgUseParserMigration' => [
+   'default' => true,
+],
+
 ];
 
 ### WMF Labs override #
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 74c0728..b6b725f 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -93,6 +93,7 @@
 $IP/extensions/PageTriage/PageTriage.php
 $IP/extensions/PageViewInfo/extension.json
 $IP/extensions/ParserFunctions/extension.json
+$IP/extensions/ParserMigration/extension.json
 $IP/extensions/ParsoidBatchAPI/extension.json
 $IP/extensions/PdfHandler/extension.json
 $IP/extensions/Petition/extension.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3c43149d8fecd0cfaa028403c64e7005db40144
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Use color icon instead of b/w one.

[Smalyshev (Code Review)]

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

Change subject: Use color icon instead of b/w one.
..

Use color icon instead of b/w one.

Change-Id: I7e8cc71c056387c137d99381e6e4ecdb0ba9afe9
---
M index.html
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/index.html b/index.html
index 94cd5f6..8b07e8d 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@


 
-   
+   




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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add page with copyright info and basic list of federated sou...

[Smalyshev (Code Review)]

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

Change subject: Add page with copyright info and basic list of federated 
sources.
..

Add page with copyright info and basic list of federated sources.

Change-Id: I1b86db949d22df934bdf5a850792f4d877d18f3f
---
A copyright.html
M i18n/en.json
M i18n/qqq.json
M index.html
4 files changed, 34 insertions(+), 0 deletions(-)


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

diff --git a/copyright.html b/copyright.html
new file mode 100644
index 000..2077507
--- /dev/null
+++ b/copyright.html
@@ -0,0 +1,31 @@
+
+
+
+
+
+   
+   Wikidata Query Service
+
+
+   
+   
+   
+   
+   
+
+
+   
+Licensing information
+
+This site provides information from https://www.wikidata.org/;>Wikidata, which is available under https://creativecommons.org/publicdomain/zero/1.0/;>Creative Commons CC0 
License. See more information in the https://wikimediafoundation.org/wiki/Terms_of_Use;>Terms of Use.
+
+Query data on this site may also include information for the following sources:
+
+ http://labs.europeana.eu/api/linked-open-data-sparql-endpoint;>Europeana
+ http://nomisma.org/;>Nomisma.org
+ http://data.cervantesvirtual.com/about;>Biblioteca Virtual 
Miguel de Cervantes
+ http://datos.bne.es/sparql?help=intro;>Biblioteca Nacional de 
España
+
+
+
+
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index c918a83..d739e6d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -28,6 +28,7 @@
 "wdqs-app-help-examples": "Example Queries",
 "wdqs-app-help-datamodel": "RDF Data Model",
 "wdqs-app-help-prefixes": "List of prefixes",
+"wdqs-app-help-copy": "Licensing information",
 "wdqs-app-footer-help": "Press [CTRL-SPACE] to activate auto 
completion.",
 "wdqs-app-footer-updated": "Data updated $1 ago",
 "wdqs-app-footer-updated-seconds": "Data updated $1 seconds ago",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9d1d63a..89e6aab 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -30,6 +30,7 @@
"wdqs-app-help-examples": "Button message in help dropdown",
"wdqs-app-help-datamodel": "Button message in help dropdown",
"wdqs-app-help-prefixes": "Button message in help dropdown",
+   "wdqs-app-help-copy": "Link to page with licensing information",
"wdqs-app-footer-help": "Help message at the footer of the editor",
"wdqs-app-footer-updated": "Message displaying how long ago data was 
updated",
"wdqs-app-footer-updated-seconds": "Message displaying how many seconds 
ago data was updated",
diff --git a/index.html b/index.html
index 94cd5f6..ea28bea 100644
--- a/index.html
+++ b/index.html
@@ -90,6 +90,7 @@

https://www.wikidata.org/wiki/Wikidata:Request_a_query; 
data-i18n="wdqs-app-help-request-query">
https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service=edit=new;
 data-i18n="wdqs-app-help-feedback">
+   




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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Copy example configuration to docs during install

[Awight (Code Review)]

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

Change subject: Copy example configuration to docs during install
..

Copy example configuration to docs during install

Change-Id: I1862db40d06047864f87aefaa7d09d78754ea144
---
M debian/docs
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/73/344273/1

diff --git a/debian/docs b/debian/docs
index b43bf86..22c7238 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
 README.md
+process-control.example.yaml

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1862db40d06047864f87aefaa7d09d78754ea144
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Upgrade to node 6.

[jenkins-bot (Code Review)]

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

Change subject: Upgrade to node 6.
..


Upgrade to node 6.

After Kartotherian and Tilerator have been switched to
node v6 in production, all of our services support running
under that node version. So, we can use it in Vagrant as well.

Change-Id: Ib97834a298e77c0c3940e87ff09c63b6ee1daf3c
---
M puppet/modules/npm/files/nodesource.sources.list
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/npm/files/nodesource.sources.list 
b/puppet/modules/npm/files/nodesource.sources.list
index 32a97c9..69ce671 100644
--- a/puppet/modules/npm/files/nodesource.sources.list
+++ b/puppet/modules/npm/files/nodesource.sources.list
@@ -1,2 +1,2 @@
-deb https://deb.nodesource.com/node_4.x trusty main
-deb-src https://deb.nodesource.com/node_4.x trusty main
+deb https://deb.nodesource.com/node_6.x jessie main
+deb-src https://deb.nodesource.com/node_6.x jessie main

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib97834a298e77c0c3940e87ff09c63b6ee1daf3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Monthly Phabricator stats email: Fix output for zero open UB...

[Dzahn (Code Review)]

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

Change subject: Monthly Phabricator stats email: Fix output for zero open UBN! 
tasks
..


Monthly Phabricator stats email: Fix output for zero open UBN! tasks

Bug: T159314
Change-Id: I53f9092733d12a6f00640a2e2255011bf8f8d925
---
M modules/phabricator/templates/community_metrics.sh.erb
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/modules/phabricator/templates/community_metrics.sh.erb 
b/modules/phabricator/templates/community_metrics.sh.erb
index c684dc8..abcfaf7 100644
--- a/modules/phabricator/templates/community_metrics.sh.erb
+++ b/modules/phabricator/templates/community_metrics.sh.erb
@@ -149,10 +149,16 @@
 tasksopen=$(echo $result_tasksopen | cut -d " " -f3)
 
 epochnow=$(date +%s)
+# regex if we have zero open tasks (can happen for unbreaknow; see T159314):
+regex='^[0-9]+$'
 
 mediantasksopen_unbreaknow_epoch=$(echo $result_mediantasksopen_unbreaknow | 
cut -d " " -f3 | sed 's/.//' | sed 's/.5000//')
-diff_unbreaknow=$((epochnow-mediantasksopen_unbreaknow_epoch))
-mediantasksopen_unbreaknow=$(echo $((diff_unbreaknow/86400)))
+if [[ $mediantasksopen_unbreaknow_epoch =~ $regex ]] ; then
+  diff_unbreaknow=$((epochnow-mediantasksopen_unbreaknow_epoch))
+  mediantasksopen_unbreaknow=$(echo $((diff_unbreaknow/86400)))
+else
+  mediantasksopen_unbreaknow=0
+fi
 
 mediantasksopen_needstriage_epoch=$(echo $result_mediantasksopen_needstriage | 
cut -d " " -f3 | sed 's/.//' | sed 's/.5000//')
 diff_needstriage=$((epochnow-mediantasksopen_needstriage_epoch))

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Hack to get availability straight from iDEAL

[Ejegg (Code Review)]

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

Change subject: Hack to get availability straight from iDEAL
..

Hack to get availability straight from iDEAL

If noone vetoes this, maybe put it in a different class.

Bug: T161153
Change-Id: I0d24f86a0ca2bd89337e5d3acec723db05cb69f0
---
M PaymentProviders/Ingenico/BankPaymentProvider.php
A PaymentProviders/Ingenico/Tests/Data/availability.response
M PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
M SmashPig.yaml
4 files changed, 57 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/72/344272/1

diff --git a/PaymentProviders/Ingenico/BankPaymentProvider.php 
b/PaymentProviders/Ingenico/BankPaymentProvider.php
index 87c034d..4844bbc 100644
--- a/PaymentProviders/Ingenico/BankPaymentProvider.php
+++ b/PaymentProviders/Ingenico/BankPaymentProvider.php
@@ -4,6 +4,7 @@
 
 use SmashPig\Core\Context;
 use Psr\Cache\CacheItemPoolInterface;
+use SmashPig\Core\Http\OutboundRequest;
 
 /**
  * Handle bank payments via Ingenico
@@ -23,9 +24,15 @@
 */
protected $cache;
 
+   /**
+* @var array()
+*/
+   protected $availabilityParameters;
+
public function __construct( array $options = array() ) {
parent::__construct( $options );
$this->cacheParameters = $options['cache-parameters'];
+   $this->availabilityParameters = 
$options['availability-parameters'];
// FIXME: provide objects in constructor
$config = Context::get()->getConfiguration();
$this->cache = $config->object( 'cache' );
@@ -45,7 +52,7 @@
$cacheItem = $this->cache->getItem( $cacheKey );
 
if ( !$cacheItem->isHit() || $this->shouldBeExpired( $cacheItem 
) ) {
-   $query = array(
+   /*$query = array(
'countryCode' => $country,
'currencyCode' => $currency
);
@@ -56,7 +63,28 @@
 
foreach ( $response['entries'] as $entry ) {
$banks[$entry['issuerId']] = 
$entry['issuerName'];
+   }*/
+
+   $banks = array();
+
+   // HAAACK!
+   // Use undocumented API to get availability straight 
from iDEAL,
+   // until Ingenico can incorporate this into their 
directory
+   if ( $country === 'NL' && $currency === 'EUR' ) {
+   $url = $this->availabilityParameters['url'];
+   $threshold = 
$this->availabilityParameters['threshold'];
+
+   $request = new OutboundRequest( $url );
+   $rawResponse = $request->execute();
+   $response = json_decode( $rawResponse['body'], 
true );
+
+   foreach ( $response['Issuers'] as $issuer ) {
+   if ( $issuer['Percent'] >= $threshold ) 
{
+   $banks[$issuer['BankId']] = 
$issuer['BankName'];
+   }
+   }
}
+
$duration = $this->cacheParameters['duration'];
$cacheItem->set( array(
'value' => $banks,
diff --git a/PaymentProviders/Ingenico/Tests/Data/availability.response 
b/PaymentProviders/Ingenico/Tests/Data/availability.response
new file mode 100644
index 000..74f0def
--- /dev/null
+++ b/PaymentProviders/Ingenico/Tests/Data/availability.response
@@ -0,0 +1,14 @@
+HTTP/1.1 200 OK
+Cache-Control: no-cache
+Pragma: no-cache
+Content-Length: 656
+Content-Type: application/json; charset=utf-8
+Content-Encoding: gzip
+Expires: -1
+Vary: Accept-Encoding
+Server: Microsoft-IIS/8.0
+X-AspNet-Version: 4.0.30319
+X-Powered-By: ASP.NET
+Date: Wed, 22 Mar 2017 22:42:05 GMT
+
+{"Issuers":[{"BankId":"ABNANL2A","BankName":"ABN 
AMRO","LogoPath":"/Content/icons/banks/abn.png","Status":"Green","Percent":"40","Details":"","MoreDetails":"","LogoStatus":"/Content/icons/green.png","URL":"/History?bank=ABN_AMRO"},{"BankId":"INGBNL2A","BankName":"Issuer
 Simulation V3 - 
ING","LogoPath":"/Content/icons/banks/sim.png","Status":"Green","Percent":"100","Details":"","MoreDetails":"","LogoStatus":"/Content/icons/green.png","URL":"/History?bank=Simulated_Bank"}],"Message":"","IssuerMessageCalculationFailed":false,"LastUpdate":"22-3-2017,
 23:40","AllGreen":true}
diff --git 
a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
index d9a2e3e..18ef9e7 100644
--- 

[MediaWiki-commits] [Gerrit] mediawiki...PdfBook[master]: Remove everything except for short information in PdfBook.php

[jenkins-bot (Code Review)]

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

Change subject: Remove everything except for short information in PdfBook.php
..


Remove everything except for short information in PdfBook.php

The extension's canonical code repository is now located on GitHub.

Bug: T124978
Change-Id: Iadd2c76ce0859a1fd77e2d2b3d8760e0d3cc45dd
---
A GONE_TO_GITHUB.txt
D PdfBook.hooks.php
D PdfBook.i18n.php
M PdfBook.php
D i18n/af.json
D i18n/ast.json
D i18n/be-tarask.json
D i18n/bn.json
D i18n/br.json
D i18n/bs.json
D i18n/ca.json
D i18n/ce.json
D i18n/cy.json
D i18n/da.json
D i18n/de.json
D i18n/dsb.json
D i18n/en.json
D i18n/es.json
D i18n/eu.json
D i18n/fa.json
D i18n/fi.json
D i18n/fr.json
D i18n/frp.json
D i18n/gd.json
D i18n/gl.json
D i18n/gsw.json
D i18n/gu.json
D i18n/he.json
D i18n/hsb.json
D i18n/hu.json
D i18n/ia.json
D i18n/id.json
D i18n/ilo.json
D i18n/it.json
D i18n/ja.json
D i18n/jbo.json
D i18n/ka.json
D i18n/km.json
D i18n/ko.json
D i18n/ksh.json
D i18n/ku-latn.json
D i18n/lb.json
D i18n/lv.json
D i18n/mk.json
D i18n/ms.json
D i18n/mzn.json
D i18n/nb.json
D i18n/nl.json
D i18n/nn.json
D i18n/pl.json
D i18n/pms.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/sk.json
D i18n/sv.json
D i18n/sw.json
D i18n/ta.json
D i18n/te.json
D i18n/tl.json
D i18n/tt-cyrl.json
D i18n/uk.json
D i18n/zh-hans.json
D i18n/zh-hant.json
66 files changed, 7 insertions(+), 872 deletions(-)

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



diff --git a/GONE_TO_GITHUB.txt b/GONE_TO_GITHUB.txt
new file mode 100644
index 000..da5e550
--- /dev/null
+++ b/GONE_TO_GITHUB.txt
@@ -0,0 +1 @@
+PdfBook is now hosted over on GitHub at 
https://github.com/OrganicDesign/extensions/tree/master/MediaWiki/PdfBook
diff --git a/PdfBook.hooks.php b/PdfBook.hooks.php
deleted file mode 100644
index 18a2e3c..000
--- a/PdfBook.hooks.php
+++ /dev/null
@@ -1,173 +0,0 @@
-getTitle();
-   $opt = ParserOptions::newFromUser( $wgUser );
-
-   // Log the export
-   $msg = wfMessage( 'pdfbook-log', 
$wgUser->getUserPage()->getPrefixedText() )->text();
-   $log = new LogPage( 'pdf', false );
-   $log->addEntry( 'book', $article->getTitle(), $msg );
-
-   // Initialise PDF variables
-   $format  = $wgRequest->getText( 'format' );
-   $notitle = $wgRequest->getText( 'notitle' );
-   $layout  = $format == 'single' ? '--webpage' : 
'--firstpage toc';
-   $charset = self::setProperty( 'Charset', 
'iso-8859-1' );
-   $left= self::setProperty( 'LeftMargin',  '1cm' );
-   $right   = self::setProperty( 'RightMargin', '1cm' );
-   $top = self::setProperty( 'TopMargin',   '1cm' );
-   $bottom  = self::setProperty( 'BottomMargin','1cm' );
-   $font= self::setProperty( 'Font','Arial' );
-   $size= self::setProperty( 'FontSize','8' );
-   $ls  = self::setProperty( 'LineSpacing', 1 );
-   $linkcol = self::setProperty( 'LinkColour',  '217A28' );
-   $levels  = self::setProperty( 'TocLevels',   '2' );
-   $exclude = self::setProperty( 'Exclude', array() );
-   $width   = self::setProperty( 'Width',   '' );
-   $width   = $width ? "--browserwidth $width" : '';
-   if( !is_array( $exclude ) ) $exclude = split( 
'\\s*,\\s*', $exclude );
- 
-   // Select articles from members if a category or links 
in content if not
-   if( $format == 'single' ) $articles = array( $title );
-   else {
-   $articles = array();
-   if( $title->getNamespace() == NS_CATEGORY ) {
-   $db = wfGetDB( DB_SLAVE );
-   $cat= $db->addQuotes( 
$title->getDBkey() );
-   $result = $db->select(
-   'categorylinks',
-   'cl_from',
-   "cl_to = $cat",
-   'PdfBook',
-   array( 'ORDER BY' => 
'cl_sortkey' )
-   );
-   if( $result instanceof ResultWrapper ) 
$result = $result->result;
-   while ( $row = $db->fetchRow( $result ) 
) $articles[] = Title::newFromID( $row[0] );
-

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Upgrade to node 6.

[Ppchelko (Code Review)]

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

Change subject: Upgrade to node 6.
..

Upgrade to node 6.

After Kartotherian and Tilerator have been switched to
node v6 in production, all of our services support running
under that node version. So, we can use it in Vagrant as well.

Change-Id: Ib97834a298e77c0c3940e87ff09c63b6ee1daf3c
---
M puppet/modules/npm/files/nodesource.sources.list
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/71/344271/1

diff --git a/puppet/modules/npm/files/nodesource.sources.list 
b/puppet/modules/npm/files/nodesource.sources.list
index 32a97c9..69ce671 100644
--- a/puppet/modules/npm/files/nodesource.sources.list
+++ b/puppet/modules/npm/files/nodesource.sources.list
@@ -1,2 +1,2 @@
-deb https://deb.nodesource.com/node_4.x trusty main
-deb-src https://deb.nodesource.com/node_4.x trusty main
+deb https://deb.nodesource.com/node_6.x jessie main
+deb-src https://deb.nodesource.com/node_6.x jessie main

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib97834a298e77c0c3940e87ff09c63b6ee1daf3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
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] apps...wikipedia[master]: Update WikiErrorView for PageActivity

[Mholloway (Code Review)]

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

Change subject: Update WikiErrorView for PageActivity
..

Update WikiErrorView for PageActivity

Adds a new error view with special messages inviting the user to save
the reqeusted page to a reading list to be downloaded later.

Still to do (in the next patch): disable all action tab buttons except
for 'save to reading list.'

Bug: T157361
Change-Id: I569cf187f1a1bfd7c56b0222a52e586c076ca338
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/views/WikiErrorView.java
M app/src/main/res/layout/activity_page.xml
M app/src/main/res/layout/fragment_page.xml
M app/src/main/res/layout/view_wiki_error.xml
6 files changed, 150 insertions(+), 37 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index b76c9f4..19917a3 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -564,6 +564,16 @@
 }
 
 @Override
+public void onPageLoadError(@NonNull PageTitle title) {
+getSupportActionBar().setTitle(title.getDisplayText());
+}
+
+@Override
+public void onPageLoadErrorRetry() {
+getSupportActionBar().setTitle("");
+}
+
+@Override
 public void onSearchSelectPage(@NonNull HistoryEntry entry, boolean 
inNewTab) {
 loadPage(entry.getTitle(), entry, inNewTab ? 
TabsProvider.TabPosition.NEW_TAB_BACKGROUND
 : TabsProvider.TabPosition.CURRENT_TAB);
@@ -719,6 +729,10 @@
 super.onDestroy();
 }
 
+public int getTabLayoutHeightPx() {
+return pageFragment.getTabLayout().getHeight();
+}
+
 /**
  * ActionMode that is invoked when the user long-presses inside the 
WebView.
  * @param mode ActionMode under which this context is starting.
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 14c9c5e..74d5909 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -127,6 +127,8 @@
 void onPagePopFragment();
 @Nullable AppCompatActivity getActivity();
 void onPageInvalidateOptionsMenu();
+void onPageLoadError(@NonNull PageTitle title);
+void onPageLoadErrorRetry();
 boolean shouldLoadFromBackStack();
 boolean shouldShowTabList();
 }
@@ -188,6 +190,7 @@
 = new TabLayout.OnTabSelectedListener() {
 @Override
 public void onTabSelected(TabLayout.Tab tab) {
+// TODO: Add "disabled" state to article action tabs and take this 
into account
 PageActionTab.of(tab.getPosition()).select(pageActionTabsCallback);
 }
 
@@ -343,6 +346,9 @@
 errorView.setRetryClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
+if (callback() != null) {
+callback().onPageLoadErrorRetry();
+}
 refreshPage();
 }
 });
@@ -886,7 +892,6 @@
 
 if (pageRefreshed) {
 pageRefreshed = false;
-FeedbackUtil.showError(getActivity(), caught);
 }
 
 hidePageContent();
@@ -894,6 +899,9 @@
 errorView.setVisibility(View.VISIBLE);
 refreshView.setEnabled(ThrowableUtil.is404(getContext(), caught));
 errorState = true;
+if (callback() != null) {
+callback().onPageLoadError(getTitle());
+}
 
 if (getPageLoadCallbacks() != null) {
 getPageLoadCallbacks().onLoadError(caught);
@@ -974,6 +982,10 @@
 tocHandler.setEnabled(true);
 }
 
+TabLayout getTabLayout() {
+return tabLayout;
+}
+
 private void updateMenuPageInfo(@NonNull Menu menu) {
 MenuItem contentIssues = menu.findItem(R.id.menu_page_content_issues);
 MenuItem similarTitles = menu.findItem(R.id.menu_page_similar_titles);
diff --git a/app/src/main/java/org/wikipedia/views/WikiErrorView.java 
b/app/src/main/java/org/wikipedia/views/WikiErrorView.java
index 40c3cad..3bafb0c 100644
--- a/app/src/main/java/org/wikipedia/views/WikiErrorView.java
+++ b/app/src/main/java/org/wikipedia/views/WikiErrorView.java
@@ -8,20 +8,28 @@
 import android.support.annotation.StringRes;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Space;
 import android.widget.TextView;
 
 import org.wikipedia.R;

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.17]: Allow extensions to add jQueryMsg magic words

[Mattflaschen (Code Review)]

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

Change subject: Allow extensions to add jQueryMsg magic words
..

Allow extensions to add jQueryMsg magic words

Change-Id: Ie82a147ff32ccda3f757108474f5cbab71d45ace
(cherry picked from commit 7e65b6b3a766c1be3f7dee8fe4f11367a7820829)
---
M docs/hooks.txt
M includes/resourceloader/ResourceLoaderJqueryMsgModule.php
M resources/src/mediawiki/mediawiki.jqueryMsg.js
M tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
4 files changed, 71 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/344267/1

diff --git a/docs/hooks.txt b/docs/hooks.txt
index f307f45..cf4e3ab 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2702,6 +2702,13 @@
 context-based variables.
 &$lessVars: array of variables already added
 
+'ResourceLoaderJqueryMsgModuleMagicWords': Called in
+ResourceLoaderJqueryMsgModule to allow adding magic words for jQueryMsg.
+The value should be a string, and they can depend only on the
+ResourceLoaderContext.
+$context: ResourceLoaderContext
+&$magicWords: Associative array mapping all-caps magic word to a string value
+
 'ResourceLoaderRegisterModules': Right before modules information is required,
 such as when responding to a resource
 loader request or generating HTML output.
diff --git a/includes/resourceloader/ResourceLoaderJqueryMsgModule.php 
b/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
index a3b059b..1704481 100644
--- a/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
+++ b/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
@@ -43,9 +43,26 @@
)
);
 
-   $dataScript = Xml::encodeJsCall( 
'mw.jqueryMsg.setParserDefaults', [ $parserDefaults ] );
+   $mainDataScript = Xml::encodeJsCall( 
'mw.jqueryMsg.setParserDefaults', [ $parserDefaults ] );
 
-   return $fileScript . $dataScript;
+   // Associative array mapping magic words (e.g. SITENAME)
+   // to their values.
+   $magicWords = [
+   'SITENAME' => $this->getConfig()->get( 'Sitename' ),
+   ];
+
+   Hooks::run( 'ResourceLoaderJqueryMsgModuleMagicWords', [ 
$context, &$magicWords ] );
+
+   $magicWordExtendData = [
+   'magic' => $magicWords,
+   ];
+
+   $magicWordDataScript = Xml::encodeJsCall( 
'mw.jqueryMsg.setParserDefaults', [
+   $magicWordExtendData,
+   /* deep= */ true
+   ] );
+
+   return $fileScript . $mainDataScript . $magicWordDataScript;
}
 
/**
diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.js 
b/resources/src/mediawiki/mediawiki.jqueryMsg.js
index c82b9cb..282a2ee 100644
--- a/resources/src/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki/mediawiki.jqueryMsg.js
@@ -16,8 +16,7 @@
parserDefaults = {
magic: {
PAGENAME: mw.config.get( 'wgPageName' ),
-   PAGENAMEE: mw.util.wikiUrlencode( 
mw.config.get( 'wgPageName' ) ),
-   SITENAME: mw.config.get( 'wgSiteName' )
+   PAGENAMEE: mw.util.wikiUrlencode( 
mw.config.get( 'wgPageName' ) )
},
// Whitelist for allowed HTML elements in wikitext.
// Self-closing tags are not currently supported.
@@ -164,10 +163,15 @@
 * parsers, pass the relevant options to mw.jqueryMsg.parser.
 *
 * @private
-* @param {Object} data
+* @param {Object} data New data to extend parser defaults with
+* @param {boolean} [deep=false] Whether the extend is done recursively 
(deep)
 */
-   mw.jqueryMsg.setParserDefaults = function ( data ) {
-   $.extend( parserDefaults, data );
+   mw.jqueryMsg.setParserDefaults = function ( data, deep ) {
+   if ( deep ) {
+   $.extend( true, parserDefaults, data );
+   } else {
+   $.extend( parserDefaults, data );
+   }
};
 
/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index 3b549bd..3c77a00 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -1196,4 +1196,40 @@
);
} );
 
+   QUnit.test( 'setParserDefaults', function ( assert ) {
+   mw.jqueryMsg.setParserDefaults( {
+   magic: {
+   FOO: 'foo',
+  

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.29.0-wmf.17]: Port Wikidata filter to new RCFilters system

[Mattflaschen (Code Review)]

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

Change subject: Port Wikidata filter to new RCFilters system
..

Port Wikidata filter to new RCFilters system

Update tests, including fixing a small pre-existing
problem with the page names.

Add WBREPONAME to jQueryMsg and re-factor magic
word hook handlers to support that without code
duplication.

Bug: T156427
Bug: T159787
Depends-On: Ie82a147ff32ccda3f757108474f5cbab71d45ace
Change-Id: I0b910d273a434b5bcbc38deb0fb04f6a2cd8ac8c
(cherry picked from commit 30552f8036b46f4624af593249e6a46b03ee)
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
M client/i18n/en.json
M client/i18n/qqq.json
M client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
A client/includes/Hooks/MagicWordHookHandlers.php
M client/includes/Modules/SiteModule.php
M client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php
A client/tests/phpunit/includes/Hooks/MagicWordHookHandlersTest.php
M client/tests/phpunit/includes/Modules/SiteModuleTest.php
10 files changed, 559 insertions(+), 218 deletions(-)


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

diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 11528de..6611903 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -342,52 +342,6 @@
}
 
/**
-* Register the magic word.
-*
-* @param string[] &$aCustomVariableIds
-*
-* @return bool
-*/
-   public static function onMagicWordwgVariableIDs( &$aCustomVariableIds ) 
{
-   $aCustomVariableIds[] = 'noexternallanglinks';
-   $aCustomVariableIds[] = 'wbreponame';
-
-   return true;
-   }
-
-   /**
-* Apply the magic word.
-*
-* @param Parser &$parser
-* @param array &$cache
-* @param string &$magicWordId
-* @param string &$ret
-*
-* @return bool
-*/
-   public static function onParserGetVariableValueSwitch( Parser &$parser, 
&$cache, &$magicWordId, &$ret ) {
-   if ( $magicWordId === 'noexternallanglinks' ) {
-   NoLangLinkHandler::handle( $parser, '*' );
-   } elseif ( $magicWordId === 'wbreponame' ) {
-   // @todo factor out, with tests
-   $wikibaseClient = WikibaseClient::getDefaultInstance();
-   $settings = $wikibaseClient->getSettings();
-   $repoSiteName = $settings->getSetting( 'repoSiteName' );
-
-   $message = new Message( $repoSiteName );
-
-   if ( $message->exists() ) {
-   $lang = $parser->getTargetLanguage();
-   $ret = $message->inLanguage( $lang )->parse();
-   } else {
-   $ret = $repoSiteName;
-   }
-   }
-
-   return true;
-   }
-
-   /**
 * Adds the Entity ID of the corresponding Wikidata item in action=info
 *
 * @param IContextSource $context
@@ -496,16 +450,28 @@
}
 
/**
-* These hooks should only be run if we use the Echo extension
+* Do special hook registrations.  These are affected by ordering 
issues and/or
+* conditional on another extension being registered.
 *
 * @see 
https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExtensionFunctions
 */
public static function onExtensionLoad() {
global $wgHooks;
+
+   // These hooks should only be run if we use the Echo extension
if ( class_exists( EchoEvent::class ) ) {
$wgHooks['UserGetDefaultOptions'][] = 
EchoNotificationsHandlers::class . '::onUserGetDefaultOptions';
$wgHooks['WikibaseHandleChange'][] = 
EchoNotificationsHandlers::class . '::onWikibaseHandleChange';
}
+
+   // This is in onExtensionLoad to ensure we register our
+   // ChangesListSpecialPageStructuredFilters after ORES's.
+   //
+   // However, ORES is not required.
+   //
+   // recent changes / watchlist hooks
+   $wgHooks['ChangesListSpecialPageStructuredFilters'][] =
+   
'\Wikibase\Client\Hooks\ChangesListSpecialPageHookHandlers::onChangesListSpecialPageStructuredFilters';
}
 
 }
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 07df902..efeeeda 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -119,8 +119,6 @@
$wgHooks['SidebarBeforeOutput'][] = 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove outdated SharedPreference

[Niedzielski (Code Review)]

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

Change subject: Hygiene: remove outdated SharedPreference
..

Hygiene: remove outdated SharedPreference

A reading list page delete tutorial no longer exists so delete the
corresponding SharedPreference.

Change-Id: I9fddfb13e410b2ee578e76923f5331c60d089522
---
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/xml/developer_preferences.xml
3 files changed, 0 insertions(+), 13 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index e3ad5fe..7fa38cc 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -422,14 +422,6 @@
 setBoolean(R.string.preference_key_reading_list_tutorial_enabled, 
enabled);
 }
 
-public static boolean isReadingListPageDeleteTutorialEnabled() {
-return 
getBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
true);
-}
-
-public static void setReadingListPageDeleteTutorialEnabled(boolean 
enabled) {
-
setBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
enabled);
-}
-
 public static boolean isTocTutorialEnabled() {
 return getBoolean(R.string.preference_key_toc_tutorial_enabled, true);
 }
diff --git a/app/src/main/res/values/preference_keys.xml 
b/app/src/main/res/values/preference_keys.xml
index 7715626..6a17fa0 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -45,7 +45,6 @@
 always_send_crash_reports
 readingListSortMode
 readingListPageSortMode
-readingListPageDeleteTutorialEnabled
 pageLastShown
 feedHiddenCards
 memoryLeakTest
diff --git a/app/src/main/res/xml/developer_preferences.xml 
b/app/src/main/res/xml/developer_preferences.xml
index adda19b..2887a05 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -166,10 +166,6 @@
 
android:title="@string/preference_key_reading_list_tutorial_enabled" />
 
 
-
-
 

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: limit dev test timeout to 5 seconds

[Niedzielski (Code Review)]

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

Change subject: Hygiene: limit dev test timeout to 5 seconds
..

Hygiene: limit dev test timeout to 5 seconds

CI is slow but local dev builds probably aren't. Limit test timeout to 5
seconds instead of 5 minutes for quick feedback.

Change-Id: I1816ce345ee43b2e818df5fdac98fdf7af6aac92
---
M app/src/testlib/java/org/wikipedia/testlib/TestConstants.java
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java 
b/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java
index b4e88e7..43334ef 100644
--- a/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java
+++ b/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java
@@ -1,10 +1,12 @@
 package org.wikipedia.testlib;
 
+import org.wikipedia.util.ReleaseUtil;
+
 import java.util.concurrent.TimeUnit;
 
 public final class TestConstants {
 public static final int TIMEOUT_DURATION = 5;
-public static final TimeUnit TIMEOUT_UNIT = TimeUnit.MINUTES;
+public static final TimeUnit TIMEOUT_UNIT = ReleaseUtil.isDevRelease() ? 
TimeUnit.SECONDS : TimeUnit.MINUTES;
 
 private TestConstants() { }
 }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Chore: remove pageCombo endpoint

[Niedzielski (Code Review)]

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

Change subject: Chore: remove pageCombo endpoint
..

Chore: remove pageCombo endpoint

Bug: T156917
Change-Id: Ibec49dab4873023faa8efac8abee62149ad26152
---
D 
app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
M app/src/main/java/org/wikipedia/dataclient/page/PageClient.java
D app/src/main/java/org/wikipedia/dataclient/page/PageCombo.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageClient.java
D app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageCombo.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
M app/src/main/java/org/wikipedia/page/Section.java
9 files changed, 0 insertions(+), 188 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
deleted file mode 100644
index 2abaf41..000
--- 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.wikipedia.dataclient.mwapi.page;
-
-import org.wikipedia.dataclient.page.PageCombo;
-
-/**
- * Combines MwMobileViewPageLead and MwMobileViewPageRemaining Gson POJOs for 
mobileview API.
- * In mobileview API the implementation is basically the same as 
MwMobileViewPageLead.
- * The class name "Page" was already used, and is very entrenched in this code 
base.
- */
-public class MwMobileViewPageCombo extends MwMobileViewPageLead implements 
PageCombo {
-}
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
index db13a09..c180257 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
@@ -2,17 +2,12 @@
 
 import android.support.annotation.NonNull;
 
-import org.wikipedia.dataclient.ServiceError;
 import org.wikipedia.dataclient.page.PageClient;
-import org.wikipedia.dataclient.page.PageCombo;
 import org.wikipedia.dataclient.page.PageLead;
 import org.wikipedia.dataclient.page.PageRemaining;
 import org.wikipedia.dataclient.page.PageSummary;
 
-import java.io.IOException;
-
 import retrofit2.Call;
-import retrofit2.Response;
 
 /**
  * Retrofit web service client for MediaWiki PHP API.
@@ -40,17 +35,6 @@
 @NonNull @Override public Call sections(@NonNull 
String title,
  boolean 
noImages) {
 return service.sections(title, optional(noImages));
-}
-
-@Override public PageCombo pageCombo(String title, boolean noImages) 
throws IOException {
-Response rsp = service.pageCombo(title, 
optional(noImages)).execute();
-if (!rsp.body().hasError()) {
-return rsp.body();
-}
-ServiceError err = rsp.body() == null || rsp.body().getError() == null
-? null
-: rsp.body().getError();
-throw new IOException(err == null ? rsp.message() : err.getDetails());
 }
 
 /**
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
index 53711eb..51ca18e 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
@@ -67,19 +67,4 @@
 + "=toclevel%7Cline%7Canchor=true")
 @NonNull Call sections(@NonNull @Query("page") 
String title,
   @Nullable 
@Query("noimages") Boolean noImages);
-
-/**
- * Gets all page content of a given title -- for refreshing a saved page
- * Note: the only difference in the URL from #pageLead is the sections=all 
instead of 0.
- *
- * @param title the page title to be used including prefix
- * @param noImages add the noimages flag to the request if true
- */
-@GET("w/api.php?action=mobileview=json=2="
-+ 
"text%7Csections%7Clanguagecount%7Cthumb%7Cimage%7Cid%7Crevision%7Cdescription"
-+ 
"%7Clastmodified%7Cnormalizedtitle%7Cdisplaytitle%7Cprotection%7Ceditable"
-+ 
"%7Cpageprops=wikibase_item=1=all"
-+ "=toclevel%7Cline%7Canchor=true")
-Call pageCombo(@Query("page") String title,
-  @Query("noimages") Boolean noImages);
 }
diff --git 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Chore: add PageClient tests

[Niedzielski (Code Review)]

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

Change subject: Chore: add PageClient tests
..

Chore: add PageClient tests

Bug: T156917
Change-Id: I26eb87b10cfb4c7a2a539dcbca3325f6acbaf333
---
A app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwPageClientTest.java
A app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageClientTest.java
2 files changed, 97 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwPageClientTest.java 
b/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwPageClientTest.java
new file mode 100644
index 000..1993765
--- /dev/null
+++ 
b/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwPageClientTest.java
@@ -0,0 +1,51 @@
+package org.wikipedia.dataclient.mwapi.page;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.wikipedia.dataclient.page.PageClient;
+import org.wikipedia.test.MockWebServerTest;
+
+import retrofit2.Call;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+public class MwPageClientTest extends MockWebServerTest {
+private PageClient subject;
+
+@Before public void setUp() {
+subject = new MwPageClient(service(MwPageService.class));
+}
+
+@Test public void testLeadTitle() throws Throwable {
+Call call = subject.lead("title", 0, false);
+assertThat(call.request().url().toString(), containsString("title"));
+}
+
+@Test public void testLeadThumbnailWidth() throws Throwable {
+Call call = subject.lead("", 10, false);
+assertThat(call.request().url().toString(), containsString("10"));
+}
+
+@Test public void testLeadImages() throws Throwable {
+Call call = subject.lead("", 0, false);
+assertThat(call.request().url().queryParameter("noimages"), 
nullValue());
+}
+
+@Test public void testLeadNoImages() throws Throwable {
+Call call = subject.lead("", 0, true);
+assertThat(call.request().url().queryParameter("noimages"), 
is("true"));
+}
+
+@Test public void testSectionsTitle() throws Throwable {
+Call call = subject.sections("title", false);
+assertThat(call.request().url().toString(), containsString("title"));
+}
+
+@Test public void testSectionsNoImages() throws Throwable {
+Call call = subject.sections("", true);
+assertThat(call.request().url().queryParameter("noimages"), 
is("true"));
+}
+}
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageClientTest.java
 
b/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageClientTest.java
new file mode 100644
index 000..b326379
--- /dev/null
+++ 
b/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageClientTest.java
@@ -0,0 +1,46 @@
+package org.wikipedia.dataclient.restbase.page;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.wikipedia.dataclient.page.PageClient;
+import org.wikipedia.test.MockWebServerTest;
+
+import retrofit2.Call;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+public class RbPageClientTest extends MockWebServerTest {
+private PageClient subject;
+
+@Before public void setUp() {
+subject = new RbPageClient(service(RbPageService.class));
+}
+
+@Test public void testLeadTitle() throws Throwable {
+Call call = subject.lead("title", 0, false);
+assertThat(call.request().url().toString(), containsString("title"));
+}
+
+@Test public void testLeadImages() throws Throwable {
+Call call = subject.lead("", 0, false);
+assertThat(call.request().url().queryParameter("noimages"), 
nullValue());
+}
+
+@Test public void testLeadNoImages() throws Throwable {
+Call call = subject.lead("", 0, true);
+assertThat(call.request().url().queryParameter("noimages"), 
is("true"));
+}
+
+@Test public void testSectionsTitle() throws Throwable {
+Call call = subject.sections("title", false);
+assertThat(call.request().url().toString(), containsString("title"));
+}
+
+@Test public void testSectionsNoImages() throws Throwable {
+Call call = subject.sections("", true);
+assertThat(call.request().url().queryParameter("noimages"), 
is("true"));
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26eb87b10cfb4c7a2a539dcbca3325f6acbaf333
Gerrit-PatchSet: 1

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove ResponseLoggingInterceptor

[Niedzielski (Code Review)]

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

Change subject: Hygiene: remove ResponseLoggingInterceptor
..

Hygiene: remove ResponseLoggingInterceptor

In combination with HttpLoggingInterceptor, ResponseLoggingInterceptor
is too noisy. The ideal solution would be to extend
HttpLoggingInterceptor but the class is not very extensible.

Change-Id: I137c397af0f8634642b7ccf809018c32f154b2e0
---
M app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.java
D 
app/src/main/java/org/wikipedia/dataclient/okhttp/ResponseLoggingInterceptor.java
2 files changed, 0 insertions(+), 41 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.java
 
b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.java
index a4d34ea..91aea52 100644
--- 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.java
+++ 
b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.java
@@ -69,8 +69,6 @@
 .addInterceptor(new CacheIfErrorInterceptor())
 .addInterceptor(new 
CacheDelegateInterceptor(CacheDelegate.internalCache(SAVE_CACHE), 
CacheDelegate.internalCache(NET_CACHE)))
 .addInterceptor(new 
WikipediaZeroResponseInterceptor(WikipediaApp.getInstance().getWikipediaZeroHandler()))
-// this interceptor should appear last since it examines the 
final cache and network responses
-.addInterceptor(new 
ResponseLoggingInterceptor().setLevel(Prefs.getRetrofitLogLevel()))
 .build();
 }
 }
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/ResponseLoggingInterceptor.java
 
b/app/src/main/java/org/wikipedia/dataclient/okhttp/ResponseLoggingInterceptor.java
deleted file mode 100644
index 4e74498..000
--- 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/ResponseLoggingInterceptor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wikipedia.dataclient.okhttp;
-
-import android.support.annotation.NonNull;
-
-import org.wikipedia.util.log.L;
-
-import java.io.IOException;
-
-import okhttp3.Interceptor;
-import okhttp3.Response;
-import okhttp3.logging.HttpLoggingInterceptor;
-
-class ResponseLoggingInterceptor implements Interceptor {
-@NonNull private volatile HttpLoggingInterceptor.Level level = 
HttpLoggingInterceptor.Level.NONE;
-
-public ResponseLoggingInterceptor setLevel(@NonNull 
HttpLoggingInterceptor.Level level) {
-this.level = level;
-return this;
-}
-
-@Override public Response intercept(Chain chain) throws IOException {
-Response rsp = chain.proceed(chain.request());
-
-if (level == HttpLoggingInterceptor.Level.NONE) {
-return rsp;
-}
-
-StringBuilder builder = new 
StringBuilder(rsp.request().url().toString());
-if (rsp.networkResponse() != null) {
-builder.append(" [net]");
-}
-if (rsp.cacheResponse() != null) {
-builder.append(" [cache]");
-}
-L.v(builder.toString());
-
-return rsp;
-}
-}

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove unused ReadingListDaoProxy.pageTitles() method

[Niedzielski (Code Review)]

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

Change subject: Hygiene: remove unused ReadingListDaoProxy.pageTitles() method
..

Hygiene: remove unused ReadingListDaoProxy.pageTitles() method

Change-Id: I82c6bd8ca3ac9b186a2c9fe21c89c0a5ff5af5d5
---
M 
app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListDaoProxy.java
1 file changed, 0 insertions(+), 12 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListDaoProxy.java
 
b/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListDaoProxy.java
index dacf690..c551ac8 100644
--- 
a/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListDaoProxy.java
+++ 
b/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListDaoProxy.java
@@ -8,19 +8,7 @@
 import org.wikipedia.readinglist.page.ReadingListPage;
 import org.wikipedia.readinglist.page.database.disk.DiskStatus;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public final class ReadingListDaoProxy {
-
-public static List pageTitles(@NonNull 
Collection pages) {
-List titles = new ArrayList<>();
-for (ReadingListPage page : pages) {
-titles.add(pageTitle(page));
-}
-return titles;
-}
 
 @NonNull public static PageTitle pageTitle(@NonNull ReadingListPage page) {
 return new PageTitle(page.title(), page.wikiSite(), 
page.thumbnailUrl(), page.description());

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82c6bd8ca3ac9b186a2c9fe21c89c0a5ff5af5d5
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/vagrant[master]: Make puppet order deterministic across hosts

[jenkins-bot (Code Review)]

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

Change subject: Make puppet order deterministic across hosts
..


Make puppet order deterministic across hosts

From time to time we hit a hard to debug issue where Puppet's default
title-hash ordering produces a different order on someone's VM
that then leads to a dependency cycle or resources otherwise being
applied in an order that is unexpected. Puppet 3.3.0 introduced an
optional `manifest` ordering where the default order of resources is
a top to bottom reading of each manifest as it is encountered. Forcing
this ordering should help reduce bugs by improving the consistency of
ordering from host to host and vm to vm.

Bug: T161127
Change-Id: I1981d40242b03d6e28bdf2a91172045a5a6ea5d3
---
M Vagrantfile
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 281a3ae..1cac581 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -231,6 +231,7 @@
   '--logdest', 'console',
   '--write-catalog-summary',
   '--detailed-exitcodes',
+  '--ordering manifest',
 ]
 
 # Handy debugging commands for Puppet runs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1981d40242b03d6e28bdf2a91172045a5a6ea5d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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...process-control[master]: Remove unused config inline defaults

[Awight (Code Review)]

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

Change subject: Remove unused config inline defaults
..

Remove unused config inline defaults

Change-Id: Ice7437d238de683b6dc4bf1870bd03288cf77dc5
---
M processcontrol/config.py
1 file changed, 5 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/60/344260/1

diff --git a/processcontrol/config.py b/processcontrol/config.py
index 5ffddff..47ef279 100644
--- a/processcontrol/config.py
+++ b/processcontrol/config.py
@@ -8,22 +8,19 @@
 def __init__(self, defaults={}):
 self.values = defaults
 
-def get(self, path, default=None):
+def get(self, path):
 """Get a value from configuration.
 You can get a nested property by using a path delimited by
-forward slashes (/).
-If you provide a default value, it will be used when the
-desired property does not exist. If there is no default,
-trying to get a missing property raises a MissingKeyException.
+forward slashes (/), for example "failmail/from-address".
+
+Trying to get a missing property raises a MissingKeyException.
 """
 parts = path.split("/")
 current = self.values
 
 for part in parts:
 if part not in current:
-if default is None:
-raise MissingKeyException(path)
-return default
+raise MissingKeyException(path)
 current = current[part]
 return current
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice7437d238de683b6dc4bf1870bd03288cf77dc5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Cleanup apt repository management

[BryanDavis (Code Review)]

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

Change subject: Cleanup apt repository management
..

Cleanup apt repository management

* Import a version of the ops/puppet apt::repository define.
* Replace existing /etc/apt/sources.list.d file management with
  apt::repository.
* Split apt::repository and require_package() usage to avoid dependency
  cycles.
* Clean up unused apt templates and static files.

Bug: T161127
Change-Id: Ib6327e1cdaa5408a8b6d5cd976dc43c149e0c4b3
---
M puppet/modules/apt/manifests/init.pp
A puppet/modules/apt/manifests/repository.pp
A puppet/modules/apt/manifests/wikimedia_experimental.pp
D puppet/modules/apt/templates/backports.list.erb
D puppet/modules/apt/templates/multiverse.list.erb
D puppet/modules/apt/templates/mwv-apt.list.erb
D puppet/modules/apt/templates/wikimedia.list.erb
D puppet/modules/cassandra/files/datastax.sources.list
A puppet/modules/cassandra/manifests/datastax.pp
M puppet/modules/cassandra/manifests/init.pp
M puppet/modules/elasticsearch/manifests/init.pp
D puppet/modules/elasticsearch/templates/wikimedia-experimental.list.erb
M puppet/modules/npm/manifests/init.pp
13 files changed, 174 insertions(+), 141 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/59/344259/1

diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index 9f50e87..e1ba5f9 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -8,42 +8,53 @@
 exec { 'apt-get update':
 command  => '/usr/bin/apt-get update',
 schedule => daily,
+timeout  => 240,
+returns  => [ 0, 100 ],
 }
 
+# Directory used to store keys added with apt::repository
+file { '/var/lib/apt/keys':
+ensure  => directory,
+owner   => 'root',
+group   => 'root',
+mode=> '0700',
+recurse => true,
+purge   => true,
+}
+
+# Make sure we can fetch apt over HTTPS
 exec { 'ins-apt-transport-https':
 command => '/usr/bin/apt-get update && /usr/bin/apt-get install -y 
--force-yes apt-transport-https',
 environment => 'DEBIAN_FRONTEND=noninteractive',
 unless  => '/usr/bin/dpkg -l apt-transport-https',
 }
+Exec['ins-apt-transport-https'] -> Apt::Repository <| |>
 
-file  { '/usr/local/share/wikimedia-pubkey.asc':
-source => 'puppet:///modules/apt/wikimedia-pubkey.asc',
-notify => Exec['add_wikimedia_apt_key'],
+apt::repository { 'wikimedia':
+uri => 'https://apt.wikimedia.org/wikimedia',
+dist=> "${::lsbdistcodename}-wikimedia",
+components  => 'main backports thirdparty',
+keyfile => 'puppet:///modules/apt/wikimedia-pubkey.asc',
+comment_old => true,
 }
 
-exec { 'add_wikimedia_apt_key':
-command => '/usr/bin/apt-key add 
/usr/local/share/wikimedia-pubkey.asc',
-before  => File['/etc/apt/sources.list.d/wikimedia.list'],
-refreshonly => true,
-}
-
-file { '/etc/apt/sources.list.d/wikimedia.list':
-content => template('apt/wikimedia.list.erb'),
-before  => Exec['apt-get update'],
-}
-
-file { '/etc/apt/sources.list.d/backports.list':
-content => template('apt/backports.list.erb'),
-before  => Exec['apt-get update'],
+apt::repository { 'debian-backports':
+uri => 'https://mirrors.wikimedia.org/debian/',
+dist=> "${::lsbdistcodename}-backports",
+components  => 'main contrib non-free',
+comment_old => true,
 }
 
 # T125760 - mw-vagrant only apt repo
-file { '/etc/apt/sources.list.d/mwv-apt.list':
-content => template('apt/mwv-apt.list.erb'),
-before  => Exec['apt-get update'],
+apt::repository { 'mwv-apt':
+uri => 'https://mwv-apt.wmflabs.org/repo',
+dist=> "${::lsbdistcodename}-mwv-apt",
+components  => 'main',
+trusted => true,
+source  => false,
 }
 
-# prefer Wikimedia APT repository packages in all cases
+# Prefer Wikimedia APT repository packages in all cases
 apt::pin { 'wikimedia':
 package  => '*',
 pin  => 'release o=Wikimedia',
@@ -55,6 +66,8 @@
 content => "Dir::Cache::archives \"${::shared_apt_cache}\";\n",
 }
 }
+
+# apt-get should not install recommended packages
 file { '/etc/apt/apt.conf.d/01no-recommended':
 source => 'puppet:///modules/apt/01no-recommended',
 owner  => 'root',
diff --git a/puppet/modules/apt/manifests/repository.pp 
b/puppet/modules/apt/manifests/repository.pp
new file mode 100644
index 000..1dbb927
--- /dev/null
+++ b/puppet/modules/apt/manifests/repository.pp
@@ -0,0 +1,96 @@
+# == Define: apt::repository
+#
+# Add an apt 

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Make puppet order deterministic across hosts

[BryanDavis (Code Review)]

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

Change subject: Make puppet order deterministic across hosts
..

Make puppet order deterministic across hosts

From time to time we hit a hard to debug issue where Puppet's default
title-hash ordering produces a different order on someone's VM
that then leads to a dependency cycle or resources otherwise being
applied in an order that is unexpected. Puppet 3.3.0 introduced an
optional `manifest` ordering where the default order of resources is
a top to bottom reading of each manifest as it is encountered. Forcing
this ordering should help reduce bugs by improving the consistency of
ordering from host to host and vm to vm.

Bug: T161127
Change-Id: I1981d40242b03d6e28bdf2a91172045a5a6ea5d3
---
M Vagrantfile
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/58/344258/1

diff --git a/Vagrantfile b/Vagrantfile
index 281a3ae..1cac581 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -231,6 +231,7 @@
   '--logdest', 'console',
   '--write-catalog-summary',
   '--detailed-exitcodes',
+  '--ordering manifest',
 ]
 
 # Handy debugging commands for Puppet runs

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Move master/slave detection to profile

[Dzahn (Code Review)]

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

Change subject: Gerrit: Move master/slave detection to profile
..


Gerrit: Move master/slave detection to profile

Allows us to selectively enable/disable ferm & bacula rules if we're
the master or not. The module doesn't need to know what the master is,
just the slave status. So pass that instead

Change-Id: Iad562fd067b56854024153418572c2528e6b51c7
---
M modules/gerrit/manifests/init.pp
M modules/profile/manifests/gerrit/server.pp
2 files changed, 24 insertions(+), 17 deletions(-)

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



diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 167639e..5339aca 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -1,13 +1,8 @@
 # Manifest to setup a Gerrit instance
 class gerrit(
 $host,
-$master_host = $::fqdn,
+$slave = false,
 ) {
-
-$slave = $master_host ? {
-$::fqdn => false,
-default => true,
-}
 
 class { '::gerrit::jetty':
 slave => $slave,
diff --git a/modules/profile/manifests/gerrit/server.pp 
b/modules/profile/manifests/gerrit/server.pp
index e049034..34f48c4 100644
--- a/modules/profile/manifests/gerrit/server.pp
+++ b/modules/profile/manifests/gerrit/server.pp
@@ -25,6 +25,16 @@
 }
 }
 
+# Detect if we're a master or a slave. If we're been given a master host
+# and it's not us, we're not a master. If we are that host, we are
+# (obviously). If we're not given any master, assume we're working by
+# ourselves (safest).
+$slave = $master_host ? {
+$::fqdn => false,
+undef   => false,
+default => true,
+}
+
 monitoring::service { 'gerrit_ssh':
 description   => 'SSH access',
 check_command => 'check_ssh_port!29418',
@@ -38,22 +48,24 @@
 port  => '29418',
 }
 
-ferm::service { 'gerrit_http':
-proto => 'tcp',
-port  => 'http',
+if !$slave {
+ferm::service { 'gerrit_http':
+proto => 'tcp',
+port  => 'http',
+}
+
+ferm::service { 'gerrit_https':
+proto => 'tcp',
+port  => 'https',
+}
 }
 
-ferm::service { 'gerrit_https':
-proto => 'tcp',
-port  => 'https',
-}
-
-if $bacula != undef {
+if $bacula != undef and !$slave {
 backup::set { $bacula: }
 }
 
 class { '::gerrit':
-host=> $host,
-master_host => $master_host,
+host  => $host,
+slave => $slave,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad562fd067b56854024153418572c2528e6b51c7
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
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/puppet[production]: Gerrit: Ensure ops always has admin rights

[Dzahn (Code Review)]

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

Change subject: Gerrit: Ensure ops always has admin rights
..


Gerrit: Ensure ops always has admin rights

In case I went crazy and tried to remove them

Change-Id: I7a2bbc3a8f0f0c0bfd8a3c0fb2b602bc98945229
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 6d4a492..816324d 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -17,6 +17,8 @@
 maxAge = 90 days
 memoryLimit = 2048
 diskLimit = 256m
+[capability]
+administrateServer = group ldap/ops
 [changeCleanup]
 # Not actually used, but Gerrit complains if unset
 interval = 1 week

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: This is first comment

[Gwawryk (Code Review)]

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

Change subject: This is first comment
..

This is first comment

Change-Id: Ib8dbc22dee2e54f0e0e54b155cca5d065adcdecd
---
M Example/Example.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/Example/Example.php b/Example/Example.php
index 4d35a95..d6be595 100644
--- a/Example/Example.php
+++ b/Example/Example.php
@@ -1,5 +1,7 @@
 https://gerrit.wikimedia.org/r/344257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8dbc22dee2e54f0e0e54b155cca5d065adcdecd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Gwawryk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Double size of projects cache

[Dzahn (Code Review)]

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

Change subject: Gerrit: Double size of projects cache
..


Gerrit: Double size of projects cache

We currently store 1024 entries whereas we have 1788 total projects.
Cache misses here are expensive as we have to hit the disk.

Change-Id: I18608173dbe41938ecb492dbd5b3136a755070c0
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 71b584b..6d4a492 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -9,6 +9,7 @@
 [cache "ldap_usernames"]
 maxAge = 1 hour
 [cache "projects"]
+memoryLimit = 2048
 loadOnStartup = true
 [cache "static_content"]
 maxAge = 1 day

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18608173dbe41938ecb492dbd5b3136a755070c0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
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] operations/puppet[production]: Gerrit: Set db host (m2-master) for codfw

[Dzahn (Code Review)]

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

Change subject: Gerrit: Set db host (m2-master) for codfw
..


Gerrit: Set db host (m2-master) for codfw

Also clean up quotes in eqiad role while I'm here

Change-Id: Ib0783c4c95288acf706af4d548c1d01c731875a5
---
M hieradata/role/codfw/gerrit/server.yaml
M hieradata/role/eqiad/gerrit/server.yaml
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/codfw/gerrit/server.yaml 
b/hieradata/role/codfw/gerrit/server.yaml
index 894fc65..d21c21c 100644
--- a/hieradata/role/codfw/gerrit/server.yaml
+++ b/hieradata/role/codfw/gerrit/server.yaml
@@ -1,2 +1,3 @@
+gerrit::jetty::db_host: 'm2-master.codfw.wmnet'
 profile::gerrit::server::ipv4: '208.80.153.106'
 profile::gerrit::server::ipv6: '2620:0:860:4:208:80:153:106'
diff --git a/hieradata/role/eqiad/gerrit/server.yaml 
b/hieradata/role/eqiad/gerrit/server.yaml
index b271311..1e8e0d8 100644
--- a/hieradata/role/eqiad/gerrit/server.yaml
+++ b/hieradata/role/eqiad/gerrit/server.yaml
@@ -1,3 +1,3 @@
-gerrit::jetty::db_host: "m2-master.eqiad.wmnet"
+gerrit::jetty::db_host: 'm2-master.eqiad.wmnet'
 profile::gerrit::server::ipv4: '208.80.154.85'
 profile::gerrit::server::ipv6: '2620:0:861:3:208:80:154:85'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0783c4c95288acf706af4d548c1d01c731875a5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
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/puppet[production]: tools: Update maintain-dbusers to create labsdb accounts for...

[Madhuvishy (Code Review)]

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

Change subject: tools: Update maintain-dbusers to create labsdb accounts for 
tools users
..


tools: Update maintain-dbusers to create labsdb accounts for tools users

Bug: T158420
Change-Id: I1b2f2a69d79511683289c69f9c89c4d70120570c
---
M modules/role/files/labs/db/maintain-dbusers.py
1 file changed, 110 insertions(+), 56 deletions(-)

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



diff --git a/modules/role/files/labs/db/maintain-dbusers.py 
b/modules/role/files/labs/db/maintain-dbusers.py
index 56accf2..7ef8ae8 100644
--- a/modules/role/files/labs/db/maintain-dbusers.py
+++ b/modules/role/files/labs/db/maintain-dbusers.py
@@ -22,14 +22,14 @@
  - Make entries in `account_host` table with status of all accounts.
 
 Most of these functions should be run in a continuous loop, maintaining
-mysql accounts for new tool accounts as they appear.
+mysql accounts for new tool/user accounts as they appear.
 
-## populate_new_tools ##
+## populate_new_accounts ##
 
- - Find list of tools (From LDAP) that aren't in the `accounts` table
- - Create a replica.my.cnf for each of these tools
- - Make an entry in the `accounts` table for each of these tools
- - Make entries in `account_host` for each of these tools, marking them as
+ - Find list of tools/users (From LDAP) that aren't in the `accounts` table
+ - Create a replica.my.cnf for each of these tools/users
+ - Make an entry in the `accounts` table for each of these tools/users
+ - Make entries in `account_host` for each of these tools/users, marking them 
as
absent
 
 ## create_accounts ##
@@ -39,10 +39,10 @@
 
 If we need to add a new labsdb, we can do so the following way:
  - Add it to the config file
- - Insert entries into `account_host` for each tool with the new host.
+ - Insert entries into `account_host` for each tool/user with the new host.
  - Run `create_accounts`
 
-In normal usage, just a continuous process running `populate_new_tools` and
+In normal usage, just a continuous process running `populate_new_accounts` and
 `create_accounts` in a loop will suffice.
 
 TODO:
@@ -152,7 +152,7 @@
 """
 Return list of tools, from canonical LDAP source
 
-Return a list of tuples of uid, toolname
+Return a list of tuples of toolname, uid
 """
 with get_ldap_conn(config) as conn:
 conn.search(
@@ -169,6 +169,38 @@
 users.append((attrs['cn'][0], int(attrs['uidNumber'][0])))
 
 return users
+
+
+def find_tools_users(config):
+"""
+Return list of tools project users, from LDAP
+
+Return a list of tuples of username, uid
+"""
+
+with get_ldap_conn(config) as conn:
+conn.search(
+'ou=groups,dc=wikimedia,dc=org',
+'(&(objectclass=groupOfNames)(cn=project-tools))',
+ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
+attributes=['member'],
+)
+members = conn.response[0]['attributes']['member']
+users = []
+for member_dn in members:
+conn.search(
+member_dn,
+'(objectclass=*)',
+ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
+attributes=['uidNumber', 'uid'],
+time_limit=5
+)
+for resp in conn.response:
+attrs = resp['attributes']
+# uid is username/shell name of user in ldap
+users.append((attrs['uid'][0], int(attrs['uidNumber'][0])))
+
+return users
 
 
 def get_ldap_conn(config):
@@ -204,11 +236,11 @@
 )
 
 
-def get_replica_path(type, name):
+def get_replica_path(account_type, name):
 """
 Return path to use for replica.my.cnf for a tool or user
 """
-if type == 'tool':
+if account_type == 'tool':
 return os.path.join(
 '/srv/tools/shared/tools/project/',
 name[len(PROJECT) + 1:],  # Remove `PROJECT.` prefix from name
@@ -222,13 +254,14 @@
 )
 
 
-def harvest_cnf_files(config):
-tools = find_tools(config)
+def harvest_cnf_files(config, account_type='tool'):
+accounts_to_create = find_tools(config) if account_type == 'tool' \
+else find_tools_users(config)
 acct_db = get_accounts_db_conn(config)
 cur = acct_db.cursor()
 try:
-for toolname, uid in tools:
-replica_path = get_replica_path('tool', toolname)
+for account_name, uid in accounts_to_create:
+replica_path = get_replica_path(account_type, account_name)
 if os.path.exists(replica_path):
 mysql_user, pwd_hash = read_replica_cnf(replica_path)
 cur.execute("""
@@ -236,10 +269,11 @@
 VALUES (%s, %s, %s, %s)
 ON DUPLICATE KEY UPDATE
 password_hash = %s
-""", (mysql_user, 'tool', toolname, 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "labstore: keep archival copy of dynamic expo...

[Rush (Code Review)]

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

Change subject: Revert "Revert "labstore: keep archival copy of dynamic 
export.d contents""
..


Revert "Revert "labstore: keep archival copy of dynamic export.d contents""

This reverts commit e68931d8451c9e5d84cbfa98ac3aebfd31d7d064.

Change-Id: I784518c7b4b3d36985d5b22117e2c1575f3adf68
---
M modules/labstore/manifests/fileserver/exports.pp
1 file changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/modules/labstore/manifests/fileserver/exports.pp 
b/modules/labstore/manifests/fileserver/exports.pp
index de4b23a..e932db8 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -62,6 +62,22 @@
 notify  => Service['nfs-exportd'],
 }
 
+file { '/etc/exports.bak':
+ensure  => directory,
+owner   => 'nfsmanager',
+group   => 'nfsmanager',
+require => File['/usr/local/bin/nfs-exportd'],
+}
+
+cron { 'archive_export_d':
+command => '/bin/cp -Rp /etc/exports.d /etc/exports.bak',
+user=> 'root',
+weekday => 1,
+hour=> 0,
+minute  => 0,
+require => File['/etc/exports.bak'],
+}
+
 file { '/usr/local/sbin/archive-project-volumes':
 owner  => 'root',
 group  => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I784518c7b4b3d36985d5b22117e2c1575f3adf68
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: RCFilters UI: Pass in userId to ChangesListHighlights schema

[Catrope (Code Review)]

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

Change subject: RCFilters UI: Pass in userId to ChangesListHighlights schema
..

RCFilters UI: Pass in userId to ChangesListHighlights schema

Bug: T160928
Depends-On: Ia2bc679e37deb34b215ad16dfc3b8cfefdc8365c
Change-Id: I9d3f9281c2681ab1c89676234ddd544f76f3dc7f
---
M resources/Resources.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/344250/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 6156d19..a876472 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1815,6 +1815,7 @@
'dependencies' => [
'oojs-ui',
'mediawiki.language',
+   'mediawiki.user',
'mediawiki.rcfilters.filters.dm',
'oojs-ui.styles.icons-moderation',
'oojs-ui.styles.icons-editing-core',
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index e034826..14eabe2 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -327,7 +327,8 @@
'event.ChangesListHighlights',
{
action: action,
-   filters: filters
+   filters: filters,
+   userId: mw.user.getId()
}
);
};

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Pass in userId to ChangesListFilters schema

[Catrope (Code Review)]

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

Change subject: Pass in userId to ChangesListFilters schema
..

Pass in userId to ChangesListFilters schema

Bug: T160928
Change-Id: I8e74ef989c0302c0c6adeafe64c9dbf9621cb156
---
M WikimediaEventsHooks.php
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 7524fd9..d06e745 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -565,7 +565,8 @@
 
$logData = [
'pagename' => $special->getName(),
-   'enhancedFiltersEnabled' => 
(bool)$special->getUser()->getOption( 'rcenhancedfilters' )
+   'enhancedFiltersEnabled' => 
(bool)$special->getUser()->getOption( 'rcenhancedfilters' ),
+   'userId' => $special->getUser()->getId(),
];
 
$knownFilters = [
@@ -617,7 +618,7 @@
// Log the existing filters
EventLogging::logEvent(
'ChangesListFilters',
-   16403617,
+   16484266,
$logData
);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e74ef989c0302c0c6adeafe64c9dbf9621cb156
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Update revid for ChangesListHighlights schema

[Catrope (Code Review)]

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

Change subject: Update revid for ChangesListHighlights schema
..

Update revid for ChangesListHighlights schema

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


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

diff --git a/extension.json b/extension.json
index 302754f..33b6fd1 100644
--- a/extension.json
+++ b/extension.json
@@ -137,7 +137,7 @@
"schema.ChangesListHighlights": {
"class": "ResourceLoaderSchemaModule",
"schema": "ChangesListHighlights",
-   "revision": 16449602
+   "revision": 16484288
},
"ext.wikimediaEvents": {
"scripts": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2bc679e37deb34b215ad16dfc3b8cfefdc8365c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "labstore: keep archival copy of dynamic expo...

[Rush (Code Review)]

Hello Giuseppe Lavagetto, Madhuvishy, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Revert "labstore: keep archival copy of dynamic 
export.d contents""
..

Revert "Revert "labstore: keep archival copy of dynamic export.d contents""

This reverts commit e68931d8451c9e5d84cbfa98ac3aebfd31d7d064.

Change-Id: I784518c7b4b3d36985d5b22117e2c1575f3adf68
---
M modules/labstore/manifests/fileserver/exports.pp
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/344246/1

diff --git a/modules/labstore/manifests/fileserver/exports.pp 
b/modules/labstore/manifests/fileserver/exports.pp
index de4b23a..e932db8 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -62,6 +62,22 @@
 notify  => Service['nfs-exportd'],
 }
 
+file { '/etc/exports.bak':
+ensure  => directory,
+owner   => 'nfsmanager',
+group   => 'nfsmanager',
+require => File['/usr/local/bin/nfs-exportd'],
+}
+
+cron { 'archive_export_d':
+command => '/bin/cp -Rp /etc/exports.d /etc/exports.bak',
+user=> 'root',
+weekday => 1,
+hour=> 0,
+minute  => 0,
+require => File['/etc/exports.bak'],
+}
+
 file { '/usr/local/sbin/archive-project-volumes':
 owner  => 'root',
 group  => 'root',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I784518c7b4b3d36985d5b22117e2c1575f3adf68
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "labstore: apply exportd monitoring to second...

[Rush (Code Review)]

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

Change subject: Revert "Revert "labstore: apply exportd monitoring to secondary 
role""
..


Revert "Revert "labstore: apply exportd monitoring to secondary role""

This reverts commit 484eae9175e00ba7928cdf98c8b8d5a7bf2b6aa9.

Change-Id: I22cd209ea4ee8255f53b55870c1c014f0674f301
---
M modules/role/manifests/labs/nfs/secondary.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index f2409cc..2c102f9 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -97,6 +97,7 @@
 group   => 'root',
 }
 
+include labstore::monitoring::exports
 include labstore::monitoring::interfaces
 include labstore::monitoring::ldap
 include labstore::monitoring::nfsd

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "labstore: apply exportd monitoring to second...

[Rush (Code Review)]

Hello Giuseppe Lavagetto, Madhuvishy, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Revert "labstore: apply exportd monitoring to secondary 
role""
..

Revert "Revert "labstore: apply exportd monitoring to secondary role""

This reverts commit 484eae9175e00ba7928cdf98c8b8d5a7bf2b6aa9.

Change-Id: I22cd209ea4ee8255f53b55870c1c014f0674f301
---
M modules/role/manifests/labs/nfs/secondary.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/344241/1

diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index f2409cc..2c102f9 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -97,6 +97,7 @@
 group   => 'root',
 }
 
+include labstore::monitoring::exports
 include labstore::monitoring::interfaces
 include labstore::monitoring::ldap
 include labstore::monitoring::nfsd

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22cd209ea4ee8255f53b55870c1c014f0674f301
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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...process-control[master]: Move some things into global config

[jenkins-bot (Code Review)]

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

Change subject: Move some things into global config
..


Move some things into global config

And fix default job runner path to the place it's installed by our deb
Also, user is no longer available as a per-job option

Change-Id: I402b4f65af2c6a4e75edd5ebd787a2ebaf78c3cd
---
M process-control.yaml
M processcontrol/config.py
M processcontrol/crontab.py
M processcontrol/job_wrapper.py
M processcontrol/mailer.py
M tests/test_crontab.py
6 files changed, 29 insertions(+), 31 deletions(-)

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



diff --git a/process-control.yaml b/process-control.yaml
index 7084186..8927ade 100644
--- a/process-control.yaml
+++ b/process-control.yaml
@@ -1,3 +1,14 @@
+cron_template: |
+# Generated from {source}
+{schedule} {user} {command}
+
+runner_path: /usr/bin/run-job
+
+user: jenkins
+
 default_job_config:
-from_address: "Fail Mail "
-to_address: "fr-t...@wikimedia.org"
+failmail:
+from_address: "Fail Mail "
+to_address: "fr-t...@wikimedia.org"
+
+timeout: 600
diff --git a/processcontrol/config.py b/processcontrol/config.py
index 69fa24e..d58cd8f 100644
--- a/processcontrol/config.py
+++ b/processcontrol/config.py
@@ -47,8 +47,6 @@
 os.path.dirname(__file__) + "/../process-control.yaml",
 # machine config
 "/etc/fundraising/process-control.yaml",
-# user config
-os.path.expanduser("~/.fundraising/process-control.yaml")
 ]
 
 def load_global_config(self):
diff --git a/processcontrol/crontab.py b/processcontrol/crontab.py
index c3d1703..b7b2b3c 100644
--- a/processcontrol/crontab.py
+++ b/processcontrol/crontab.py
@@ -1,16 +1,6 @@
 import glob
-import os.path
 
 import job_wrapper
-
-# FIXME: Move to global config
-DEFAULT_USER = "jenkins"
-
-CRON_TEMPLATE = """# Generated from {source}
-{schedule} {user} {command}
-"""
-
-RUNNER_PATH = os.path.dirname(__file__) + "/crash-override"
 
 
 def make_cron(config_dir):
@@ -22,6 +12,7 @@
 config_files = sorted(glob.glob(config_dir + "/*.yaml"))
 
 for config_path in config_files:
+# FIXME just use the configuration classes, no need for job
 job = job_wrapper.JobWrapper(config_path=config_path)
 tab = JobCrontab(job)
 
@@ -43,13 +34,15 @@
 return "# Skipping disabled job 
{path}\n".format(path=self.job.config_path)
 
 command = "{runner} {conf}".format(
-runner=RUNNER_PATH,
+runner=self.job.global_config.get("runner_path"),
 conf=self.job.config_path)
 
-out = CRON_TEMPLATE.format(
+template = self.job.global_config.get("cron_template")
+
+out = template.format(
 source=self.job.config_path,
 schedule=self.job.config.get("schedule"),
-user=DEFAULT_USER,
+user=self.job.global_config.get("user"),
 command=command)
 
 return out
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 6b8423e..fefcf25 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -9,9 +9,6 @@
 from . import lock
 from . import mailer
 
-# FIXME: move to global config
-DEFAULT_TIMEOUT = 600
-
 
 class JobWrapper(object):
 def __init__(self, config_path=None):
@@ -22,11 +19,7 @@
 self.name = self.config.get("name")
 self.start_time = datetime.datetime.utcnow().isoformat()
 self.mailer = mailer.Mailer(self.config)
-
-if self.config.has("timeout"):
-self.timeout = self.config.get("timeout")
-else:
-self.timeout = DEFAULT_TIMEOUT
+self.timeout = self.config.get("timeout")
 
 if self.config.has("disabled") and self.config.get("disabled") is True:
 self.enabled = False
diff --git a/processcontrol/mailer.py b/processcontrol/mailer.py
index 35e3a07..08bb432 100644
--- a/processcontrol/mailer.py
+++ b/processcontrol/mailer.py
@@ -4,7 +4,8 @@
 
 class Mailer(object):
 def __init__(self, config):
-self.config = config
+self.from_address = config.get("failmail/from_address")
+self.to_address = config.get("failmail/to_address")
 # FIXME: this is set to ensure one failmail per instance. Should
 # do something more sophisticated to collect all calls and send
 # the mail before exiting.
@@ -17,13 +18,13 @@
 msg = MIMEText(body)
 
 msg["Subject"] = "Fail Mail : " + subject
-msg["From"] = self.config.get("from_address")
-msg["To"] = self.config.get("to_address")
+msg["From"] = self.from_address
+msg["To"] = self.to_address
 
 mailer = smtplib.SMTP("localhost")
 mailer.sendmail(
-

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Recurring Message Normalization.

[jenkins-bot (Code Review)]

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

Change subject: Recurring Message Normalization.
..


Recurring Message Normalization.

Normalize new style recurring PayPal messages.
Move txn_type normalization to type-specific normalization functions.

Bug: T157074
Change-Id: I983e4010eebaf499f334a0f0ebb6d12e76a2ad18
---
M PaymentProviders/PayPal/Job.php
M PaymentProviders/PayPal/PaymentMessage.php
M PaymentProviders/PayPal/RecurringMessage.php
M PaymentProviders/PayPal/RefundMessage.php
A PaymentProviders/PayPal/Tests/Data/recurring_payment.json
A PaymentProviders/PayPal/Tests/Data/recurring_payment_transformed.json
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M SmashPig.yaml
8 files changed, 151 insertions(+), 6 deletions(-)

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



diff --git a/PaymentProviders/PayPal/Job.php b/PaymentProviders/PayPal/Job.php
index b76727f..6e8816f 100644
--- a/PaymentProviders/PayPal/Job.php
+++ b/PaymentProviders/PayPal/Job.php
@@ -69,11 +69,6 @@
$creator = array( $msgClass, 'fromIpnMessage' );
$normalized = call_user_func( $creator, $request );
 
-   if ( $txn_type == 'express_checkout' ) {
-   $normalized['gateway'] = 'paypal_ec';
-   } else {
-   $normalized['gateway'] = 'paypal';
-   }
SourceFields::addToMessage( $normalized );
 
// Save to appropriate queue.
diff --git a/PaymentProviders/PayPal/PaymentMessage.php 
b/PaymentProviders/PayPal/PaymentMessage.php
index ce6ab7b..f0416a8 100644
--- a/PaymentProviders/PayPal/PaymentMessage.php
+++ b/PaymentProviders/PayPal/PaymentMessage.php
@@ -5,6 +5,13 @@
 class PaymentMessage extends Message {
 
public static function normalizeMessage( &$message, $ipnMessage ) {
+   if ( $ipnMessage['txn_type'] === 'express_checkout' ) {
+   $message['gateway'] = 'paypal_ec';
+   } else {
+   $message['gateway'] = 'paypal';
+   }
+
// TODO: Implement normalizeMessage() method.
+
}
 }
diff --git a/PaymentProviders/PayPal/RecurringMessage.php 
b/PaymentProviders/PayPal/RecurringMessage.php
index d19c778..b80458b 100644
--- a/PaymentProviders/PayPal/RecurringMessage.php
+++ b/PaymentProviders/PayPal/RecurringMessage.php
@@ -5,6 +5,75 @@
 class RecurringMessage extends Message {
 
public static function normalizeMessage( &$message, $ipnMessage ) {
-   // TODO: Implement normalizeMessage() method.
+   $message['recurring'] = "1";
+
+   // Contact info
+   if ( $ipnMessage['txn_type'] === 
'recurring_payment_profile_created' || $ipnMessage['txn_type'] === 
'recurring_payment' ) {
+
+
+   $message['middle_name'] = '';
+
+   if ( isset( $ipnMessage['address_street'] ) ) {
+   $split = explode("\n", str_replace("\r", '', 
$ipnMessage['address_street']));
+   $message['street_address'] = $split[0];
+   if ( count( $split ) > 1 ) {
+   $message['supplemental_address_1'] = 
$split[1];
+   }
+
+   }
+   }
+
+   switch ( $ipnMessage['txn_type'] ) {
+
+   case 'recurring_payment':
+   $message['txn_type'] = 'subscr_payment';
+   break;
+
+   case 'recurring_payment_profile_created':
+   $message['txn_type'] = 'subscr_signup';
+   // break the period out for civicrm
+   if( $ipnMessage['payment_cycle'] == 'Monthly' ) 
{
+
+   $message['frequency_interval'] = '1';
+   $message['frequency_unit'] = 'month';
+   }
+
+   $message['installments'] = 0;
+
+   if ( isset( $ipnMessage['time_created'] ) ) {
+   if ( $ipnMessage['txn_type'] == 
'recurring_payment_profile_created' ) {
+   $message['create_date'] = 
strtotime( $ipnMessage['time_created'] );
+   $message['start_date'] = 
strtotime( $ipnMessage['time_created'] );
+   }
+   if ( !isset( $message['date'] ) ) {
+   $message['date'] = strtotime( 
$ipnMessage['time_created'] );
+   }
+   

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Update CodeMirror to 5.25.0

[jenkins-bot (Code Review)]

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

Change subject: Update CodeMirror to 5.25.0
..


Update CodeMirror to 5.25.0

Change-Id: I47680ba98e1ab39360608aa7a923e7fee7db615e
---
M resources/lib/codemirror/AUTHORS
A resources/lib/codemirror/CHANGELOG.md
M resources/lib/codemirror/CONTRIBUTING.md
M resources/lib/codemirror/LICENSE
M resources/lib/codemirror/README.md
M resources/lib/codemirror/addon/comment/comment.js
M resources/lib/codemirror/addon/display/panel.js
M resources/lib/codemirror/addon/display/rulers.js
M resources/lib/codemirror/addon/edit/closebrackets.js
M resources/lib/codemirror/addon/edit/continuelist.js
M resources/lib/codemirror/addon/edit/matchbrackets.js
M resources/lib/codemirror/addon/fold/indent-fold.js
M resources/lib/codemirror/addon/fold/xml-fold.js
M resources/lib/codemirror/addon/hint/javascript-hint.js
M resources/lib/codemirror/addon/hint/show-hint.css
M resources/lib/codemirror/addon/hint/show-hint.js
M resources/lib/codemirror/addon/hint/sql-hint.js
M resources/lib/codemirror/addon/lint/lint.js
M resources/lib/codemirror/addon/lint/yaml-lint.js
M resources/lib/codemirror/addon/merge/merge.js
M resources/lib/codemirror/addon/mode/overlay.js
M resources/lib/codemirror/addon/scroll/annotatescrollbar.js
M resources/lib/codemirror/addon/search/match-highlighter.js
M resources/lib/codemirror/addon/search/search.js
M resources/lib/codemirror/addon/selection/active-line.js
M resources/lib/codemirror/addon/selection/mark-selection.js
M resources/lib/codemirror/keymap/emacs.js
M resources/lib/codemirror/keymap/sublime.js
M resources/lib/codemirror/keymap/vim.js
M resources/lib/codemirror/lib/codemirror.css
M resources/lib/codemirror/lib/codemirror.js
M resources/lib/codemirror/mode/clike/clike.js
M resources/lib/codemirror/mode/commonlisp/commonlisp.js
M resources/lib/codemirror/mode/crystal/crystal.js
M resources/lib/codemirror/mode/crystal/index.html
M resources/lib/codemirror/mode/css/css.js
M resources/lib/codemirror/mode/css/index.html
M resources/lib/codemirror/mode/cypher/cypher.js
A resources/lib/codemirror/mode/cypher/test.js
M resources/lib/codemirror/mode/dylan/dylan.js
M resources/lib/codemirror/mode/erlang/erlang.js
M resources/lib/codemirror/mode/go/go.js
M resources/lib/codemirror/mode/groovy/groovy.js
M resources/lib/codemirror/mode/haskell/haskell.js
M resources/lib/codemirror/mode/htmlmixed/htmlmixed.js
M resources/lib/codemirror/mode/htmlmixed/index.html
M resources/lib/codemirror/mode/index.html
M resources/lib/codemirror/mode/javascript/javascript.js
M resources/lib/codemirror/mode/javascript/test.js
M resources/lib/codemirror/mode/javascript/typescript.html
M resources/lib/codemirror/mode/jsx/index.html
M resources/lib/codemirror/mode/jsx/jsx.js
M resources/lib/codemirror/mode/jsx/test.js
M resources/lib/codemirror/mode/julia/julia.js
M resources/lib/codemirror/mode/livescript/livescript.js
M resources/lib/codemirror/mode/markdown/markdown.js
M resources/lib/codemirror/mode/markdown/test.js
M resources/lib/codemirror/mode/meta.js
M resources/lib/codemirror/mode/mllike/mllike.js
M resources/lib/codemirror/mode/mscgen/index.html
M resources/lib/codemirror/mode/mscgen/mscgen.js
M resources/lib/codemirror/mode/mscgen/mscgen_test.js
M resources/lib/codemirror/mode/mscgen/msgenny_test.js
M resources/lib/codemirror/mode/mscgen/xu_test.js
M resources/lib/codemirror/mode/nsis/nsis.js
M resources/lib/codemirror/mode/octave/octave.js
M resources/lib/codemirror/mode/powershell/powershell.js
M resources/lib/codemirror/mode/powershell/test.js
A resources/lib/codemirror/mode/pug/index.html
A resources/lib/codemirror/mode/pug/pug.js
M resources/lib/codemirror/mode/python/index.html
M resources/lib/codemirror/mode/python/python.js
M resources/lib/codemirror/mode/r/index.html
M resources/lib/codemirror/mode/r/r.js
M resources/lib/codemirror/mode/ruby/ruby.js
M resources/lib/codemirror/mode/ruby/test.js
M resources/lib/codemirror/mode/sas/sas.js
M resources/lib/codemirror/mode/sass/index.html
M resources/lib/codemirror/mode/sass/sass.js
A resources/lib/codemirror/mode/sass/test.js
M resources/lib/codemirror/mode/shell/shell.js
M resources/lib/codemirror/mode/shell/test.js
M resources/lib/codemirror/mode/soy/soy.js
A resources/lib/codemirror/mode/soy/test.js
M resources/lib/codemirror/mode/sql/sql.js
M resources/lib/codemirror/mode/stylus/stylus.js
M resources/lib/codemirror/mode/swift/swift.js
A resources/lib/codemirror/mode/swift/test.js
M resources/lib/codemirror/mode/verilog/verilog.js
M resources/lib/codemirror/mode/vue/index.html
M resources/lib/codemirror/mode/vue/vue.js
M resources/lib/codemirror/mode/yaml/yaml.js
M resources/lib/codemirror/theme/dracula.css
A resources/lib/codemirror/theme/duotone-dark.css
A resources/lib/codemirror/theme/duotone-light.css
M resources/lib/codemirror/theme/material.css
A 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs-exportd: Explicitly check if instance address is valid

[Madhuvishy (Code Review)]

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

Change subject: nfs-exportd: Explicitly check if instance address is valid
..


nfs-exportd: Explicitly check if instance address is valid

Change-Id: I3d686ea7a4769714b51c937d24a2293565ac629d
---
M modules/labstore/files/nfs-exportd
1 file changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/modules/labstore/files/nfs-exportd 
b/modules/labstore/files/nfs-exportd
index 800573d..20f82a8 100755
--- a/modules/labstore/files/nfs-exportd
+++ b/modules/labstore/files/nfs-exportd
@@ -92,15 +92,17 @@
 project_domain_name='default'
 ))
 )
-
 ips = []
 try:
 for instance in client.servers.list():
 # Only provide internal IPs!
-ips += [
-str(ip['addr']) for ip in instance.addresses['public']
-if ip['OS-EXT-IPS:type'] == 'fixed' and 
is_valid_ipv4(ip['addr'])
-]
+if 'public' in instance.addresses:
+for ip in instance.addresses['public']:
+if ip['OS-EXT-IPS:type'] == 'fixed' and 
is_valid_ipv4(ip['addr']):
+ips.append(str(ip['addr']))
+else:
+logging.warn('Failed to get instance address for instance 
%s.%s',
+ repr(instance), project)
 except keystoneauth1.exceptions.http.Unauthorized:
 logging.warn("Failed to get server list for project %s."
  "  Maybe the project was deleted." % project)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d686ea7a4769714b51c937d24a2293565ac629d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: Add analytics labsdb pw in hdfs, add logrotate for refinery ...

[Ottomata (Code Review)]

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

Change subject: Add analytics labsdb pw in hdfs, add logrotate for refinery logs
..

Add analytics labsdb pw in hdfs, add logrotate for refinery logs

Bug: T160083
Change-Id: I9bd4025117d8dfe85102133503e640e495e51639
---
M modules/role/manifests/analytics_cluster/mysql_password.pp
M modules/role/manifests/analytics_cluster/refinery.pp
M modules/role/manifests/analytics_cluster/refinery/job/project_namespace_map.pp
M modules/role/manifests/analytics_cluster/refinery/job/sqoop_mediawiki.pp
4 files changed, 33 insertions(+), 16 deletions(-)


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

diff --git a/modules/role/manifests/analytics_cluster/mysql_password.pp 
b/modules/role/manifests/analytics_cluster/mysql_password.pp
index b6470b1..ffc1ea3 100644
--- a/modules/role/manifests/analytics_cluster/mysql_password.pp
+++ b/modules/role/manifests/analytics_cluster/mysql_password.pp
@@ -1,22 +1,29 @@
 # == Class role::analytics_cluster::mysql_password
-# Creates a protected file in HDFS that contains
-# a password used to access the MySQL research slaves.
+# Creates protected files in HDFS that contains
+# a passwords used to access MySQL slaves.
 # This is so we can automate sqooping of data
 # out of MySQL into Hadoop.
-#
-# This will put the $::passwords::mysql::research::pass
-# at hdfs:///user/hdfs/mysql-analytics-research-client-pw.txt
 #
 class role::analytics_cluster::mysql_password {
 Class['role::analytics_cluster::hadoop::client'] -> 
Class['role::analytics_cluster::mysql_password']
 
 include ::passwords::mysql::research
-$password = $::passwords::mysql::research::pass
-$path = '/user/hdfs/mysql-analytics-research-client-pw.txt'
-
+$research_user = $::passwords::mysql::research::user
+$research_pass = $::passwords::mysql::research::pass
+$research_path = '/user/hdfs/mysql-analytics-research-client-pw.txt'
 exec { 'hdfs_put_mysql-analytics-research-client-pw.txt':
-command => "/bin/echo -n '${password}' | /usr/bin/hdfs dfs -put - 
${path} && /usr/bin/hdfs dfs -chmod 600 ${path}",
-unless  => "/usr/bin/hdfs dfs -test -e ${path}",
+command => "/bin/echo -n '${research_pass}' | /usr/bin/hdfs dfs -put - 
${research_path} && /usr/bin/hdfs dfs -chmod 600 ${research_path}",
+unless  => "/usr/bin/hdfs dfs -test -e ${research_path}",
+user=> 'hdfs',
+}
+
+include ::passwords::mysql::analytics_labsdb
+$labsdb_user = $::passwords::mysql::analytics_labsdb::user
+$labsdb_pass = $::passwords::mysql::analytics_labsdb::pass
+$labsdb_path = '/user/hdfs/mysql-analytics-labsdb-client-pw.txt'
+exec { 'hdfs_put_mysql-analytics-labsdb-client-pw.txt':
+command => "/bin/echo -n '${labsdb_pass}' | /usr/bin/hdfs dfs -put - 
${labsdb_path} && /usr/bin/hdfs dfs -chmod 600 ${labsdb_path}",
+unless  => "/usr/bin/hdfs dfs -test -e ${labsdb_path}",
 user=> 'hdfs',
 }
 }
diff --git a/modules/role/manifests/analytics_cluster/refinery.pp 
b/modules/role/manifests/analytics_cluster/refinery.pp
index 1e557ba..8c33eb0 100644
--- a/modules/role/manifests/analytics_cluster/refinery.pp
+++ b/modules/role/manifests/analytics_cluster/refinery.pp
@@ -64,4 +64,9 @@
 # by users in the $$log_dir_group group.
 mode   => '2775',
 }
-}
\ No newline at end of file
+
+logrotate::conf { 'refinery':
+source  => 
'puppet:///modules/role/analytics_cluster/refinery-logrotate.conf',
+require => File[$log_dir],
+}
+}
diff --git 
a/modules/role/manifests/analytics_cluster/refinery/job/project_namespace_map.pp
 
b/modules/role/manifests/analytics_cluster/refinery/job/project_namespace_map.pp
index 9ffde94..f544fa8 100644
--- 
a/modules/role/manifests/analytics_cluster/refinery/job/project_namespace_map.pp
+++ 
b/modules/role/manifests/analytics_cluster/refinery/job/project_namespace_map.pp
@@ -10,10 +10,11 @@
 $env = "export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics_cluster::refinery::path}/python"
 
 $output_directory = '/wmf/data/raw/mediawiki/project_namespace_map'
+$log_file = 
"${::role::analytics_cluster::refinery::log_dir}/download-project-namespace-map.log"
 
 # This downloads the project namespace map for a 'labsdb' public import.
-cron { 'refinery-download-project-namespace':
-command => "${env} && 
${role::analytics_cluster::refinery::path}/bin/download-project-namespace-map 
-x ${output_directory} -s \$(/bin/date '+%Y-%m')",
+cron { 'refinery-download-project-namespace-map':
+command => "${env} && 
${role::analytics_cluster::refinery::path}/bin/download-project-namespace-map 
-x ${output_directory} -s \$(/bin/date '+%Y-%m') >> ${log_file} 2>&1 ",
 user=> 'hdfs',
 minute  => '0',
 hour=> '12',

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ImageCaptionNode: correct documentation typo

[jenkins-bot (Code Review)]

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

Change subject: ImageCaptionNode: correct documentation typo
..


ImageCaptionNode: correct documentation typo

Change-Id: Ic6e66e82662ec2fbf673062a0b3bc1087c54c4c7
---
M modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
index 484e53a..a9b5dd3 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
@@ -1,12 +1,12 @@
 /*!
- * VisualEditor ContentEditable ListItemNode class.
+ * VisualEditor ContentEditable ImageCaptionNode class.
  *
  * @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
 
 /**
- * ContentEditable image caption item node.
+ * ContentEditable image caption node.
  *
  * @class
  * @extends ve.ce.BranchNode

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6e66e82662ec2fbf673062a0b3bc1087c54c4c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...3D[master]: Use tabs to indent in json

[jenkins-bot (Code Review)]

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

Change subject: Use tabs to indent in json
..


Use tabs to indent in json

Change-Id: Idc0159b9e77ad134b8b9791e31daec50307f9ed1
---
M extension.json
M package.json
2 files changed, 20 insertions(+), 20 deletions(-)

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



diff --git a/extension.json b/extension.json
index 2ba378c..972b1c4 100644
--- a/extension.json
+++ b/extension.json
@@ -9,10 +9,10 @@
"descriptionmsg": "3d-desc",
"license-name": "MIT",
"requires": {
- "MediaWiki": ">= 1.29.0",
- "extensions": {
-   "MultimediaViewer": "*"
- }
+   "MediaWiki": ">= 1.29.0",
+   "extensions": {
+   "MultimediaViewer": "*"
+   }
},
"type": "other",
"manifest_version": 1,
diff --git a/package.json b/package.json
index ff224c0..e231161 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,18 @@
 {
-  "name": "3d",
-  "version": "0.0.1",
-  "private": true,
-  "description": "Build tools for the 3D MediaWiki extension.",
-  "scripts": {
-"test": "grunt test"
-  },
-  "devDependencies": {
-"eslint-config-wikimedia": "0.3.0",
-"grunt": "1.0.1",
-"grunt-eslint": "19.0.0",
-"grunt-banana-checker": "0.5.0",
-"grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.7.0",
-"stylelint-config-wikimedia": "0.4.1"
-  }
+   "name": "3d",
+   "version": "0.0.1",
+   "private": true,
+   "description": "Build tools for the 3D MediaWiki extension.",
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "eslint-config-wikimedia": "0.3.0",
+   "grunt": "1.0.1",
+   "grunt-eslint": "19.0.0",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0",
+   "grunt-stylelint": "0.7.0",
+   "stylelint-config-wikimedia": "0.4.1"
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc0159b9e77ad134b8b9791e31daec50307f9ed1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/3D
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...Athena[master]: Use tabs to indent in json

[jenkins-bot (Code Review)]

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

Change subject: Use tabs to indent in json
..


Use tabs to indent in json

Change-Id: I7327598205ac0d80c684edcaf8daac52855ed820
---
M extension.json
M i18n/en.json
2 files changed, 157 insertions(+), 157 deletions(-)

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



diff --git a/extension.json b/extension.json
index 61b2e06..978be95 100644
--- a/extension.json
+++ b/extension.json
@@ -1,54 +1,54 @@
 {
-  "name": "Athena",
-  "version": "0.0.3",
-  "author": [
-"Richard Cook"
-  ],
-  "url": "https://www.mediawiki.org/wiki/Extension:Athena;,
-  "descriptionmsg": "athena-desc",
-  "type": "antispam",
-  "manifest_version": 1,
-  "SpecialPages": {
+   "name": "Athena",
+   "version": "0.0.3",
+   "author": [
+   "Richard Cook"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:Athena;,
+   "descriptionmsg": "athena-desc",
+   "type": "antispam",
+   "manifest_version": 1,
+   "SpecialPages": {
"Athena": "SpecialAthena"
},
-  "MessagesDirs": {
-   "Athena": [
-   "i18n"
-   ]
-   },
-  "ExtensionMessagesFiles": {
-"AthenaAlias": "Athena.alias.php"
-  },
-  "AutoloadClasses": {
-"AthenaFilters": "AthenaFilters.php",
-"AthenaHooks": "AthenaHooks.php",
-"AthenaHelper": "AthenaHelper.php",
-   "SpecialAthena": "Athena_body.php"
-  },
-  "Hooks": {
-"EditFilter": [
-  "AthenaHooks::editFilter"
-],
-"LoadExtensionSchemaUpdates": [
-  "AthenaHooks::createTables"
-],
-"PageContentSaveComplete": [
-  "AthenaHooks::successfulEdit"
-],
-"ArticleDeleteComplete": [
-  "AthenaHooks::pageDeleted"
-]
-},
-  "config": {
-"AthenaSpamThreshold": 0.5,
-   "AthenaTraining": false
-  },
-  "AvailableRights": [
-   "athena"
-  ],
-  "GroupPermissions": {
-   "sysop": {
- "athena": true
+   "MessagesDirs": {
+   "Athena": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "AthenaAlias": "Athena.alias.php"
+   },
+   "AutoloadClasses": {
+   "AthenaFilters": "AthenaFilters.php",
+   "AthenaHooks": "AthenaHooks.php",
+   "AthenaHelper": "AthenaHelper.php",
+   "SpecialAthena": "Athena_body.php"
+   },
+   "Hooks": {
+   "EditFilter": [
+   "AthenaHooks::editFilter"
+   ],
+   "LoadExtensionSchemaUpdates": [
+   "AthenaHooks::createTables"
+   ],
+   "PageContentSaveComplete": [
+   "AthenaHooks::successfulEdit"
+   ],
+   "ArticleDeleteComplete": [
+   "AthenaHooks::pageDeleted"
+   ]
+   },
+   "config": {
+   "AthenaSpamThreshold": 0.5,
+   "AthenaTraining": false
+   },
+   "AvailableRights": [
+   "athena"
+   ],
+   "GroupPermissions": {
+   "sysop": {
+   "athena": true
+   }
}
-  }
 }
diff --git a/i18n/en.json b/i18n/en.json
index 3ad1165..2730a03 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,112 +4,112 @@
"Richard Cook"
]
},
-  "athena": "Athena",
-  "athena-anon": "Anonymous user",
-  "athena-blocked": "Blocked",
-  "athena-blocked-error": "Your edit has been triggered as spam. If you think 
this is a mistake please let an admin know",
-  "athena-desc": "Experimental Context-Based Smart Anti-Spam Tool",
-  "athena-false": "False",
-  "athena-id": "id",
-  "athena-log-date": "Date",
-  "athena-log-id": "ID",
-  "athena-log-view": "View",
-  "athena-not-blocked": "Not blocked",
-  "athena-pagetext":"Select what Athena logs you want to view below.",
-  "athena-pagetext-0": "Showing all pages Athena has encountered.",
-  "athena-pagetext-1": "Showing all pages Athena has blocked.",
-  "athena-pagetext-2": "Showing all pages Athena has not blocked.",
-  "athena-spam": "Athena-Spam",
-  "athena-syntax-basic": "Basic",
-  "athena-syntax-complex": "Complex",
-  "athena-syntax-invalid": "Invalid value",
-  "athena-syntax-none": "None",
-  "athena-syntax-spambot": "Broken spambot",
-  "athena-title": "Athena",
-  "athena-title-0": "Athena - All logs",
-  "athena-title-1": "Athena - Blocked log",
-  "athena-title-2": "Athena - Not blocked log",
-  "athena-true": "True",
-  "athena-type-0": "all",
-  "athena-type-1": "spam",
-  "athena-type-2": "notspam",
-  "athena-type-desc-0": "All",
-  "athena-type-desc-1": "Pages blocked by Athena",
-  "athena-type-desc-2": "Pages not blocked by Athena",
-  "athena-view-athena-value": "Athena Value",
-  "athena-view-blocked": "Athena 

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

[Ppchelko (Code Review)]

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

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

Update electron-render-service to a2493a8

List of changes:
eadd02b Make clear url arguments need to be encoded
d3035ae Update to electron v1.3.2, async v2.0.0
5f2787f Update linting rules
623face Update fixture
1ae8843 & needs to be quoted in Terminal
e643bfe Wget output-file argument shorthand is capital O
9d3d814 Update util test
78df426 Add layers badge
56ca3f9 Bump Electron to v1.3.4 and other deps
1f27ee5 Bump to v0.8.0
2e39553 Drop electron NPM package in Dockerfile before install, fixes #21
180a862 Add yarn lockfile
0b24982 Bump dependencies
f3fc22a Bump deps
c3bf8b9 Fix waitForText not found hang
014890b Fix async waitForText
12c41ae Docs update
248cfcd Skip delay and waitForText on loading failures
a0d69a4 Add waitfor test file
21551cc docs(readme): add Greenkeeper badge
67d68c4 0.9.0
2859def Fix waitForText not found double callback error
c6d076e 0.9.1
8422a0f Bump deps
683397b A fix for #31 and #37
dddb128 Added stability test
793fe8e Show indication of progress before failing test
47e64f0 A fix for broken .pdf's
bcd04a5 Update pdf fixture
b56099a Fix linting, bump deps
02e773b Update another fixture
0d713c0 Update render fail fixture
e9609cf 0.10.0
ec872a5 Update README
71c4840 Remove bad note from README
f4ccb42 A fix for #31
3f0e9a0 Add .gitreview
dd53834 Add files needed for the build process and ignore Dockerfile
6a3ed5d Use node 4.6 for building the deploy repo
a2493a8 Upgrade to Node v6.9.1
xxx Update node module dependencies

Change-Id: Ief25a202893b7b4a615fb7b93fe86a57065af856
---
M node_modules/.bin/electron
D node_modules/.bin/har-validator
D node_modules/.bin/strip-json-comments
A node_modules/@types/bluebird/index.d.ts
A node_modules/@types/bluebird/package.json
A node_modules/@types/bluebird/types-metadata.json
A node_modules/@types/express-serve-static-core/index.d.ts
A node_modules/@types/express-serve-static-core/package.json
A node_modules/@types/express/index.d.ts
A node_modules/@types/express/package.json
A node_modules/@types/express/types-metadata.json
A node_modules/@types/mime/index.d.ts
A node_modules/@types/mime/package.json
A node_modules/@types/mime/types-metadata.json
A node_modules/@types/node/index.d.ts
A node_modules/@types/node/package.json
A node_modules/@types/serve-static/index.d.ts
A node_modules/@types/serve-static/package.json
A node_modules/@types/serve-static/types-metadata.json
A node_modules/ajv/.tonic_example.js
A node_modules/ajv/LICENSE
A node_modules/ajv/dist/ajv.bundle.js
A node_modules/ajv/dist/ajv.min.js
A node_modules/ajv/dist/ajv.min.js.map
A node_modules/ajv/dist/nodent.min.js
A node_modules/ajv/dist/regenerator.min.js
A node_modules/ajv/lib/ajv.d.ts
A node_modules/ajv/lib/ajv.js
A node_modules/ajv/lib/async.js
A node_modules/ajv/lib/cache.js
A node_modules/ajv/lib/compile/_rules.js
A node_modules/ajv/lib/compile/equal.js
A node_modules/ajv/lib/compile/formats.js
A node_modules/ajv/lib/compile/index.js
A node_modules/ajv/lib/compile/resolve.js
A node_modules/ajv/lib/compile/rules.js
A node_modules/ajv/lib/compile/schema_obj.js
A node_modules/ajv/lib/compile/ucs2length.js
A node_modules/ajv/lib/compile/util.js
A node_modules/ajv/lib/compile/validation_error.js
A node_modules/ajv/lib/dot/_limit.jst
A node_modules/ajv/lib/dot/_limitItems.jst
A node_modules/ajv/lib/dot/_limitLength.jst
A node_modules/ajv/lib/dot/_limitProperties.jst
A node_modules/ajv/lib/dot/allOf.jst
A node_modules/ajv/lib/dot/anyOf.jst
A node_modules/ajv/lib/dot/coerce.def
A node_modules/ajv/lib/dot/custom.jst
A node_modules/ajv/lib/dot/defaults.def
A node_modules/ajv/lib/dot/definitions.def
A node_modules/ajv/lib/dot/dependencies.jst
A node_modules/ajv/lib/dot/enum.jst
A node_modules/ajv/lib/dot/errors.def
A node_modules/ajv/lib/dot/format.jst
A node_modules/ajv/lib/dot/items.jst
A node_modules/ajv/lib/dot/missing.def
A node_modules/ajv/lib/dot/multipleOf.jst
A node_modules/ajv/lib/dot/not.jst
A node_modules/ajv/lib/dot/oneOf.jst
A node_modules/ajv/lib/dot/pattern.jst
A node_modules/ajv/lib/dot/properties.jst
A node_modules/ajv/lib/dot/ref.jst
A node_modules/ajv/lib/dot/required.jst
A node_modules/ajv/lib/dot/uniqueItems.jst
A node_modules/ajv/lib/dot/v5/_formatLimit.jst
A node_modules/ajv/lib/dot/v5/constant.jst
A node_modules/ajv/lib/dot/v5/patternRequired.jst
A node_modules/ajv/lib/dot/v5/switch.jst
A node_modules/ajv/lib/dot/validate.jst
A node_modules/ajv/lib/dotjs/_formatLimit.js
A node_modules/ajv/lib/dotjs/_limit.js
A node_modules/ajv/lib/dotjs/_limitItems.js
A node_modules/ajv/lib/dotjs/_limitLength.js
A node_modules/ajv/lib/dotjs/_limitProperties.js
A node_modules/ajv/lib/dotjs/allOf.js
A node_modules/ajv/lib/dotjs/anyOf.js
A node_modules/ajv/lib/dotjs/constant.js
A node_modules/ajv/lib/dotjs/custom.js
A 

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Use tabs to indent in json

[Umherirrender (Code Review)]

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

Change subject: Use tabs to indent in json
..

Use tabs to indent in json

Change-Id: I20811dc220cd020b1f795cad62d690f142b68643
---
M extension.json
M package.json
2 files changed, 21 insertions(+), 21 deletions(-)


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

diff --git a/extension.json b/extension.json
index 4f906bf..2dec0f1 100644
--- a/extension.json
+++ b/extension.json
@@ -13,9 +13,9 @@
"descriptionmsg": "echo-desc",
"license-name": "MIT",
"type": "specialpage",
-"requires": {
-"MediaWiki": ">= 1.29.0"
-},
+   "requires": {
+   "MediaWiki": ">= 1.29.0"
+   },
"callback": "EchoHooks::registerExtension",
"APIMetaModules": {
"notifications": "ApiEchoNotifications",
diff --git a/package.json b/package.json
index c520c4d..3ade3ed 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,20 @@
 {
-  "name": "echo",
-  "version": "0.0.1",
-  "private": true,
-  "description": "Build tools for Echo.",
-  "scripts": {
-"test": "grunt test",
-"doc": "jsduck"
-  },
-  "devDependencies": {
-"eslint-config-wikimedia": "0.3.0",
-"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0",
-"grunt-contrib-watch": "1.0.0",
-"grunt-eslint": "19.0.0",
-"grunt-jsonlint": "1.0.8",
-"grunt-stylelint": "0.7.0",
-"stylelint-config-wikimedia": "0.4.1"
-  }
+   "name": "echo",
+   "version": "0.0.1",
+   "private": true,
+   "description": "Build tools for Echo.",
+   "scripts": {
+   "test": "grunt test",
+   "doc": "jsduck"
+   },
+   "devDependencies": {
+   "eslint-config-wikimedia": "0.3.0",
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-contrib-watch": "1.0.0",
+   "grunt-eslint": "19.0.0",
+   "grunt-jsonlint": "1.0.8",
+   "grunt-stylelint": "0.7.0",
+   "stylelint-config-wikimedia": "0.4.1"
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs-exportd: Explicitly check if instance address is valid

[Madhuvishy (Code Review)]

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

Change subject: nfs-exportd: Explicitly check if instance address is valid
..

nfs-exportd: Explicitly check if instance address is valid

Change-Id: I3d686ea7a4769714b51c937d24a2293565ac629d
---
M modules/labstore/files/nfs-exportd
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/344220/1

diff --git a/modules/labstore/files/nfs-exportd 
b/modules/labstore/files/nfs-exportd
index 800573d..d1ff484 100755
--- a/modules/labstore/files/nfs-exportd
+++ b/modules/labstore/files/nfs-exportd
@@ -97,10 +97,13 @@
 try:
 for instance in client.servers.list():
 # Only provide internal IPs!
-ips += [
-str(ip['addr']) for ip in instance.addresses['public']
-if ip['OS-EXT-IPS:type'] == 'fixed' and 
is_valid_ipv4(ip['addr'])
-]
+if 'public' in instance.addresses:
+ip = instance.addresses['public']
+if ip['OS-EXT-IPS:type'] == 'fixed' and 
is_valid_ipv4(ip['addr']):
+ips.append(ip)
+else:
+logging.warn('Failed to get instance address for instance 
%s.%s',
+ repr(instance), project)
 except keystoneauth1.exceptions.http.Unauthorized:
 logging.warn("Failed to get server list for project %s."
  "  Maybe the project was deleted." % project)

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Setup apache vhost on scap proxies as well

[Chad (Code Review)]

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

Change subject: Setup apache vhost on scap proxies as well
..

Setup apache vhost on scap proxies as well

Change-Id: I2a735937b2cc2ee351b542953802cb10cefe16c1
---
M modules/role/manifests/deployment/server.pp
M modules/scap/manifests/proxy.pp
A modules/scap/manifests/vhost.pp
R modules/scap/templates/apache-vhost.erb
4 files changed, 31 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/344221/1

diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 5b56833..9f32c47 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -81,9 +81,8 @@
 group  => $deployment_group,
 }
 
-apache::site { 'deployment':
-content => template('role/deployment/apache-vhost.erb'),
-require => File['/srv/deployment'],
+class { '::scap::vhost':
+deployable_networks => $deployable_networks,
 }
 
 $deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet')
diff --git a/modules/scap/manifests/proxy.pp b/modules/scap/manifests/proxy.pp
index 66879da..4637027 100644
--- a/modules/scap/manifests/proxy.pp
+++ b/modules/scap/manifests/proxy.pp
@@ -10,4 +10,8 @@
 read_only   => 'yes',
 hosts_allow => $::network::constants::mw_appserver_networks;
 }
+
+class { 'scap::vhost':
+deployable_networks => $::network::constants::deployable_networks,
+}
 }
diff --git a/modules/scap/manifests/vhost.pp b/modules/scap/manifests/vhost.pp
new file mode 100644
index 000..42beef9
--- /dev/null
+++ b/modules/scap/manifests/vhost.pp
@@ -0,0 +1,25 @@
+# = class: scap::vhost
+#
+# Sets up an apache vhost for scap
+class scap::vhost(
+   $apache_fqdn = $::fqdn,
+   $deployable_networks = [],
+) {
+include ::apache
+
+   if !defined(File['/srv/deployment']) {
+   # Todo: Clean this up. This ownership is disgusting. But it's 
what
+   # we've got as long as trebuchet is around and we don't want to 
fight
+   # ownership on the deploy masters
+   file { '/srv/deployment':
+   ensure => directory,
+   owner  => 'trebuchet',
+   group  => 'wikidev',
+   }
+   }
+
+   apache::site { 'deployment':
+   content => template('scap/apache-vhost.erb'),
+   require => File['/srv/deployment'],
+   }
+}
diff --git a/modules/role/templates/deployment/apache-vhost.erb 
b/modules/scap/templates/apache-vhost.erb
similarity index 100%
rename from modules/role/templates/deployment/apache-vhost.erb
rename to modules/scap/templates/apache-vhost.erb

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

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

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