date:20170510

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

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Revert "db-eqiad.php: Depool db1067"
..


Revert "db-eqiad.php: Depool db1067"

This reverts commit a94275c82771fd53119737e418f43d07c5f3a9e8.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index aa642de..6421082 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,7 +94,7 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-#  'db1067' => 0,   # D1 2.8TB 160GB, old master #T147166 #T130067
+   'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

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

2017-05-10 Thread Marostegui (Code Review)

Hello jenkins-bot, Jcrespo,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1067"
..

Revert "db-eqiad.php: Depool db1067"

This reverts commit a94275c82771fd53119737e418f43d07c5f3a9e8.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index aa642de..6421082 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,7 +94,7 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-#  'db1067' => 0,   # D1 2.8TB 160GB, old master #T147166 #T130067
+   'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: Categories: Use MenuTagMultiselectWidget widget

2017-05-10 Thread Santhosh (Code Review)

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

Change subject: CX2: Categories: Use MenuTagMultiselectWidget widget
..

CX2: Categories: Use MenuTagMultiselectWidget widget

Use MenuTagMultiselectWidget instead of CapsuleMultiselectWidget.

Bug: T134740
Change-Id: Ia444b8b483367e7a42af94c8931a5e9c9d696ec9
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ui/mw.cx.ui.Categories.js
4 files changed, 16 insertions(+), 12 deletions(-)


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

diff --git a/extension.json b/extension.json
index a451c91..a7cfde8 100644
--- a/extension.json
+++ b/extension.json
@@ -1700,6 +1700,7 @@
"mw.cx.ui"
],
"messages": [
+   "cx-tools-category-add",
"cx-tools-categories-count-message"
]
},
diff --git a/i18n/en.json b/i18n/en.json
index bd8d113..8854428 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -219,5 +219,6 @@
"cx-template-not-available": "Not available in $1",
"cx-translation-template-add-param": "+ Translate field",
"cx-translation-template-add-more": "Add more fields",
-   "cx-translation-template-select-param": "Select target fields"
+   "cx-translation-template-select-param": "Select target fields",
+   "cx-tools-category-add": "Add category"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5b03326..42180bf 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -227,5 +227,6 @@
"cx-template-not-available": "Text shown when a corresponding template 
not available in target language\n* $1 - Target language name",
"cx-translation-template-add-param": "Hover text for the template field 
placeholders. Shown in the form for translating the template fields. \"Field\" 
should be the same word as in 
{{msg-mw|visualeditor-dialog-transclusion-required-parameter-dialog-title}}.",
"cx-translation-template-add-more": "Label for the control to add more 
template fields. Shown at the bottom of the form for translating the template 
parameters. \"Field\" should be the same word as in 
{{msg-mw|visualeditor-dialog-transclusion-required-parameter-dialog-title}}",
-   "cx-translation-template-select-param": "Label for the template field 
selector. \"Field\" should be the same word as in 
{{msg-mw|visualeditor-dialog-transclusion-required-parameter-dialog-title}}"
+   "cx-translation-template-select-param": "Label for the template field 
selector. \"Field\" should be the same word as in 
{{msg-mw|visualeditor-dialog-transclusion-required-parameter-dialog-title}}",
+   "cx-tools-category-add": "Placeholder text for adding new category to 
translation"
 }
diff --git a/modules/ui/mw.cx.ui.Categories.js 
b/modules/ui/mw.cx.ui.Categories.js
index fc96b86..c3db985 100644
--- a/modules/ui/mw.cx.ui.Categories.js
+++ b/modules/ui/mw.cx.ui.Categories.js
@@ -78,18 +78,18 @@
label: label
} ) );
}
-   this.categoryListing = new OO.ui.CapsuleMultiselectWidget( {
+   this.categoryListing = new OO.ui.MenuTagMultiselectWidget( {
// Should we allow Arbitrary categories?
allowArbitrary: true,
+   inputPosition: 'outline',
icon: 'tag',
-   menu: {
-   items: categoryItems
-   },
-   classes: [ 'cx-category-listing' ]
+   options: categoryItems,
+   selected: categoryItems.map( function ( item ) { return 
item.label; } ),
+   classes: [ 'cx-category-listing' ],
+   input: {
+   placeholder: mw.msg( 'cx-tools-category-add' )
+   }
} );
-
-   // Add all adapted items
-   this.categoryListing.addItemsFromData( categories );
 
return this.categoryListing;
 };
@@ -104,9 +104,10 @@
}.bind( this ) );
 
if ( this.editable ) {
-   this.categoryListing.on( 'change', function () {
+   this.categoryListing.on( 'change', function ( items ) {
// The new set of categories. Update the page.
-   this.page.categories = 
this.categoryListing.getItemsData();
+   this.page.categories = items.map( function ( item ) { 
return item.data; } );
+   // TODO: Remove the selected items from the options menu
}.bind( this ) );
}
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia444b8b483367e7a42af94c8931a5e9c9d696ec9
Gerrit-PatchSet: 1
Gerrit-Project:

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: UI changes for the MT tool card

2017-05-10 Thread Santhosh (Code Review)

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

Change subject: CX2: UI changes for the MT tool card
..

CX2: UI changes for the MT tool card

1. The engine selector is full width
2. Keep as default uses pin icon

Bug: T158415
Change-Id: Iada37768012da5fbfca8fbdc517b7e3484b5c289
---
M extension.json
M modules/tools/mw.cx.tools.MachineTranslationTool.js
M modules/tools/styles/mw.cx.tools.MachineTranslationTool.less
3 files changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/extension.json b/extension.json
index a451c91..2dc8c71 100644
--- a/extension.json
+++ b/extension.json
@@ -1846,7 +1846,8 @@
],
"dependencies": [
"ext.cx.widgets.spinner",
-   "mw.cx.tools.TranslationTool"
+   "mw.cx.tools.TranslationTool",
+   "oojs-ui.styles.icons-moderation"
]
},
"mw.cx.tools.TemplateTool": {
diff --git a/modules/tools/mw.cx.tools.MachineTranslationTool.js 
b/modules/tools/mw.cx.tools.MachineTranslationTool.js
index c524e69..5ef2cf8 100644
--- a/modules/tools/mw.cx.tools.MachineTranslationTool.js
+++ b/modules/tools/mw.cx.tools.MachineTranslationTool.js
@@ -30,7 +30,7 @@
 mw.cx.tools.MachineTranslationTool.prototype.getActions = function () {
this.keepDefault = new OO.ui.ButtonWidget( {
label: mw.msg( 'cx-tools-mt-set-default' ),
-   icon: 'check',
+   icon: 'pushPin',
framed: false,
classes: [ 'cx-mt-set-default' ]
} );
diff --git a/modules/tools/styles/mw.cx.tools.MachineTranslationTool.less 
b/modules/tools/styles/mw.cx.tools.MachineTranslationTool.less
index 962fe3a..1e41925 100644
--- a/modules/tools/styles/mw.cx.tools.MachineTranslationTool.less
+++ b/modules/tools/styles/mw.cx.tools.MachineTranslationTool.less
@@ -4,7 +4,7 @@
.cx-widget-translationtool-container {
.card-mt-providers-menu {
.mw-ui-item;
-   .mw-ui-two-thirds;
+   .mw-ui-one-whole;
.oo-ui-dropdownWidget-handle {
background-color: @white;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedLinks[master]: good

2017-05-10 Thread Sleepinglion (Code Review)

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

Change subject: good
..

good

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedLinks 
refs/changes/08/353208/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib628d2465ad215a60456ae389aa3c36273ee6b0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedLinks
Gerrit-Branch: master
Gerrit-Owner: Sleepinglion 

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Make testing-access-wrapper require instead of require-dev

2017-05-10 Thread Mattflaschen (Code Review)

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

Change subject: Make testing-access-wrapper require instead of require-dev
..

Make testing-access-wrapper require instead of require-dev

This used to be available in production, and is still useful there
sometimes when debugging and investigating (e.g. in a REPL).

Change-Id: I860b957d8eef856a881130b7c7570d5e349148cb
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
5 files changed, 106 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/13/353213/1

diff --git a/composer.json b/composer.json
index 7910a6a..0218e18 100644
--- a/composer.json
+++ b/composer.json
@@ -73,6 +73,7 @@
"wikimedia/remex-html": "1.0.1",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
+   "wikimedia/testing-access-wrapper": "~1.0",
"wikimedia/textcat": "1.2.0",
"wikimedia/timestamp": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
diff --git a/composer.lock b/composer.lock
index 7ee284d..8da5191 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "ffbe2bba86ce8713a20780e0a7be4019",
+"content-hash": "389fc356e019add12efadfa1866488ac",
 "packages": [
 {
 "name": "composer/semver",
@@ -1849,6 +1849,56 @@
 "time": "2016-09-29T07:03:03+00:00"
 },
 {
+"name": "wikimedia/testing-access-wrapper",
+"version": "1.0.0",
+"source": {
+"type": "git",
+"url": 
"https://github.com/wikimedia/testing-access-wrapper.git;,
+"reference": "e18b87c86739733506bd184a70852c30cdb30699"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/wikimedia/testing-access-wrapper/zipball/e18b87c86739733506bd184a70852c30cdb30699;,
+"reference": "e18b87c86739733506bd184a70852c30cdb30699",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.0"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"mediawiki/mediawiki-codesniffer": "0.7.2",
+"phpunit/phpunit": "4.8.31"
+},
+"type": "library",
+"autoload": {
+"classmap": [
+"src/"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"GPL-2.0+"
+],
+"authors": [
+{
+"name": "Adam Roses Wight",
+"email": "awi...@wikimedia.org"
+},
+{
+"name": "Brad Jorsch",
+"email": "bjor...@wikimedia.org"
+},
+{
+"name": "Gergő Tisza",
+"email": "gti...@wikimedia.org"
+}
+],
+"description": "A simple helper class to access non-public 
elements of a class when testing.",
+"homepage": 
"https://www.mediawiki.org/wiki/Testing-access-wrapper;,
+"time": "2017-04-19T16:43:33+00:00"
+},
+{
 "name": "wikimedia/textcat",
 "version": "1.2.0",
 "source": {
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index cedf897..eebf93e 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -692,6 +692,7 @@
 'Wikimedia\\Composer\\Merge\\StabilityFlags' => $vendorDir . 
'/wikimedia/composer-merge-plugin/src/Merge/StabilityFlags.php',
 'Wikimedia\\PhpSessionSerializer' => $vendorDir . 
'/wikimedia/php-session-serializer/src/Wikimedia/PhpSessionSerializer.php',
 'Wikimedia\\ScopedCallback' => $vendorDir . 
'/wikimedia/scoped-callback/src/ScopedCallback.php',
+'Wikimedia\\TestingAccessWrapper' => $vendorDir . 
'/wikimedia/testing-access-wrapper/src/TestingAccessWrapper.php',
 'Wikimedia\\Timestamp\\ConvertibleTimestamp' => $vendorDir . 
'/wikimedia/timestamp/src/ConvertibleTimestamp.php',
 'Wikimedia\\Timestamp\\TimestampException' => $vendorDir . 
'/wikimedia/timestamp/src/TimestampException.php',
 'Wikimedia\\WaitConditionLoop' => $vendorDir . 
'/wikimedia/wait-condition-loop/src/WaitConditionLoop.php',
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 0ba5f6a..e052cfa 100644
---

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make testing-access-wrap require instead of require-dev

2017-05-10 Thread Mattflaschen (Code Review)

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

Change subject: Make testing-access-wrap require instead of require-dev
..

Make testing-access-wrap require instead of require-dev

This used to be available in production, and is still useful
there sometimes (e.g. shell)

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


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

diff --git a/composer.json b/composer.json
index 147a066..604e609 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
+   "wikimedia/testing-access-wrapper": "~1.0",
"wikimedia/timestamp": "1.0.0",
"wikimedia/wait-condition-loop": "1.0.1",
"wikimedia/wrappedstring": "2.2.0",
@@ -60,7 +61,6 @@
"phpunit/phpunit": "4.8.35",
"psy/psysh": "0.8.3",
"wikimedia/avro": "1.7.7",
-   "wikimedia/testing-access-wrapper": "~1.0",
"wmde/hamcrest-html-matchers": "^0.1.0"
},
"suggest": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc43ef588dc10f9a23b06ff4700e9ea7cdd9f9fe
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...WikimediaEvents[wmf/1.30.0-wmf.1]: RecentChangesClicks: Address minor performance concerns

2017-05-10 Thread Catrope (Code Review)

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

Change subject: RecentChangesClicks: Address minor performance concerns
..

RecentChangesClicks: Address minor performance concerns

* Avoid unconditional DOM/jQuery actions at dom-ready.
  Move '.mw-recentchanges-toplinks' query to inside the if block
  which was previously running on every page view. Should also help
  avoid false positives from user generated content.

* Reduce init overhead (create 'linkTypes' in the deferred inner scope).

* Avoid using the DOM to determine what page we're on, use pure
  data from mw.config instead of $body.hasClass.

Bug: T158458
Change-Id: Ia128695fa817f69df7d761e37c825c873c25aa2a
(cherry picked from commit fb492fd55db85b8e00b6f72cec044e833ae04f4f)
---
M modules/ext.wikimediaEvents.recentChangesClicks.js
1 file changed, 31 insertions(+), 32 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index 7e9b461..5779188 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -5,23 +5,22 @@
  * @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();
+   var uri = new mw.Uri(),
+   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 trackClick( type, fromPage ) {
mw.track( 'event.ChangesListClickTracking', {
@@ -43,7 +42,7 @@
return 'page';
}
 
-   if ( $( 'body' ).hasClass( 'mw-special-Recentchanges' ) ) {
+   if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'Recentchanges' ) {
$( '.mw-changeslist' ).on( 'click', 'a[href]', function 
( e ) {
var selector,
type = 'unknown',
@@ -72,6 +71,21 @@
// Log an event
trackClick( type, 'Recentchanges' );
} );
+
+   // Click tracking for top links (T164617)
+   $( '.mw-recentchanges-toplinks' ).on( 'click', 
'a[href]', function ( e ) {
+   var $link = $( this );
+
+   if ( e.which === 3 ) {
+   return;
+   }
+
+   mw.track( 'event.RecentChangesTopLinks', {
+   url: $link.prop( 'href' ),
+   label: $link.text(),
+   loggedIn: !mw.user.isAnon()
+   } );
+   } );
} else if ( uri.query.fromrc === '1' ) {
$( 'body' ).on( 'click', 'a[href]', function ( e ) {
var selector, type,
@@ -96,21 +110,6 @@
trackClick( type, getPageType() );
} );
}
-
-   // Click tracking for top links (T164617)
-   $( '.mw-recentchanges-toplinks' ).on( 'click', 'a[href]', 
function ( e ) {
-   var $link = $( this );
-
-   if ( e.which === 3 ) {
-

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: RecentChangesClicks: Address minor performance concerns

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: RecentChangesClicks: Address minor performance concerns
..


RecentChangesClicks: Address minor performance concerns

* Avoid unconditional DOM/jQuery actions at dom-ready.
  Move '.mw-recentchanges-toplinks' query to inside the if block
  which was previously running on every page view. Should also help
  avoid false positives from user generated content.

* Reduce init overhead (create 'linkTypes' in the deferred inner scope).

* Avoid using the DOM to determine what page we're on, use pure
  data from mw.config instead of $body.hasClass.

Bug: T158458
Change-Id: Ia128695fa817f69df7d761e37c825c873c25aa2a
---
M modules/ext.wikimediaEvents.recentChangesClicks.js
1 file changed, 31 insertions(+), 32 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index 7e9b461..5779188 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -5,23 +5,22 @@
  * @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();
+   var uri = new mw.Uri(),
+   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 trackClick( type, fromPage ) {
mw.track( 'event.ChangesListClickTracking', {
@@ -43,7 +42,7 @@
return 'page';
}
 
-   if ( $( 'body' ).hasClass( 'mw-special-Recentchanges' ) ) {
+   if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'Recentchanges' ) {
$( '.mw-changeslist' ).on( 'click', 'a[href]', function 
( e ) {
var selector,
type = 'unknown',
@@ -72,6 +71,21 @@
// Log an event
trackClick( type, 'Recentchanges' );
} );
+
+   // Click tracking for top links (T164617)
+   $( '.mw-recentchanges-toplinks' ).on( 'click', 
'a[href]', function ( e ) {
+   var $link = $( this );
+
+   if ( e.which === 3 ) {
+   return;
+   }
+
+   mw.track( 'event.RecentChangesTopLinks', {
+   url: $link.prop( 'href' ),
+   label: $link.text(),
+   loggedIn: !mw.user.isAnon()
+   } );
+   } );
} else if ( uri.query.fromrc === '1' ) {
$( 'body' ).on( 'click', 'a[href]', function ( e ) {
var selector, type,
@@ -96,21 +110,6 @@
trackClick( type, getPageType() );
} );
}
-
-   // Click tracking for top links (T164617)
-   $( '.mw-recentchanges-toplinks' ).on( 'click', 'a[href]', 
function ( e ) {
-   var $link = $( this );
-
-   if ( e.which === 3 ) {
-   return;
-   }
-
-

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: RecentChangesClicks: Address minor performance concerns

2017-05-10 Thread Krinkle (Code Review)

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

Change subject: RecentChangesClicks: Address minor performance concerns
..

RecentChangesClicks: Address minor performance concerns

* Avoid unconditional DOM/jQuery actions at dom-ready.
  Move '.mw-recentchanges-toplinks' query to inside the if block
  which was previously running on every page view. Should also help
  avoid false positives from user generated content.

* Reduce init overhead (create 'linkTypes' in the deferred inner scope).

* Avoid using the DOM to determine what page we're on, use pure
  data from mw.config instead of $body.hasClass.

Change-Id: Ia128695fa817f69df7d761e37c825c873c25aa2a
---
M modules/ext.wikimediaEvents.recentChangesClicks.js
1 file changed, 31 insertions(+), 32 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index 7e9b461..5779188 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -5,23 +5,22 @@
  * @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();
+   var uri = new mw.Uri(),
+   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 trackClick( type, fromPage ) {
mw.track( 'event.ChangesListClickTracking', {
@@ -43,7 +42,7 @@
return 'page';
}
 
-   if ( $( 'body' ).hasClass( 'mw-special-Recentchanges' ) ) {
+   if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'Recentchanges' ) {
$( '.mw-changeslist' ).on( 'click', 'a[href]', function 
( e ) {
var selector,
type = 'unknown',
@@ -72,6 +71,21 @@
// Log an event
trackClick( type, 'Recentchanges' );
} );
+
+   // Click tracking for top links (T164617)
+   $( '.mw-recentchanges-toplinks' ).on( 'click', 
'a[href]', function ( e ) {
+   var $link = $( this );
+
+   if ( e.which === 3 ) {
+   return;
+   }
+
+   mw.track( 'event.RecentChangesTopLinks', {
+   url: $link.prop( 'href' ),
+   label: $link.text(),
+   loggedIn: !mw.user.isAnon()
+   } );
+   } );
} else if ( uri.query.fromrc === '1' ) {
$( 'body' ).on( 'click', 'a[href]', function ( e ) {
var selector, type,
@@ -96,21 +110,6 @@
trackClick( type, getPageType() );
} );
}
-
-   // Click tracking for top links (T164617)
-   $( '.mw-recentchanges-toplinks' ).on( 'click', 'a[href]', 
function ( e ) {
-   var $link = $( this );
-
-   if ( e.which === 3 ) {
-   return;
-   }
-
-

[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Clarify and easify descriptions

2017-05-10 Thread VolkerE (Code Review)

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

Change subject: README: Clarify and easify descriptions
..

README: Clarify and easify descriptions

Change-Id: I22362b1907fdd1246a5bac1dc0aec97e322eb80a
---
M README.md
1 file changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/353209/1

diff --git a/README.md b/README.md
index 5cbc067..7880570 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 OOjs UI
 =
 
-OOjs UI is a modern JavaScript UI toolkit for browsers. It provides a library 
of common widgets, layouts and windows that are ready to use, as well as many 
foundational classes for constructing custom user interfaces. The library was 
originally created for use by 
[VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for 
its entire user interface, and is now completely independent, and more useful 
and convenient for other use cases.
+OOjs UI is a modern JavaScript UI toolkit. It provides common widgets, 
layouts, dialogs and icons that are ready to use, as well as many useful and 
convenient classes for constructing custom user interfaces. It is the standard 
user-interface libary in Wikimedia Foundation web products and was originally 
created for use by [VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), 
which uses it for its entire user interface.
 
 Quick start
 --
@@ -17,17 +17,17 @@
 
 1. Clone the repo and move into it, `$ git clone 
https://phabricator.wikimedia.org/diffusion/GOJU/oojs-ui.git oojs-ui && cd 
oojs-ui`.
 
-2. Install Grunt command-line utility:`$ npm install -g grunt-cli`
+2. Install Grunt command-line utility:`$ npm install -g grunt-cli`
 
 3. Install [composer](https://getcomposer.org/download/) and make sure running 
`composer` will execute it (*e.g.* add it to `$PATH` in POSIX environments).
 
-4. Install dev dependencies:`$ npm install`
+4. Install dev dependencies:`$ npm install`
 
-5. Build the library (you can alternatively use `grunt quick-build` if you 
don't need to rebuild the PNGs):`$ grunt build`
+5. Build the library (you can alternatively use `grunt quick-build` if you 
don't need to rebuild the PNGs):`$ grunt build`
 
 6. You can now copy the distribution files from the dist directory into your 
project.
 
-7. You can see a suite of demos in `/demos` by executing:`$ npm 
run-script demos`
+7. You can see a suite of demos in `/demos` by executing:`$ npm run-script 
demos`
 
 
 Loading the library
@@ -36,10 +36,10 @@
 While the distribution directory is chock-full of files, you will normally 
only need to load three:
 
 * `oojs-ui.js`, containing the full library
-* One of `oojs-ui-apex.css` or `oojs-ui-mediawiki.css`, containing 
theme-specific styles
-* One of `oojs-ui-apex.js` or `oojs-ui-mediawiki.js`, containing 
theme-specific code
+* One of `oojs-ui-mediawiki.css` or `oojs-ui-apex.css`, containing 
theme-specific styles
+* One of `oojs-ui-mediawiki.js` or  `oojs-ui-apex.js`, containing 
theme-specific code
 
-You can load additional icon packs from files named `oojs-ui-apex-icons-*.css` 
or `oojs-ui-mediawiki-icons-*.css`.
+You can load additional icon packs from files named 
`oojs-ui-mediawiki-icons-*.css` or  `oojs-ui-apex-icons-*.css`.
 
 The remaining files make it possible to load only parts of the whole library.
 
@@ -61,7 +61,7 @@
 Issue tracker
 -
 
-Found a bug or missing feature? Please report it in the [issue 
tracker](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=PHID-PROJ-dgmoevjqeqlerleqzzx5)!
+Found a bug or missing feature? Please report it in our [issue tracker 
Phabricator](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=PHID-PROJ-dgmoevjqeqlerleqzzx5)!
 
 
 Contributing
@@ -69,7 +69,7 @@
 
 We are always delighted when people contribute patches. We recommend a few 
things to make it quicker and easier for you to contribute:
 
-* You will need a [wikitech 
account](https://wikitech.wikimedia.org/w/index.php?title=Special:UserLogin=Help%3AGetting+Started=signup)
 which you can use to login to [gerrit](https://gerrit.wikimedia.org/), our 
code review system.
+* You will need a [Wikitech 
account](https://wikitech.wikimedia.org/w/index.php?title=Special:UserLogin=Help%3AGetting+Started=signup)
 which you can use to login to [Gerrit](https://gerrit.wikimedia.org/), our 
code review system.
 * You will need a [Wikimedia 
account](https://www.mediawiki.org/w/index.php?title=Special:UserLogin=signup),
 which you can [use to login to 
Phabricator](https://www.mediawiki.org/w/index.php?title=Special:UserLogin=Special%3AOAuth%2Fauthorize=oauth_token%3D2fa60627878b83173e0196040b983326%26oauth_consumer_key%3D038ec949b263dc807b0079fd88538f37).
 * You should [create a Phabricator

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Add ARIA roles

2017-05-10 Thread VolkerE (Code Review)

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

Change subject: demos: Add ARIA roles
..

demos: Add ARIA roles

Adding ARIA roles `navigation` and `main` where applicable.

Change-Id: I78f1a795131f4773b8babe1c68fb2a80cba94734
---
M demos/demo.js
M demos/demos.php
M demos/pages/dialogs.js
M demos/pages/icons.js
M demos/pages/toolbars.js
M demos/pages/widgets.js
6 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/07/353207/1

diff --git a/demos/demo.js b/demos/demo.js
index 00dda5f..c392517 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -78,6 +78,7 @@
this.platformSelect.selectItemByData( this.mode.platform );
this.$menu
.addClass( 'demo-menu' )
+   .attr( 'role', 'navigation' )
.append(
this.pageDropdown.$element,
this.themeSelect.$element,
diff --git a/demos/demos.php b/demos/demos.php
index d3ba067..bd22c06 100644
--- a/demos/demos.php
+++ b/demos/demos.php
@@ -52,7 +52,7 @@
 
 

-   
+   
 true,
diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index dc34cf3..4df1924 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -321,6 +321,7 @@
framed: true
} ).$element
.addClass( 'demo-container' )
+   .attr( 'role', 'main' )
.append( $fieldsets ),
windowManager.$element
);
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index d718f7f..3ce0269 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -294,6 +294,7 @@
framed: true
} ).$element
.addClass( 'demo-container demo-icons' )
+   .attr( 'role', 'main' )
.append(
selector.$element,
indicatorsFieldset.$element,
diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js
index f31fc41..4110768 100644
--- a/demos/pages/toolbars.js
+++ b/demos/pages/toolbars.js
@@ -417,6 +417,7 @@
framed: true
} ).$element
.addClass( 'demo-container demo-toolbars' )
+   .attr( 'role', 'main' )
);
 
$containers.last().append( toolbars[ i ].$element );
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 15d3839..dd1708c 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -2550,6 +2550,7 @@
framed: true
} ).$element
.addClass( 'demo-container' )
+   .attr( 'role', 'main' )
.append(
$( fieldsets.map( function ( fieldset ) { 
return fieldset.$element[ 0 ]; } ) )
)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Add tooltip to saved links items

2017-05-10 Thread Catrope (Code Review)

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

Change subject: RCFilters UI: Add tooltip to saved links items
..

RCFilters UI: Add tooltip to saved links items

Bug: T164861
Change-Id: Ic7c38c59c53d4d83b959eff36d4b1d198bb654ea
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/353205/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
index 51b348e..44b48b8 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
@@ -5,6 +5,7 @@
 * @extends OO.ui.Widget
 * @mixins OO.ui.mixin.LabelElement
 * @mixins OO.ui.mixin.IconElement
+* @mixins OO.ui.mixin.TitledElement
 *
 * @constructor
 * @param {mw.rcfilters.dm.SavedQueryItemModel} model View model
@@ -27,6 +28,9 @@
}, config ) );
OO.ui.mixin.IconElement.call( this, $.extend( {
icon: ''
+   }, config ) );
+   OO.ui.mixin.TitledElement.call( this, $.extend( {
+   title: this.model.getLabel()
}, config ) );
 
this.edit = false;
@@ -126,6 +130,7 @@
OO.inheritClass( mw.rcfilters.ui.SavedLinksListItemWidget, OO.ui.Widget 
);
OO.mixinClass( mw.rcfilters.ui.SavedLinksListItemWidget, 
OO.ui.mixin.LabelElement );
OO.mixinClass( mw.rcfilters.ui.SavedLinksListItemWidget, 
OO.ui.mixin.IconElement );
+   OO.mixinClass( mw.rcfilters.ui.SavedLinksListItemWidget, 
OO.ui.mixin.TitledElement );
 
/* Events */
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7c38c59c53d4d83b959eff36d4b1d198bb654ea
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/core[master]: RCFilters UI: Don't remove removed saved links twice

2017-05-10 Thread Catrope (Code Review)

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

Change subject: RCFilters UI: Don't remove removed saved links twice
..

RCFilters UI: Don't remove removed saved links twice

The second removal also didn't remove the right thing.

Change-Id: Iab32ae2e19e2b19995b88fbfd2e84a36dbda1bac
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/353203/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 9ae1d34..40186aa 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
@@ -86,7 +86,6 @@
 */
mw.rcfilters.ui.SavedLinksListWidget.prototype.onMenuItemRemove = 
function ( item ) {
this.controller.removeSavedQuery( item.getID() );
-   this.menu.removeItems( [ item ] );
};
 
/**
@@ -131,7 +130,7 @@
 * @param {mw.rcfilters.ui.SavedLinksListItemWidget} item Menu item
 */
mw.rcfilters.ui.SavedLinksListWidget.prototype.onModelRemoveItem = 
function ( item ) {
-   this.menu.removeItems( [ this.model.getItemByID( item.getID() ) 
] );
+   this.menu.removeItems( [ this.menu.getItemFromData( 
item.getID() ) ] );
this.button.toggle( !this.menu.isEmpty() );
};
 }( mediaWiki ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab32ae2e19e2b19995b88fbfd2e84a36dbda1bac
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/core[master]: RCFilters UI: Add down indicator to SavedLnksListWidget button

2017-05-10 Thread Catrope (Code Review)

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

Change subject: RCFilters UI: Add down indicator to SavedLnksListWidget button
..

RCFilters UI: Add down indicator to SavedLnksListWidget button

Bug: T164861
Change-Id: I23c602e9bcfbbe8f39f3e3efc4a5482490699214
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/353204/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 40186aa..3f701ea 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
@@ -30,6 +30,7 @@
classes: [ 
'mw-rcfilters-ui-savedLinksListWidget-button' ],
label: mw.msg( 'rcfilters-quickfilters' ),
icon: 'unClip',
+   indicator: 'down',
$overlay: this.$overlay,
popup: {
width: 300,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23c602e9bcfbbe8f39f3e3efc4a5482490699214
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/core[master]: RCFilters UI: Add a placeholder to SavedLinksListWidget when...

2017-05-10 Thread Catrope (Code Review)

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

Change subject: RCFilters UI: Add a placeholder to SavedLinksListWidget when 
it's empty
..

RCFilters UI: Add a placeholder to SavedLinksListWidget when it's empty

No longer hide the button when the menu is empty, but instead
show the placeholder item when the *model* is empty.

Bug: T164861
Change-Id: I96e5e375de5f35946663042f6731d7b69e53308b
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
5 files changed, 26 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/353206/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 05164df..8f15d5d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1366,6 +1366,7 @@
"recentchanges-submit": "Show",
"rcfilters-activefilters": "Active filters",
"rcfilters-quickfilters": "Quick links",
+   "rcfilters-quickfilters-placeholder": "Save your favorite tool settings 
to re-use them later.",
"rcfilters-savedqueries-defaultlabel": "Saved filters",
"rcfilters-savedqueries-rename": "Rename",
"rcfilters-savedqueries-setdefault": "Set as default",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 0234d24..9e83fd4 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1554,6 +1554,7 @@
"recentchanges-submit": "Label for submit button in 
[[Special:RecentChanges]]\n{{Identical|Show}}",
"rcfilters-activefilters": "Title for the filters selection showing the 
active filters.",
"rcfilters-quickfilters": "Label for the button that opens the quick 
filters menu in [[Special:RecentChanges]]",
+   "rcfilters-quickfilters-placeholder": "Text shown in the quick filters 
menu on [[Special:RecentChanges]] if the user has not saved any quick filters.",
"rcfilters-savedqueries-defaultlabel": "Default name for saving a new 
set of quick filters [[Special:RecentChanges]]",
"rcfilters-savedqueries-rename": "Label for the menu option that edits 
a quick filter in [[Special:RecentChanges]]\n{{Identical|Rename}}",
"rcfilters-savedqueries-setdefault": "Label for the menu option that 
sets a quick filter as default in [[Special:RecentChanges]]",
diff --git a/resources/Resources.php b/resources/Resources.php
index e8c8f61..ad83632 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1803,6 +1803,7 @@
'messages' => [
'rcfilters-activefilters',
'rcfilters-quickfilters',
+   'rcfilters-quickfilters-placeholder',
'rcfilters-savedqueries-defaultlabel',
'rcfilters-savedqueries-rename',
'rcfilters-savedqueries-setdefault',
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListWidget.less
index e1e55a7..5bda034 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListWidget.less
@@ -4,4 +4,17 @@
&-menu {
width: 100%;
}
+
+   &-placeholder {
+   // Extra specificity needed to override OOUI rule that sets 
white-space: nowrap;
+   // on labels inside options
+   &.oo-ui-optionWidget .oo-ui-labelElement-label {
+   color: #72777d;
+   white-space: normal;
+   }
+
+   .oo-ui-iconElement-icon {
+   opacity: 0.5;
+   }
+   }
 }
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 3f701ea..91c05b2 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
@@ -20,11 +20,17 @@
this.model = model;
this.$overlay = config.$overlay || this.$element;
 
+   this.placeholderItem = new OO.ui.DecoratedOptionWidget( {
+   classes: [ 
'mw-rcfilters-ui-savedLinksListWidget-placeholder' ],
+   label: mw.msg( 'rcfilters-quickfilters-placeholder' ),
+   icon: 'unClip'
+   } );
// The only reason we're using "ButtonGroupWidget" here is that
// straight-out "GroupWidget" is a mixin and cannot be 
initialized

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.1

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: group1 wikis to 1.30.0-wmf.1
..


group1 wikis to 1.30.0-wmf.1

Change-Id: I494a65d390500b8f10b5b42de425c5e19779ac17
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index d9f4bc0..8d7dfcc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.21",
-"aawikibooks": "php-1.29.0-wmf.21",
-"aawiktionary": "php-1.29.0-wmf.21",
+"aawikibooks": "php-1.30.0-wmf.1",
+"aawiktionary": "php-1.30.0-wmf.1",
 "abwiki": "php-1.29.0-wmf.21",
-"abwiktionary": "php-1.29.0-wmf.21",
+"abwiktionary": "php-1.30.0-wmf.1",
 "acewiki": "php-1.29.0-wmf.21",
-"advisorywiki": "php-1.29.0-wmf.21",
+"advisorywiki": "php-1.30.0-wmf.1",
 "adywiki": "php-1.29.0-wmf.21",
 "afwiki": "php-1.29.0-wmf.21",
-"afwikibooks": "php-1.29.0-wmf.21",
-"afwikiquote": "php-1.29.0-wmf.21",
-"afwiktionary": "php-1.29.0-wmf.21",
+"afwikibooks": "php-1.30.0-wmf.1",
+"afwikiquote": "php-1.30.0-wmf.1",
+"afwiktionary": "php-1.30.0-wmf.1",
 "akwiki": "php-1.29.0-wmf.21",
-"akwikibooks": "php-1.29.0-wmf.21",
-"akwiktionary": "php-1.29.0-wmf.21",
+"akwikibooks": "php-1.30.0-wmf.1",
+"akwiktionary": "php-1.30.0-wmf.1",
 "alswiki": "php-1.29.0-wmf.21",
-"alswikibooks": "php-1.29.0-wmf.21",
-"alswikiquote": "php-1.29.0-wmf.21",
-"alswiktionary": "php-1.29.0-wmf.21",
+"alswikibooks": "php-1.30.0-wmf.1",
+"alswikiquote": "php-1.30.0-wmf.1",
+"alswiktionary": "php-1.30.0-wmf.1",
 "amwiki": "php-1.29.0-wmf.21",
-"amwikiquote": "php-1.29.0-wmf.21",
-"amwiktionary": "php-1.29.0-wmf.21",
+"amwikiquote": "php-1.30.0-wmf.1",
+"amwiktionary": "php-1.30.0-wmf.1",
 "angwiki": "php-1.29.0-wmf.21",
-"angwikibooks": "php-1.29.0-wmf.21",
-"angwikiquote": "php-1.29.0-wmf.21",
-"angwikisource": "php-1.29.0-wmf.21",
-"angwiktionary": "php-1.29.0-wmf.21",
+"angwikibooks": "php-1.30.0-wmf.1",
+"angwikiquote": "php-1.30.0-wmf.1",
+"angwikisource": "php-1.30.0-wmf.1",
+"angwiktionary": "php-1.30.0-wmf.1",
 "anwiki": "php-1.29.0-wmf.21",
-"anwiktionary": "php-1.29.0-wmf.21",
+"anwiktionary": "php-1.30.0-wmf.1",
 "arbcom_cswiki": "php-1.29.0-wmf.21",
 "arbcom_dewiki": "php-1.29.0-wmf.21",
 "arbcom_enwiki": "php-1.29.0-wmf.21",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.21",
 "arcwiki": "php-1.29.0-wmf.21",
 "arwiki": "php-1.29.0-wmf.21",
-"arwikibooks": "php-1.29.0-wmf.21",
-"arwikimedia": "php-1.29.0-wmf.21",
-"arwikinews": "php-1.29.0-wmf.21",
-"arwikiquote": "php-1.29.0-wmf.21",
-"arwikisource": "php-1.29.0-wmf.21",
-"arwikiversity": "php-1.29.0-wmf.21",
-"arwiktionary": "php-1.29.0-wmf.21",
+"arwikibooks": "php-1.30.0-wmf.1",
+"arwikimedia": "php-1.30.0-wmf.1",
+"arwikinews": "php-1.30.0-wmf.1",
+"arwikiquote": "php-1.30.0-wmf.1",
+"arwikisource": "php-1.30.0-wmf.1",
+"arwikiversity": "php-1.30.0-wmf.1",
+"arwiktionary": "php-1.30.0-wmf.1",
 "arzwiki": "php-1.29.0-wmf.21",
 "astwiki": "php-1.29.0-wmf.21",
-"astwikibooks": "php-1.29.0-wmf.21",
-"astwikiquote": "php-1.29.0-wmf.21",
-"astwiktionary": "php-1.29.0-wmf.21",
+"astwikibooks": "php-1.30.0-wmf.1",
+"astwikiquote": "php-1.30.0-wmf.1",
+"astwiktionary": "php-1.30.0-wmf.1",
 "aswiki": "php-1.29.0-wmf.21",
-"aswikibooks": "php-1.29.0-wmf.21",
-"aswikisource": "php-1.29.0-wmf.21",
-"aswiktionary": "php-1.29.0-wmf.21",
-"auditcomwiki": "php-1.29.0-wmf.21",
+"aswikibooks": "php-1.30.0-wmf.1",
+"aswikisource": "php-1.30.0-wmf.1",
+"aswiktionary": "php-1.30.0-wmf.1",
+"auditcomwiki": "php-1.30.0-wmf.1",
 "avwiki": "php-1.29.0-wmf.21",
-"avwiktionary": "php-1.29.0-wmf.21",
+"avwiktionary": "php-1.30.0-wmf.1",
 "aywiki": "php-1.29.0-wmf.21",
-"aywikibooks": "php-1.29.0-wmf.21",
-"aywiktionary": "php-1.29.0-wmf.21",
+"aywikibooks": "php-1.30.0-wmf.1",
+"aywiktionary": "php-1.30.0-wmf.1",
 "azbwiki": "php-1.29.0-wmf.21",
 "azwiki": "php-1.29.0-wmf.21",
-"azwikibooks": "php-1.29.0-wmf.21",
-"azwikiquote": "php-1.29.0-wmf.21",
-"azwikisource": "php-1.29.0-wmf.21",
-"azwiktionary": "php-1.29.0-wmf.21",
+"azwikibooks": "php-1.30.0-wmf.1",
+"azwikiquote": "php-1.30.0-wmf.1",
+"azwikisource": "php-1.30.0-wmf.1",
+"azwiktionary": "php-1.30.0-wmf.1",
 "barwiki": "php-1.29.0-wmf.21",
 "bat_smgwiki": "php-1.29.0-wmf.21",
 "bawiki": "php-1.29.0-wmf.21",
-"bawikibooks": "php-1.29.0-wmf.21",
+"bawikibooks": "php-1.30.0-wmf.1",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.1

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353202 )

Change subject: group1 wikis to 1.30.0-wmf.1
..

group1 wikis to 1.30.0-wmf.1

Change-Id: I494a65d390500b8f10b5b42de425c5e19779ac17
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index d9f4bc0..8d7dfcc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.21",
-"aawikibooks": "php-1.29.0-wmf.21",
-"aawiktionary": "php-1.29.0-wmf.21",
+"aawikibooks": "php-1.30.0-wmf.1",
+"aawiktionary": "php-1.30.0-wmf.1",
 "abwiki": "php-1.29.0-wmf.21",
-"abwiktionary": "php-1.29.0-wmf.21",
+"abwiktionary": "php-1.30.0-wmf.1",
 "acewiki": "php-1.29.0-wmf.21",
-"advisorywiki": "php-1.29.0-wmf.21",
+"advisorywiki": "php-1.30.0-wmf.1",
 "adywiki": "php-1.29.0-wmf.21",
 "afwiki": "php-1.29.0-wmf.21",
-"afwikibooks": "php-1.29.0-wmf.21",
-"afwikiquote": "php-1.29.0-wmf.21",
-"afwiktionary": "php-1.29.0-wmf.21",
+"afwikibooks": "php-1.30.0-wmf.1",
+"afwikiquote": "php-1.30.0-wmf.1",
+"afwiktionary": "php-1.30.0-wmf.1",
 "akwiki": "php-1.29.0-wmf.21",
-"akwikibooks": "php-1.29.0-wmf.21",
-"akwiktionary": "php-1.29.0-wmf.21",
+"akwikibooks": "php-1.30.0-wmf.1",
+"akwiktionary": "php-1.30.0-wmf.1",
 "alswiki": "php-1.29.0-wmf.21",
-"alswikibooks": "php-1.29.0-wmf.21",
-"alswikiquote": "php-1.29.0-wmf.21",
-"alswiktionary": "php-1.29.0-wmf.21",
+"alswikibooks": "php-1.30.0-wmf.1",
+"alswikiquote": "php-1.30.0-wmf.1",
+"alswiktionary": "php-1.30.0-wmf.1",
 "amwiki": "php-1.29.0-wmf.21",
-"amwikiquote": "php-1.29.0-wmf.21",
-"amwiktionary": "php-1.29.0-wmf.21",
+"amwikiquote": "php-1.30.0-wmf.1",
+"amwiktionary": "php-1.30.0-wmf.1",
 "angwiki": "php-1.29.0-wmf.21",
-"angwikibooks": "php-1.29.0-wmf.21",
-"angwikiquote": "php-1.29.0-wmf.21",
-"angwikisource": "php-1.29.0-wmf.21",
-"angwiktionary": "php-1.29.0-wmf.21",
+"angwikibooks": "php-1.30.0-wmf.1",
+"angwikiquote": "php-1.30.0-wmf.1",
+"angwikisource": "php-1.30.0-wmf.1",
+"angwiktionary": "php-1.30.0-wmf.1",
 "anwiki": "php-1.29.0-wmf.21",
-"anwiktionary": "php-1.29.0-wmf.21",
+"anwiktionary": "php-1.30.0-wmf.1",
 "arbcom_cswiki": "php-1.29.0-wmf.21",
 "arbcom_dewiki": "php-1.29.0-wmf.21",
 "arbcom_enwiki": "php-1.29.0-wmf.21",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.21",
 "arcwiki": "php-1.29.0-wmf.21",
 "arwiki": "php-1.29.0-wmf.21",
-"arwikibooks": "php-1.29.0-wmf.21",
-"arwikimedia": "php-1.29.0-wmf.21",
-"arwikinews": "php-1.29.0-wmf.21",
-"arwikiquote": "php-1.29.0-wmf.21",
-"arwikisource": "php-1.29.0-wmf.21",
-"arwikiversity": "php-1.29.0-wmf.21",
-"arwiktionary": "php-1.29.0-wmf.21",
+"arwikibooks": "php-1.30.0-wmf.1",
+"arwikimedia": "php-1.30.0-wmf.1",
+"arwikinews": "php-1.30.0-wmf.1",
+"arwikiquote": "php-1.30.0-wmf.1",
+"arwikisource": "php-1.30.0-wmf.1",
+"arwikiversity": "php-1.30.0-wmf.1",
+"arwiktionary": "php-1.30.0-wmf.1",
 "arzwiki": "php-1.29.0-wmf.21",
 "astwiki": "php-1.29.0-wmf.21",
-"astwikibooks": "php-1.29.0-wmf.21",
-"astwikiquote": "php-1.29.0-wmf.21",
-"astwiktionary": "php-1.29.0-wmf.21",
+"astwikibooks": "php-1.30.0-wmf.1",
+"astwikiquote": "php-1.30.0-wmf.1",
+"astwiktionary": "php-1.30.0-wmf.1",
 "aswiki": "php-1.29.0-wmf.21",
-"aswikibooks": "php-1.29.0-wmf.21",
-"aswikisource": "php-1.29.0-wmf.21",
-"aswiktionary": "php-1.29.0-wmf.21",
-"auditcomwiki": "php-1.29.0-wmf.21",
+"aswikibooks": "php-1.30.0-wmf.1",
+"aswikisource": "php-1.30.0-wmf.1",
+"aswiktionary": "php-1.30.0-wmf.1",
+"auditcomwiki": "php-1.30.0-wmf.1",
 "avwiki": "php-1.29.0-wmf.21",
-"avwiktionary": "php-1.29.0-wmf.21",
+"avwiktionary": "php-1.30.0-wmf.1",
 "aywiki": "php-1.29.0-wmf.21",
-"aywikibooks": "php-1.29.0-wmf.21",
-"aywiktionary": "php-1.29.0-wmf.21",
+"aywikibooks": "php-1.30.0-wmf.1",
+"aywiktionary": "php-1.30.0-wmf.1",
 "azbwiki": "php-1.29.0-wmf.21",
 "azwiki": "php-1.29.0-wmf.21",
-"azwikibooks": "php-1.29.0-wmf.21",
-"azwikiquote": "php-1.29.0-wmf.21",
-"azwikisource": "php-1.29.0-wmf.21",
-"azwiktionary": "php-1.29.0-wmf.21",
+"azwikibooks": "php-1.30.0-wmf.1",
+"azwikiquote": "php-1.30.0-wmf.1",
+"azwikisource": "php-1.30.0-wmf.1",
+"azwiktionary": "php-1.30.0-wmf.1",
 "barwiki": "php-1.29.0-wmf.21",
 "bat_smgwiki": "php-1.29.0-wmf.21",
 "bawiki": "php-1.29.0-wmf.21",
-"bawikibooks": "php-1.29.0-wmf.21",
+"bawikibooks":

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Fix minor whitespace issue

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: build: Fix minor whitespace issue
..


build: Fix minor whitespace issue

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

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



diff --git a/package.json b/package.json
index 9e3957d..2baec1a 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
 "karma-coverage": "1.1.0",
 "karma-firefox-launcher": "1.0.0",
 "karma-qunit": "1.1.0",
-   "karma-remap-istanbul": "0.6.0",
+"karma-remap-istanbul": "0.6.0",
 "q": "1.4.1",
 "qunitjs": "1.22.0",
 "stylelint": "7.8.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c51a8a04116f4b65041d2f90e58f6ee0b9a7a7b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
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...Popups[master]: Hygiene: Make webpack.config.js conform to eslint

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Make webpack.config.js conform to eslint
..


Hygiene: Make webpack.config.js conform to eslint

Bug: T160061
Change-Id: I81ccdb34108660b7f3637d6cb17aa4e3a84c68f5
---
M webpack.config.js
1 file changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/webpack.config.js b/webpack.config.js
index 444e078..2478723 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,8 @@
-var path = require( 'path' );
-var webpack = require( 'webpack' );
-var PUBLIC_PATH = '/w/extensions/Popups';
+/* global __dirname */
+
+var path = require( 'path' ),
+   webpack = require( 'webpack' ),
+   PUBLIC_PATH = '/w/extensions/Popups';
 
 module.exports = {
output: {
@@ -18,8 +20,8 @@
devtool: 'source-map',
resolve: {
alias: {
-   redux: path.resolve(__dirname, 
'node_modules/redux/dist/redux.js'),
-   'redux-thunk': path.resolve(__dirname, 
'node_modules/redux-thunk/dist/redux-thunk.js')
+   redux: path.resolve( __dirname, 
'node_modules/redux/dist/redux.js' ),
+   'redux-thunk': path.resolve( __dirname, 
'node_modules/redux-thunk/dist/redux-thunk.js' )
}
},
plugins: [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81ccdb34108660b7f3637d6cb17aa4e3a84c68f5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
Gerrit-Reviewer: Bmansurov 
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] Add 'displayGroup' concept and namespace view to RCFil...

2017-05-10 Thread Mooeypoo (Code Review)

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

Change subject: [wip] Add 'displayGroup' concept and namespace view to RCFilters
..

[wip] Add 'displayGroup' concept and namespace view to RCFilters

Change-Id: I7e83f0800cbeb289dfd3461c1c5a197c053147ca
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
6 files changed, 95 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/353201/1

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 22b2619..49e06ce 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -9,6 +9,8 @@
 * @param {string} name Group name
 * @param {Object} [config] Configuration options
 * @cfg {string} [type='send_unselected_if_any'] Group type
+* @cfg {string} [displayGroup='default'] Name of the display group 
this group
+*  is a part of.
 * @cfg {string} [title] Group title
 * @cfg {string} [separator='|'] Value separator for 'string_options' 
groups
 * @cfg {boolean} [active] Group is active
@@ -29,6 +31,7 @@
 
this.name = name;
this.type = config.type || 'send_unselected_if_any';
+   this.displayGroup = config.displayGroup || 'default';
this.title = config.title;
this.separator = config.separator || '|';
 
@@ -532,6 +535,15 @@
};
 
/**
+* Get display group
+*
+* @return {string} Display group
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.getDisplayGroup = function () {
+   return this.displayGroup;
+   };
+
+   /**
 * Get the prefix used for the filter names inside this group.
 *
 * @param {string} [name] Filter name to prefix
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 88ce33c..d78c0e4 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -191,10 +191,11 @@
 *
 * @param {Array} filters Filter group definition
 */
-   mw.rcfilters.dm.FiltersViewModel.prototype.initializeFilters = function 
( filters ) {
+   mw.rcfilters.dm.FiltersViewModel.prototype.initializeFilters = function 
( filters, namespaces ) {
var filterItem, filterConflictResult, groupConflictResult,
model = this,
items = [],
+   namespaceDefinition = [],
groupConflictMap = {},
filterConflictMap = {},
/*!
@@ -259,6 +260,7 @@
this.clearItems();
this.groups = {};
 
+   // Filters
filters.forEach( function ( data ) {
var i,
group = data.name;
@@ -295,9 +297,30 @@
}
} );
 
+   // Namespaces group
+   $.each( namespaces, function ( namespaceID, label ) {
+   // Build definition
+   namespaceDefinition.push( {
+   name: namespaceID,
+   label: label,
+   description: ''
+   } );
+   } );
+
+   // Add the group
+   model.groups.namespaces = new mw.rcfilters.dm.FilterGroup( 
'namespaces', {
+   type: 'string_options',
+   displayGroup: 'namespaces',
+   title: mw.msg( 'namespace' ),
+   separator: ':',
+   fullCoverage: true
+   } );
+   // Add namespace items to group
+   model.groups.namespaces.initializeFilters( namespaceDefinition 
);
+   items = items.concat( model.groups.namespaces.getItems() );
+
// Add item references to the model, for lookup
this.addItems( items );
-
// Expand conflicts
groupConflictResult = expandConflictDefinitions( 
groupConflictMap );

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Fix minor whitespace issue

2017-05-10 Thread VolkerE (Code Review)

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

Change subject: build: Fix minor whitespace issue
..

build: Fix minor whitespace issue

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


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/00/353200/1

diff --git a/package.json b/package.json
index 9e3957d..2baec1a 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
 "karma-coverage": "1.1.0",
 "karma-firefox-launcher": "1.0.0",
 "karma-qunit": "1.1.0",
-   "karma-remap-istanbul": "0.6.0",
+"karma-remap-istanbul": "0.6.0",
 "q": "1.4.1",
 "qunitjs": "1.22.0",
 "stylelint": "7.8.0",

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Separate two active ToggleButton siblings v...

2017-05-10 Thread VolkerE (Code Review)

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

Change subject: MediaWiki theme: Separate two active ToggleButton siblings 
visually
..

MediaWiki theme: Separate two active ToggleButton siblings visually

Change-Id: Ic498b724743ba097c688c36d7f8ef58532a53857
---
M src/themes/mediawiki/widgets.less
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/99/353199/1

diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 8f29b9b..273e529 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -50,7 +50,6 @@
// Identical to .theme-oo-ui-buttonSelectWidget, except for the 
`:focus` selector.
&.oo-ui-widget-enabled {
.oo-ui-buttonElement {
-   &.oo-ui-widget-enabled > 
.oo-ui-buttonElement-button:hover,
&.oo-ui-widget-enabled > 
.oo-ui-buttonElement-button:active {
z-index: 1;
}
@@ -66,6 +65,14 @@
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
z-index: -1;
}
+
+   &.oo-ui-toggleWidget-on + .oo-ui-toggleWidget-on {
+   > .oo-ui-buttonElement-button,
+   > .oo-ui-buttonElement-button:active {
+   border-left-color: 
@border-color-disabled-filled; // Using `@border-color-disabled-filled` here 
similar to `.oo-ui-widget-disabled` above
+   z-index: 3;
+   }
+   }
}
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix usage of $db->nextSequenceValue()

2017-05-10 Thread Tim Starling (Code Review)

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

Change subject: Fix usage of $db->nextSequenceValue()
..

Fix usage of $db->nextSequenceValue()

The return value from the method is only suitable for passing to
$db->insert(). To get the inserted ID, you need to call $db->insertId()
even if $db->nextSequenceValue() returned non-null.

Change-Id: Id5a0df17c77445e9f29564a55fb850c3ecad2630
---
M includes/AbuseFilter.class.php
1 file changed, 1 insertion(+), 4 deletions(-)


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

diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 5ce7337..c531e96 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -1118,10 +1118,7 @@
$data['afl_var_dump'] = $var_dump;
$data['afl_id'] = $dbw->nextSequenceValue( 
'abuse_filter_log_afl_id_seq' );
$dbw->insert( 'abuse_filter_log', $data, __METHOD__ );
-   $local_log_ids[] = $dbw->insertId();
-   if ( $data['afl_id'] === null ) {
-   $data['afl_id'] = $dbw->insertId();
-   }
+   $local_log_ids[] = $data['afl_id'] = $dbw->insertId();
// Give grep a chance to find the usages:
// logentry-abusefilter-hit
$entry = new ManualLogEntry( 'abusefilter', 'hit' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a0df17c77445e9f29564a55fb850c3ecad2630
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
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]: Fix usage of $db->nextSequenceValue()

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix usage of $db->nextSequenceValue()
..


Fix usage of $db->nextSequenceValue()

The return value from the method is only suitable for passing to
$db->insert(). To get the inserted ID, you need to call $db->insertId()
even if $db->nextSequenceValue() returned non-null.

Bug: T164900
Change-Id: I6beb6243ccb9425372623307ef23ae6571ce8c0d
---
M includes/Revision.php
M includes/logging/LogEntry.php
M includes/logging/LogPage.php
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/includes/Revision.php b/includes/Revision.php
index b20f843..c3782ba 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1496,7 +1496,10 @@
 
$dbw->insert( 'revision', $row, __METHOD__ );
 
-   $this->mId = $rev_id !== null ? $rev_id : $dbw->insertId();
+   if ( $this->mId === null ) {
+   // Only if nextSequenceValue() was called
+   $this->mId = $dbw->insertId();
+   }
 
// Assertion to try to catch T92046
if ( (int)$this->mId === 0 ) {
diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 1c5899b..e7095f0 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -634,7 +634,7 @@
}
 
$dbw->insert( 'logging', $data, __METHOD__ );
-   $this->id = !is_null( $id ) ? $id : $dbw->insertId();
+   $this->id = $dbw->insertId();
 
$rows = [];
foreach ( $relations as $tag => $values ) {
diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 64102b7..f2b1670 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -110,7 +110,7 @@
'log_params' => $this->params
];
$dbw->insert( 'logging', $data, __METHOD__ );
-   $newId = !is_null( $log_id ) ? $log_id : $dbw->insertId();
+   $newId = $dbw->insertId();
 
# And update recentchanges
if ( $this->updateRecentChanges ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6beb6243ccb9425372623307ef23ae6571ce8c0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kafkatee: use logrotate::conf for logrotate

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: kafkatee: use logrotate::conf for logrotate
..


kafkatee: use logrotate::conf for logrotate

Part of a general cleanup to use logrotate::conf
all over the repo where we have /etc/logrotate.d snippets.

Tested on oxygen.eqiad.wmnet.

Change-Id: I90e08609701430e229db5a84b22bf10f5e6735fd
---
M modules/role/manifests/logging/kafkatee/webrequest/base.pp
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/modules/role/manifests/logging/kafkatee/webrequest/base.pp 
b/modules/role/manifests/logging/kafkatee/webrequest/base.pp
index 7806ea4..ac99322 100644
--- a/modules/role/manifests/logging/kafkatee/webrequest/base.pp
+++ b/modules/role/manifests/logging/kafkatee/webrequest/base.pp
@@ -75,10 +75,8 @@
 
 # if the logs in $log_directory should be rotated
 # then configure a logrotate.d script to do so.
-file { '/etc/logrotate.d/kafkatee-webrequest':
-mode=> '0444',
-owner   => 'root',
-group   => 'root',
+logrotate::conf { 'kafkatee-webrequest':
+ensure  => 'present',
 content => template('role/logging/kafkatee_logrotate.erb'),
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90e08609701430e229db5a84b22bf10f5e6735fd
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: consistent quoting for role names

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: site.pp: consistent quoting for role names
..


site.pp: consistent quoting for role names

Change-Id: I7c267e233d5a93fd4178ec180ba5a158f2b8ea7e
---
M manifests/site.pp
1 file changed, 6 insertions(+), 7 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a88df60..de9a00e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -187,7 +187,7 @@
 
 # VM with webserver for misc. static sites
 node 'bromine.eqiad.wmnet' {
-role('webserver_misc_static')
+role(webserver_misc_static)
 }
 
 # Californium hosts openstack-dashboard AKA horizon
@@ -218,7 +218,7 @@
 
 # All gerrit servers (swap master status in hiera)
 node 'cobalt.wikimedia.org', 'gerrit2001.wikimedia.org' {
-role('gerrit::server')
+role(gerrit::server)
 
 interface::add_ip6_mapped { 'main': }
 }
@@ -2332,7 +2332,7 @@
 
 # virtual machines hosting 
https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org
 node /^planet[12]001\.(eqiad|codfw)\.wmnet$/ {
-role('planet_server')
+role(planet_server)
 }
 
 # LDAP servers relied on by OIT for mail
@@ -2401,7 +2401,7 @@
 
 # Tor relay
 node 'radium.wikimedia.org' {
-role('tor_relay')
+role(tor_relay)
 }
 
 node 'radon.wikimedia.org' {
@@ -2662,7 +2662,7 @@
 
 # mediawiki maintenance servers (https://wikitech.wikimedia.org/wiki/Terbium)
 node 'terbium.eqiad.wmnet', 'wasat.codfw.wmnet' {
-role('mediawiki_maintenance')
+role(mediawiki_maintenance)
 }
 
 # Thumbor servers for MediaWiki image scaling
@@ -2685,7 +2685,7 @@
 
 # replaced magnesium (RT) (T119112 T123713)
 node 'ununpentium.wikimedia.org' {
-role('requesttracker_server')
+role(requesttracker_server)
 }
 
 # Ganglia Web UI
@@ -2734,7 +2734,6 @@
 # T138650 - tools for the security team
 node 'zosma.codfw.wmnet' {
 role(security::tools)
-
 interface::add_ip6_mapped { 'main': interface => 'eth0', }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: hadoop: use logrotate::conf for logrotate

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: hadoop: use logrotate::conf for logrotate
..


hadoop: use logrotate::conf for logrotate

Part of a general cleanup to use logrotate::conf
all across the repo.

Compiled and checked on analytics1003.

Change-Id: I31c9c1f8367a5e3d5db249960f260449e043edf4
---
M modules/role/manifests/analytics_cluster/hadoop/balancer.pp
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/modules/role/manifests/analytics_cluster/hadoop/balancer.pp 
b/modules/role/manifests/analytics_cluster/hadoop/balancer.pp
index 9fb9b0d..b250022 100644
--- a/modules/role/manifests/analytics_cluster/hadoop/balancer.pp
+++ b/modules/role/manifests/analytics_cluster/hadoop/balancer.pp
@@ -11,11 +11,9 @@
 }
 
 # logrotate HDFS balancer's log files
-file { '/etc/logrotate.d/hdfs_balancer':
+logrotate::conf { 'hdfs_balancer':
+ensure => 'present',
 source => 
'puppet:///modules/role/analytics_cluster/hadoop/hadoop_hdfs.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 }
 
 cron { 'hdfs-balancer':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31c9c1f8367a5e3d5db249960f260449e043edf4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: decom arsenic

2017-05-10 Thread RobH (Code Review)

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

Change subject: decom arsenic
..


decom arsenic

system was already moved into decom rack it seems, playing catchup on
the checklist to ensure all steps were taken.  mgmt dns removal hadn't
been done yet.

Bug:T83340
Change-Id: I9bd5bebbce16f759df4a676e1226dafde9235371
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 00f0f41..b602681 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1661,8 +1661,6 @@
 43  1H  IN PTR  wmf3418.mgmt.eqiad.wmnet.
 44  1H  IN PTR  lvs1006.mgmt.eqiad.wmnet.
 44  1H  IN PTR  wmf3419.mgmt.eqiad.wmnet.
-45  1H  IN PTR  arsenic.mgmt.eqiad.wmnet.
-45  1H  IN PTR  wmf3420.mgmt.eqiad.wmnet.
 46  1H  IN PTR  payments1004.mgmt.eqiad.wmnet.
 46  1H  IN PTR  wmf6948.mgmt.eqiad.wmnet.
 47  1H  IN PTR  payments1002.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 1df95db..739c5f9 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1958,8 +1958,6 @@
 wmf3424 1H  IN A10.65.3.49
 silver  1H  IN A10.65.3.59
 wmf3434 1H  IN A10.65.3.59
-arsenic 1H  IN A10.65.3.45
-wmf3420 1H  IN A10.65.3.45
 mw1260  1H  IN A10.65.3.60
 wmf3435 1H  IN A10.65.3.60
 niobium 1H  IN A10.65.3.53

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bd5bebbce16f759df4a676e1226dafde9235371
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: decom arsenic

2017-05-10 Thread RobH (Code Review)

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

Change subject: decom arsenic
..

decom arsenic

system was already moved into decom rack it seems, playing catchup on
the checklist to ensure all steps were taken.  mgmt dns removal hadn't
been done yet.

Bug:T83340
Change-Id: I9bd5bebbce16f759df4a676e1226dafde9235371
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/97/353197/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 00f0f41..b602681 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1661,8 +1661,6 @@
 43  1H  IN PTR  wmf3418.mgmt.eqiad.wmnet.
 44  1H  IN PTR  lvs1006.mgmt.eqiad.wmnet.
 44  1H  IN PTR  wmf3419.mgmt.eqiad.wmnet.
-45  1H  IN PTR  arsenic.mgmt.eqiad.wmnet.
-45  1H  IN PTR  wmf3420.mgmt.eqiad.wmnet.
 46  1H  IN PTR  payments1004.mgmt.eqiad.wmnet.
 46  1H  IN PTR  wmf6948.mgmt.eqiad.wmnet.
 47  1H  IN PTR  payments1002.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 1df95db..739c5f9 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1958,8 +1958,6 @@
 wmf3424 1H  IN A10.65.3.49
 silver  1H  IN A10.65.3.59
 wmf3434 1H  IN A10.65.3.59
-arsenic 1H  IN A10.65.3.45
-wmf3420 1H  IN A10.65.3.45
 mw1260  1H  IN A10.65.3.60
 wmf3435 1H  IN A10.65.3.60
 niobium 1H  IN A10.65.3.53

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dynamicproxy: use logrotate::conf for logrotate

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: dynamicproxy: use logrotate::conf for logrotate
..


dynamicproxy: use logrotate::conf for logrotate

Change-Id: I80c36606536463af15e6814dc07e90e1c21cc8c1
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index 09c4ae6..adfdfe4 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -64,11 +64,8 @@
 variant => 'extras',
 }
 
-file { '/etc/logrotate.d/nginx':
+logrotate::conf { 'nginx':
 ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 source => 'puppet:///modules/dynamicproxy/logrotate',
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80c36606536463af15e6814dc07e90e1c21cc8c1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.29.0-wmf.21]: Remove Finnish text from en-gb.json

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove Finnish text from en-gb.json
..


Remove Finnish text from en-gb.json

Change-Id: Ic19b8695674430be95ed1ac595b0afcadee2a70b
---
M i18n/en-gb.json
1 file changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/i18n/en-gb.json b/i18n/en-gb.json
index b4ac936..c653c59 100644
--- a/i18n/en-gb.json
+++ b/i18n/en-gb.json
@@ -4,12 +4,5 @@
"4shadoww"
]
},
-   "ores-beta-feature-description": "ORES on tekoäly pohjainen työkalu, 
joka merkitsee mahdollisesti haitallisia muutoksia tuoreista muutoksista, ja 
tarkkailulistalta.",
-   "ores-damaging-letter": "r",
-   "ores-damaging-title": "Tämä muutos on tarkastettava",
-   "ores-hide-nondamaging-filter": "Piilota mahdollisesti hyvät muutokset",
-   "ores-pref-damaging": "ORES herkkyys",
-   "ores-rcfilters-whats-this-link-text": "Lue lisää",
-   "ores-rcfilters-damaging-likelygood-label": "Todennäköisesti hyvä",
-   "ores-rcfilters-damaging-maybebad-label": "Ehkä ongelmia"
+   "ores-damaging-letter": "r"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic19b8695674430be95ed1ac595b0afcadee2a70b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Catrope 
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/core[master]: Check for index to exist before accessing it.

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Check for index to exist before accessing it.
..


Check for index to exist before accessing it.

This fixes "Notice: Undefined index: quality ..."

Bug: T164983
Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5822699..29f0d7c 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -205,7 +205,7 @@
// we'll also add TinyRGB profile to images lacking a 
profile, but
// only if they're not low quality (which are meant to 
save bandwith
// and we don't want to increase the filesize by adding 
a profile)
-   if ( $params['quality'] > 30 ) {
+   if ( isset( $params['quality'] ) && $params['quality'] 
> 30 ) {
$profiles[] = '-';
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.29.0-wmf.21]: Remove Finnish text from en-gb.json

2017-05-10 Thread Catrope (Code Review)

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

Change subject: Remove Finnish text from en-gb.json
..

Remove Finnish text from en-gb.json

Change-Id: Ic19b8695674430be95ed1ac595b0afcadee2a70b
---
M i18n/en-gb.json
1 file changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/96/353196/1

diff --git a/i18n/en-gb.json b/i18n/en-gb.json
index b4ac936..c653c59 100644
--- a/i18n/en-gb.json
+++ b/i18n/en-gb.json
@@ -4,12 +4,5 @@
"4shadoww"
]
},
-   "ores-beta-feature-description": "ORES on tekoäly pohjainen työkalu, 
joka merkitsee mahdollisesti haitallisia muutoksia tuoreista muutoksista, ja 
tarkkailulistalta.",
-   "ores-damaging-letter": "r",
-   "ores-damaging-title": "Tämä muutos on tarkastettava",
-   "ores-hide-nondamaging-filter": "Piilota mahdollisesti hyvät muutokset",
-   "ores-pref-damaging": "ORES herkkyys",
-   "ores-rcfilters-whats-this-link-text": "Lue lisää",
-   "ores-rcfilters-damaging-likelygood-label": "Todennäköisesti hyvä",
-   "ores-rcfilters-damaging-maybebad-label": "Ehkä ongelmia"
+   "ores-damaging-letter": "r"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic19b8695674430be95ed1ac595b0afcadee2a70b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[wmf/1.30.0-wmf.1]: i18n: Tell users they can use ISBNs

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: i18n: Tell users they can use ISBNs
..


i18n: Tell users they can use ISBNs

Bug: T145462
Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
(cherry picked from commit 5a4c9bf4adfbb0aee3697af6a25835310a690f71)
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 84d8c86..f1af274 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,7 +11,7 @@
"citoid-citefromiddialog-mode-manual": "Manual",
"citoid-citefromiddialog-mode-reuse": "Re-use",
"citoid-citefromiddialog-search": "Search",
-   "citoid-citefromiddialog-search-label": "URL, DOI or PMID",
+   "citoid-citefromiddialog-search-label": "URL, DOI, ISBN or PMC/PMID",
"citoid-citefromiddialog-search-placeholder": "e.g. 
http://www.example.com;,
"citoid-citefromiddialog-search-progress": "Searching, please wait...",
"citoid-citefromiddialog-title": "Add a citation",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0fda28c..8cbaf27 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,7 +21,7 @@
"citoid-citefromiddialog-mode-reuse": "Label of tab in citation dialog, 
used to select mode.\n{{Identical|Re-use}}",
"citoid-citefromiddialog-search": "Text for the search 
button.\n{{Identical|Search}}",
"citoid-citefromiddialog-search-label": "Label for the URL/DOI/PMID 
search field.",
-   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMID search field.",
+   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMCID/PMID/ISBN search field.",
"citoid-citefromiddialog-search-progress": "Message for when the search 
is in progress",
"citoid-citefromiddialog-title": "The title displayed on the dialog",
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: wmf/1.30.0-wmf.1
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...Citoid[wmf/1.29.0-wmf.21]: i18n: Tell users they can use ISBNs

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: i18n: Tell users they can use ISBNs
..


i18n: Tell users they can use ISBNs

Bug: T145462
Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
(cherry picked from commit 5a4c9bf4adfbb0aee3697af6a25835310a690f71)
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 84d8c86..f1af274 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,7 +11,7 @@
"citoid-citefromiddialog-mode-manual": "Manual",
"citoid-citefromiddialog-mode-reuse": "Re-use",
"citoid-citefromiddialog-search": "Search",
-   "citoid-citefromiddialog-search-label": "URL, DOI or PMID",
+   "citoid-citefromiddialog-search-label": "URL, DOI, ISBN or PMC/PMID",
"citoid-citefromiddialog-search-placeholder": "e.g. 
http://www.example.com;,
"citoid-citefromiddialog-search-progress": "Searching, please wait...",
"citoid-citefromiddialog-title": "Add a citation",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9d031db..37c9ce1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,7 +21,7 @@
"citoid-citefromiddialog-mode-reuse": "Label of tab in citation dialog, 
used to select mode.\n{{Identical|Re-use}}",
"citoid-citefromiddialog-search": "Text for the search 
button.\n{{Identical|Search}}",
"citoid-citefromiddialog-search-label": "Label for the URL/DOI/PMID 
search field.",
-   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMID search field.",
+   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMCID/PMID/ISBN search field.",
"citoid-citefromiddialog-search-progress": "Message for when the search 
is in progress",
"citoid-citefromiddialog-title": "The title displayed on the dialog",
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: wmf/1.29.0-wmf.21
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[wmf/1.30.0-wmf.1]: Track RC clicks for all users, not just logged-in users

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Track RC clicks for all users, not just logged-in users
..


Track RC clicks for all users, not just logged-in users

Bug: T164617
Change-Id: I31988e000f4565db5be3f28142509e9f176d0404
(cherry picked from commit 463c0f63615175ed2d5b3c8e2760a55b90aaf5c2)
---
M extension.json
M modules/ext.wikimediaEvents.recentChangesClicks.js
2 files changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/extension.json b/extension.json
index 6b4b8bb..14ab13a 100644
--- a/extension.json
+++ b/extension.json
@@ -147,7 +147,7 @@
"schema.RecentChangesTopLinks": {
"class": "ResourceLoaderSchemaModule",
"schema": "RecentChangesTopLinks",
-   "revision": 16699164
+   "revision": 16732249
},
"ext.wikimediaEvents": {
"scripts": [
@@ -155,7 +155,8 @@
"ext.wikimediaEvents.statsd.js",
"ext.wikimediaEvents.kartographer.js",
"ext.wikimediaEvents.readingDepth.js",
-   "ext.wikimediaEvents.geoFeatures.js"
+   "ext.wikimediaEvents.geoFeatures.js",
+   "ext.wikimediaEvents.recentChangesClicks.js"
],
"skinScripts": {
"default": [
@@ -177,8 +178,7 @@
},
"ext.wikimediaEvents.loggedin": {
"scripts": [
-   "ext.wikimediaEvents.deprecate.js",
-   "ext.wikimediaEvents.recentChangesClicks.js"
+   "ext.wikimediaEvents.deprecate.js"
],
"targets": [
"desktop",
diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index cecc1c2..7e9b461 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -107,7 +107,8 @@
 
mw.track( 'event.RecentChangesTopLinks', {
url: $link.prop( 'href' ),
-   label: $link.text()
+   label: $link.text(),
+   loggedIn: !mw.user.isAnon()
} );
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31988e000f4565db5be3f28142509e9f176d0404
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Catrope 
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] operations/mediawiki-config[master]: Enable archive search on select wikis.

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Enable archive search on select wikis.
..


Enable archive search on select wikis.

This is still behind feature flag (fuzzy=1) so nothing changes in the
default case. Indexing is not enabled yet because it needs manual index
to add mappings.

Bug: T162302
Change-Id: I0905971e29c29507cc614886c3cd5d6ed90aa28f
---
M wmf-config/InitialiseSettings.php
1 file changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ef5642e..6c06e7d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18564,11 +18564,22 @@
 'wmgCirrusSearchIndexDeletes' => [
'default' => false,
'testwiki' => true,
+   'mediawikiwiki' => true,
 ],
 
 'wmgCirrusSearchEnableArchive' => [
'default' => false,
'testwiki' => true,
+'mediawikiwiki' => true,
+'cawiki' => true,
+'itwiki' => true,
+'ruwiki' => true,
+'fawiki' => true,
+'dewiki' => true,
+'frwiki' => true,
+'plwiki' => true,
+'arwiki' => true,
+'enwiki' => true,
 ],
 
 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0905971e29c29507cc614886c3cd5d6ed90aa28f
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.1]: Check for index to exist before accessing it.

2017-05-10 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/353188 )

Change subject: Check for index to exist before accessing it.
..


Check for index to exist before accessing it.

This fixes "Notice: Undefined index: quality ..."

Bug: T164983
Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5822699..29f0d7c 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -205,7 +205,7 @@
// we'll also add TinyRGB profile to images lacking a 
profile, but
// only if they're not low quality (which are meant to 
save bandwith
// and we don't want to increase the filesize by adding 
a profile)
-   if ( $params['quality'] > 30 ) {
+   if ( isset( $params['quality'] ) && $params['quality'] 
> 30 ) {
$profiles[] = '-';
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Install php5-gimp and php7.0-gmp

2017-05-10 Thread Paladox (Code Review)

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

Change subject: contint: Install php5-gimp and php7.0-gmp
..

contint: Install php5-gimp and php7.0-gmp

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/353194/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib21412c17b3a84f3b295f9094c2edc4856901ce1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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...parsoid[master]: T153107: Fix unhandled detection of modified link content

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: T153107: Fix unhandled detection of modified link content
..


T153107: Fix unhandled detection of modified link content

* The link handler didn't detect content of newly inserted links as
  modified content. Normally, this doesn't matter since this only
  affects normalization of piped links, but in copy-paste scenarios,
  this leads to unwanted piped syntax as in the bug report.

* Added new mocha test for catching regressions.

* The blacklisted tests are valid changes.

Change-Id: I1156207540c5e7a7dbf71be2f3f599421da2cefd
---
M lib/html2wt/LinkHandler.js
M tests/mocha/regression.specs.js
M tests/parserTests-blacklist.js
3 files changed, 47 insertions(+), 3 deletions(-)

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



diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index 8e25b0b..1f0750f 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -129,9 +129,9 @@
return state.serializer.serializedAttrVal(node, 
'href').then(function(target) {
rtData.target = target;
 
-   // Check if the link content has been modified.
+   // Check if the link content has been modified or is newly 
inserted content.
// FIXME: This will only work with selser of course. Hard to 
test without selser.
-   if (DU.hasDiffMark(node, env, 'subtree-changed')) {
+   if (state.inModifiedContent || DU.hasDiffMark(node, env, 
'subtree-changed')) {
rtData.contentModified = true;
}
 
diff --git a/tests/mocha/regression.specs.js b/tests/mocha/regression.specs.js
index b167066..58f8965 100644
--- a/tests/mocha/regression.specs.js
+++ b/tests/mocha/regression.specs.js
@@ -5,6 +5,7 @@
 require('../../core-upgrade.js');
 require("chai").should();
 var ParsoidConfig = require('../../lib/config/ParsoidConfig.js').ParsoidConfig;
+var DU = require('../../lib/utils/DOMUtils.js').DOMUtils;
 var helpers = require('./test.helpers.js');
 
 // FIXME: MWParserEnvironment.getParserEnv and switchToConfig both require
@@ -16,6 +17,8 @@
return ret.doc;
});
 };
+
+var serialize = helpers.serialize.bind(null, parsoidConfig);
 
 // These are regression specs for when we fix bugs that cannot be easily
 // verified with the parser tests framework
@@ -33,4 +36,28 @@
});
});
 
+   it('should prevent regression of T153107', function() {
+   var wt = '[[Foo|bar]]';
+   return parse(wt).then(function(result) {
+   var origDOM = result.body;
+   // This is mimicking a copy/paste in an editor
+   var editedHTML = origDOM.innerHTML + 
origDOM.innerHTML.replace(/bar/, 'Foo');
+
+   // Without selser, we should see [[Foo|Foo]], since we 
only normalize
+   // for modified / new content, which requires selser 
for detection
+   return serialize(DU.parseHTML(editedHTML), null, 
{}).then(function(editedWT) {
+   editedWT.should.equal(wt + "\n\n[[Foo|Foo]]\n");
+   // With selser, we should see [[Foo]]
+   var options = {
+   useSelser: true,
+   pageSrc: wt,
+   origDOM: origDOM,
+   };
+   return serialize(DU.parseHTML(editedHTML), 
null, options).then(function(editedWT) {
+   editedWT.should.equal(wt + 
"\n\n[[Foo]]\n");
+   });
+   });
+   });
+   });
+
 });
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index b9e5405..9c7098f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1408,7 +1408,16 @@
 add("selser", "Parsoid-centric test: Whitespace in ext- and wiki-links should 
be preserved [3,4,2,2,2,0,4]", "q9c5unenvqtihpvi\n\nk8q51d5k1t7w4s4i\n\n[[Foo|  
''bar'']]\n\nl31jajvwag36jemi\n\np43tgo0r9n23ayvi\n\n[http://wp.org   
foo]\n\nwffmswrjps0pb9\n");
 add("selser", "Parsoid-centric test: Whitespace in ext- and wiki-links should 
be preserved [0,2,1,3,[[4]],3,0]", "[[Foo|  bar]]\n\ncpt8orwf0l26s9k9\n\n[[Foo| 
 ''bar'']]\n\n[http://wp.org e15bwsd59u73c8fr]\n\n[http://wp.org   ''foo'']");
 add("selser", "Parsoid-centric test: Whitespace in ext- and wiki-links should 
be preserved [3,4,4,2,2,4,0]", 
"o3awmbfvt9fnu3di\n\nj0e1avrz9scvunmi\n\npvsdo8qneqe8w7b9\n\nou4krycgek8uayvi\n\n[http://wp.org
   foo]\n\nu9e32ytur700ms4i\n\n[http://wp.org   ''foo'']");
+add("selser", "Interwiki link encoding conversion

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: mocha: update test helpers to support selser

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: mocha: update test helpers to support selser
..


mocha: update test helpers to support selser

Change-Id: Ibe43b8bed2cea60949de1dfef36ebc2a5d2065a5
---
M tests/mocha/test.helpers.js
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/tests/mocha/test.helpers.js b/tests/mocha/test.helpers.js
index e2fa325..6a210f8 100644
--- a/tests/mocha/test.helpers.js
+++ b/tests/mocha/test.helpers.js
@@ -44,7 +44,11 @@
if (pb) {
DU.applyPageBundle(doc, pb);
}
-   return env.getContentHandler().fromHTML(env, doc.body, false);
+   if (options.useSelser) {
+   env.page.src = options.pageSrc;
+   env.page.dom = options.origDOM;
+   }
+   return env.getContentHandler().fromHTML(env, doc.body, 
options.useSelser);
});
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe43b8bed2cea60949de1dfef36ebc2a5d2065a5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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]: Fix bugs serializing modified content in simple wikilink form

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix bugs serializing modified content in simple wikilink form
..


Fix bugs serializing modified content in simple wikilink form

* These bugs were exposed when I made fixes for T153107
* I am not adding new tests because once T153107 lands, regressions
  will cause selser failures.

Change-Id: I9555ec1f4e780f5f7de5c6e6f7d375344fa4fded
---
M lib/html2wt/LinkHandler.js
1 file changed, 13 insertions(+), 9 deletions(-)

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



diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index 8bf5a65..8e25b0b 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -296,10 +296,6 @@
  * Add a colon escape to a wikilink target string if needed.
  */
 var addColonEscape = function(env, linkTarget, linkData) {
-   if (linkData.target.fromsrc) {
-   return linkTarget;
-   }
-
var linkTitle = env.makeTitleFromText(linkTarget);
if ((linkTitle.getNamespace().isCategory() || 
linkTitle.getNamespace().isFile())
&& linkData.type === 'mw:WikiLink'
@@ -476,11 +472,18 @@
if (!target.modified && !linkData.contentModified) {
linkTarget = target.value.replace(/^\.\//, '');
} else {
-   escapedTgt = 
escapeLinkTarget(linkData.content.string, state);
-   if (!escapedTgt.invalidLink) {
-   linkTarget = addColonEscape(env, 
escapedTgt.linkTarget, linkData);
+   // If token has templated attrs or is a 
subpage, use target.value
+   // since content string will be drastically 
different.
+   if (DU.hasExpandedAttrsType(node) ||
+   /(^|\/)\.\.\//.test(target.value)) {
+   linkTarget = 
target.value.replace(/^\.\//, '');
} else {
-   linkTarget = escapedTgt.linkTarget;
+   escapedTgt = 
escapeLinkTarget(linkData.content.string, state);
+   if (!escapedTgt.invalidLink) {
+   linkTarget = 
addColonEscape(env, escapedTgt.linkTarget, linkData);
+   } else {
+   linkTarget = 
escapedTgt.linkTarget;
+   }
}
if (linkData.isInterwikiLang && 
!/^[:]/.test(linkTarget) &&
linkData.type !== 
'mw:PageProp/Language') {
@@ -542,7 +545,8 @@
linkTarget = escapedTgt.linkTarget;
}
 
-   if (!escapedTgt || !escapedTgt.invalidLink) {
+   // FIXME: Is the "!target.fromsrc" check 
necessary below?
+   if ((!escapedTgt || !escapedTgt.invalidLink) && 
!target.fromsrc) {
linkTarget = addColonEscape(env, 
linkTarget, linkData);
}
});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9555ec1f4e780f5f7de5c6e6f7d375344fa4fded
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: 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...Quiz[master]: Remove executable flags

2017-05-10 Thread Fomafix (Code Review)

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

Change subject: Remove executable flags
..

Remove executable flags

Performed using:
find * -executable -type f -exec chmod -x {} \;

Change-Id: I736ad4451d3246e959d694434995b8017325a572
---
M Question.php
M Quiz.class.php
M modules/ext.quiz.js
3 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/Question.php b/Question.php
old mode 100755
new mode 100644
diff --git a/Quiz.class.php b/Quiz.class.php
old mode 100755
new mode 100644
diff --git a/modules/ext.quiz.js b/modules/ext.quiz.js
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I736ad4451d3246e959d694434995b8017325a572
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid duplicate refreshCounts() updates

2017-05-10 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353192 )

Change subject: Avoid duplicate refreshCounts() updates
..

Avoid duplicate refreshCounts() updates

The refresh method uses the initialize() method, which itself
might trigger the refresh method again after the row is created.

Change-Id: I6702bebea66fcb8b94cd2e6a496e55f52fa70b69
---
M includes/Category.php
1 file changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/353192/1

diff --git a/includes/Category.php b/includes/Category.php
index 50ffeec..5c7cb8d 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -40,15 +40,19 @@
/** Counts of membership (cat_pages, cat_subcats, cat_files) */
private $mPages = null, $mSubcats = null, $mFiles = null;
 
+   const LOAD_ONLY = 0;
+   const LAZY_INIT_ROW = 1;
+
private function __construct() {
}
 
/**
 * Set up all member variables using a database query.
+* @param integer $mode
 * @throws MWException
 * @return bool True on success, false on failure.
 */
-   protected function initialize() {
+   protected function initialize( $mode = self::LOAD_ONLY ) {
if ( $this->mName === null && $this->mID === null ) {
throw new MWException( __METHOD__ . ' has both names 
and IDs null' );
} elseif ( $this->mID === null ) {
@@ -80,7 +84,7 @@
$this->mFiles = 0;
 
# If the title exists, call refreshCounts to 
add a row for it.
-   if ( $this->mTitle->exists() ) {
+   if ( $mode === self::LAZY_INIT_ROW && 
$this->mTitle->exists() ) {
DeferredUpdates::addCallableUpdate( [ 
$this, 'refreshCounts' ] );
}
 
@@ -104,7 +108,9 @@
$this->mSubcats = max( $this->mSubcats, 0 );
$this->mFiles = max( $this->mFiles, 0 );
 
-   DeferredUpdates::addCallableUpdate( [ $this, 
'refreshCounts' ] );
+   if ( $mode === self::LAZY_INIT_ROW ) {
+   DeferredUpdates::addCallableUpdate( [ $this, 
'refreshCounts' ] );
+   }
}
 
return true;
@@ -247,7 +253,7 @@
return $this->mTitle;
}
 
-   if ( !$this->initialize() ) {
+   if ( !$this->initialize( self::LAZY_INIT_ROW ) ) {
return false;
}
 
@@ -258,7 +264,7 @@
/**
 * Fetch a TitleArray of up to $limit category members, beginning after 
the
 * category sort key $offset.
-* @param int $limit
+* @param int|bool $limit
 * @param string $offset
 * @return TitleArray TitleArray object for category members.
 */
@@ -297,7 +303,7 @@
 * @return bool
 */
private function getX( $key ) {
-   if ( !$this->initialize() ) {
+   if ( !$this->initialize( self::LAZY_INIT_ROW ) ) {
return false;
}
return $this->{$key};
@@ -316,7 +322,7 @@
# If we have just a category name, find out whether there is an
# existing row. Or if we have just an ID, get the name, because
# that's what categorylinks uses.
-   if ( !$this->initialize() ) {
+   if ( !$this->initialize( self::LOAD_ONLY ) ) {
return false;
}
 
@@ -325,7 +331,7 @@
$name = __METHOD__ . ':' . md5( $this->mName );
$scopedLock = $dbw->getScopedLockAndFlush( $name, __METHOD__, 1 
);
if ( !$scopedLock ) {
-   return;
+   return false;
}
 
$dbw->startAtomic( __METHOD__ );

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webperf: Remove remnants of webperf::asset_check

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: webperf: Remove remnants of webperf::asset_check
..


webperf: Remove remnants of webperf::asset_check

Follows-up 35d45f78d7.

Bug: T164419
Change-Id: I363335dd022f36be2cfff1251be2b90defb31ca7
---
M modules/role/manifests/webperf.pp
D modules/webperf/manifests/asset_check.pp
2 files changed, 0 insertions(+), 27 deletions(-)

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



diff --git a/modules/role/manifests/webperf.pp 
b/modules/role/manifests/webperf.pp
index e2fd1a8..bf9ff72 100644
--- a/modules/role/manifests/webperf.pp
+++ b/modules/role/manifests/webperf.pp
@@ -28,7 +28,4 @@
 eventlogging_path => $eventlogging_path,
 statsd_host   => $statsd_host,
 }
-
-# TODO: Remove (T164419)
-class { '::webperf::asset_check': }
 }
diff --git a/modules/webperf/manifests/asset_check.pp 
b/modules/webperf/manifests/asset_check.pp
deleted file mode 100644
index 5a698b9..000
--- a/modules/webperf/manifests/asset_check.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# == Class: webperf::asset_check
-#
-# Remnant class to uninstall asset-check (T164419).
-#
-class webperf::asset_check {
-
-file { '/srv/webperf/asset-check.js':
-ensure => absent,
-}
-
-file { '/srv/webperf/asset-check.py':
-ensure => absent,
-}
-
-file { '/lib/systemd/system/asset-check.service':
-ensure => absent,
-}
-
-service { 'asset-check':
-ensure   => stopped,
-enable   => false,
-provider => 'systemd',
-}
-}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MagicNumberedHeadings[master]: Add .gitreview

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Add .gitreview
..


Add .gitreview

Change-Id: Idb6b009a9c5d466375fd52d88a448d12df3bb801
---
A .gitreview
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..2cc25f2
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/MagicNumberedHeadings.git
+defaultbranch=master
+defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb6b009a9c5d466375fd52d88a448d12df3bb801
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MagicNumberedHeadings
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LdapGroups[master]: Fix requires in extension.json

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix requires in extension.json
..


Fix requires in extension.json

Change-Id: I51b5e8890f6c90e3e0f15da9b1077676bead6f40
---
M extension.json
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 25e4a5f..8ba5c22 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,9 @@
"author": [
"[http://mwstake.org Mark A. Hershberger]"
],
-   "require": [ "1.26" ],
+   "requires": {
+   "MediaWiki": ">=1.26"
+   },
"url": "https://www.mediawiki.org/wiki/Extension:LdapGroups;,
"descriptionmsg": "ldapgroups-desc",
"type": "specialpage",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51b5e8890f6c90e3e0f15da9b1077676bead6f40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LdapGroups
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageNameFormula[master]: Fix requires in extension.json

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix requires in extension.json
..


Fix requires in extension.json

Remove dead entry from autoloader

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

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



diff --git a/extension.json b/extension.json
index e49bbdd..6bb6dd0 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,9 @@
"[http://mwstake.org Mark A. Hershberger]"
],
"url": "https://www.mediawiki.org/wiki/Extension:PageNameFormula;,
-   "require": [ "1.28" ],
+   "requires": {
+   "MediaWiki": ">=1.28"
+   },
"descriptionmsg": "pagenameformula-desc",
"type": "parserhook",
"MessagesDirs": {
@@ -18,7 +20,6 @@
"PageNameFormulaMagic": "src/i18n/Magic.php"
},
"AutoloadClasses": {
-   "PageNameFormula\\PageNameFormula": "src/PageNameFormula.php",
"PageNameFormula\\Hook": "src/Hook.php"
},
"Hooks": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ab1c0fce51658f0b9e1a20bdaa76a06d7a8e542
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageNameFormula
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UserSnoop[master]: Fix requires and autoloader in extension.json

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix requires and autoloader in extension.json
..


Fix requires and autoloader in extension.json

Add .gitreview file

Change-Id: I4d9dd59b32d329ae71a964791ffaecd67d9a206e
---
A .gitreview
M extension.json
2 files changed, 12 insertions(+), 5 deletions(-)

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..aded61a
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/UserSnoop.git
+defaultbranch=master
+defaultrebase=0
diff --git a/extension.json b/extension.json
index 05136f9..231cf78 100644
--- a/extension.json
+++ b/extension.json
@@ -1,12 +1,14 @@
 {
"name": "UserSnoop",
-"version": "0.1.0",
+   "version": "0.1.0",
"license-name": "GPL-2.0",
"author": [
"Kimon Andreou",
"[//mwstake.org Mark A. Hershberger]"
],
-   "require": [ "1.26" ],
+   "requires": {
+   "MediaWiki": ">=1.26"
+   },
"url": "https://www.mediawiki.org/wiki/Extension:UserSnoop;,
"descriptionmsg": "usersnoop-desc",
"type": "specialpage",
@@ -19,11 +21,11 @@
]
},
"AutoloadClasses": {
-   "UserSnoop\\UserSnoop": "src/UserSnoop.php",
"UserSnoop\\Hook": "src/Hook.php",
-   "UserSnoop\\NewPages": "src/NewPages.php",
+   "UserSnoopPagerNewPages": "src/NewPage.php",
"UserSnoop\\Pager": "src/Pager.php",
"UserSnoop\\PagerPageviews": "src/PagerPageviews.php",
+   "UserSnoopPagerWatchlist": "src/PagerWatchlist.php",
"UserSnoop\\SpecialPage": "src/SpecialPage.php"
},
"ExtensionMessagesFiles": {
@@ -41,7 +43,6 @@
"bureaucrat": {
"usersnoop": true
}
-
},
"AvailableRights": [
"usersnoop"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d9dd59b32d329ae71a964791ffaecd67d9a206e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UserSnoop
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix usage of $db->nextSequenceValue()

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix usage of $db->nextSequenceValue()
..


Fix usage of $db->nextSequenceValue()

The return value from the method is only suitable for passing to
$db->insert(). To get the inserted ID, you need to call $db->insertId()
even if $db->nextSequenceValue() returned non-null.

Bug: T164900
Change-Id: I466fd372804927b3ad72125c7a69d253bd7a24f8
---
M includes/mapper/EventMapper.php
M tests/phpunit/mapper/EventMapperTest.php
2 files changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/includes/mapper/EventMapper.php b/includes/mapper/EventMapper.php
index bcefb6f..aeee3bd 100644
--- a/includes/mapper/EventMapper.php
+++ b/includes/mapper/EventMapper.php
@@ -25,9 +25,7 @@
$res = $dbw->insert( 'echo_event', $row, __METHOD__ );
 
if ( $res ) {
-   if ( !$id ) {
-   $id = $dbw->insertId();
-   }
+   $id = $dbw->insertId();
 
$listeners = $this->getMethodListeners( __FUNCTION__ );
foreach ( $listeners as $listener ) {
diff --git a/tests/phpunit/mapper/EventMapperTest.php 
b/tests/phpunit/mapper/EventMapperTest.php
index 901c96b..772cdab 100644
--- a/tests/phpunit/mapper/EventMapperTest.php
+++ b/tests/phpunit/mapper/EventMapperTest.php
@@ -6,7 +6,7 @@
return [
[
'successful insert with next sequence = 1',
-   [ 'nextSequenceValue' => 1, 'insert' => true, 
'insertId' => 2 ],
+   [ 'nextSequenceValue' => 1, 'insert' => true, 
'insertId' => 1 ],
1
],
[

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I466fd372804927b3ad72125c7a69d253bd7a24f8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update Parsoid output for TOC-related parserTests.

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Update Parsoid output for TOC-related parserTests.
..


Update Parsoid output for TOC-related parserTests.

Change-Id: I3662c7c6e3b09f8b1f769044273ce6c0a65d83ae
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 56 insertions(+), 38 deletions(-)

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



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 565485a..b9e5405 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -236,11 +236,6 @@
 add("wt2html", "T33490 Turkish: ucfirst 'ix'", "Ix");
 add("wt2html", "T33490 Turkish: ucfırst (with a dotless i)", "{{ucfırst:blah}}");
 add("wt2html", "T33490 ucfırst (with a dotless i) with English language", "{{ucfırst:blah}}");
-add("wt2html", "T35845: Headings become cursive in TOC when they contain an 
image", "\n Image 
 ");
-add("wt2html", "T35845 (2): Headings become bold in TOC when they contain a 
blockquote", "\n Quote 
");
-add("wt2html", "Multiple tags in TOC", "\n Foo Bar \n\n Foo Bar 
");
-add("wt2html", "span tags with directionality in TOC", "\n C++ \n\n זבנג! 
\n\n The attributes on these 
span tags must be deleted from the TOC \n\n All 
attributes on these span tags must be deleted from the TOC \n\n Attributes 
after dir on these span tags must be deleted from the TOC ");
-add("wt2html", "Empty  tag in TOC, removed by Sanitizer (T92892)", "\n x ");
 add("wt2html", "T34057: Title needed when expanding  nodes.", "Parser
 function implementation for pf_int missing in Parsoid.");
 add("wt2html", "Check noCommafy in formatNum", "123456.78\n123456.78");
 add("wt2html", "Wrong option for formatNum (T58199)", "1,234.56\n1,234.56\n1234.56");
@@ -524,16 +519,6 @@
 add("html2html", "T33098 Template which includes system messages which 
includes the template", "Template 
loop detected: Template:Identical\nTemplate loop detected: 
Template:Identical\n");
 add("html2html", "T33490 Turkish: ucfırst (with a dotless i)", "[/index.php?title=%C5%9Eablon:Ucf%C4%B1rst:blahaction=editredlink=1
 Şablon:Ucfırst:blah]\n");
 add("html2html", "T33490 ucfırst (with a dotless i) with English language", 
"[/index.php?title=Template:Ucf%C4%B1rst:blahaction=editredlink=1
 Template:Ucfırst:blah]\n");
-add("html2html", "T28375: TOC with italics", "\n Contents 
\n\n\n 1 Lost 
episodes\n\n\n\n Lost episodes \n");
-add("html2html", "T28375: TOC with bold", "\n Contents 
\n\n\n 1 should be bold then normal 
text\n\n\n\n 
should be bold then normal text 
\n");
-add("html2html", "T35845: Headings become cursive in TOC when they contain an 
image", "\n Contents 
\n\n\n 1 Image\n\n\n\n Image http://example.com/images/3/3a/Foobar.jpg\; alt=\"Foobar.jpg\" 
rel=\"mw:externalImage\" data-parsoid='{\"dsr\":[185,226,null,null]}'/> 
\n");
-add("html2html", "T35845 (2): Headings become bold in TOC when they contain a 
blockquote", "\n\n\n Contents 
\n\n\n 1 Quote\n\n\n\n\n\nQuote\n\n[[/index.php?title=Main_Pageaction=editsection=1
 edit]]\n");
-add("html2html", "Unclosed tags in TOC", "\n Contents 
\n\n\n 1 Proof: 2  
3\n\n\n\n Proof: 2  3 \nHanc marginis exiguitas 
non caperet.\nQED\n");
-add("html2html", "Multiple tags in TOC", "\n\n\n Contents 
\n\n\n 1 Foo Bar\n 2 Foo 
Bar\n\n\n\n Foo Bar \n\n Foo \n\nBar\n\n[[/index.php?title=Parser_testaction=editsection=2
 edit]]\n");
-add("html2html", "span tags with directionality in TOC", "\n Contents \n\n\n 1 C++\n 2 זבנג!\n 3 The attributes on these 
span tags must be deleted from the TOC\n 4 All attributes on these 
span tags must be deleted from the TOC\n 5 Attributes after dir 
on these span tags must be deleted from the 
TOC\n\n\n\n C++[[/index.php?title=Parser_testaction=editsection=1
 edit]] 
\n\n זבנג![[/index.php?title=Parser_testaction=editsection=2
 edit]] 
\n\n The attributes on 
these span tags must be deleted from the TOC[[/index.php?title=Parser_testaction=editsection=3
 edit]] 
\n\n All 
attributes on these span tags must be deleted from the TOC[[/index.php?title=Parser_testaction=editsection=4
 edit]] 
\n\n Attributes after dir 
on these span tags must be deleted from the TOC[[/index.php?title=Parser_testaction=editsection=5
 edit]] 
\n");
-add("html2html", "T74884: bdi element in ToC", "\n Contents 
\n\n\n 1 test\n\n\n\n test \n");
-add("html2html", "T35715: s/strike element in ToC", "\n Contents \n\n\n 1 test test test\n\n\n\n test test test \n");
-add("html2html", "Empty  tag in TOC, removed by Sanitizer (T92892)", 
"\n\n\n Contents 
\n\n\n 1 x\n\n\n\n x \n");
 add("html2html", "nowiki inside link inside heading (T20295)", " xyz
 \n");
 add("html2html", "new support for bdi element (T33817)", "ולדימיר לנין (ברוסית: Владимир Ленин, 24 
באפריל 1870–22 בינואר 1924) הוא מנהיג פוליטי קומוניסטי רוסי.\n");
 add("html2html", "Empty LI and TR

[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment_server: Fix misspelt variable

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: deployment_server: Fix misspelt variable
..


deployment_server: Fix misspelt variable

Change-Id: I45e968a0dc013311e66f2fbc04b2bdab10ea252b
---
M modules/profile/manifests/mediawiki/deployment/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp 
b/modules/profile/manifests/mediawiki/deployment/server.pp
index 37efa9e..f07ddab 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -4,7 +4,7 @@
 $deployment_group = hiera('deployment_group', 'wikidev'),
 $deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet'),
 $main_deployment_server = hiera('scap::deployment_server'),
-$base_path = hiera('base_[ath', '/srv/deployment'),
+$base_path = hiera('base_path', '/srv/deployment'),
 ) {
 
 ## Scap Config ##

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45e968a0dc013311e66f2fbc04b2bdab10ea252b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Edit overlay fixes

2017-05-10 Thread Bmansurov (Code Review)

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

Change subject: Edit overlay fixes
..

Edit overlay fixes

* Correctly mark the edit overlay as a tutorial;
* Hide the overlay when the main menu is opened.

Bug: T142579
Change-Id: I41d470d982b3207aee14fe272f4517c24170fb71
---
M resources/skins.minerva.newusers/init.js
A tests/browser/features/signup_edit_tutorial.feature
A tests/browser/features/step_definitions/signup_edit_tutorial.rb
M tests/browser/features/support/pages/article_page.rb
4 files changed, 32 insertions(+), 1 deletion(-)


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

diff --git a/resources/skins.minerva.newusers/init.js 
b/resources/skins.minerva.newusers/init.js
index 586acde..adb5c4b 100644
--- a/resources/skins.minerva.newusers/init.js
+++ b/resources/skins.minerva.newusers/init.js
@@ -11,6 +11,7 @@
 */
 ( function ( M, $ ) {
var PageActionOverlay = require( 'mobile.pointerOverlay' ),
+   skin = M.require( 'skins.minerva.scripts/skin' ),
util = M.require( 'mobile.startup/util' ),
escapeHash = util.escapeHash,
inEditor = window.location.hash.indexOf( '#editor/' ) > -1,
@@ -55,13 +56,17 @@
 
editOverlay = new PageActionOverlay( {
target: target,
-   skin: M.require( 'skins.minerva.scripts/skin' ),
+   skin: skin,
+   isTutorial: true,
className: 'slide active editing',
appendToElement: '#mw-mf-page-center',
summary: mw.msg( 
'mobile-frontend-editor-tutorial-summary', mw.config.get( 'wgTitle' ) ),
confirmMsg: mw.msg( 
'mobile-frontend-editor-tutorial-confirm' ),
cancelMsg: mw.msg( 
'mobile-frontend-editor-tutorial-cancel' )
} );
+   skin.mainMenu.on( 'open', function () {
+   editOverlay.hide();
+   } );
editOverlay.show();
$( '#ca-edit' ).on( 'mousedown', $.proxy( editOverlay, 'hide' ) 
);
// Initialize the 'Start editing' button
diff --git a/tests/browser/features/signup_edit_tutorial.feature 
b/tests/browser/features/signup_edit_tutorial.feature
new file mode 100644
index 000..696c0ae
--- /dev/null
+++ b/tests/browser/features/signup_edit_tutorial.feature
@@ -0,0 +1,10 @@
+@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @vagrant @login
+Feature: Signup edit tutorial
+
+  Background:
+   Given I have just signed up after trying to edit as anonymous
+
+  Scenario: Signup edit tutorial shows up correctly and hides when main menu 
is opened
+Then I should see the signup edit tutorial
+When I click on the main navigation button
+   Then I should not see the signup edit tutorial
diff --git a/tests/browser/features/step_definitions/signup_edit_tutorial.rb 
b/tests/browser/features/step_definitions/signup_edit_tutorial.rb
new file mode 100644
index 000..d05040c
--- /dev/null
+++ b/tests/browser/features/step_definitions/signup_edit_tutorial.rb
@@ -0,0 +1,14 @@
+Given(/^I have just signed up after trying to edit as anonymous$/) do
+  step "I am logged into the mobile website"
+  api.create_page 'Selenium mobile signup edit tutorial test', 'signup edit 
tutorial test'
+  visit(ArticlePage, using_params: { article_name: 
'Selenium_mobile_signup_edit_tutorial_test?article_action=signup-edit' })
+  on(ArticlePage).wait_until_rl_module_ready('skins.minerva.newusers')
+end
+
+Then(/^I should see the signup edit tutorial$/) do
+  expect(on(ArticlePage).signup_edit_tutorial_element).to be_visible
+end
+
+Then(/^I should not see the signup edit tutorial$/) do
+  expect(on(ArticlePage).signup_edit_tutorial_element).not_to be_visible
+end
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 275cfe5..7d63c48 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -31,6 +31,8 @@
   end
   li(:upload_page_action, id: 'ca-upload')
 
+  div(:signup_edit_tutorial, class: 'pointer-overlay-tutorial')
+
   a(:edit_link, text: 'Edit')
   div(:anon_editor_warning, css: '.anon-msg')
   div(:editor_overlay, class: 'editor-overlay')

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

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

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: html2wt link handler: Eliminate a potentially-unsafe optimiz...

2017-05-10 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353190 )

Change subject: html2wt link handler: Eliminate a potentially-unsafe 
optimization
..

html2wt link handler: Eliminate a potentially-unsafe optimization

* It is okay to always check whether colon-escaping is required for
  direct links to File and Category pages.

* The 'target.fromsrc' check is an optimization to just reuse wikitext
  from source. It is unnecessary and can potentially introduce subtle bugs.
  We have selser as a better and more robust source reuse mechanism.

Change-Id: Idc47644875c4ba6689d042a63ba2c8e3c4b8dd3e
---
M lib/html2wt/LinkHandler.js
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index 1f0750f..29ca0b6 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -545,8 +545,7 @@
linkTarget = escapedTgt.linkTarget;
}
 
-   // FIXME: Is the "!target.fromsrc" check 
necessary below?
-   if ((!escapedTgt || !escapedTgt.invalidLink) && 
!target.fromsrc) {
+   if ((!escapedTgt || !escapedTgt.invalidLink)) {
linkTarget = addColonEscape(env, 
linkTarget, linkData);
}
});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc47644875c4ba6689d042a63ba2c8e3c4b8dd3e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump mobile-sections content version requested to 0.10.2

2017-05-10 Thread Mholloway (Code Review)

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

Change subject: Bump mobile-sections content version requested to 0.10.2
..

Bump mobile-sections content version requested to 0.10.2

Request content associated with the video anchor update.[1]

[1] 
https://phabricator.wikimedia.org/rGMOAc0aa75966f70c90964959665b6c01d935142f84f

Change-Id: Ic89ee60cd3d1f39cb91eb1f415eda6aeb67de17f
---
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java 
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
index a766825..2323400 100644
--- 
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
+++ 
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
@@ -20,7 +20,7 @@
  */
 public interface RbPageService {
 String ACCEPT_HEADER_MOBILE_SECTIONS = "accept: application/json; 
charset=utf-8; "
-+ 
"profile=\"https://www.mediawiki.org/wiki/Specs/mobile-sections/0.10.1\";;
++ 
"profile=\"https://www.mediawiki.org/wiki/Specs/mobile-sections/0.10.2\";;
 String ACCEPT_HEADER_DEFINITION = "accept: application/json; 
charset=utf-8; "
 + 
"profile=\"https://www.mediawiki.org/wiki/Specs/definition/0.7.1\";;
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Refactor the pipetrick handler to avoid using `text()`.

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Refactor the pipetrick handler to avoid using `text()`.
..


Refactor the pipetrick handler to avoid using `text()`.

Change-Id: I720cc0d75c483068090773f7d5a8a183ea6148ce
---
M lib/wt2html/pegTokenizer.pegjs
M tests/parserTests.txt
2 files changed, 30 insertions(+), 19 deletions(-)

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



diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index a7317e9..5e09a0c 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -933,17 +933,11 @@
 }
 
 wikilink_content
-  = lcs:( pipe startPos:("" { return endOffset(); }) lt:link_text? {
+  = ( pipe startPos:("" { return endOffset(); }) lt:link_text? {
 var maybeContent = new KV('mw:maybeContent', lt, [startPos, 
endOffset()]);
 maybeContent.vsrc = input.substring(startPos, endOffset());
 return maybeContent;
-} ) + {
-if (lcs.length === 1 && lcs[0].v === null) {
-return { content: [], pipetrick: true };
-} else {
-return { content: lcs };
-}
-}
+  } )*
 
 // TODO: handle link prefixes as in al[[Razi]]
 wikilink
@@ -953,25 +947,31 @@
 // XXX: disallow pipe!
 target:wikilink_preprocessor_text?
 tpos:("" { return endOffset(); })
-lcontent:wikilink_content?
+lcs:wikilink_content
 "]]"
   {
-  if (lcontent === null) {
-  lcontent = { content: [] };
-  }
-
-  if (target === null || lcontent.pipetrick) {
-return [text()];
-  }
-
-  var obj = new SelfclosingTagTk('wikilink');
+  var pipeTrick = (lcs.length === 1 && lcs[0].v === null);
   var textTokens = [];
+  if (target === null || pipeTrick) {
+textTokens.push("[[");
+if (target) {
+  textTokens.push(target);
+}
+lcs.forEach(function(a) {
+  // a is a mw:maybeContent attribute
+  textTokens.push("|");
+  if (a.v !== null) { textTokens.push(a.v); }
+});
+textTokens.push("]]");
+return textTokens;
+  }
+  var obj = new SelfclosingTagTk('wikilink');
   var hrefKV = new KV('href', target);
   hrefKV.vsrc = input.substring(startOffset() + 2, tpos);
   // XXX: Point to object with path, revision and input information
   // obj.source = input;
   obj.attribs.push(hrefKV);
-  obj.attribs = obj.attribs.concat(lcontent.content);
+  obj.attribs = obj.attribs.concat(lcs);
   obj.dataAttribs = {
   tsr: tsrOffsets(),
   src: text(),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index a666b34..c95f81f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -13181,6 +13181,17 @@
 !! end
 
 !! test
+Parsoid: backwards pipe trick
+!! wikitext
+[[|'''bar''']]
+!! html/php
+[[|bar]]
+
+!! html/parsoid
+[[|bar]]
+!! end
+
+!! test
 pre-save transform: trim trailing empty lines
 !! options
 pst

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I720cc0d75c483068090773f7d5a8a183ea6148ce
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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]: Check for index to exist before accessing it.

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353187 )

Change subject: Check for index to exist before accessing it.
..

Check for index to exist before accessing it.

This fixes "Notice: Undefined index: quality ..."

Bug: T164983
Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/87/353187/1

diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5822699..115e947 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -205,7 +205,7 @@
// we'll also add TinyRGB profile to images lacking a 
profile, but
// only if they're not low quality (which are meant to 
save bandwith
// and we don't want to increase the filesize by adding 
a profile)
-   if ( $params['quality'] > 30 ) {
+   if ( isset($params['quality']) && $params['quality'] > 
30 ) {
$profiles[] = '-';
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.1]: Check for index to exist before accessing it.

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353188 )

Change subject: Check for index to exist before accessing it.
..

Check for index to exist before accessing it.

This fixes "Notice: Undefined index: quality ..."

Bug: T164983
Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5822699..115e947 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -205,7 +205,7 @@
// we'll also add TinyRGB profile to images lacking a 
profile, but
// only if they're not low quality (which are meant to 
save bandwith
// and we don't want to increase the filesize by adding 
a profile)
-   if ( $params['quality'] > 30 ) {
+   if ( isset($params['quality']) && $params['quality'] > 
30 ) {
$profiles[] = '-';
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: use logrotate::conf for logrotate

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: openstack: use logrotate::conf for logrotate
..


openstack: use logrotate::conf for logrotate

Change-Id: I71776e0ccf7e2549d01292f4609e811ec2862dd5
---
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/keystone/service.pp
2 files changed, 12 insertions(+), 20 deletions(-)

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



diff --git a/modules/openstack/manifests/designate/service.pp 
b/modules/openstack/manifests/designate/service.pp
index ff000b9..a27f117 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -93,19 +93,13 @@
 
 # These would be automatically included in a correct designate package...
 # probably this can be ripped out in Liberty.
-file { '/etc/logrotate.d/designate-mdns':
+logrotate::conf { 'designate-mdns':
 ensure => present,
 source => 'puppet:///modules/openstack/designate-mdns.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 }
-file { '/etc/logrotate.d/designate-pool-manager':
+logrotate::conf { 'designate-pool-manager':
 ensure => present,
 source => 
'puppet:///modules/openstack/designate-pool-manager.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 }
 
 file { '/var/lib/designate/.ssh/':
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 699eb14..c53e368 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -78,18 +78,16 @@
 mode=> '0644',
 notify  => Service['uwsgi-keystone-admin', 
'uwsgi-keystone-public'],
 recurse => true;
-'/etc/logrotate.d/keystone-public-uwsgi':
-ensure => present,
-source => 
'puppet:///modules/openstack/keystone-public-uwsgi.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444';
-'/etc/logrotate.d/keystone-admin-uwsgi':
-ensure => present,
-source => 
'puppet:///modules/openstack/keystone-admin-uwsgi.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444';
+}
+
+logrotate::conf { 'keystone-public-uwsgi':
+ensure => present,
+source => 
'puppet:///modules/openstack/keystone-public-uwsgi.logrotate',
+}
+
+logrotate::conf { 'keystone-admin-uwsgi':
+ensure => present,
+source => 'puppet:///modules/openstack/keystone-admin-uwsgi.logrotate',
 }
 
 if $::fqdn == hiera('labs_nova_controller') {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: lvs/configuation: Fix inline template so it will use :: if $...

2017-05-10 Thread Paladox (Code Review)

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

Change subject: lvs/configuation: Fix inline template so it will use :: if 
$ipaddress does not exist or puppet can't find it
..

lvs/configuation: Fix inline template so it will use :: if $ipaddress does not 
exist or puppet can't find it

This fixes it for labs.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/353186/1


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Return to previous modified state

2017-05-10 Thread Arlolra (Code Review)

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

Change subject: Return to previous modified state
..

Return to previous modified state

 * Probably doesn't make a difference because we don't have nested
   inserted content.

Change-Id: I62795cedf30526a7b91120306bd932b893bc3736
---
M lib/html2wt/WikitextSerializer.js
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/lib/html2wt/WikitextSerializer.js 
b/lib/html2wt/WikitextSerializer.js
index 1487761..f93ddef 100644
--- a/lib/html2wt/WikitextSerializer.js
+++ b/lib/html2wt/WikitextSerializer.js
@@ -991,6 +991,8 @@
 
state.currNodeUnmodified = false;
 
+   var currentModifiedState = state.inModifiedContent;
+
var inModifiedContent = state.selserMode &&
DU.hasInsertedDiffMark(node, this.env);
 
@@ -998,7 +1000,7 @@
 
return domHandler.handle(node, state, wrapperUnmodified)
.then(function(next) {
-   if (inModifiedContent) { state.inModifiedContent = false; }
+   if (inModifiedContent) { state.inModifiedContent = 
currentModifiedState; }
return next;
});
 });

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix usage of $db->nextSequenceValue()

2017-05-10 Thread Anomie (Code Review)

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

Change subject: Fix usage of $db->nextSequenceValue()
..

Fix usage of $db->nextSequenceValue()

The return value from the method is only suitable for passing to
$db->insert(). To get the inserted ID, you need to call $db->insertId()
even if $db->nextSequenceValue() returned non-null.

Bug: T164900
Change-Id: I466fd372804927b3ad72125c7a69d253bd7a24f8
---
M includes/mapper/EventMapper.php
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/includes/mapper/EventMapper.php b/includes/mapper/EventMapper.php
index bcefb6f..aeee3bd 100644
--- a/includes/mapper/EventMapper.php
+++ b/includes/mapper/EventMapper.php
@@ -25,9 +25,7 @@
$res = $dbw->insert( 'echo_event', $row, __METHOD__ );
 
if ( $res ) {
-   if ( !$id ) {
-   $id = $dbw->insertId();
-   }
+   $id = $dbw->insertId();
 
$listeners = $this->getMethodListeners( __FUNCTION__ );
foreach ( $listeners as $listener ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix usage of $db->nextSequenceValue()

2017-05-10 Thread Anomie (Code Review)

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

Change subject: Fix usage of $db->nextSequenceValue()
..

Fix usage of $db->nextSequenceValue()

The return value from the method is only suitable for passing to
$db->insert(). To get the inserted ID, you need to call $db->insertId()
even if $db->nextSequenceValue() returned non-null.

Bug: T164900
Change-Id: I6beb6243ccb9425372623307ef23ae6571ce8c0d
---
M includes/Revision.php
M includes/logging/LogEntry.php
M includes/logging/LogPage.php
3 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/353182/1

diff --git a/includes/Revision.php b/includes/Revision.php
index b20f843..c3782ba 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1496,7 +1496,10 @@
 
$dbw->insert( 'revision', $row, __METHOD__ );
 
-   $this->mId = $rev_id !== null ? $rev_id : $dbw->insertId();
+   if ( $this->mId === null ) {
+   // Only if nextSequenceValue() was called
+   $this->mId = $dbw->insertId();
+   }
 
// Assertion to try to catch T92046
if ( (int)$this->mId === 0 ) {
diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 1c5899b..e7095f0 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -634,7 +634,7 @@
}
 
$dbw->insert( 'logging', $data, __METHOD__ );
-   $this->id = !is_null( $id ) ? $id : $dbw->insertId();
+   $this->id = $dbw->insertId();
 
$rows = [];
foreach ( $relations as $tag => $values ) {
diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 64102b7..f2b1670 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -110,7 +110,7 @@
'log_params' => $this->params
];
$dbw->insert( 'logging', $data, __METHOD__ );
-   $newId = !is_null( $log_id ) ? $log_id : $dbw->insertId();
+   $newId = $dbw->insertId();
 
# And update recentchanges
if ( $this->updateRecentChanges ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.30.0-wmf.1]: Do not error out when threshold can't be found

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Do not error out when threshold can't be found
..


Do not error out when threshold can't be found

Bug: T164984
Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index c716bfc..295b9bf 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -539,8 +539,8 @@
return;
}
 
-   // Doesn't have ores score, skipping.
-   if ( !isset( $row->ores_damaging_score ) ) {
+   // Doesn't have ores score or threshold is not set properly, 
skipping.
+   if ( !isset( $row->ores_damaging_score ) || !isset( 
$row->ores_damaging_threshold ) ) {
return;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Do not error out when threshold can't be found

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Do not error out when threshold can't be found
..


Do not error out when threshold can't be found

Bug: T164984
Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index c716bfc..295b9bf 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -539,8 +539,8 @@
return;
}
 
-   // Doesn't have ores score, skipping.
-   if ( !isset( $row->ores_damaging_score ) ) {
+   // Doesn't have ores score or threshold is not set properly, 
skipping.
+   if ( !isset( $row->ores_damaging_score ) || !isset( 
$row->ores_damaging_threshold ) ) {
return;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Sbisson 
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...ORES[wmf/1.30.0-wmf.1]: Do not error out when threshold can't be found

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353181 )

Change subject: Do not error out when threshold can't be found
..

Do not error out when threshold can't be found

Bug: T164984
Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/Hooks.php b/includes/Hooks.php
index c716bfc..295b9bf 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -539,8 +539,8 @@
return;
}
 
-   // Doesn't have ores score, skipping.
-   if ( !isset( $row->ores_damaging_score ) ) {
+   // Doesn't have ores score or threshold is not set properly, 
skipping.
+   if ( !isset( $row->ores_damaging_score ) || !isset( 
$row->ores_damaging_threshold ) ) {
return;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Add field to filter references

2017-05-10 Thread Sophivorus (Code Review)

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

Change subject: Add field to filter references
..


Add field to filter references

Bug: T148227
Change-Id: I1eba4d8a8cd213c9d5abf5a78dd105248e35a9a7
---
M README.md
M i18n/ast.json
M i18n/be-tarask.json
M i18n/bg.json
M i18n/bn.json
M i18n/br.json
M i18n/bs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/et.json
M i18n/eu.json
M i18n/fr.json
M i18n/gl.json
M i18n/it.json
M i18n/ja.json
M i18n/ko.json
M i18n/lb.json
M i18n/mg.json
M i18n/mk.json
M i18n/pa.json
M i18n/qqq.json
M i18n/ru.json
M i18n/sr-ec.json
M i18n/sv.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M proveit.css
M proveit.js
29 files changed, 65 insertions(+), 43 deletions(-)

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



diff --git a/README.md b/README.md
index fb1c206..1814a7e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # ProveIt
 
-ProveIt is powerful reference manager for Wikipedia
+ProveIt is powerful reference manager for MediaWiki
 
 Documentation at https://commons.wikimedia.org/wiki/Help:Gadget-ProveIt
\ No newline at end of file
diff --git a/i18n/ast.json b/i18n/ast.json
index e4e7a8e..e0abc07 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Esto desaniciará la referencia y toles cites 
que tenga. ¿Tas seguru?",
"proveit-no-template": "Sin plantía",
"proveit-no-references": "Nun s'alcontraron referencies",
-   "proveit-filter-field": "Filtrar campos"
+   "proveit-filter-fields": "Filtrar campos"
 }
diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json
index e912c63..ea1fcc7 100644
--- a/i18n/be-tarask.json
+++ b/i18n/be-tarask.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Гэта выдаліць крыніцу і ўсе яе цытаты. Вы 
ўпэўненыя?",
"proveit-no-template": "Няма шаблёну",
"proveit-no-references": "Крыніцы ня знойдзеныя",
-   "proveit-filter-field": "Фільтар палёў"
+   "proveit-filter-fields": "Фільтар палёў"
 }
diff --git a/i18n/bg.json b/i18n/bg.json
index 13cd37e..eab111b 100644
--- a/i18n/bg.json
+++ b/i18n/bg.json
@@ -18,5 +18,5 @@
"proveit-confirm-remove": "Това ще премахне източникът и всички негови 
цитирания. Сигурни ли сте?",
"proveit-no-template": "Няма шаблон",
"proveit-no-references": "Не са намерени източници",
-   "proveit-filter-field": "Филтър на полета"
+   "proveit-filter-fields": "Филтър на полета"
 }
diff --git a/i18n/bn.json b/i18n/bn.json
index ba7f874..90a9418 100644
--- a/i18n/bn.json
+++ b/i18n/bn.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "এটি এই তথ্যসূত্রটি এবং এর থেকে দেয়া সব 
উদ্ধৃতিদান সরিয়ে ফেলবে। আপনি কি নিশ্চিত?",
"proveit-no-template": "কোন টেমপ্লেট নেই",
"proveit-no-references": "কোন তথ্যসূত্র পাওয়া যায়নি",
-   "proveit-filter-field": "ক্ষেত্র ছাঁকুন"
+   "proveit-filter-fields": "ক্ষেত্র ছাঁকুন"
 }
diff --git a/i18n/br.json b/i18n/br.json
index 988a11b..0ebfc2e 100644
--- a/i18n/br.json
+++ b/i18n/br.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Dilemel a raio an daveenn hag an holl 
arroudennoù. Sur oc'h ?",
"proveit-no-template": "Patrom ebet",
"proveit-no-references": "N'eus bet kavet daveenn ebet",
-   "proveit-filter-field": "Maeziennoù ar sil"
+   "proveit-filter-fields": "Maeziennoù ar sil"
 }
diff --git a/i18n/bs.json b/i18n/bs.json
index f97f950..2d2dd66 100644
--- a/i18n/bs.json
+++ b/i18n/bs.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Ovim će se ukloniti referenca i svi njene 
navodi. Jeste li sigurni?",
"proveit-no-template": "Nema šablona",
"proveit-no-references": "Nisu pronađene reference",
-   "proveit-filter-field": "Filtriraj polja"
+   "proveit-filter-fields": "Filtriraj polja"
 }
diff --git a/i18n/de.json b/i18n/de.json
index 68c29dd..bab3f18 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -18,5 +18,5 @@
"proveit-confirm-remove": "Dies wird den Einzelnachweis und all seine 
Zitate entfernen. Bist du sicher?",
"proveit-no-template": "Keine Vorlage",
"proveit-no-references": "Keine Einzelnachweise gefunden",
-   "proveit-filter-field": "Felder filtern"
+   "proveit-filter-fields": "Felder filtern"
 }
diff --git a/i18n/en.json b/i18n/en.json
index f2903c8..0c68e55 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,5 +17,6 @@
"proveit-confirm-remove": "This will remove the reference and all of 
its citations. Are you sure?",
"proveit-no-template": "No template",
"proveit-no-references": "No references found",
-   "proveit-filter-field": "Filter fields"
+   "proveit-filter-fields": "Filter fields",
+   "proveit-filter-references": "Filter references"
 }
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
index 8823f73..5c7de16 100644
---

[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Add field to filter references

2017-05-10 Thread Sophivorus (Code Review)

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

Change subject: Add field to filter references
..

Add field to filter references

Bug: T148227
Change-Id: I1eba4d8a8cd213c9d5abf5a78dd105248e35a9a7
---
M README.md
M i18n/ast.json
M i18n/be-tarask.json
M i18n/bg.json
M i18n/bn.json
M i18n/br.json
M i18n/bs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/et.json
M i18n/eu.json
M i18n/fr.json
M i18n/gl.json
M i18n/it.json
M i18n/ja.json
M i18n/ko.json
M i18n/lb.json
M i18n/mg.json
M i18n/mk.json
M i18n/pa.json
M i18n/qqq.json
M i18n/ru.json
M i18n/sr-ec.json
M i18n/sv.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M proveit.css
M proveit.js
29 files changed, 65 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikipedia/gadgets/ProveIt 
refs/changes/80/353180/1

diff --git a/README.md b/README.md
index fb1c206..1814a7e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # ProveIt
 
-ProveIt is powerful reference manager for Wikipedia
+ProveIt is powerful reference manager for MediaWiki
 
 Documentation at https://commons.wikimedia.org/wiki/Help:Gadget-ProveIt
\ No newline at end of file
diff --git a/i18n/ast.json b/i18n/ast.json
index e4e7a8e..e0abc07 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Esto desaniciará la referencia y toles cites 
que tenga. ¿Tas seguru?",
"proveit-no-template": "Sin plantía",
"proveit-no-references": "Nun s'alcontraron referencies",
-   "proveit-filter-field": "Filtrar campos"
+   "proveit-filter-fields": "Filtrar campos"
 }
diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json
index e912c63..ea1fcc7 100644
--- a/i18n/be-tarask.json
+++ b/i18n/be-tarask.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Гэта выдаліць крыніцу і ўсе яе цытаты. Вы 
ўпэўненыя?",
"proveit-no-template": "Няма шаблёну",
"proveit-no-references": "Крыніцы ня знойдзеныя",
-   "proveit-filter-field": "Фільтар палёў"
+   "proveit-filter-fields": "Фільтар палёў"
 }
diff --git a/i18n/bg.json b/i18n/bg.json
index 13cd37e..eab111b 100644
--- a/i18n/bg.json
+++ b/i18n/bg.json
@@ -18,5 +18,5 @@
"proveit-confirm-remove": "Това ще премахне източникът и всички негови 
цитирания. Сигурни ли сте?",
"proveit-no-template": "Няма шаблон",
"proveit-no-references": "Не са намерени източници",
-   "proveit-filter-field": "Филтър на полета"
+   "proveit-filter-fields": "Филтър на полета"
 }
diff --git a/i18n/bn.json b/i18n/bn.json
index ba7f874..90a9418 100644
--- a/i18n/bn.json
+++ b/i18n/bn.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "এটি এই তথ্যসূত্রটি এবং এর থেকে দেয়া সব 
উদ্ধৃতিদান সরিয়ে ফেলবে। আপনি কি নিশ্চিত?",
"proveit-no-template": "কোন টেমপ্লেট নেই",
"proveit-no-references": "কোন তথ্যসূত্র পাওয়া যায়নি",
-   "proveit-filter-field": "ক্ষেত্র ছাঁকুন"
+   "proveit-filter-fields": "ক্ষেত্র ছাঁকুন"
 }
diff --git a/i18n/br.json b/i18n/br.json
index 988a11b..0ebfc2e 100644
--- a/i18n/br.json
+++ b/i18n/br.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Dilemel a raio an daveenn hag an holl 
arroudennoù. Sur oc'h ?",
"proveit-no-template": "Patrom ebet",
"proveit-no-references": "N'eus bet kavet daveenn ebet",
-   "proveit-filter-field": "Maeziennoù ar sil"
+   "proveit-filter-fields": "Maeziennoù ar sil"
 }
diff --git a/i18n/bs.json b/i18n/bs.json
index f97f950..2d2dd66 100644
--- a/i18n/bs.json
+++ b/i18n/bs.json
@@ -17,5 +17,5 @@
"proveit-confirm-remove": "Ovim će se ukloniti referenca i svi njene 
navodi. Jeste li sigurni?",
"proveit-no-template": "Nema šablona",
"proveit-no-references": "Nisu pronađene reference",
-   "proveit-filter-field": "Filtriraj polja"
+   "proveit-filter-fields": "Filtriraj polja"
 }
diff --git a/i18n/de.json b/i18n/de.json
index 68c29dd..bab3f18 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -18,5 +18,5 @@
"proveit-confirm-remove": "Dies wird den Einzelnachweis und all seine 
Zitate entfernen. Bist du sicher?",
"proveit-no-template": "Keine Vorlage",
"proveit-no-references": "Keine Einzelnachweise gefunden",
-   "proveit-filter-field": "Felder filtern"
+   "proveit-filter-fields": "Felder filtern"
 }
diff --git a/i18n/en.json b/i18n/en.json
index f2903c8..0c68e55 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,5 +17,6 @@
"proveit-confirm-remove": "This will remove the reference and all of 
its citations. Are you sure?",
"proveit-no-template": "No template",
"proveit-no-references": "No references found",
-   "proveit-filter-field": "Filter fields"
+   "proveit-filter-fields": "Filter fields",
+   "proveit-filter-references": "Filter references"
 }
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
index

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: add beta canary_dashboard_url config value

2017-05-10 Thread Thcipriani (Code Review)

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

Change subject: Scap: add beta canary_dashboard_url config value
..

Scap: add beta canary_dashboard_url config value

Bug: T164981
Change-Id: Ib53a91541cf3dc5c5ded41d7a832bd4edaf1f013
---
M modules/scap/templates/scap.cfg.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/353179/1

diff --git a/modules/scap/templates/scap.cfg.erb 
b/modules/scap/templates/scap.cfg.erb
index 16e0947..47fbfe3 100644
--- a/modules/scap/templates/scap.cfg.erb
+++ b/modules/scap/templates/scap.cfg.erb
@@ -78,6 +78,7 @@
 # Wikimedia Foundation beta eqiad datacenter
 datacenter: eqiad
 logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs:9200
+canary_dashboard_url: 
https://logstash-beta.wmflabs.org/goto/5439151a6232a0ee886c0278bc6d487b
 
 
 [wikimedia.org]

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment::server: move add_ip6_mapped back to site.pp

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: deployment::server: move add_ip6_mapped back to site.pp
..


deployment::server: move add_ip6_mapped back to site.pp

The "add_ip6_mapped" calls should go back from profiles into
site.pp. I tried to consolidate but it's breaking the roles
in labs, since labs does not have IPv6.

This is like d1512074fc28a10cf but doing it only for deployment
servers to fix deployment-tin/mira specifically before touching
all roles.

Change-Id: Ibaf10e16a903b8341c7923135f531b745025dffe
---
M manifests/site.pp
M modules/profile/manifests/mediawiki/deployment/server.pp
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index cdfa913..a88df60 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2675,6 +2675,7 @@
 # deployment servers
 node 'tin.eqiad.wmnet', 'naos.codfw.wmnet' {
 role(deployment_server)
+interface::add_ip6_mapped { 'main': interface => 'eth0', }
 }
 
 # test system for performance team (T117888)
diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp 
b/modules/profile/manifests/mediawiki/deployment/server.pp
index 9b65b9f..37efa9e 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -7,8 +7,6 @@
 $base_path = hiera('base_[ath', '/srv/deployment'),
 ) {
 
-interface::add_ip6_mapped { 'main': interface => 'eth0', }
-
 ## Scap Config ##
 require ::scap
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaf10e16a903b8341c7923135f531b745025dffe
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
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] apps...wikipedia[master]: Update description edit abuse filter results for formatversi...

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Update description edit abuse filter results for formatversion=2
..


Update description edit abuse filter results for formatversion=2

No further updates needed for section edits.

Bug: T150382
Change-Id: I0937babecb0cd011b2406d5e464792f19c5d5f1a
---
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
M app/src/test/res/raw/description_edit_abusefilter_disallowed.json
M app/src/test/res/raw/description_edit_abusefilter_warning.json
3 files changed, 8 insertions(+), 17 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
index e0729d1..4326622 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
@@ -3,8 +3,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.google.gson.annotations.SerializedName;
-
+import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.dataclient.ServiceError;
 
 import java.util.Collections;
@@ -47,7 +46,7 @@
 @Nullable public String getMessageHtml(@NonNull String messageName) {
 for (Message msg : messages) {
 if (messageName.equals(msg.name)) {
-return msg.getHtmlValue();
+return msg.html();
 }
 }
 return null;
@@ -62,15 +61,11 @@
 }
 
 private static final class Message {
-@SuppressWarnings("unused") private String name;
-@SuppressWarnings("unused") private MessageHtml html;
+@SuppressWarnings("unused") @Nullable private String name;
+@SuppressWarnings("unused") @Nullable private String html;
 
-@NonNull private String getHtmlValue() {
-return html != null ? html.value : "";
+@NonNull private String html() {
+return StringUtils.defaultString(html);
 }
-}
-
-private static class MessageHtml {
-@SuppressWarnings("unused") @SerializedName("*") private String value;
 }
 }
diff --git a/app/src/test/res/raw/description_edit_abusefilter_disallowed.json 
b/app/src/test/res/raw/description_edit_abusefilter_disallowed.json
index f7d678f..cafaac9 100644
--- a/app/src/test/res/raw/description_edit_abusefilter_disallowed.json
+++ b/app/src/test/res/raw/description_edit_abusefilter_disallowed.json
@@ -9,9 +9,7 @@
 "parameters": [
   "global-123"
 ],
-"html": {
-  "*": "This action has been automatically identified as harmful, and 
therefore disallowed.\nIf you believe your action was constructive, please 
inform an administrator of what you were trying to do."
-}
+"html": "This action has been automatically identified as harmful, and 
therefore disallowed.\nIf you believe your action was constructive, please 
inform an administrator of what you were trying to do."
   }
 ],
 "docref": "See https://www.wikidata.org/w/api.php for API usage"
diff --git a/app/src/test/res/raw/description_edit_abusefilter_warning.json 
b/app/src/test/res/raw/description_edit_abusefilter_warning.json
index 10d4d50..fb9e3ad 100644
--- a/app/src/test/res/raw/description_edit_abusefilter_warning.json
+++ b/app/src/test/res/raw/description_edit_abusefilter_warning.json
@@ -10,9 +10,7 @@
   "Possible vandalism by adding badwords or similar trolling words",
   11
 ],
-"html": {
-  "*": "Warning: This action has been automatically identified 
as harmful.\nUnconstructive edits will be quickly reverted,\nand egregious or 
repeated unconstructive editing will result in your account or IP address being 
blocked.\nIf you believe this action to be constructive, you may submit it 
again to confirm it.\nA brief description of the abuse rule which your action 
matched is: Possible vandalism by adding badwords or similar trolling words"
-}
+"html": "Warning: This action has been automatically identified 
as harmful.\nUnconstructive edits will be quickly reverted,\nand egregious or 
repeated unconstructive editing will result in your account or IP address being 
blocked.\nIf you believe this action to be constructive, you may submit it 
again to confirm it.\nA brief description of the abuse rule which your action 
matched is: Possible vandalism by adding badwords or similar trolling words"
   }
 ],
 "docref": "See https://www.wikidata.org/w/api.php for API usage"

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

Gerrit-MessageType: merged
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Do not error out when threshold can't be found

2017-05-10 Thread Ladsgroup (Code Review)

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

Change subject: Do not error out when threshold can't be found
..

Do not error out when threshold can't be found

Bug: T164984
Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/Hooks.php b/includes/Hooks.php
index c716bfc..295b9bf 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -539,8 +539,8 @@
return;
}
 
-   // Doesn't have ores score, skipping.
-   if ( !isset( $row->ores_damaging_score ) ) {
+   // Doesn't have ores score or threshold is not set properly, 
skipping.
+   if ( !isset( $row->ores_damaging_score ) || !isset( 
$row->ores_damaging_threshold ) ) {
return;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid postgres CategoryMembershipChangeTest failures

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Avoid postgres CategoryMembershipChangeTest failures
..


Avoid postgres CategoryMembershipChangeTest failures

Strip out the redundant /32 CIDR suffix from the IP.

Bug: T75174
Change-Id: If7738ab46c72babb51d3c306ce749a9ccfe34740
---
M includes/changes/RecentChange.php
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index 35f8b3b..e8e35a3 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -911,7 +911,16 @@
public function loadFromRow( $row ) {
$this->mAttribs = get_object_vars( $row );
$this->mAttribs['rc_timestamp'] = wfTimestamp( TS_MW, 
$this->mAttribs['rc_timestamp'] );
-   $this->mAttribs['rc_deleted'] = $row->rc_deleted; // MUST be set
+   // rc_deleted MUST be set
+   $this->mAttribs['rc_deleted'] = $row->rc_deleted;
+
+   if ( isset( $this->mAttribs['rc_ip'] ) ) {
+   // Clean up CIDRs for Postgres per T164898. 
("127.0.0.1" casts to "127.0.0.1/32")
+   $n = strpos( $this->mAttribs['rc_ip'], '/' );
+   if ( $n !== false ) {
+   $this->mAttribs['rc_ip'] = substr( 
$this->mAttribs['rc_ip'], 0, $n );
+   }
+   }
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7738ab46c72babb51d3c306ce749a9ccfe34740
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
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] maps/kartotherian[master]: Switch to node 6

2017-05-10 Thread MaxSem (Code Review)

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

Change subject: Switch to node 6
..


Switch to node 6

Apparently, this was never officially merged :O

Change-Id: Ifa6a089b2d594e1312728c306e2b8718386e0d65
---
M package.json
1 file changed, 24 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 951ebe4..8bf6339 100644
--- a/package.json
+++ b/package.json
@@ -94,12 +94,34 @@
 "swagger-router": "^0.4.2"
   },
   "deploy": {
-"node": "4.6.0",
+"node": "6.9.1",
 "target": "debian",
+"install_opts": ["--build-from-source=mapnik", 
"--fallback-to-build=false"] ,
 "dependencies": {
   "_all": ["libcairo2-dev", "libgif-dev", "libpango1.0-dev"],
   "ubuntu": ["libjpeg62-dev"],
-  "debian": ["libjpeg62-turbo-dev"]
+  "debian": [
+"libjpeg62-turbo-dev",
+"fonts-dejavu",
+"libboost-filesystem-dev",
+"libboost-program-options-dev",
+"libboost-regex-dev",
+"libboost-system-dev",
+"libboost-thread-dev",
+"libgdal-dev",
+"libicu-dev",
+"libpq-dev",
+"libcurl4-gnutls-dev",
+"libproj-dev",
+"libtiff-dev",
+"libwebp5",
+{
+  "repo_url": "https://apt.wikimedia.org/wikimedia;,
+  "release": "jessie-wikimedia",
+  "pool": "backports",
+  "packages": [ "libmapbox-variant-dev", "libmapnik-dev", 
"mapnik-utils" ]
+}
+  ]
 }
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa6a089b2d594e1312728c306e2b8718386e0d65
Gerrit-PatchSet: 2
Gerrit-Project: maps/kartotherian
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace assertEquals test with assertThat

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: replace assertEquals test with assertThat
..


Hygiene: replace assertEquals test with assertThat

Comment follow-up.  Prefer assertThat to assertEquals.

Change-Id: Ie9f92995497249ba88ebd099a8c348798b771334
---
M app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java 
b/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
index 5ee71f1..5e6f343 100644
--- a/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
+++ b/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
@@ -17,8 +17,8 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isA;
-import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -60,7 +60,7 @@
 verify(cb).success(any(Call.class), captor.capture());
 ZeroConfig config = captor.getValue();
 
-assertEquals(config, new ZeroConfig());
+assertThat(config, is(new ZeroConfig()));
 }
 
 @Test public void testRequestMalformed() throws Throwable {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[wmf/1.29.0-wmf.21]: i18n: Tell users they can use ISBNs

2017-05-10 Thread Jforrester (Code Review)

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

Change subject: i18n: Tell users they can use ISBNs
..

i18n: Tell users they can use ISBNs

Bug: T145462
Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
(cherry picked from commit 5a4c9bf4adfbb0aee3697af6a25835310a690f71)
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 84d8c86..f1af274 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,7 +11,7 @@
"citoid-citefromiddialog-mode-manual": "Manual",
"citoid-citefromiddialog-mode-reuse": "Re-use",
"citoid-citefromiddialog-search": "Search",
-   "citoid-citefromiddialog-search-label": "URL, DOI or PMID",
+   "citoid-citefromiddialog-search-label": "URL, DOI, ISBN or PMC/PMID",
"citoid-citefromiddialog-search-placeholder": "e.g. 
http://www.example.com;,
"citoid-citefromiddialog-search-progress": "Searching, please wait...",
"citoid-citefromiddialog-title": "Add a citation",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9d031db..37c9ce1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,7 +21,7 @@
"citoid-citefromiddialog-mode-reuse": "Label of tab in citation dialog, 
used to select mode.\n{{Identical|Re-use}}",
"citoid-citefromiddialog-search": "Text for the search 
button.\n{{Identical|Search}}",
"citoid-citefromiddialog-search-label": "Label for the URL/DOI/PMID 
search field.",
-   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMID search field.",
+   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMCID/PMID/ISBN search field.",
"citoid-citefromiddialog-search-progress": "Message for when the search 
is in progress",
"citoid-citefromiddialog-title": "The title displayed on the dialog",
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[wmf/1.30.0-wmf.1]: i18n: Tell users they can use ISBNs

2017-05-10 Thread Jforrester (Code Review)

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

Change subject: i18n: Tell users they can use ISBNs
..

i18n: Tell users they can use ISBNs

Bug: T145462
Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
(cherry picked from commit 5a4c9bf4adfbb0aee3697af6a25835310a690f71)
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/76/353176/1

diff --git a/i18n/en.json b/i18n/en.json
index 84d8c86..f1af274 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,7 +11,7 @@
"citoid-citefromiddialog-mode-manual": "Manual",
"citoid-citefromiddialog-mode-reuse": "Re-use",
"citoid-citefromiddialog-search": "Search",
-   "citoid-citefromiddialog-search-label": "URL, DOI or PMID",
+   "citoid-citefromiddialog-search-label": "URL, DOI, ISBN or PMC/PMID",
"citoid-citefromiddialog-search-placeholder": "e.g. 
http://www.example.com;,
"citoid-citefromiddialog-search-progress": "Searching, please wait...",
"citoid-citefromiddialog-title": "Add a citation",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0fda28c..8cbaf27 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,7 +21,7 @@
"citoid-citefromiddialog-mode-reuse": "Label of tab in citation dialog, 
used to select mode.\n{{Identical|Re-use}}",
"citoid-citefromiddialog-search": "Text for the search 
button.\n{{Identical|Search}}",
"citoid-citefromiddialog-search-label": "Label for the URL/DOI/PMID 
search field.",
-   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMID search field.",
+   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMCID/PMID/ISBN search field.",
"citoid-citefromiddialog-search-progress": "Message for when the search 
is in progress",
"citoid-citefromiddialog-title": "The title displayed on the dialog",
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[master]: i18n: Tell users they can use ISBNs

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: i18n: Tell users they can use ISBNs
..


i18n: Tell users they can use ISBNs

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 84d8c86..f1af274 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,7 +11,7 @@
"citoid-citefromiddialog-mode-manual": "Manual",
"citoid-citefromiddialog-mode-reuse": "Re-use",
"citoid-citefromiddialog-search": "Search",
-   "citoid-citefromiddialog-search-label": "URL, DOI or PMID",
+   "citoid-citefromiddialog-search-label": "URL, DOI, ISBN or PMC/PMID",
"citoid-citefromiddialog-search-placeholder": "e.g. 
http://www.example.com;,
"citoid-citefromiddialog-search-progress": "Searching, please wait...",
"citoid-citefromiddialog-title": "Add a citation",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8404814..8411136 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,7 +21,7 @@
"citoid-citefromiddialog-mode-reuse": "Label of tab in citation dialog, 
used to select mode. The other tabs are 
{{msg-mw|Citoid-citefromiddialog-mode-auto}} and 
{{msg-mw|Citoid-citefromiddialog-mode-manual}}.\n{{Identical|Re-use}}",
"citoid-citefromiddialog-search": "Text for the search 
button.\n{{Identical|Search}}",
"citoid-citefromiddialog-search-label": "Label for the URL/DOI/PMID 
search field.",
-   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMID search field.",
+   "citoid-citefromiddialog-search-placeholder": "{{doc-important|Do not 
translate example.com as it is a domain name specifically reserved by IANA for 
examples.}}\n\nPlaceholder for the URL/DOI/PMCID/PMID/ISBN search field.",
"citoid-citefromiddialog-search-progress": "Message for when the search 
is in progress",
"citoid-citefromiddialog-title": "The title displayed on the dialog",
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c73dfbfc3a99b26d0f598adee4ce891fed3ddb9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mvolz 
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/mediawiki-config[master]: Move swift auth URL to ProductionServices

2017-05-10 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353173 )

Change subject: Move swift auth URL to ProductionServices
..

Move swift auth URL to ProductionServices

Also set the storage URL, which will later be set to
https to force https when the TLS proxy is used.

Change-Id: Iee94ae3a248314985c8e64324bd851eb80a3d48a
---
M wmf-config/ProductionServices.php
M wmf-config/filebackend.php
2 files changed, 14 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/ProductionServices.php 
b/wmf-config/ProductionServices.php
index b3d8a59..853a695 100644
--- a/wmf-config/ProductionServices.php
+++ b/wmf-config/ProductionServices.php
@@ -24,6 +24,8 @@
'upload' => 'upload.svc.eqiad.wmnet',
'cxserver' => 'http://cxserver.discovery.wmnet:8080',
'etcd' => '_etcd._tcp.eqiad.wmnet',
+   'mediaSwiftAuth' => 'http://ms-fe.svc.eqiad.wmnet/auth',
+   'mediaSwiftStore' => 'http://ms-fe.svc.eqiad.wmnet/v1/AUTH_mw'
 ];
 
 $wmfAllServices['codfw'] = [
@@ -39,6 +41,8 @@
'upload' => 'upload.svc.codfw.wmnet',
'cxserver' => 'http://cxserver.discovery.wmnet:8080',
'etcd' => '_etcd._tcp.codfw.wmnet',
+   'mediaSwiftAuth' => 'http://ms-fe.svc.codfw.wmnet/auth',
+   'mediaSwiftStore' => 'http://ms-fe.svc.codfw.wmnet/v1/AUTH_mw'
 ];
 
 ### Logstash
@@ -70,8 +74,8 @@
 
 ### Poolcounter
 $wmfAllServices['eqiad']['poolcounter'] = [
-'10.64.32.126', # poolcounter1001.eqiad.wmnet
-'10.64.16.152', # poolcounter1002.eqiad.wmnet
+   '10.64.32.126', # poolcounter1001.eqiad.wmnet
+   '10.64.16.152', # poolcounter1002.eqiad.wmnet
 ];
 $wmfAllServices['codfw']['poolcounter'] = [
'10.192.16.124', # subra.codfw.wmnet
diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index 2ceaa45..d6c92f8 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -33,7 +33,8 @@
'name'   => "local-swift-{$specificDC}",
'wikiId' => "{$site}-{$lang}",
'lockManager'=> 'redisLockManager',
-   'swiftAuthUrl'   => $wmfSwiftConfig[$specificDC]['authUrl'],
+   'swiftAuthUrl'   => 
$wmfAllServices[$specificDC]['mediaSwiftAuth'],
+   'swiftStorageUrl'=> 
$wmfAllServices[$specificDC]['mediaSwiftStore'],
'swiftUser'  => $wmfSwiftConfig[$specificDC]['user'],
'swiftKey'   => $wmfSwiftConfig[$specificDC]['key'],
'swiftTempUrlKey'=> 
$wmfSwiftConfig[$specificDC]['tempUrlKey'],
@@ -59,7 +60,8 @@
'name'   => "shared-swift-{$specificDC}",
'wikiId' => "wikipedia-commons",
'lockManager'=> 'redisLockManager',
-   'swiftAuthUrl'   => $wmfSwiftConfig[$specificDC]['authUrl'],
+   'swiftAuthUrl'   => 
$wmfAllServices[$specificDC]['mediaSwiftAuth'],
+   'swiftStorageUrl'=> 
$wmfAllServices[$specificDC]['mediaSwiftStore'],
'swiftUser'  => $wmfSwiftConfig[$specificDC]['user'],
'swiftKey'   => $wmfSwiftConfig[$specificDC]['key'],
'swiftTempUrlKey'=> 
$wmfSwiftConfig[$specificDC]['tempUrlKey'],
@@ -83,7 +85,8 @@
'name'   => "global-swift-{$specificDC}",
'wikiId' => "global-data",
'lockManager'=> 'redisLockManager',
-   'swiftAuthUrl'   => $wmfSwiftConfig[$specificDC]['authUrl'],
+   'swiftAuthUrl'   => 
$wmfAllServices[$specificDC]['mediaSwiftAuth'],
+   'swiftStorageUrl'=> 
$wmfAllServices[$specificDC]['mediaSwiftStore'],
'swiftUser'  => $wmfSwiftConfig[$specificDC]['user'],
'swiftKey'   => $wmfSwiftConfig[$specificDC]['key'],
'swiftTempUrlKey'=> 
$wmfSwiftConfig[$specificDC]['tempUrlKey'],
@@ -100,7 +103,8 @@
'name'   => "shared-testwiki-swift-{$specificDC}",
'wikiId' => "wikipedia-test",
'lockManager'=> 'redisLockManager',
-   'swiftAuthUrl'   => $wmfSwiftConfig[$specificDC]['authUrl'],
+   'swiftAuthUrl'   => 
$wmfAllServices[$specificDC]['mediaSwiftAuth'],
+   'swiftStorageUrl'=> 
$wmfAllServices[$specificDC]['mediaSwiftStore'],
'swiftUser'  => $wmfSwiftConfig[$specificDC]['user'],
'swiftKey'   => $wmfSwiftConfig[$specificDC]['key'],
'swiftTempUrlKey'=> 
$wmfSwiftConfig[$specificDC]['tempUrlKey'],

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove imageOverflow transform.

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove imageOverflow transform.
..


Remove imageOverflow transform.

We actually no longer need this transform, since the work of wrapping
images in divs that specify overflow-x:auto is now done upstream!

If we continue to find instances of articles that scroll incorrectly due
to extra-wide images, we should now file issues upstream, as well.

Change-Id: I7c356cb1db2557334e980f592c0fa0b0d4e8aa68
---
M app/src/main/assets/bundle.js
M www/js/sections.js
D www/js/transforms/addImageOverflowContainers.js
M www/js/transforms/widenImages.js
4 files changed, 14 insertions(+), 101 deletions(-)

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



diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index e5bac77..109f69c 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -91,7 +91,7 @@
 
 module.exports = new ActionsHandler();
 
-},{"./bridge":2,"./utilities":25}],2:[function(require,module,exports){
+},{"./bridge":2,"./utilities":24}],2:[function(require,module,exports){
 function Bridge() {
 }
 
@@ -217,7 +217,7 @@
 setImageBackgroundsForDarkMode: setImageBackgroundsForDarkMode
 };
 
-},{"./bridge":2,"./constant":3,"./loader":8,"./utilities":25}],5:[function(require,module,exports){
+},{"./bridge":2,"./constant":3,"./loader":8,"./utilities":24}],5:[function(require,module,exports){
 var transformer = require('./transformer');
 
 transformer.register( 'displayDisambigLink', function( content ) {
@@ -465,7 +465,6 @@
 
 if (!window.isMainPage) {
 transformer.transform( "hideTables", content ); // clickHandler
-transformer.transform( "addImageOverflowXContainers", content ); // 
offsetWidth
 
 if (!window.isNetworkMetered) {
 transformer.transform( "widenImages", content ); // offsetWidth
@@ -536,7 +535,6 @@
 
 if (!window.isMainPage) {
 transformer.transform( "hideTables", content ); // clickHandler
-transformer.transform( "addImageOverflowXContainers", content ); // 
offsetWidth
 
 if (!window.isNetworkMetered) {
 transformer.transform( "widenImages", content ); // offsetWidth
@@ -690,46 +688,6 @@
 }
 } );
 },{"../dark":4,"../transformer":14}],16:[function(require,module,exports){
-var transformer = require("../transformer");
-var utilities = require("../utilities");
-
-function shouldAddImageOverflowXContainer(image) {
-if ((image.width > document.getElementById('content').offsetWidth) && 
!utilities.isNestedInTable(image)) {
-return true;
-} else {
-return false;
-}
-}
-
-function addImageOverflowXContainer(image, ancestor) {
-image.setAttribute('hasOverflowXContainer', 'true'); // So "widenImages" 
transform knows instantly not to widen this one.
-var div = document.createElement( 'div' );
-div.className = 'image_overflow_x_container';
-ancestor.parentElement.insertBefore( div, ancestor );
-div.appendChild(ancestor);
-}
-
-function maybeAddImageOverflowXContainer() {
-var image = this;
-if (shouldAddImageOverflowXContainer(image)) {
-var ancestor = utilities.firstAncestorWithMultipleChildren(image);
-if (ancestor) {
-addImageOverflowXContainer(image, ancestor);
-}
-}
-}
-
-transformer.register( "addImageOverflowXContainers", function( content ) {
-// Wrap wide images in a ... so they 
can scroll
-// side to side if needed without causing the entire section to scroll 
side to side.
-var images = content.getElementsByTagName('img');
-for (var i = 0; i < images.length; ++i) {
-// Load event used so images w/o style or inline width/height
-// attributes can still have their size determined reliably.
-images[i].addEventListener('load', maybeAddImageOverflowXContainer, 
false);
-}
-} );
-},{"../transformer":14,"../utilities":25}],17:[function(require,module,exports){
 var getTableHeader = 
require("wikimedia-page-library").CollapseTable.getTableHeader;
 var transformer = require("../transformer");
 
@@ -833,7 +791,7 @@
 module.exports = {
 handleTableCollapseOrExpandClick: handleTableCollapseOrExpandClick
 };
-},{"../transformer":14,"wikimedia-page-library":26}],18:[function(require,module,exports){
+},{"../transformer":14,"wikimedia-page-library":25}],17:[function(require,module,exports){
 var transformer = require("../transformer");
 var collapseTables = require("./collapseTables");
 
@@ -879,7 +837,7 @@
 bottomDiv.onclick = collapseTables.handleTableCollapseOrExpandClick;
 }
 } );
-},{"../transformer":14,"./collapseTables":17}],19:[function(require,module,exports){
+},{"../transformer":14,"./collapseTables":16}],18:[function(require,module,exports){
 var

[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment::server: move add_ip6_mapped back to site.pp

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: deployment::server: move add_ip6_mapped back to site.pp
..

deployment::server: move add_ip6_mapped back to site.pp

The "add_ip6_mapped" calls should go back from profiles into
site.pp. I tried to consolidate but it's breaking the roles
in labs, since labs does not have IPv6.

This is like d1512074fc28a10cf but doing it only for deployment
servers to fix deployment-tin/mira specifically before touching
all roles.

Change-Id: Ibaf10e16a903b8341c7923135f531b745025dffe
---
M manifests/site.pp
M modules/profile/manifests/mediawiki/deployment/server.pp
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/353171/1

diff --git a/manifests/site.pp b/manifests/site.pp
index cdfa913..9e4aef0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2675,6 +2675,7 @@
 # deployment servers
 node 'tin.eqiad.wmnet', 'naos.codfw.wmnet' {
 role(deployment_server)
+interface::add_ip6_mapped { 'main': }
 }
 
 # test system for performance team (T117888)
diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp 
b/modules/profile/manifests/mediawiki/deployment/server.pp
index 9b65b9f..37efa9e 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -7,8 +7,6 @@
 $base_path = hiera('base_[ath', '/srv/deployment'),
 ) {
 
-interface::add_ip6_mapped { 'main': interface => 'eth0', }
-
 ## Scap Config ##
 require ::scap
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaf10e16a903b8341c7923135f531b745025dffe
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/mediawiki-config[master]: Create Autor and Portal namespaces on Spanish Wikisource

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Create Autor and Portal namespaces on Spanish Wikisource
..


Create Autor and Portal namespaces on Spanish Wikisource

Bug: T164195
Change-Id: I3c4a36f944559cceed63002945e3a7773f4c1c6a
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b9ef566..ef5642e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5882,6 +5882,12 @@
102 => 'Aŭtoro', // Author
103 => 'Aŭtoro-Diskuto', // Author talk
],
+   'eswikisource' => [
+   100 => 'Portal', // Portal, T164195
+   101 => 'Portal_discusión', // Portal talk, T164195
+   106 => 'Autor', // Author, T164195
+   107 => 'Autor_discusión', // Author talk, T164195
+   ],
'etwikisource' => [
106 => 'Autor',
107 => 'Autori_arutelu',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c4a36f944559cceed63002945e3a7773f4c1c6a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 75b135e

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Update mobileapps to 75b135e
..


Update mobileapps to 75b135e

List of changes:
5bcc3d3 Bump Parsoid version requested
277609a Hygiene: update diff test results
36435df Update diff test results
c22e60f Hygiene: Update eslint config
ad1aad0 Do not strip 'id' attribute from tags.
e2da297 Hygiene: remove mobile-text route
1441fce Hygiene: fix definition test to a specific revision
3a930f1 Hygiene: update expected page id in most read diff test result
c0aa759 Wrap video elements in anchor elements
75b135e Only remove Parsoid-generated id attributes
xxx Update node module dependencies

Change-Id: If483c8009cb33bf021bf1e820e1535fd7e40808c
---
M node_modules/ajv/dist/ajv.bundle.js
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/bl/bl.js
M node_modules/bl/package.json
M node_modules/bl/test/test.js
M node_modules/brace-expansion/package.json
M node_modules/extend/.eslintrc
M node_modules/extend/.jscs.json
M node_modules/extend/.travis.yml
M node_modules/extend/index.js
M node_modules/extend/package.json
M node_modules/hot-shots/lib/statsd.js
M node_modules/hot-shots/package.json
M node_modules/js-yaml/dist/js-yaml.js
M node_modules/js-yaml/dist/js-yaml.min.js
M node_modules/js-yaml/lib/js-yaml/dumper.js
M node_modules/js-yaml/package.json
M node_modules/kad/package.json
M node_modules/minimatch/package.json
M src
24 files changed, 383 insertions(+), 318 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: If483c8009cb33bf021bf1e820e1535fd7e40808c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 75b135e

2017-05-10 Thread BearND (Code Review)

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

Change subject: Update mobileapps to 75b135e
..

Update mobileapps to 75b135e

List of changes:
5bcc3d3 Bump Parsoid version requested
277609a Hygiene: update diff test results
36435df Update diff test results
c22e60f Hygiene: Update eslint config
ad1aad0 Do not strip 'id' attribute from tags.
e2da297 Hygiene: remove mobile-text route
1441fce Hygiene: fix definition test to a specific revision
3a930f1 Hygiene: update expected page id in most read diff test result
c0aa759 Wrap video elements in anchor elements
75b135e Only remove Parsoid-generated id attributes
xxx Update node module dependencies

Change-Id: If483c8009cb33bf021bf1e820e1535fd7e40808c
---
M node_modules/ajv/dist/ajv.bundle.js
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/bl/bl.js
M node_modules/bl/package.json
M node_modules/bl/test/test.js
M node_modules/brace-expansion/package.json
M node_modules/extend/.eslintrc
M node_modules/extend/.jscs.json
M node_modules/extend/.travis.yml
M node_modules/extend/index.js
M node_modules/extend/package.json
M node_modules/hot-shots/lib/statsd.js
M node_modules/hot-shots/package.json
M node_modules/js-yaml/dist/js-yaml.js
M node_modules/js-yaml/dist/js-yaml.min.js
M node_modules/js-yaml/lib/js-yaml/dumper.js
M node_modules/js-yaml/package.json
M node_modules/kad/package.json
M node_modules/minimatch/package.json
M src
24 files changed, 383 insertions(+), 318 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/70/353170/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If483c8009cb33bf021bf1e820e1535fd7e40808c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace assertEquals test with assertThat

2017-05-10 Thread Mholloway (Code Review)

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

Change subject: Hygiene: replace assertEquals test with assertThat
..

Hygiene: replace assertEquals test with assertThat

Comment follow-up.  Prefer assertThat to assertEquals.

Change-Id: Ie9f92995497249ba88ebd099a8c348798b771334
---
M app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java 
b/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
index 5ee71f1..5e6f343 100644
--- a/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
+++ b/app/src/test/java/org/wikipedia/zero/ZeroConfigClientTest.java
@@ -17,8 +17,8 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isA;
-import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -60,7 +60,7 @@
 verify(cb).success(any(Call.class), captor.capture());
 ZeroConfig config = captor.getValue();
 
-assertEquals(config, new ZeroConfig());
+assertThat(config, is(new ZeroConfig()));
 }
 
 @Test public void testRequestMalformed() throws Throwable {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Only remove Parsoid-generated id attributes

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Only remove Parsoid-generated id attributes
..


Only remove Parsoid-generated id attributes

We'd like to remove id attributes that are generated by Parsoid. They
start with "mw", followed by a couple of characters.
We do want to keep other ids attributes, though. Especially ones
generated by editors or from reference links.

Bug: T164480
Change-Id: Ibee53c6cdc227a057e9ebdd4e3e53762221f6fb1
---
M lib/transforms.js
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-intro.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section1-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section11-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section12-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section14-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section16-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section17-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section18-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section19-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section2-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section20-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section21-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section22-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section23-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section24-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section25-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section3-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section4-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section5-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section6-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section7-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section8-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding/lead-intro.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding/section1-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding/section2-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding/section3-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-section0-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section1-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section11-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section12-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section14-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section16-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section17-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section18-text.html
M

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T161151: Linter: Emit fully resolved template names

2017-05-10 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353168 )

Change subject: T161151: Linter: Emit fully resolved template names
..

T161151: Linter: Emit fully resolved template names

Change-Id: Ia4bd7a82d4cfceaec28c8c63954addaf50f35c85
---
M lib/wt2html/pp/handlers/linter.js
1 file changed, 14 insertions(+), 9 deletions(-)


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

diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index 213051f..fec50d9 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -88,11 +88,16 @@
  * @param {Object} tplInfo Template info
  * @return {string}
  */
-function findEnclosingTemplateName(tplInfo) {
+function findEnclosingTemplateName(env, tplInfo) {
var dmw = DU.getDataMw(tplInfo.first);
if (dmw.parts && dmw.parts.length === 1) {
var p0 = dmw.parts[0];
-   return { name: (p0.template || p0.templatearg).target.wt.trim() 
};
+   var name = (p0.template || p0.templatearg).target.wt.trim();
+   // Fully resolve template paths where required
+   if (/^\.*\//.test(name)) {
+   name = env.page.title.getPrefixedDBKey() + name;
+   }
+   return { name: name };
} else {
return { multiPartTemplateBlock: true };
}
@@ -120,7 +125,7 @@
 
if (tplInfo) {
dsr = tplInfo.dsr;
-   templateInfo = findEnclosingTemplateName(tplInfo);
+   templateInfo = findEnclosingTemplateName(env, tplInfo);
} else if (dp.tmp.origDSR) {
// During DSR computation, stripped meta tags
// surrender their width to its previous sibling.
@@ -227,7 +232,7 @@
if (wc) {
if (tplInfo) {
dsr = 
tplInfo.dsr;
-   
templateInfo = findEnclosingTemplateName(tplInfo);
+   
templateInfo = findEnclosingTemplateName(env, tplInfo);
} else {
dsr = 
dp.dsr;
}
@@ -268,7 +273,7 @@
var templateInfo;
if (tplInfo) {
dsr = tplInfo.dsr;
-   templateInfo = findEnclosingTemplateName(tplInfo);
+   templateInfo = findEnclosingTemplateName(env, tplInfo);
} else {
dsr = DU.getDataParsoid(nextSibling).dsr;
}
@@ -296,7 +301,7 @@
if (!(dp.autoInsertedStart && dp.autoInsertedEnd) && 
obsoleteTagsRE.test(c.nodeName)) {
var templateInfo;
if (tplInfo) {
-   templateInfo = findEnclosingTemplateName(tplInfo);
+   templateInfo = findEnclosingTemplateName(env, tplInfo);
}
var lintObj = {
dsr: tplInfo ? tplInfo.dsr : dp.dsr,
@@ -322,7 +327,7 @@
if (items.length) {
var templateInfo;
if (tplInfo) {
-   templateInfo = 
findEnclosingTemplateName(tplInfo);
+   templateInfo = findEnclosingTemplateName(env, 
tplInfo);
}
env.log('lint/bogus-image-options', {
dsr: tplInfo ? tplInfo.dsr : dp.dsr,
@@ -358,7 +363,7 @@
if (prev && prev.nodeName === 'TABLE' && 
DU.getDataParsoid(prev).autoInsertedEnd) {
var dsr;
if (tplInfo) {
-   templateInfo = 
findEnclosingTemplateName(tplInfo);
+   templateInfo = findEnclosingTemplateName(env, 
tplInfo);
dsr = tplInfo.dsr;
} else {
// Identify the dsr-span of the opening tag
@@ -406,7 +411,7 @@
if (p) {
var dsr, templateInfo;
if (tplInfo) {
-   templateInfo = 
findEnclosingTemplateName(tplInfo);
+   templateInfo = 
findEnclosingTemplateName(env, tplInfo);
dsr = tplInfo.dsr;
} else {
dsr = dp.dsr;

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Re-introduce .simulateLabelClick() as a separate method from...

2017-05-10 Thread Code Review

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

Change subject: Re-introduce .simulateLabelClick() as a separate method from 
.focus()
..

Re-introduce .simulateLabelClick() as a separate method from .focus()

This implements the behavior that we would want a ``
associated with the widget to have, if HTML allowed us to associate
`` with arbitrary HTML elements.

* For most focusable widgets, it just focuses the widget.
* For CheckboxInputWidget, RadioInputWidget and ToggleSwitchWidget,
  italso  toggles the widget's state.

FieldLayout and LabelWidget now call .simulateLabelClick() instead of
.focus() for widgets that can't be used with ``.

We previously deprecated InputWidget#simulateLabelClick as unnecessary
(73521855861d4ef887af0b67533245c15e4dd942). But it turns out that
such a method would be useful on some other widgets. Let's reuse the name.

InputWidget#simulateLabelClick is removed. Calling it will fall back to
TabIndexedElement#simulateLabelClick, which effectively works the same.

Bug: T164507
Change-Id: I50eeb5a65a9cdc343f7c199f4f2447aa6b5d032c
---
M src/Widget.js
M src/layouts/FieldLayout.js
M src/mixins/TabIndexedElement.js
M src/widgets/CheckboxInputWidget.js
M src/widgets/InputWidget.js
M src/widgets/LabelWidget.js
M src/widgets/RadioInputWidget.js
M src/widgets/SelectFileWidget.js
M src/widgets/ToggleSwitchWidget.js
9 files changed, 63 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/67/353167/1

diff --git a/src/Widget.js b/src/Widget.js
index 661cf27..cb2a65a 100644
--- a/src/Widget.js
+++ b/src/Widget.js
@@ -106,8 +106,25 @@
  * Get an ID of a labelable node which is part of this widget, if any, to be 
used for ``
  * value.
  *
+ * If this function returns null, the widget should have a meaningful 
#simulateLabelClick method
+ * instead.
+ *
  * @return {string|null} The ID of the labelable element
  */
 OO.ui.Widget.prototype.getInputId = function () {
return null;
 };
+
+/**
+ * Simulate the behavior of clicking on a label (a HTML `` element) 
bound to this input.
+ * HTML only allows `` to act on specific "labelable" elements; complex 
widgets might need to
+ * override this method to provide intuitive, accessible behavior.
+ *
+ * By default, this does nothing. OO.ui.mixin.TabIndexedElement overrides it 
for focusable widgets.
+ * Individual widgets may override it too.
+ *
+ * This method is called by OO.ui.LabelWidget and OO.ui.FieldLayout. It should 
not be called
+ * directly.
+ */
+OO.ui.Widget.prototype.simulateLabelClick = function () {
+};
diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index cc25b5d..2bbe48a 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -101,7 +101,7 @@
this.$label.attr( 'for', this.fieldWidget.getInputId() );
} else {
this.$label.on( 'click', function () {
-   this.fieldWidget.focus();
+   this.fieldWidget.simulateLabelClick();
return false;
}.bind( this ) );
}
diff --git a/src/mixins/TabIndexedElement.js b/src/mixins/TabIndexedElement.js
index 18b7c39..c81eed7 100644
--- a/src/mixins/TabIndexedElement.js
+++ b/src/mixins/TabIndexedElement.js
@@ -209,3 +209,10 @@
this.$tabIndexed.blur();
return this;
 };
+
+/**
+ * @inheritdoc
+ */
+OO.ui.mixin.TabIndexedElement.prototype.simulateLabelClick = function () {
+   this.focus();
+};
diff --git a/src/widgets/CheckboxInputWidget.js 
b/src/widgets/CheckboxInputWidget.js
index 2af9457..793b837 100644
--- a/src/widgets/CheckboxInputWidget.js
+++ b/src/widgets/CheckboxInputWidget.js
@@ -134,6 +134,16 @@
 /**
  * @inheritdoc
  */
+OO.ui.CheckboxInputWidget.prototype.simulateLabelClick = function () {
+   if ( !this.isDisabled() ) {
+   this.$input.click();
+   }
+   this.focus();
+};
+
+/**
+ * @inheritdoc
+ */
 OO.ui.CheckboxInputWidget.prototype.restorePreInfuseState = function ( state ) 
{
OO.ui.CheckboxInputWidget.parent.prototype.restorePreInfuseState.call( 
this, state );
if ( state.checked !== undefined && state.checked !== this.isSelected() 
) {
diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js
index f36360c..eb22eb4 100644
--- a/src/widgets/InputWidget.js
+++ b/src/widgets/InputWidget.js
@@ -200,23 +200,6 @@
 };
 
 /**
- * Simulate the behavior of clicking on a label bound to this input. This 
method is only called by
- * {@link OO.ui.LabelWidget LabelWidget} and {@link OO.ui.FieldLayout 
FieldLayout}. It should not be
- * called directly.
- */
-OO.ui.InputWidget.prototype.simulateLabelClick = function () {
-   OO.ui.warnDeprecation( 'InputWidget: simulateLabelClick() is 
deprecated.' );
-   if ( !this.isDisabled() ) {
-   if ( this.$input.is( ':checkbox,

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use .focus() method when possible instead of looking inside ...

2017-05-10 Thread Code Review

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

Change subject: Use .focus() method when possible instead of looking inside 
widgets
..

Use .focus() method when possible instead of looking inside widgets

For example, MessageDialog shouldn't have to know that ActionWidgets
have a '$button' property, it can just call .focus() on them.

Change-Id: Iae9bf605ca5263cde946ff03556fbe57dae2b4d1
---
M src/dialogs/MessageDialog.js
M src/widgets/ComboBoxInputWidget.js
M src/widgets/SearchInputWidget.js
M src/widgets/TextInputWidget.js
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/66/353166/1

diff --git a/src/dialogs/MessageDialog.js b/src/dialogs/MessageDialog.js
index a047053..88c73c0 100644
--- a/src/dialogs/MessageDialog.js
+++ b/src/dialogs/MessageDialog.js
@@ -205,7 +205,7 @@
return action.getFlags().indexOf( 'primary' ) > 
-1;
} );
if ( actions.length > 0 ) {
-   actions[ 0 ].$button.focus();
+   actions[ 0 ].focus();
}
}, this );
 };
diff --git a/src/widgets/ComboBoxInputWidget.js 
b/src/widgets/ComboBoxInputWidget.js
index 7073949..3ef7793 100644
--- a/src/widgets/ComboBoxInputWidget.js
+++ b/src/widgets/ComboBoxInputWidget.js
@@ -192,7 +192,7 @@
  */
 OO.ui.ComboBoxInputWidget.prototype.onDropdownButtonClick = function () {
this.menu.toggle();
-   this.$input[ 0 ].focus();
+   this.focus();
 };
 
 /**
diff --git a/src/widgets/SearchInputWidget.js b/src/widgets/SearchInputWidget.js
index 1181e56..cc33b87 100644
--- a/src/widgets/SearchInputWidget.js
+++ b/src/widgets/SearchInputWidget.js
@@ -46,7 +46,7 @@
if ( e.which === OO.ui.MouseButtons.LEFT ) {
// Clear the text field
this.setValue( '' );
-   this.$input[ 0 ].focus();
+   this.focus();
return false;
}
 };
diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index d127529..ce71b7f 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -212,7 +212,7 @@
  */
 OO.ui.TextInputWidget.prototype.onIconMouseDown = function ( e ) {
if ( e.which === OO.ui.MouseButtons.LEFT ) {
-   this.$input[ 0 ].focus();
+   this.focus();
return false;
}
 };
@@ -229,7 +229,7 @@
// Clear the text field
this.setValue( '' );
}
-   this.$input[ 0 ].focus();
+   this.focus();
return false;
}
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae9bf605ca5263cde946ff03556fbe57dae2b4d1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Generalize .getInputId() for all widgets

2017-05-10 Thread Code Review

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

Change subject: Generalize .getInputId() for all widgets
..

Generalize .getInputId() for all widgets

No reason to limit this to InputWidget, the  is nice for
accessibility so let's use it where we can. This method is now a part of
TabIndexedElement. Widget includes a fallback version of it, so that we
can just call it for anything.

The 'supportsSimpleLabel' property (previously meant to allow for the same
thing but broken at least since 73521855861d4ef887af0b67533245c15e4dd942,
which added a requirement for widgets to also implement .getInputId()),
is now removed.

The HTML specification places some arbitrary restrictions on which
elements a  can be used with (so-called 'labelable elements'),
which TabIndexedElement follows.

Also resolve minor inconsistencies in the handling of this in LabelWidget
versus FieldLayout (basically, FieldLayout was able to handle some
non-InputWidgets like CapsuleMultiselectWidget, LabelWidget wasn't).

This should result in no behavior changes for code which previously worked.
For some widgets (e.g. TagMultiselectWidget), a FieldLayout will now use
a `` rather than manual click handling, but for a user the
effect is the same.

Change-Id: I4286ca7633e29fcef551cffd74d46aed52819f95
---
M php/Widget.php
M php/layouts/FieldLayout.php
M php/mixins/TabIndexedElement.php
M php/widgets/ButtonInputWidget.php
M php/widgets/CheckboxMultiselectInputWidget.php
M php/widgets/InputWidget.php
M php/widgets/LabelWidget.php
M php/widgets/RadioSelectInputWidget.php
M src/Widget.js
M src/layouts/FieldLayout.js
M src/mixins/TabIndexedElement.js
M src/widgets/ButtonInputWidget.js
M src/widgets/CapsuleMultiselectWidget.js
M src/widgets/CheckboxMultiselectInputWidget.js
M src/widgets/InputWidget.js
M src/widgets/LabelWidget.js
M src/widgets/RadioSelectInputWidget.js
17 files changed, 136 insertions(+), 133 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/65/353165/1

diff --git a/php/Widget.php b/php/Widget.php
index b5ec488..a93fbfb 100644
--- a/php/Widget.php
+++ b/php/Widget.php
@@ -9,16 +9,6 @@
  */
 class Widget extends Element {
 
-   /* Static Properties */
-
-   /**
-* Whether this widget will behave reasonably when wrapped in a HTML 
``. If this is true,
-* wrappers such as FieldLayout may use a ``.
-*
-* @var boolean
-*/
-   public static $supportsSimpleLabel = false;
-
/* Properties */
 
/**
@@ -72,6 +62,16 @@
return $this;
}
 
+   /**
+* Get an ID of a labelable node which is part of this widget, if any, 
to be used for
+* `` value.
+*
+* @return {string|null} The ID of the labelable node
+*/
+   public function getInputId() {
+   return null;
+   }
+
public function getConfig( &$config ) {
if ( $this->disabled ) {
$config['disabled'] = $this->disabled;
diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index beae36b..78aab90 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -110,7 +110,7 @@
array_merge( $config, [ 'titled' => $this->label ] ) );
 
// Initialization
-   if ( $fieldWidget::$supportsSimpleLabel ) {
+   if ( $this->fieldWidget->getInputId() ) {
$this->label->setAttributes( [ 'for' => 
$this->fieldWidget->getInputId() ] );
}
$this
diff --git a/php/mixins/TabIndexedElement.php b/php/mixins/TabIndexedElement.php
index adca595..ecf884a 100644
--- a/php/mixins/TabIndexedElement.php
+++ b/php/mixins/TabIndexedElement.php
@@ -86,4 +86,48 @@
public function getTabIndex() {
return $this->tabIndex;
}
+
+   /**
+* Get an ID of a focusable element of this widget, if any, to be used 
for `` value.
+*
+* If the element already has an ID then that is returned, otherwise 
unique ID is
+* generated, set on the element, and returned.
+*
+* @return {string|null} The ID of the focusable element
+*/
+   public function getInputId() {
+   $id = $this->tabIndexed->getAttribute( 'id' );
+
+   if ( !$this->isLabelableNode( $this->tabIndexed ) ) {
+   return null;
+   }
+
+   if ( $id === null ) {
+   $id = Tag::generateElementId();
+   $this->tabIndexed->setAttributes( [ 'id' => $id ] );
+   }
+
+   return $id;
+   }
+
+   /**
+* Whether the node is 'labelable' according to the HTML spec
+* (i.e., whether it can be interacted with through a ``).
+* See:

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Allow more widgets to be focussed programatically

2017-05-10 Thread Code Review

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

Change subject: Allow more widgets to be focussed programatically
..

Allow more widgets to be focussed programatically

* Generalize the .focus() method (and .blur() too for consistency) for
  all TabIndexedElements.
* Add custom .focus() / .blur() implementations for focusable widgets
  that are not TabIndexedElements (mostly because they are wrappers,
  e.g. SelectFileWidget).
* Remove custom .focus() / .blur() implementations where they became
  redundant, e.g. InputWidget.
* Fix up some widgets that were confused about .focus() method versus
  .onFocus() (focus event handler).

With this change, the following widgets will be receiving focus when
the label of their associated FieldLayout or LabelWidget is clicked:

* ButtonWidget and subclasses:
  * PopupButtonWidget
* DropdownWidget
* SelectFileWidget
* InputWidget subclasses:
  * ButtonInputWidget
  * DropdownInputWidget
  * RadioSelectInputWidget
* SelectWidget subclasses:
  * ButtonSelectWidget
  * RadioSelectWidget
* ToggleWidget subclasses:
  * ToggleSwitchWidget
  * ToggleButtonWidget
* TagMultiselectWidget and subclasses:
  * PopupTagMultiselectWidget
  * MenuTagMultiselectWidget

Bug: T164506
Change-Id: I559a4e429bc224e01e7407988078a6b275430e35
---
M src/layouts/FieldLayout.js
M src/mixins/TabIndexedElement.js
M src/widgets/CapsuleItemWidget.js
M src/widgets/CapsuleMultiselectWidget.js
M src/widgets/DropdownInputWidget.js
M src/widgets/InputWidget.js
M src/widgets/LabelWidget.js
M src/widgets/MenuTagMultiselectWidget.js
M src/widgets/PopupTagMultiselectWidget.js
M src/widgets/RadioSelectInputWidget.js
M src/widgets/SelectFileWidget.js
M src/widgets/TagItemWidget.js
M src/widgets/TagMultiselectWidget.js
13 files changed, 67 insertions(+), 86 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/64/353164/1

diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index 1603ea8..533f854 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -97,15 +97,13 @@
this.fieldWidget.connect( this, { disable: 'onFieldDisable' } );
 
// Initialization
-   if ( fieldWidget.constructor.static.supportsSimpleLabel ) {
-   if ( this.fieldWidget.getInputId() ) {
-   this.$label.attr( 'for', this.fieldWidget.getInputId() 
);
-   } else {
-   this.$label.on( 'click', function () {
-   this.fieldWidget.focus();
-   return false;
-   }.bind( this ) );
-   }
+   if ( fieldWidget.constructor.static.supportsSimpleLabel && 
this.fieldWidget.getInputId() ) {
+   this.$label.attr( 'for', this.fieldWidget.getInputId() );
+   } else {
+   this.$label.on( 'click', function () {
+   this.fieldWidget.focus();
+   return false;
+   }.bind( this ) );
}
this.$element
.addClass( 'oo-ui-fieldLayout' )
diff --git a/src/mixins/TabIndexedElement.js b/src/mixins/TabIndexedElement.js
index 0116c03..5c245de 100644
--- a/src/mixins/TabIndexedElement.js
+++ b/src/mixins/TabIndexedElement.js
@@ -137,3 +137,25 @@
 OO.ui.mixin.TabIndexedElement.prototype.getTabIndex = function () {
return this.tabIndex;
 };
+
+/**
+ * Focus this element.
+ *
+ * @chainable
+ */
+OO.ui.mixin.TabIndexedElement.prototype.focus = function () {
+   if ( !this.isDisabled() ) {
+   this.$tabIndexed.focus();
+   }
+   return this;
+};
+
+/**
+ * Blur this element.
+ *
+ * @chainable
+ */
+OO.ui.mixin.TabIndexedElement.prototype.blur = function () {
+   this.$tabIndexed.blur();
+   return this;
+};
diff --git a/src/widgets/CapsuleItemWidget.js b/src/widgets/CapsuleItemWidget.js
index 5dc852b..d50ab0c 100644
--- a/src/widgets/CapsuleItemWidget.js
+++ b/src/widgets/CapsuleItemWidget.js
@@ -100,10 +100,3 @@
element.getNextItem( this ).focus();
}
 };
-
-/**
- * Focuses the capsule
- */
-OO.ui.CapsuleItemWidget.prototype.focus = function () {
-   this.$element.focus();
-};
diff --git a/src/widgets/CapsuleMultiselectWidget.js 
b/src/widgets/CapsuleMultiselectWidget.js
index 67ef5e3..20e528d 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -545,6 +545,7 @@
  */
 OO.ui.CapsuleMultiselectWidget.prototype.onInputFocus = function () {
if ( !this.isDisabled() ) {
+   this.updateInputSize();
this.menu.toggle( true );
}
 };
@@ -813,7 +814,6 @@
  * Focus the widget
  *
  * @chainable
- * @return {OO.ui.CapsuleMultiselectWidget}
  */
 OO.ui.CapsuleMultiselectWidget.prototype.focus = function () {
if ( !this.isDisabled() ) {
@@ -822,9 +822,7 @@

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.1]: Track RC clicks for all users, not just logged-in users

2017-05-10 Thread Catrope (Code Review)

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

Change subject: Track RC clicks for all users, not just logged-in users
..

Track RC clicks for all users, not just logged-in users

Bug: T164617
Change-Id: I31988e000f4565db5be3f28142509e9f176d0404
(cherry picked from commit 463c0f63615175ed2d5b3c8e2760a55b90aaf5c2)
---
M extension.json
M modules/ext.wikimediaEvents.recentChangesClicks.js
2 files changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/extension.json b/extension.json
index 6b4b8bb..14ab13a 100644
--- a/extension.json
+++ b/extension.json
@@ -147,7 +147,7 @@
"schema.RecentChangesTopLinks": {
"class": "ResourceLoaderSchemaModule",
"schema": "RecentChangesTopLinks",
-   "revision": 16699164
+   "revision": 16732249
},
"ext.wikimediaEvents": {
"scripts": [
@@ -155,7 +155,8 @@
"ext.wikimediaEvents.statsd.js",
"ext.wikimediaEvents.kartographer.js",
"ext.wikimediaEvents.readingDepth.js",
-   "ext.wikimediaEvents.geoFeatures.js"
+   "ext.wikimediaEvents.geoFeatures.js",
+   "ext.wikimediaEvents.recentChangesClicks.js"
],
"skinScripts": {
"default": [
@@ -177,8 +178,7 @@
},
"ext.wikimediaEvents.loggedin": {
"scripts": [
-   "ext.wikimediaEvents.deprecate.js",
-   "ext.wikimediaEvents.recentChangesClicks.js"
+   "ext.wikimediaEvents.deprecate.js"
],
"targets": [
"desktop",
diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index cecc1c2..7e9b461 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -107,7 +107,8 @@
 
mw.track( 'event.RecentChangesTopLinks', {
url: $link.prop( 'href' ),
-   label: $link.text()
+   label: $link.text(),
+   loggedIn: !mw.user.isAnon()
} );
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31988e000f4565db5be3f28142509e9f176d0404
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: [WIP] Add ZRR from well-behaved searchers

2017-05-10 Thread Bearloga (Code Review)

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

Change subject: [WIP] Add ZRR from well-behaved searchers
..

[WIP] Add ZRR from well-behaved searchers

Bug: T150901
Change-Id: I3c50c7d3bc3a0fdffbbae9c19d6b3784a0f2df05
---
M README.md
A modules/metrics/search/cirrus_query_aggregates_well_behaved
M modules/metrics/search/config.yaml
A modules/metrics/search/well_behaved.R
4 files changed, 76 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/62/353162/1

diff --git a/README.md b/README.md
index 89ad0b0..1c5132d 100644
--- a/README.md
+++ b/README.md
@@ -176,8 +176,8 @@
 - [x] Broken down by language-project pairs 
([T126244](https://phabricator.wikimedia.org/T126244))
 - [x] [No 
automata](modules/metrics/search/cirrus_langproj_breakdown_no_automata)
 - [x] [With 
automata](modules/metrics/search/cirrus_langproj_breakdown_with_automata)
-- Well-behaved searchers (planned, 
[T150901](https://phabricator.wikimedia.org/T150901))
-- Probable non-bots, as detected by ML (planned, 
[T149440](https://phabricator.wikimedia.org/T149440)
+- Well-behaved searchers (planned, 
[T150370](https://phabricator.wikimedia.org/T150370))
+- [ ] 
[ZRR](modules/metrics/search/cirrus_query_aggregates_well_behaved) 
([T150901](https://phabricator.wikimedia.org/T150901))
   - [x] [Wikipedia.org 
Portal](https://www.mediawiki.org/wiki/Wikipedia.org_Portal) 
([configuration](modules/metrics/portal/config.yaml), 
[T118994](https://phabricator.wikimedia.org/T118994))
 - [x] [Pageviews](modules/metrics/portal/pageviews) 
([T125737](https://phabricator.wikimedia.org/T125737), 
[T143064](https://phabricator.wikimedia.org/T143064), 
[T143605](https://phabricator.wikimedia.org/T143605))
 - [x] [Referers](modules/metrics/portal/referer_data)
diff --git a/modules/metrics/search/cirrus_query_aggregates_well_behaved 
b/modules/metrics/search/cirrus_query_aggregates_well_behaved
new file mode 100755
index 000..d5fd007
--- /dev/null
+++ b/modules/metrics/search/cirrus_query_aggregates_well_behaved
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+Rscript modules/metrics/search/well_behaved.R -d $1 -m zrr
diff --git a/modules/metrics/search/config.yaml 
b/modules/metrics/search/config.yaml
index cffd6fc..9c86d5b 100644
--- a/modules/metrics/search/config.yaml
+++ b/modules/metrics/search/config.yaml
@@ -110,15 +110,20 @@
 max_data_points: 30
 funnel: true
 type: script
+cirrus_query_aggregates_with_automata:
+description: Overall zero results rate (ZRR)
+granularity: days
+starts: 2015-12-11
+type: script
 cirrus_query_aggregates_no_automata:
 description: Zero results rate (ZRR), excluding known bots/tools
 granularity: days
 starts: 2015-12-11
 type: script
-cirrus_query_aggregates_with_automata:
-description: Overall zero results rate (ZRR)
+cirrus_query_aggregates_well_behaved:
+description: Zero results rate (ZRR) from 
[well-behaving](https://phabricator.wikimedia.org/T150370) searchers only
 granularity: days
-starts: 2015-12-11
+starts: 2017-04-01
 type: script
 cirrus_query_breakdowns_no_automata:
 description: Zero results rate (ZRR) broken down by full-text vs. 
prefix searches, excluding known bots/tools
diff --git a/modules/metrics/search/well_behaved.R 
b/modules/metrics/search/well_behaved.R
new file mode 100644
index 000..e8155f3
--- /dev/null
+++ b/modules/metrics/search/well_behaved.R
@@ -0,0 +1,63 @@
+#!/usr/bin/env Rscript
+
+.libPaths("/a/discovery/r-library"); 
suppressPackageStartupMessages(library("optparse"))
+
+option_list <- list(
+  make_option(c("-d", "--date"), default = NA, action = "store", type = 
"character"),
+  make_option(c("-m", "--metric"), default = "zrr", action = "store",
+  help = "Available: [default %default]")
+)
+
+# Get command line options, if help option encountered print help and exit,
+# otherwise if options not found on command line then set defaults:
+opt <- parse_args(OptionParser(option_list = option_list))
+
+if (is.na(opt$date) || !(opt$output %in% c("zrr"))) {
+  quit(save = "no", status = 1)
+}
+
+output <- switch(
+  opt$metric,
+  zrr = {
+query <- "ADD JAR hdfs:///wmf/refinery/current/artifacts/refinery-hive.jar;
+CREATE TEMPORARY FUNCTION array_sum AS 
'org.wikimedia.analytics.refinery.hive.ArraySumUDF';
+CREATE TEMPORARY FUNCTION is_spider as 
'org.wikimedia.analytics.refinery.hive.IsSpiderUDF';
+CREATE TEMPORARY FUNCTION ua_parser as 
'org.wikimedia.analytics.refinery.hive.UAParserUDF';
+USE wmf_raw;
+WITH well_behaved_searches AS (
+  SELECT
+  ip AS ip_address,
+  COUNT(1) AS total_searches
+  FROM CirrusSearchRequestSet
+  WHERE
+  year = 2017 AND month = 5 AND day

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update WikitextClient to use formatversion=2

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: Update WikitextClient to use formatversion=2
..


Update WikitextClient to use formatversion=2

Bug: T150382
Change-Id: I7669b25d0130db9a5daaeaad9e612f16903c4596
---
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
M app/src/main/java/org/wikipedia/edit/wikitext/Wikitext.java
M app/src/main/java/org/wikipedia/edit/wikitext/WikitextClient.java
M app/src/test/res/raw/wikitext.json
4 files changed, 22 insertions(+), 23 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
index f7ee9d7..9d5f09b 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
@@ -42,9 +42,9 @@
 }
 
 public static class Revision {
-@SuppressWarnings("unused,NullableProblems") @NonNull private String 
contentformat;
-@SuppressWarnings("unused,NullableProblems") @NonNull private String 
contentmodel;
-@SerializedName("*") @SuppressWarnings("unused,NullableProblems") 
@NonNull private String content;
+@SuppressWarnings("unused,NullableProblems") 
@SerializedName("contentformat") @NonNull private String contentFormat;
+@SuppressWarnings("unused,NullableProblems") 
@SerializedName("contentmodel") @NonNull private String contentModel;
+@SuppressWarnings("unused,NullableProblems") @NonNull private String 
content;
 @NonNull public String content() {
 return content;
 }
diff --git a/app/src/main/java/org/wikipedia/edit/wikitext/Wikitext.java 
b/app/src/main/java/org/wikipedia/edit/wikitext/Wikitext.java
index 958e578..5774585 100644
--- a/app/src/main/java/org/wikipedia/edit/wikitext/Wikitext.java
+++ b/app/src/main/java/org/wikipedia/edit/wikitext/Wikitext.java
@@ -5,24 +5,21 @@
 import org.wikipedia.dataclient.mwapi.MwQueryPage;
 import org.wikipedia.model.BaseModel;
 
-import java.util.Iterator;
-import java.util.Map;
+import java.util.List;
 
 public class Wikitext extends BaseModel {
 
@SuppressWarnings("unused,NullableProblems,MismatchedQueryAndUpdateOfCollection")
 @Nullable
-private Map pages;
+private List pages;
 
 @Nullable String wikitext() {
 if (pages == null) {
 return null;
 }
-Iterator> i = 
pages.entrySet().iterator();
-MwQueryPage page = i.next().getValue();
-if (page == null
-|| page.revisions() == null
-|| page.revisions().get(0) == null) {
-return null;
+for (MwQueryPage page : pages) {
+if (page.revisions() != null && page.revisions().get(0) != null) {
+return page.revisions().get(0).content();
+}
 }
-return page.revisions().get(0).content();
+return null;
 }
 }
diff --git a/app/src/main/java/org/wikipedia/edit/wikitext/WikitextClient.java 
b/app/src/main/java/org/wikipedia/edit/wikitext/WikitextClient.java
index 1de7669..af42395 100644
--- a/app/src/main/java/org/wikipedia/edit/wikitext/WikitextClient.java
+++ b/app/src/main/java/org/wikipedia/edit/wikitext/WikitextClient.java
@@ -33,15 +33,17 @@
 call.enqueue(new retrofit2.Callback() {
 @Override
 public void onResponse(Call call, 
Response response) {
-if (response.body().hasError()) {
+// noinspection ConstantConditions
+if (response.body().success() && 
response.body().query().wikitext() != null) {
+// noinspection ConstantConditions
+cb.success(call, response.body().query().wikitext());
+} else if (response.body().hasError()) {
+// noinspection ConstantConditions
 cb.failure(call, new 
MwException(response.body().getError()));
-return;
-} else if (response.body().query().wikitext() == null) {
+} else {
 Throwable t = new JsonParseException("Error parsing 
wikitext from query response");
 cb.failure(call, t);
-return;
 }
-cb.success(call, response.body().query().wikitext());
 }
 
 @Override
@@ -58,7 +60,7 @@
 }
 
 @VisibleForTesting interface Service {
-
@GET("w/api.php?action=query=json=revisions=content=1")
+
@GET("w/api.php?action=query=json=2=revisions=content=1")
 Call request(@NonNull @Query("titles") 
String title,

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.29.0-wmf.21

2017-05-10 Thread jenkins-bot (Code Review)

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

Change subject: group1 wikis to 1.29.0-wmf.21
..


group1 wikis to 1.29.0-wmf.21

Change-Id: I58865d5d83f4cb038ef4113294faf2968f53f2e3
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index 8d7dfcc..d9f4bc0 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.21",
-"aawikibooks": "php-1.30.0-wmf.1",
-"aawiktionary": "php-1.30.0-wmf.1",
+"aawikibooks": "php-1.29.0-wmf.21",
+"aawiktionary": "php-1.29.0-wmf.21",
 "abwiki": "php-1.29.0-wmf.21",
-"abwiktionary": "php-1.30.0-wmf.1",
+"abwiktionary": "php-1.29.0-wmf.21",
 "acewiki": "php-1.29.0-wmf.21",
-"advisorywiki": "php-1.30.0-wmf.1",
+"advisorywiki": "php-1.29.0-wmf.21",
 "adywiki": "php-1.29.0-wmf.21",
 "afwiki": "php-1.29.0-wmf.21",
-"afwikibooks": "php-1.30.0-wmf.1",
-"afwikiquote": "php-1.30.0-wmf.1",
-"afwiktionary": "php-1.30.0-wmf.1",
+"afwikibooks": "php-1.29.0-wmf.21",
+"afwikiquote": "php-1.29.0-wmf.21",
+"afwiktionary": "php-1.29.0-wmf.21",
 "akwiki": "php-1.29.0-wmf.21",
-"akwikibooks": "php-1.30.0-wmf.1",
-"akwiktionary": "php-1.30.0-wmf.1",
+"akwikibooks": "php-1.29.0-wmf.21",
+"akwiktionary": "php-1.29.0-wmf.21",
 "alswiki": "php-1.29.0-wmf.21",
-"alswikibooks": "php-1.30.0-wmf.1",
-"alswikiquote": "php-1.30.0-wmf.1",
-"alswiktionary": "php-1.30.0-wmf.1",
+"alswikibooks": "php-1.29.0-wmf.21",
+"alswikiquote": "php-1.29.0-wmf.21",
+"alswiktionary": "php-1.29.0-wmf.21",
 "amwiki": "php-1.29.0-wmf.21",
-"amwikiquote": "php-1.30.0-wmf.1",
-"amwiktionary": "php-1.30.0-wmf.1",
+"amwikiquote": "php-1.29.0-wmf.21",
+"amwiktionary": "php-1.29.0-wmf.21",
 "angwiki": "php-1.29.0-wmf.21",
-"angwikibooks": "php-1.30.0-wmf.1",
-"angwikiquote": "php-1.30.0-wmf.1",
-"angwikisource": "php-1.30.0-wmf.1",
-"angwiktionary": "php-1.30.0-wmf.1",
+"angwikibooks": "php-1.29.0-wmf.21",
+"angwikiquote": "php-1.29.0-wmf.21",
+"angwikisource": "php-1.29.0-wmf.21",
+"angwiktionary": "php-1.29.0-wmf.21",
 "anwiki": "php-1.29.0-wmf.21",
-"anwiktionary": "php-1.30.0-wmf.1",
+"anwiktionary": "php-1.29.0-wmf.21",
 "arbcom_cswiki": "php-1.29.0-wmf.21",
 "arbcom_dewiki": "php-1.29.0-wmf.21",
 "arbcom_enwiki": "php-1.29.0-wmf.21",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.21",
 "arcwiki": "php-1.29.0-wmf.21",
 "arwiki": "php-1.29.0-wmf.21",
-"arwikibooks": "php-1.30.0-wmf.1",
-"arwikimedia": "php-1.30.0-wmf.1",
-"arwikinews": "php-1.30.0-wmf.1",
-"arwikiquote": "php-1.30.0-wmf.1",
-"arwikisource": "php-1.30.0-wmf.1",
-"arwikiversity": "php-1.30.0-wmf.1",
-"arwiktionary": "php-1.30.0-wmf.1",
+"arwikibooks": "php-1.29.0-wmf.21",
+"arwikimedia": "php-1.29.0-wmf.21",
+"arwikinews": "php-1.29.0-wmf.21",
+"arwikiquote": "php-1.29.0-wmf.21",
+"arwikisource": "php-1.29.0-wmf.21",
+"arwikiversity": "php-1.29.0-wmf.21",
+"arwiktionary": "php-1.29.0-wmf.21",
 "arzwiki": "php-1.29.0-wmf.21",
 "astwiki": "php-1.29.0-wmf.21",
-"astwikibooks": "php-1.30.0-wmf.1",
-"astwikiquote": "php-1.30.0-wmf.1",
-"astwiktionary": "php-1.30.0-wmf.1",
+"astwikibooks": "php-1.29.0-wmf.21",
+"astwikiquote": "php-1.29.0-wmf.21",
+"astwiktionary": "php-1.29.0-wmf.21",
 "aswiki": "php-1.29.0-wmf.21",
-"aswikibooks": "php-1.30.0-wmf.1",
-"aswikisource": "php-1.30.0-wmf.1",
-"aswiktionary": "php-1.30.0-wmf.1",
-"auditcomwiki": "php-1.30.0-wmf.1",
+"aswikibooks": "php-1.29.0-wmf.21",
+"aswikisource": "php-1.29.0-wmf.21",
+"aswiktionary": "php-1.29.0-wmf.21",
+"auditcomwiki": "php-1.29.0-wmf.21",
 "avwiki": "php-1.29.0-wmf.21",
-"avwiktionary": "php-1.30.0-wmf.1",
+"avwiktionary": "php-1.29.0-wmf.21",
 "aywiki": "php-1.29.0-wmf.21",
-"aywikibooks": "php-1.30.0-wmf.1",
-"aywiktionary": "php-1.30.0-wmf.1",
+"aywikibooks": "php-1.29.0-wmf.21",
+"aywiktionary": "php-1.29.0-wmf.21",
 "azbwiki": "php-1.29.0-wmf.21",
 "azwiki": "php-1.29.0-wmf.21",
-"azwikibooks": "php-1.30.0-wmf.1",
-"azwikiquote": "php-1.30.0-wmf.1",
-"azwikisource": "php-1.30.0-wmf.1",
-"azwiktionary": "php-1.30.0-wmf.1",
+"azwikibooks": "php-1.29.0-wmf.21",
+"azwikiquote": "php-1.29.0-wmf.21",
+"azwikisource": "php-1.29.0-wmf.21",
+"azwiktionary": "php-1.29.0-wmf.21",
 "barwiki": "php-1.29.0-wmf.21",
 "bat_smgwiki": "php-1.29.0-wmf.21",
 "bawiki": "php-1.29.0-wmf.21",
-"bawikibooks": "php-1.30.0-wmf.1",
+"bawikibooks": "php-1.29.0-wmf.21",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.29.0-wmf.21

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353161 )

Change subject: group1 wikis to 1.29.0-wmf.21
..

group1 wikis to 1.29.0-wmf.21

Change-Id: I58865d5d83f4cb038ef4113294faf2968f53f2e3
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 8d7dfcc..d9f4bc0 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.21",
-"aawikibooks": "php-1.30.0-wmf.1",
-"aawiktionary": "php-1.30.0-wmf.1",
+"aawikibooks": "php-1.29.0-wmf.21",
+"aawiktionary": "php-1.29.0-wmf.21",
 "abwiki": "php-1.29.0-wmf.21",
-"abwiktionary": "php-1.30.0-wmf.1",
+"abwiktionary": "php-1.29.0-wmf.21",
 "acewiki": "php-1.29.0-wmf.21",
-"advisorywiki": "php-1.30.0-wmf.1",
+"advisorywiki": "php-1.29.0-wmf.21",
 "adywiki": "php-1.29.0-wmf.21",
 "afwiki": "php-1.29.0-wmf.21",
-"afwikibooks": "php-1.30.0-wmf.1",
-"afwikiquote": "php-1.30.0-wmf.1",
-"afwiktionary": "php-1.30.0-wmf.1",
+"afwikibooks": "php-1.29.0-wmf.21",
+"afwikiquote": "php-1.29.0-wmf.21",
+"afwiktionary": "php-1.29.0-wmf.21",
 "akwiki": "php-1.29.0-wmf.21",
-"akwikibooks": "php-1.30.0-wmf.1",
-"akwiktionary": "php-1.30.0-wmf.1",
+"akwikibooks": "php-1.29.0-wmf.21",
+"akwiktionary": "php-1.29.0-wmf.21",
 "alswiki": "php-1.29.0-wmf.21",
-"alswikibooks": "php-1.30.0-wmf.1",
-"alswikiquote": "php-1.30.0-wmf.1",
-"alswiktionary": "php-1.30.0-wmf.1",
+"alswikibooks": "php-1.29.0-wmf.21",
+"alswikiquote": "php-1.29.0-wmf.21",
+"alswiktionary": "php-1.29.0-wmf.21",
 "amwiki": "php-1.29.0-wmf.21",
-"amwikiquote": "php-1.30.0-wmf.1",
-"amwiktionary": "php-1.30.0-wmf.1",
+"amwikiquote": "php-1.29.0-wmf.21",
+"amwiktionary": "php-1.29.0-wmf.21",
 "angwiki": "php-1.29.0-wmf.21",
-"angwikibooks": "php-1.30.0-wmf.1",
-"angwikiquote": "php-1.30.0-wmf.1",
-"angwikisource": "php-1.30.0-wmf.1",
-"angwiktionary": "php-1.30.0-wmf.1",
+"angwikibooks": "php-1.29.0-wmf.21",
+"angwikiquote": "php-1.29.0-wmf.21",
+"angwikisource": "php-1.29.0-wmf.21",
+"angwiktionary": "php-1.29.0-wmf.21",
 "anwiki": "php-1.29.0-wmf.21",
-"anwiktionary": "php-1.30.0-wmf.1",
+"anwiktionary": "php-1.29.0-wmf.21",
 "arbcom_cswiki": "php-1.29.0-wmf.21",
 "arbcom_dewiki": "php-1.29.0-wmf.21",
 "arbcom_enwiki": "php-1.29.0-wmf.21",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.21",
 "arcwiki": "php-1.29.0-wmf.21",
 "arwiki": "php-1.29.0-wmf.21",
-"arwikibooks": "php-1.30.0-wmf.1",
-"arwikimedia": "php-1.30.0-wmf.1",
-"arwikinews": "php-1.30.0-wmf.1",
-"arwikiquote": "php-1.30.0-wmf.1",
-"arwikisource": "php-1.30.0-wmf.1",
-"arwikiversity": "php-1.30.0-wmf.1",
-"arwiktionary": "php-1.30.0-wmf.1",
+"arwikibooks": "php-1.29.0-wmf.21",
+"arwikimedia": "php-1.29.0-wmf.21",
+"arwikinews": "php-1.29.0-wmf.21",
+"arwikiquote": "php-1.29.0-wmf.21",
+"arwikisource": "php-1.29.0-wmf.21",
+"arwikiversity": "php-1.29.0-wmf.21",
+"arwiktionary": "php-1.29.0-wmf.21",
 "arzwiki": "php-1.29.0-wmf.21",
 "astwiki": "php-1.29.0-wmf.21",
-"astwikibooks": "php-1.30.0-wmf.1",
-"astwikiquote": "php-1.30.0-wmf.1",
-"astwiktionary": "php-1.30.0-wmf.1",
+"astwikibooks": "php-1.29.0-wmf.21",
+"astwikiquote": "php-1.29.0-wmf.21",
+"astwiktionary": "php-1.29.0-wmf.21",
 "aswiki": "php-1.29.0-wmf.21",
-"aswikibooks": "php-1.30.0-wmf.1",
-"aswikisource": "php-1.30.0-wmf.1",
-"aswiktionary": "php-1.30.0-wmf.1",
-"auditcomwiki": "php-1.30.0-wmf.1",
+"aswikibooks": "php-1.29.0-wmf.21",
+"aswikisource": "php-1.29.0-wmf.21",
+"aswiktionary": "php-1.29.0-wmf.21",
+"auditcomwiki": "php-1.29.0-wmf.21",
 "avwiki": "php-1.29.0-wmf.21",
-"avwiktionary": "php-1.30.0-wmf.1",
+"avwiktionary": "php-1.29.0-wmf.21",
 "aywiki": "php-1.29.0-wmf.21",
-"aywikibooks": "php-1.30.0-wmf.1",
-"aywiktionary": "php-1.30.0-wmf.1",
+"aywikibooks": "php-1.29.0-wmf.21",
+"aywiktionary": "php-1.29.0-wmf.21",
 "azbwiki": "php-1.29.0-wmf.21",
 "azwiki": "php-1.29.0-wmf.21",
-"azwikibooks": "php-1.30.0-wmf.1",
-"azwikiquote": "php-1.30.0-wmf.1",
-"azwikisource": "php-1.30.0-wmf.1",
-"azwiktionary": "php-1.30.0-wmf.1",
+"azwikibooks": "php-1.29.0-wmf.21",
+"azwikiquote": "php-1.29.0-wmf.21",
+"azwikisource": "php-1.29.0-wmf.21",
+"azwiktionary": "php-1.29.0-wmf.21",
 "barwiki": "php-1.29.0-wmf.21",
 "bat_smgwiki": "php-1.29.0-wmf.21",
 "bawiki": "php-1.29.0-wmf.21",
-"bawikibooks": "php-1.30.0-wmf.1",
+"bawikibooks":

[MediaWiki-commits] [Gerrit] labs/private[master]: add private/files/releases/id_rsa.upload FAKE secret key

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: add private/files/releases/id_rsa.upload FAKE secret key
..


add private/files/releases/id_rsa.upload FAKE secret key

deployment-mira/deployment-tin had puppet errors because they could
not find "puppet:///private/releases/id_rsa.upload".

This is from releases::reprepro::upload and unrelated to my recent
change of the deployment server role class.

Adding fake private key to make puppet happy in deployment-prep.

Change-Id: I79588394b95efe780b4d390c8fd27b80a277c8c4
---
A files/releases/id_rsa.upload
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/files/releases/id_rsa.upload b/files/releases/id_rsa.upload
new file mode 100644
index 000..c6160c1
--- /dev/null
+++ b/files/releases/id_rsa.upload
@@ -0,0 +1,3 @@
+-BEGIN RSA PRIVATE KEY-
+SNAKEOIL - NOT PRIVATE
+-END RSA PRIVATE KEY-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79588394b95efe780b4d390c8fd27b80a277c8c4
Gerrit-PatchSet: 3
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/private[master]: add private/files/releases/id_rsa.upload FAKE secret key

2017-05-10 Thread Dzahn (Code Review)

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

Change subject: add private/files/releases/id_rsa.upload FAKE secret key
..

add private/files/releases/id_rsa.upload FAKE secret key

deployment-mira/deployment-tin had puppet errors because they could
not find "puppet:///private/releases/id_rsa.upload".

This is from releases::reprepro::upload and unrelated to my recent
change of the deployment server role class.

Adding fake private key to make puppet happy in deployment-prep.

Change-Id: I79588394b95efe780b4d390c8fd27b80a277c8c4
---
A files/releases/id_rsa.upload
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/60/353160/1

diff --git a/files/releases/id_rsa.upload b/files/releases/id_rsa.upload
new file mode 100644
index 000..9cd63e3
--- /dev/null
+++ b/files/releases/id_rsa.upload
@@ -0,0 +1,4 @@
+-BEGIN RSA PRIVATE KEY-
+SNAKEOIL - NOT PRIVATE 
+-END RSA PRIVATE KEY-
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79588394b95efe780b4d390c8fd27b80a277c8c4
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update description edit abuse filter results for formatversi...

2017-05-10 Thread Mholloway (Code Review)

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

Change subject: Update description edit abuse filter results for formatversion=2
..

Update description edit abuse filter results for formatversion=2

No further updates needed for section edits.

Bug: T150382
Change-Id: I0937babecb0cd011b2406d5e464792f19c5d5f1a
---
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
M app/src/test/res/raw/description_edit_abusefilter_disallowed.json
M app/src/test/res/raw/description_edit_abusefilter_warning.json
3 files changed, 8 insertions(+), 17 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
index e0729d1..4326622 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java
@@ -3,8 +3,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.google.gson.annotations.SerializedName;
-
+import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.dataclient.ServiceError;
 
 import java.util.Collections;
@@ -47,7 +46,7 @@
 @Nullable public String getMessageHtml(@NonNull String messageName) {
 for (Message msg : messages) {
 if (messageName.equals(msg.name)) {
-return msg.getHtmlValue();
+return msg.html();
 }
 }
 return null;
@@ -62,15 +61,11 @@
 }
 
 private static final class Message {
-@SuppressWarnings("unused") private String name;
-@SuppressWarnings("unused") private MessageHtml html;
+@SuppressWarnings("unused") @Nullable private String name;
+@SuppressWarnings("unused") @Nullable private String html;
 
-@NonNull private String getHtmlValue() {
-return html != null ? html.value : "";
+@NonNull private String html() {
+return StringUtils.defaultString(html);
 }
-}
-
-private static class MessageHtml {
-@SuppressWarnings("unused") @SerializedName("*") private String value;
 }
 }
diff --git a/app/src/test/res/raw/description_edit_abusefilter_disallowed.json 
b/app/src/test/res/raw/description_edit_abusefilter_disallowed.json
index f7d678f..cafaac9 100644
--- a/app/src/test/res/raw/description_edit_abusefilter_disallowed.json
+++ b/app/src/test/res/raw/description_edit_abusefilter_disallowed.json
@@ -9,9 +9,7 @@
 "parameters": [
   "global-123"
 ],
-"html": {
-  "*": "This action has been automatically identified as harmful, and 
therefore disallowed.\nIf you believe your action was constructive, please 
inform an administrator of what you were trying to do."
-}
+"html": "This action has been automatically identified as harmful, and 
therefore disallowed.\nIf you believe your action was constructive, please 
inform an administrator of what you were trying to do."
   }
 ],
 "docref": "See https://www.wikidata.org/w/api.php for API usage"
diff --git a/app/src/test/res/raw/description_edit_abusefilter_warning.json 
b/app/src/test/res/raw/description_edit_abusefilter_warning.json
index 10d4d50..fb9e3ad 100644
--- a/app/src/test/res/raw/description_edit_abusefilter_warning.json
+++ b/app/src/test/res/raw/description_edit_abusefilter_warning.json
@@ -10,9 +10,7 @@
   "Possible vandalism by adding badwords or similar trolling words",
   11
 ],
-"html": {
-  "*": "Warning: This action has been automatically identified 
as harmful.\nUnconstructive edits will be quickly reverted,\nand egregious or 
repeated unconstructive editing will result in your account or IP address being 
blocked.\nIf you believe this action to be constructive, you may submit it 
again to confirm it.\nA brief description of the abuse rule which your action 
matched is: Possible vandalism by adding badwords or similar trolling words"
-}
+"html": "Warning: This action has been automatically identified 
as harmful.\nUnconstructive edits will be quickly reverted,\nand egregious or 
repeated unconstructive editing will result in your account or IP address being 
blocked.\nIf you believe this action to be constructive, you may submit it 
again to confirm it.\nA brief description of the abuse rule which your action 
matched is: Possible vandalism by adding badwords or similar trolling words"
   }
 ],
 "docref": "See https://www.wikidata.org/w/api.php for API usage"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

1 2 3 4 5 >

1 - 100 of 457 matches

Mail list logo