[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Convert Index: Pages editing form to OOjsUI

[Amritsreekumar (Code Review)]

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

Change subject: Convert Index: Pages editing form to OOjsUI
..

Convert Index: Pages editing form to OOjsUI

[WiP]: The Index: Pages editing interface is converted to OOjsUI.

Bug: T153120
Change-Id: I885869211a2b8cc3ccd2cb9019b9f064135c41d4
---
M includes/index/EditIndexPage.php
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/48/359648/1

diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index 819389e..f938872 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -68,7 +68,7 @@
}
$key = $this->getFieldNameForEntry( $entry->getKey() );
$val = $this->safeUnicodeOutput( $entry->getStringValue() );
-
+   $out->enableOOUI();
$out->addHTML( Html::openElement( 'tr' ) . Html::openElement( 
'th', [ 'scope' => 'row' ] ) . Xml::label( $entry->getLabel(), $key ) );
 
$help = $entry->getHelp();
@@ -98,12 +98,18 @@
$inputAttributes['type'] = $inputType;
$inputAttributes['id'] = $key;
$inputAttributes['size'] = 60;
-   $out->addHTML( Html::input( $key, $val, 
$inputType, $inputAttributes ) );
+   $out-> OOUI\TextInputWidget( [
+   'value' => $val,
+   'infusable' => true,
+   ] + $inputAttributes );
} else {
$inputAttributes['cols'] = 60;
$inputAttributes['rows'] = $size;
-   $out->addHTML( Html::textarea( $key, $val, 
$inputAttributes ) );
-   }
+   $out-> OOUI\TextInputWidget( [
+   'value' => $val,
+   'infusable' => true,
+   ] + $inputAttributes );
+   }
}
 
$out->addHTML( Html::closeElement( 'td' ) . Html::closeElement( 
'tr' ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I885869211a2b8cc3ccd2cb9019b9f064135c41d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Amritsreekumar 

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

[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: Fix color contrast in preferences of the Dark theme for Vector

[jenkins-bot (Code Review)]

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

Change subject: Fix color contrast in preferences of the Dark theme for Vector
..


Fix color contrast in preferences of the Dark theme for Vector

Change-Id: Ib2c745f267a8c521d326b97bc3a3b0a8cdcca7ab
---
M extension.json
R vector/dark/dark.css
A vector/dark/dark.special.preferences.styles.less
3 files changed, 64 insertions(+), 42 deletions(-)

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



diff --git a/extension.json b/extension.json
index 9127324..9691581 100644
--- a/extension.json
+++ b/extension.json
@@ -42,7 +42,10 @@
},
"themeloader.skins.vector.dark": {
"styles": {
-   "vector/dark.css": {
+   "vector/dark/dark.css": {
+   "media": "screen"
+   },
+   
"vector/dark/dark.special.preferences.styles.less": {
"media": "screen"
}
}
diff --git a/vector/dark.css b/vector/dark/dark.css
similarity index 94%
rename from vector/dark.css
rename to vector/dark/dark.css
index 9d0d7ac..d1be847 100644
--- a/vector/dark.css
+++ b/vector/dark/dark.css
@@ -30,7 +30,7 @@
 div#mw-page-base {
background-color: #17456E;
/* @embed */
-   background-image: url(dark/page-fade.png);
+   background-image: url(page-fade.png);
 }
 
 /* Link colors */
@@ -116,7 +116,7 @@
 div.vectorTabs,
 div.vectorTabs ul {
/* @embed */
-   background-image: url('dark/tab-break.png');
+   background-image: url('tab-break.png');
 }
 /* OVERRIDDEN BY COMPLIANT BROWSERS */
 div.vectorTabs ul li { /* @todo */
@@ -135,7 +135,7 @@
 
 div.vectorTabs li.selected {
/* @embed */
-   background-image: url('dark/tab-current-fade.png');
+   background-image: url('tab-current-fade.png');
 }
 
 div.vectorTabs li.selected a,
@@ -161,7 +161,7 @@
 
 div.vectorTabs span {
/* @embed */
-   background-image: url('dark/tab-break.png');
+   background-image: url('tab-break.png');
 }
 
 div.vectorMenu li.selected a,
@@ -174,7 +174,7 @@
 div#mw-head div.vectorMenu h3,
 div#mw-head div.vectorMenu h5 {
/* @embed */
-   background-image: url('dark/tab-break.png');
+   background-image: url('tab-break.png');
 }
 
 /* OVERRIDDEN BY COMPLIANT BROWSERS */
@@ -229,7 +229,7 @@
  */
 button#searchButton img {
/* @embed */
-   background: url(dark/search-ltr.png);
+   background: url(search-ltr.png);
height: 0px !important;
padding: 6px !important;
width: 0px !important;
@@ -282,39 +282,6 @@
 #p-logo {
left: 0;
top: -150px;
-}
-
-/* Preferences */
-#preftoc {
-   /* @embed */
-   background-image: url(dark/preferences-break.png);
-}
-#preftoc a,
-#preftoc a:active {
-   color: #F4F26B;
-   text-decoration: none;
-}
-#preftoc li {
-   /* @embed */
-   background-image: url(dark/preferences-break.png);
-}
-#preftoc li.selected a {
-   /* @embed */
-   background-image: url(dark/preferences-fade.png);
-   color: #d2d2d2;
-   text-decoration: none;
-}
-#preferences { /* @todo */
-   border: solid 1px #426787;
-   background-color: #1D578B;
-}
-
-#preferences legend {
-   color: #b6b6b6;
-}
-
-.htmlform-tip {
-   color: #b6b6b6;
 }
 
 /* Links */
@@ -399,7 +366,7 @@
 ul {
list-style-type: disc;
/* @embed */
-   list-style-image: url(dark/bullet-icon.png);
+   list-style-image: url(bullet-icon.png);
 }
 
 .mw-code {
@@ -846,4 +813,4 @@
 
 div.view-poll-navigation h2 {
color: #d2d2d2;
-}
\ No newline at end of file
+}
diff --git a/vector/dark/dark.special.preferences.styles.less 
b/vector/dark/dark.special.preferences.styles.less
new file mode 100644
index 000..0010f87
--- /dev/null
+++ b/vector/dark/dark.special.preferences.styles.less
@@ -0,0 +1,52 @@
+@color_1: #f4f26b;
+@color_2: #d2d2d2;
+@color_3: #b6b6b6;
+@background_color_1: #1d578b;
+
+.client-js {
+   #preferences {
+   background-color: @background_color_1;
+   border: 0;
+
+   legend {
+   color: @color_3;
+   }
+   }
+
+   #preftoc {
+   background-image: url(preferences-break.png);
+
+   a {
+   color: @color_1;
+   text-decoration: none;
+
+   &:active {
+   color: @color_1;
+   text-decoration: none;
+   }
+   }
+
+   li {
+   background-image: url(preferences-break.png);
+
+   &.selected {
+

[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: Fix color contrast in preferences of the Dark theme for Vector

[SamanthaNguyen (Code Review)]

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

Change subject: Fix color contrast in preferences of the Dark theme for Vector
..

Fix color contrast in preferences of the Dark theme for Vector

Change-Id: Ib2c745f267a8c521d326b97bc3a3b0a8cdcca7ab
---
M extension.json
R vector/dark/dark.css
A vector/dark/dark.special.preferences.styles.less
3 files changed, 49 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Theme 
refs/changes/47/359647/1

diff --git a/extension.json b/extension.json
index 9127324..9691581 100644
--- a/extension.json
+++ b/extension.json
@@ -42,7 +42,10 @@
},
"themeloader.skins.vector.dark": {
"styles": {
-   "vector/dark.css": {
+   "vector/dark/dark.css": {
+   "media": "screen"
+   },
+   
"vector/dark/dark.special.preferences.styles.less": {
"media": "screen"
}
}
diff --git a/vector/dark.css b/vector/dark/dark.css
similarity index 96%
rename from vector/dark.css
rename to vector/dark/dark.css
index 9d0d7ac..eeb5aa2 100644
--- a/vector/dark.css
+++ b/vector/dark/dark.css
@@ -284,39 +284,6 @@
top: -150px;
 }
 
-/* Preferences */
-#preftoc {
-   /* @embed */
-   background-image: url(dark/preferences-break.png);
-}
-#preftoc a,
-#preftoc a:active {
-   color: #F4F26B;
-   text-decoration: none;
-}
-#preftoc li {
-   /* @embed */
-   background-image: url(dark/preferences-break.png);
-}
-#preftoc li.selected a {
-   /* @embed */
-   background-image: url(dark/preferences-fade.png);
-   color: #d2d2d2;
-   text-decoration: none;
-}
-#preferences { /* @todo */
-   border: solid 1px #426787;
-   background-color: #1D578B;
-}
-
-#preferences legend {
-   color: #b6b6b6;
-}
-
-.htmlform-tip {
-   color: #b6b6b6;
-}
-
 /* Links */
 a {
text-decoration: none;
@@ -846,4 +813,4 @@
 
 div.view-poll-navigation h2 {
color: #d2d2d2;
-}
\ No newline at end of file
+}
diff --git a/vector/dark/dark.special.preferences.styles.less 
b/vector/dark/dark.special.preferences.styles.less
new file mode 100644
index 000..18abe37
--- /dev/null
+++ b/vector/dark/dark.special.preferences.styles.less
@@ -0,0 +1,44 @@
+@color_1: #f4f26b;
+@color_2: #d2d2d2;
+@color_3: #b6b6b6;
+@background_color_1: #1d578b;
+
+.client-js {
+   #preferences {
+   background-color: @background_color_1;
+   border: 0;
+
+   legend {
+   color: @color_3;
+   }
+   }
+
+   #preftoc {
+   background-image: url(dark/preferences-break.png);
+
+   a {
+   color: @color_1;
+   text-decoration: none;
+
+   &:active {
+   color: @color_1;
+   text-decoration: none;
+   }
+   }
+
+   li {
+   background-image: url(dark/preferences-break.png);
+   
+   &.selected {
+   a {
+   background-image: 
url(dark/preferences-fade.png);
+   color: @color_2;
+   text-decoration: none;
+   }
+   }
+   }
+
+   .htmlform-tip {
+   color: @color_3;
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2c745f267a8c521d326b97bc3a3b0a8cdcca7ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Return nothing from styleParsoidElements

[Esanders (Code Review)]

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

Change subject: Return nothing from styleParsoidElements
..

Return nothing from styleParsoidElements

The method modifies DOM elements in place, and the return
value is never used.

Change-Id: I6254389dbf8daa67795206cb508038b60e1a4761
---
M modules/ve-mw/init/ve.init.mw.LinkCache.js
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.LinkCache.js 
b/modules/ve-mw/init/ve.init.mw.LinkCache.js
index 472af3a..7a4dcca 100644
--- a/modules/ve-mw/init/ve.init.mw.LinkCache.js
+++ b/modules/ve-mw/init/ve.init.mw.LinkCache.js
@@ -110,7 +110,6 @@
  * @chainable
  * @param {jQuery} $element Elements to style
  * @param {HTMLDocument} doc Base document to use for normalisation
- * @return {jQuery} The elements, now styled
  */
 ve.init.mw.LinkCache.prototype.styleParsoidElements = function ( $elements, 
doc ) {
// TODO: Remove when fixed upstream in Parsoid (T58756)
@@ -133,8 +132,6 @@
ve.init.platform.linkCache.styleElement( title, 
$( this ) );
} );
}
-
-   return $elements;
 };
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Show simple category list in preview

[Esanders (Code Review)]

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

Change subject: Show simple category list in preview
..

Show simple category list in preview

Bug: T153534
Change-Id: Ie86abdad76a38855d5ad1a394c0bfb3c8dd5a8c6
---
M extension.json
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
2 files changed, 21 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index ebcd257..2cc1ebd 100644
--- a/extension.json
+++ b/extension.json
@@ -551,7 +551,9 @@
"accesskey-save",
"accesskey-minoredit",
"accesskey-watch",
+   "colon-separator",
"newsectionsummary",
+   "pagecategories",
"tooltip-minoredit",
"tooltip-watch",
"visualeditor-diff-no-changes"
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 8a8f985..017095e 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -179,10 +179,15 @@
  * @param {HTMLDocument} [baseDoc] Base document against which to normalise 
links, if document provided
  */
 ve.ui.MWSaveDialog.prototype.showPreview = function ( docOrMsg, baseDoc ) {
-   var body, contents;
+   var body, contents,
+   categories = [];
 
if ( docOrMsg instanceof HTMLDocument ) {
body = docOrMsg.body;
+   // Take a snapshot of all categories
+   body.querySelectorAll( 'link[rel="mw:PageProp/Category"]' 
).forEach( function ( element ) {
+   categories.push( 
ve.dm.MWCategoryMetaItem.static.toDataElement( [ element ] 
).attributes.category );
+   } );
// Import body to current document, then resolve attributes 
against original document (parseDocument called #fixBase)
document.adoptNode( body );
 
@@ -201,6 +206,19 @@
)
);
 
+   if ( categories.length ) {
+   // Simple category list rendering
+   this.$previewViewer.append(
+   $( '' ).addClass( 'catlinks' ).append(
+   document.createTextNode( ve.msg( 
'pagecategories', categories.length ) + ve.msg( 'colon-separator' ) ),
+   $( '' ).append( categories.map( 
function ( category ) {
+   var title = 
mw.Title.newFromText( category );
+   return $( '' ).append( $( 
'' ).attr( 'href', title.getUrl() ).text( title.getMainText() ) );
+   } ) )
+   )
+   );
+   }
+
// Run hooks so other things can alter the document
mw.hook( 'wikipage.content' ).fire( this.$previewViewer );
} else {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move preview document filtering into MWSaveDialog

[Esanders (Code Review)]

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

Change subject: Move preview document filtering into MWSaveDialog
..

Move preview document filtering into MWSaveDialog

Also:
* Make mw-content-DIR nest inside mw-body-content
* Use ve.filterMetaElements

Change-Id: Ic70c7dff0f74b81f92b8bd48e8092549947990ba
Depends-On: I478fe1f39164b9fd7e71987b818b8f668d1a7020
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
2 files changed, 38 insertions(+), 20 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 8605460..4585298 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -996,26 +996,19 @@
wikitext: wikitext,
pst: true
} ).always( function ( response, details ) {
-   var doc, body,
+   var doc,
baseDoc = 
target.getSurface().getModel().getDocument().getHtmlDocument();
 
if ( ve.getProp( response, 'visualeditor', 'result' ) 
=== 'success' ) {
doc = target.constructor.static.parseDocument( 
response.visualeditor.content, 'visual' );
-   body = doc.body;
-   // Import body to current document, then 
resolve attributes against original document (parseDocument called #fixBase)
-   document.adoptNode( body );
-   // TODO: This code is very similar to 
ve.ui.PreviewElement
-   ve.resolveAttributes( body, doc, 
ve.dm.Converter.static.computedAttributes );
-   ve.targetLinksToNewWindow( body );
-   target.saveDialog.showPreview( $( body 
).contents(), baseDoc );
+   target.saveDialog.showPreview( doc, baseDoc );
 
} else {
target.saveDialog.showPreview(
-   $( '' ).text( ve.msg(
+   ve.msg(

'visualeditor-loaderror-message',
ve.getProp( details, 'error', 
'info' ) || 'Failed to connect'
-   ) ),
-   baseDoc
+   )
);
}
target.bindSaveDialogClearDiff();
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 4aa96a8..8a8f985 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -175,15 +175,40 @@
 /**
  * Set preview content and show preview panel.
  *
- * @param {jQuery} content Preview content
- * @param {HTMLDocument} baseDoc Base document against which to normalise links
+ * @param {HTMLDocument|string} docOrMsg Document to preview, or error message
+ * @param {HTMLDocument} [baseDoc] Base document against which to normalise 
links, if document provided
  */
-ve.ui.MWSaveDialog.prototype.showPreview = function ( content, baseDoc ) {
-   this.$previewViewer.empty().append( content );
-   // Run styles so links render with their appropriate classes
-   ve.init.platform.linkCache.styleParsoidElements( this.$previewViewer, 
baseDoc );
-   // Run hooks so other things can alter the document
-   mw.hook( 'wikipage.content' ).fire( this.$previewViewer );
+ve.ui.MWSaveDialog.prototype.showPreview = function ( docOrMsg, baseDoc ) {
+   var body, contents;
+
+   if ( docOrMsg instanceof HTMLDocument ) {
+   body = docOrMsg.body;
+   // Import body to current document, then resolve attributes 
against original document (parseDocument called #fixBase)
+   document.adoptNode( body );
+
+   // TODO: This code is very similar to 
ve.ui.PreviewElement+ve.ui.MWPreviewElement
+   ve.resolveAttributes( body, docOrMsg, 
ve.dm.Converter.static.computedAttributes );
+   ve.targetLinksToNewWindow( body );
+   // Add styles so links render with their appropriate classes
+   ve.init.platform.linkCache.styleParsoidElements( $( body ), 
baseDoc );
+
+   // Remove metadata
+   contents = ve.filterMetaElements( Array.prototype.slice.call( 
body.childNodes ) );
+
+   this.$previewViewer.empty().append(
+   $( '' ).addClass( 'mw-content-' 

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: bs4 shall be used as import

[jenkins-bot (Code Review)]

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

Change subject: bs4 shall be used as import
..


bs4 shall be used as import

Change-Id: Iac827381cf3034dda7cd58686ab4414de6b782a9
---
M tests/script_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/script_tests.py b/tests/script_tests.py
index b305a2b..893964b 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -41,7 +41,7 @@
 'script_wui': ['crontab', 'lua'],
 # Note: package 'lunatic-python' provides module 'lua'
 'flickrripper': ['flickrapi'],
-'imageharvest': ['beautifulsoup4'],
+'imageharvest': ['bs4'],
 'match_images': ['PIL.ImageTk'],
 'states_redirect': ['pycountry'],
 'patrol': ['mwparserfromhell'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac827381cf3034dda7cd58686ab4414de6b782a9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: [WIP] Version 2.0 -- allow users to choose a personal theme ...

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359643 )

Change subject: [WIP] Version 2.0 -- allow users to choose a personal theme in 
Special:Preferences
..

[WIP] Version 2.0 -- allow users to choose a personal theme in 
Special:Preferences

Adds a drop-down menu for choosing the theme into Special:Preferences if
the current skin has themes.

Cleaned up the Monaco-specific stuff a bit and allowed Theme to control
Monaco's themes. This reduces code duplication and generally speaking just
makes sense.

Change-Id: I8fa4e48b663b695975410a398c437c81949b9128
TODO: Theme::getAvailableThemes() is awfully hacky and needs some sorta caching
TODO: Some way of previewing the themes
---
A Theme.class.php
M Theme.hooks.php
M extension.json
M i18n/en.json
4 files changed, 148 insertions(+), 16 deletions(-)


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

diff --git a/Theme.class.php b/Theme.class.php
new file mode 100644
index 000..89ae5be
--- /dev/null
+++ b/Theme.class.php
@@ -0,0 +1,82 @@
+ $moduleContents ) {
+   if ( preg_match( '/themeloader\.skins\.*/', $name ) && 
$ourSkin !== 'monaco' ) {
+   $name = str_replace( 'themeloader.skins.', '', 
$name );
+   $exploded = explode( '.', $name );
+   $skin = $exploded[0];
+   $theme = $exploded[1];
+   $themes[$skin][] = $theme;
+   } elseif (
+   $ourSkin === 'monaco' &&
+   preg_match( "/skins\.{$ourSkin}\.(.*)/", $name 
) &&
+   $name !== 'skins.monaco.scripts' // HACKHACK: 
skip over skins.monaco.scripts, a JS module
+   ) {
+   // I <3 special cases. NOT!
+   $theme = str_replace( "skins.{$ourSkin}.", '', 
$name );
+   $themes[$ourSkin][] = $theme;
+   }
+   }
+
+   if ( !isset( $themes[$ourSkin] ) ) {
+   $themes[$ourSkin] = [];
+   }
+
+   // Ensure that 'default' is always the 1st array item
+   array_unshift( $themes[$ourSkin], 'default' );
+
+   return !empty( $themes[$ourSkin] ) ? $themes[$ourSkin] : [ 
'default' => 'default' ];
+   }
+
+   /**
+* Check if the given skin has a theme named $theme.
+*
+* @param string $skin Skin name, e.g. aurora, monobook, vector, etc.
+* @param string $theme Theme name, e.g. dark, pink, etc.
+* @return bool
+*/
+   public static function skinHasTheme( $skin, $theme ) {
+   global $wgResourceModules;
+
+   $skin = strtolower( $skin );
+   $theme = strtolower( $theme );
+
+   // Special case, all skins have a default theme since default 
means
+   // "the skin without any custom styling"
+   if ( $theme === 'default' ) {
+   return true;
+   }
+
+   $moduleName = 'themeloader.skins.' . $skin . '.' . $theme;
+   if ( $skin === 'monaco' ) {
+   $moduleName = 'skins.' . $skin . '.' . $theme;
+   }
+
+   if ( isset( $wgResourceModules[$moduleName] ) && 
$wgResourceModules[$moduleName] ) {
+   return true;
+   }
+
+   return false;
+   }
+}
\ No newline at end of file
diff --git a/Theme.hooks.php b/Theme.hooks.php
index 949cc04..3ca4fbd 100644
--- a/Theme.hooks.php
+++ b/Theme.hooks.php
@@ -4,9 +4,15 @@
 
public static function onBeforePageDisplay( &$out, &$sk ) {
global $wgRequest, $wgDefaultTheme, $wgValidSkinNames;
-   global $wgResourceModules;
 
-   $theme = $wgRequest->getVal( 'usetheme', false );
+   $userTheme = false;
+   // User's personal theme override, if any
+   $user = $out->getUser();
+   if ( $user->getOption( 'theme' ) ) {
+   $userTheme = $user->getOption( 'theme' );
+   }
+
+   $theme = $wgRequest->getVal( 'usetheme', $userTheme );
$useskin = $wgRequest->getVal( 'useskin', false );
$skin = $useskin ? $useskin : $sk->getSkinName();
 
@@ -14,12 +20,7 @@
// so we don't load themes for skins when we can't 
actually load the skin
$skin = $sk->getSkinName();
}
-
-   // Monaco is a special case, since it handles its themes in its 
main PHP
-   // file instead of leaving theme handling to us (ShoutWiki bug 
#173)
-   if ( strtolower( $skin ) == 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistats: disable cron for wikia - dump file too large (for...

[Dzahn (Code Review)]

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

Change subject: wikistats: disable cron for wikia - dump file too large (for 
now)
..


wikistats: disable cron for wikia - dump file too large (for now)

Bug: T165879
Change-Id: Ic6ee99bf41abc9ccc7f1b1c9a43c152ae6cd2e40
---
M modules/wikistats/manifests/updates.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index 467165f..48d91f8 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -76,7 +76,6 @@
 'ws' : db_pass => $db_pass, table => 'wikisources', minute => '13';
 'wy' : db_pass => $db_pass, table => 'wikivoyage', minute => '15';
 'wx' : db_pass => $db_pass, table => 'wmspecials', minute => '17';
-'wi' : db_pass => $db_pass, table => 'wikia', minute => '19';
 'et' : db_pass => $db_pass, table => 'editthis', minute => '23';
 'wr' : db_pass => $db_pass, table => 'wikitravel', minute => '25';
 'mw' : db_pass => $db_pass, table => 'mediawikis', minute => '32';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6ee99bf41abc9ccc7f1b1c9a43c152ae6cd2e40
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...wikistats[master]: fix typo in index.php, missing $

[jenkins-bot (Code Review)]

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

Change subject: fix typo in index.php, missing $
..


fix typo in index.php, missing $

Change-Id: I5b3405f5300e15d4ed4292e63c802d6d3311463f
---
M var/www/wikistats/index.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/var/www/wikistats/index.php b/var/www/wikistats/index.php
index cd8934b..e024833 100644
--- a/var/www/wikistats/index.php
+++ b/var/www/wikistats/index.php
@@ -156,7 +156,7 @@
 while ($row = $fnord->fetch()) {
 $count++;
 $users = $row['gusers'];
-$gwikis = gwikis + $row['numwikis'];
+$gwikis = $gwikis + $row['numwikis'];
 $gtotal = $gtotal + $row['gtotal'];
 $ggood = $ggood + $row['ggood'];
 $gedits = $gedits + $row['gedits'];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b3405f5300e15d4ed4292e63c802d6d3311463f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
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]: wikistats: disable cron for wikia - dump file too large (for...

[Dzahn (Code Review)]

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

Change subject: wikistats: disable cron for wikia - dump file too large (for 
now)
..

wikistats: disable cron for wikia - dump file too large (for now)

Change-Id: Ic6ee99bf41abc9ccc7f1b1c9a43c152ae6cd2e40
---
M modules/wikistats/manifests/updates.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/359642/1

diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index 467165f..48d91f8 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -76,7 +76,6 @@
 'ws' : db_pass => $db_pass, table => 'wikisources', minute => '13';
 'wy' : db_pass => $db_pass, table => 'wikivoyage', minute => '15';
 'wx' : db_pass => $db_pass, table => 'wmspecials', minute => '17';
-'wi' : db_pass => $db_pass, table => 'wikia', minute => '19';
 'et' : db_pass => $db_pass, table => 'editthis', minute => '23';
 'wr' : db_pass => $db_pass, table => 'wikitravel', minute => '25';
 'mw' : db_pass => $db_pass, table => 'mediawikis', minute => '32';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6ee99bf41abc9ccc7f1b1c9a43c152ae6cd2e40
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...wikistats[master]: fix typo in index.php, missing $

[Dzahn (Code Review)]

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

Change subject: fix typo in index.php, missing $
..

fix typo in index.php, missing $

Change-Id: I5b3405f5300e15d4ed4292e63c802d6d3311463f
---
M var/www/wikistats/index.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/var/www/wikistats/index.php b/var/www/wikistats/index.php
index cd8934b..e024833 100644
--- a/var/www/wikistats/index.php
+++ b/var/www/wikistats/index.php
@@ -156,7 +156,7 @@
 while ($row = $fnord->fetch()) {
 $count++;
 $users = $row['gusers'];
-$gwikis = gwikis + $row['numwikis'];
+$gwikis = $gwikis + $row['numwikis'];
 $gtotal = $gtotal + $row['gtotal'];
 $ggood = $ggood + $row['ggood'];
 $gedits = $gedits + $row['gedits'];

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Consistent use of the edit icon

[jenkins-bot (Code Review)]

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

Change subject: Consistent use of the edit icon
..


Consistent use of the edit icon

Change-Id: I53631da03c02a7e2c914bea9ed692394e1725594
---
M extension.json
M modules/ext.CollaborationKit.hubtheme.js
M modules/ext.CollaborationKit.list.ui.js
3 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5f0a516..0de6fb3 100644
--- a/extension.json
+++ b/extension.json
@@ -183,6 +183,7 @@
"mediawiki.api.edit",
"oojs-ui",
"oojs-ui.styles.icons-movement",
+   "oojs-ui.styles.icons-editing-core",
"mediawiki.widgets",
"mediawiki.widgets.UserInputWidget",
"jquery.ui.sortable",
diff --git a/modules/ext.CollaborationKit.hubtheme.js 
b/modules/ext.CollaborationKit.hubtheme.js
index c45b747..daced22 100644
--- a/modules/ext.CollaborationKit.hubtheme.js
+++ b/modules/ext.CollaborationKit.hubtheme.js
@@ -291,14 +291,14 @@
 
// Defining buttons
colourBrowserButton = new OO.ui.ButtonWidget( {
-   icon: 'search',
+   icon: 'edit',
framed: false,
classes: [ 'mw-ck-hubtheme-widget-inlinebutton' ]
} );
colourBrowserButton.on( 'click', openColourBrowser );
 
hubimageBrowserButton = new OO.ui.ButtonWidget( {
-   icon: 'search',
+   icon: 'edit',
framed: false,
classes: [ 'mw-ck-hubtheme-widget-inlinebutton' ]
} );
diff --git a/modules/ext.CollaborationKit.list.ui.js 
b/modules/ext.CollaborationKit.list.ui.js
index dd6cfaa..27404a2 100644
--- a/modules/ext.CollaborationKit.list.ui.js
+++ b/modules/ext.CollaborationKit.list.ui.js
@@ -302,7 +302,7 @@
}
 
editButton = new OO.ui.ButtonWidget( {
-   label: 'edit',
+   icon: 'edit',
framed: false
} ).on( 'click', function () {
modifyExistingItem(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53631da03c02a7e2c914bea9ed692394e1725594
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 
Gerrit-Reviewer: Brian Wolff 
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...Theme[master]: Add DeepSea as a theme for the Vector skin

[jenkins-bot (Code Review)]

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

Change subject: Add DeepSea as a theme for the Vector skin
..


Add DeepSea as a theme for the Vector skin

Change-Id: I33fd9c83be59155e4196f2c5e0ddf4c7ab10ee60
---
M extension.json
A vector/deepsea/deepsea-screen-big.css
A vector/deepsea/deepsea-screen-hd.css
A vector/deepsea/deepsea-screen.css
4 files changed, 250 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 75298dc..9127324 100644
--- a/extension.json
+++ b/extension.json
@@ -1,10 +1,11 @@
 {
"name": "Theme",
"namemsg": "theme-extensionname",
-   "version": "1.7.2",
+   "version": "1.8.0",
"author": [
"Ryan Schmidt",
-   "Jack Phoenix"
+   "Jack Phoenix",
+   "Samantha Nguyen"
],
"url": "https://www.mediawiki.org/wiki/Extension:Theme;,
"descriptionmsg": "theme-desc",
@@ -45,6 +46,19 @@
"media": "screen"
}
}
+   },
+   "themeloader.skins.vector.deepsea": {
+   "styles": {
+   "vector/deepsea/deepsea-screen.css": {
+   "media": "screen"
+   },
+   "vector/deepsea/deepsea-screen-big.css": {
+   "media": "only screen and (min-width: 
800px), only screen and (min-device-width: 800px)"
+   },
+   "vector/deepsea/deepsea-screen-hd.css": {
+   "media": "screen and (min-width: 982px)"
+   }
+   }
}
},
"ResourceFileModulePaths": {
diff --git a/vector/deepsea/deepsea-screen-big.css 
b/vector/deepsea/deepsea-screen-big.css
new file mode 100644
index 000..c74be93
--- /dev/null
+++ b/vector/deepsea/deepsea-screen-big.css
@@ -0,0 +1,13 @@
+div#content {
+   margin-left: 15%;
+   margin-right: 1em;
+}
+
+#left-navigation {
+   left: 1.6em;
+   top: 1em;
+}
+
+#right-navigation {
+   margin: 3.5em 0 0 0;
+}
diff --git a/vector/deepsea/deepsea-screen-hd.css 
b/vector/deepsea/deepsea-screen-hd.css
new file mode 100644
index 000..7e44fe0
--- /dev/null
+++ b/vector/deepsea/deepsea-screen-hd.css
@@ -0,0 +1,3 @@
+#mw-panel {
+   padding-left: 0;
+}
diff --git a/vector/deepsea/deepsea-screen.css 
b/vector/deepsea/deepsea-screen.css
new file mode 100644
index 000..b35c6a0
--- /dev/null
+++ b/vector/deepsea/deepsea-screen.css
@@ -0,0 +1,218 @@
+/* colors */
+body {
+   background: #eaecf0;
+}
+
+/* main colors */
+#p-search,
+#p-personal ul li,
+div.vectorTabs ul li,
+div#mw-head div.vectorMenu h3,
+div#mw-panel div.portal div.body ul li {
+   background: #f8f9fa;
+}
+
+/* hover colors */
+#p-personal ul li:hover,
+div.vectorTabs li:hover,
+div#mw-panel div.portal div.body ul li:hover {
+   background: #fff;
+}
+
+/* headings */
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.mw-body h1,
+.mw-body h2 {
+   color: #222;
+   font-family: "Helvetica","Arial",sans-serif;
+}
+
+/* main content */
+#mw-page-base {
+   background: none;
+   height: 6em;
+}
+
+#mw-head-base {
+   height: 6em;
+   margin-top: -6em;
+   margin-left: 15%;
+}
+
+.mw-body {
+   border: 0;
+}
+
+/* personal */
+#p-personal {
+   top: 0;
+   right: 0;
+   border-radius: 0 0 0 1em;
+}
+
+#p-personal ul {
+   padding: 0;
+}
+
+#p-personal ul li {
+   margin: 0;
+}
+
+#p-personal li:first-child {
+   border-radius: 0 0 0 1em;
+}
+
+#p-personal ul li a {
+   text-decoration: none;
+   padding: .75em 1em;
+   display: block;
+}
+
+#p-personal #pt-notifications-alert,
+#p-personal #pt-notifications-notice {
+   margin: 0;
+
+}
+
+#pt-notifications-alert .mw-echo-notifications-badge,
+#pt-notifications-notice .mw-echo-notifications-badge {
+   top: 0;
+   height: 1.1em;
+   width: 1.25em;
+}
+
+#pt-notifications-alert .mw-echo-notifications-badge:before,
+#pt-notifications-notice .mw-echo-notifications-badge:before {
+   top: .125em;
+   left: .5em;
+}
+
+/* navigation */
+#left-navigation {
+   position: absolute;
+}
+
+div#mw-head div.vectorMenu h3 {
+   background-image: none;
+}
+
+#right-navigation div.emptyPortlet + div.emptyPortlet + div {
+   border-radius: 1em 0 0 0;
+}
+
+div.vectorMenu {
+   margin-right: -.5em;
+}
+
+div.vectorMenu h3 span {
+   line-height: .5;
+   padding: 1.375em 1em 0 1em;
+}
+
+div.vectorMenu h3 a {
+   top: -.25em;
+   left: 3em;
+}
+
+div.vectorMenu div.menu {
+   

[MediaWiki-commits] [Gerrit] mediawiki...InputBox[master]: Allow appending searchfilters to terms

[jenkins-bot (Code Review)]

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

Change subject: Allow appending searchfilters to terms
..


Allow appending searchfilters to terms

For search-style inputboxes, if you have `searchfilter=foo` as a
parameter, it will append `foo` after the search term. This is
useful for leveraging search filters in custom search boxes without
exposing it to the user.

Bug: T147951
Change-Id: Ie23ce220ff9657c38fe5b41195e297ca7cebf7f1
---
M InputBox.classes.php
M InputBox.hooks.php
2 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/InputBox.classes.php b/InputBox.classes.php
index e5a4290..1ee1931 100644
--- a/InputBox.classes.php
+++ b/InputBox.classes.php
@@ -36,6 +36,7 @@
private $mInline = false;
private $mPrefix = '';
private $mDir = '';
+   private $mSearchFilter = '';
 
/* Functions */
 
@@ -167,6 +168,10 @@
 
if ( $this->mPrefix != '' ) {
$htmlOut .= Html::hidden( 'prefix', $this->mPrefix );
+   }
+
+   if ( $this->mSearchFilter != '' ) {
+   $htmlOut .= Html::hidden( 'searchfilter', 
$this->mSearchFilter );
}
 
$htmlOut .= $this->mBR;
@@ -599,6 +604,7 @@
'inline' => 'mInline',
'prefix' => 'mPrefix',
'dir' => 'mDir',
+   'searchfilter' => 'mSearchFilter'
];
foreach ( $options as $name => $var ) {
if ( isset( $values[$name] ) ) {
diff --git a/InputBox.hooks.php b/InputBox.hooks.php
index 9bdae13..60c16d1 100644
--- a/InputBox.hooks.php
+++ b/InputBox.hooks.php
@@ -22,10 +22,15 @@
$request = $special->getRequest();
$prefix = $request->getText( 'prefix', '' );
$title = $request->getText( 'wpNewTitle', '' );
+   $search = $request->getText( 'search', '' );
+   $searchfilter = $request->getText( 'searchfilter', '' );
if ( $special->getName() == 'Movepage' && $prefix !== '' && 
$title !== '' ) {
$request->setVal( 'wpNewTitle', $prefix . $title );
$request->unsetVal( 'prefix' );
}
+   if ( $special->getName() == 'Search' && $searchfilter !== '' ) {
+   $request->setVal( 'search', $search . ' ' . 
$searchfilter );
+   }
return true;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie23ce220ff9657c38fe5b41195e297ca7cebf7f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InputBox
Gerrit-Branch: master
Gerrit-Owner: Harej 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...wikistats[master]: re-activate XML dump links, to new target in ./xml/

[Dzahn (Code Review)]

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

Change subject: re-activate XML dump links, to new target in ./xml/
..


re-activate XML dump links, to new target in ./xml/

Now that we have crons that dump XML for all tables
(Change-Id Ife133dbcaaac31ccd) we can reactivate the XML
dump links, but link to the new locations.

Bug: T165879
Change-Id: I5a5650a9514f2c7d6b9df7371b3ef4dcad2eec31
---
M var/www/wikistats/index.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/var/www/wikistats/index.php b/var/www/wikistats/index.php
index 8f852fb..cd8934b 100644
--- a/var/www/wikistats/index.php
+++ b/var/www/wikistats/index.php
@@ -205,8 +205,7 @@
 " . $stubratio . "
 csv
 ssv
-xml";
-
+xml";
 if ($project == 'wp') {
 echo "mwiki";
 } else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a5650a9514f2c7d6b9df7371b3ef4dcad2eec31
Gerrit-PatchSet: 3
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
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...wikistats[master]: re-activate XML dump links, to new target in ./xml/

[Dzahn (Code Review)]

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

Change subject: re-activate XML dump links, to new target in ./xml/
..

re-activate XML dump links, to new target in ./xml/

Now that we have crons that dump XML for all tables
(Change-Id Ife133dbcaaac31ccd) we can reactivate the XML
dump links, but link to the new locations.

Bug: T165879
Change-Id: I5a5650a9514f2c7d6b9df7371b3ef4dcad2eec31
---
M var/www/wikistats/index.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/var/www/wikistats/index.php b/var/www/wikistats/index.php
index 8f852fb..cd8934b 100644
--- a/var/www/wikistats/index.php
+++ b/var/www/wikistats/index.php
@@ -205,8 +205,7 @@
 " . $stubratio . "
 csv
 ssv
-xml";
-
+xml";
 if ($project == 'wp') {
 echo "mwiki";
 } else {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistats: add XML dumps for all tables, fix db access

[Dzahn (Code Review)]

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

Change subject: wikistats: add XML dumps for all tables, fix db access
..


wikistats: add XML dumps for all tables, fix db access

Bug: 165879
Change-Id: Ife133dbcaaac31ccdd3bee2c4f9cb45e5e0e4e3b
---
M modules/wikistats/manifests/cronjob/xmldump.pp
M modules/wikistats/manifests/updates.pp
2 files changed, 37 insertions(+), 1 deletion(-)

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



diff --git a/modules/wikistats/manifests/cronjob/xmldump.pp 
b/modules/wikistats/manifests/cronjob/xmldump.pp
index a820c1b..c350f16 100644
--- a/modules/wikistats/manifests/cronjob/xmldump.pp
+++ b/modules/wikistats/manifests/cronjob/xmldump.pp
@@ -9,7 +9,7 @@
 ){
 
 $query = $table ? {
-'wikipedias' => 'SELECT *,good/total AS ratio FROM wikipedias WHERE 
lang NOT LIKE \"%articles%\" ORDER BY good desc,total desc',
+'wikipedias' => 'SELECT *,good/total AS ratio FROM wikipedias WHERE 
lang NOT LIKE "%articles%" ORDER BY good desc,total desc',
 default  => "SELECT *,good/total AS ratio FROM ${table} ORDER BY 
good desc,total desc",
 }
 
diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index 4c51ed0..467165f 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -21,6 +21,15 @@
 group  => 'wikistatsuser',
 }
 
+# db pass for [client] for dumps
+file { '/usr/lib/wikistats/.my.cnf':
+ensure  => present,
+mode=> '0400',
+owner   => 'wikistatsuser',
+group   => 'wikistatsuser',
+content => "[client]\npassword=${db_pass}\n"
+}
+
 # update table data: usage: @
 wikistats::cronjob::update { [
 'wp@0',  # Wikipedias
@@ -61,6 +70,33 @@
 wikistats::cronjob::xmldump {
 'wp' : db_pass => $db_pass, table => 'wikipedias',   minute => '3';
 'wt' : db_pass => $db_pass, table => 'wiktionaries', minute => '5';
+'wq' : db_pass => $db_pass, table => 'wikiquotes', minute => '7';
+'wb' : db_pass => $db_pass, table => 'wikibooks', minute => '9';
+'wn' : db_pass => $db_pass, table => 'wikinews', minute => '11';
+'ws' : db_pass => $db_pass, table => 'wikisources', minute => '13';
+'wy' : db_pass => $db_pass, table => 'wikivoyage', minute => '15';
+'wx' : db_pass => $db_pass, table => 'wmspecials', minute => '17';
+'wi' : db_pass => $db_pass, table => 'wikia', minute => '19';
+'et' : db_pass => $db_pass, table => 'editthis', minute => '23';
+'wr' : db_pass => $db_pass, table => 'wikitravel', minute => '25';
+'mw' : db_pass => $db_pass, table => 'mediawikis', minute => '32';
+'mt' : db_pass => $db_pass, table => 'metapedias', minute => '37';
+'sc' : db_pass => $db_pass, table => 'scoutwiki', minute => '39';
+'os' : db_pass => $db_pass, table => 'opensuse', minute => '41';
+'un' : db_pass => $db_pass, table => 'uncyclomedia', minute => '43';
+'wf' : db_pass => $db_pass, table => 'wikifur', minute => '45';
+'an' : db_pass => $db_pass, table => 'anarchopedias', minute => '47';
+'si' : db_pass => $db_pass, table => 'wikisite', minute => '51';
+'ne' : db_pass => $db_pass, table => 'neoseeker', minute => '53';
+'wv' : db_pass => $db_pass, table => 'wikiversity', minute => '34';
+'re' : db_pass => $db_pass, table => 'referata', minute => '57';
+'ro' : db_pass => $db_pass, table => 'rodovid', minute => '1';
+'lx' : db_pass => $db_pass, table => 'lxde', minute => '59';
+'sw' : db_pass => $db_pass, table => 'shoutwiki', minute => '36';
+'w3' : db_pass => $db_pass, table => 'w3cwikis', minute => '27';
+'ga' : db_pass => $db_pass, table => 'gamepedias', minute => '29';
+'sf' : db_pass => $db_pass, table => 'sourceforge', minute => '24';
+'mh' : db_pass => $db_pass, table => 'miraheze', minute => '6';
 }
 
 # imports (fetching lists of wikis itself) usage: @

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistats: add XML dumps for all tables, fix db access

[Dzahn (Code Review)]

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

Change subject: wikistats: add XML dumps for all tables, fix db access
..

wikistats: add XML dumps for all tables, fix db access

Bug: 165879
Change-Id: Ife133dbcaaac31ccdd3bee2c4f9cb45e5e0e4e3b
---
M modules/wikistats/manifests/cronjob/xmldump.pp
M modules/wikistats/manifests/updates.pp
2 files changed, 37 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/359639/1

diff --git a/modules/wikistats/manifests/cronjob/xmldump.pp 
b/modules/wikistats/manifests/cronjob/xmldump.pp
index a820c1b..c350f16 100644
--- a/modules/wikistats/manifests/cronjob/xmldump.pp
+++ b/modules/wikistats/manifests/cronjob/xmldump.pp
@@ -9,7 +9,7 @@
 ){
 
 $query = $table ? {
-'wikipedias' => 'SELECT *,good/total AS ratio FROM wikipedias WHERE 
lang NOT LIKE \"%articles%\" ORDER BY good desc,total desc',
+'wikipedias' => 'SELECT *,good/total AS ratio FROM wikipedias WHERE 
lang NOT LIKE "%articles%" ORDER BY good desc,total desc',
 default  => "SELECT *,good/total AS ratio FROM ${table} ORDER BY 
good desc,total desc",
 }
 
diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index 4c51ed0..467165f 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -21,6 +21,15 @@
 group  => 'wikistatsuser',
 }
 
+# db pass for [client] for dumps
+file { '/usr/lib/wikistats/.my.cnf':
+ensure  => present,
+mode=> '0400',
+owner   => 'wikistatsuser',
+group   => 'wikistatsuser',
+content => "[client]\npassword=${db_pass}\n"
+}
+
 # update table data: usage: @
 wikistats::cronjob::update { [
 'wp@0',  # Wikipedias
@@ -61,6 +70,33 @@
 wikistats::cronjob::xmldump {
 'wp' : db_pass => $db_pass, table => 'wikipedias',   minute => '3';
 'wt' : db_pass => $db_pass, table => 'wiktionaries', minute => '5';
+'wq' : db_pass => $db_pass, table => 'wikiquotes', minute => '7';
+'wb' : db_pass => $db_pass, table => 'wikibooks', minute => '9';
+'wn' : db_pass => $db_pass, table => 'wikinews', minute => '11';
+'ws' : db_pass => $db_pass, table => 'wikisources', minute => '13';
+'wy' : db_pass => $db_pass, table => 'wikivoyage', minute => '15';
+'wx' : db_pass => $db_pass, table => 'wmspecials', minute => '17';
+'wi' : db_pass => $db_pass, table => 'wikia', minute => '19';
+'et' : db_pass => $db_pass, table => 'editthis', minute => '23';
+'wr' : db_pass => $db_pass, table => 'wikitravel', minute => '25';
+'mw' : db_pass => $db_pass, table => 'mediawikis', minute => '32';
+'mt' : db_pass => $db_pass, table => 'metapedias', minute => '37';
+'sc' : db_pass => $db_pass, table => 'scoutwiki', minute => '39';
+'os' : db_pass => $db_pass, table => 'opensuse', minute => '41';
+'un' : db_pass => $db_pass, table => 'uncyclomedia', minute => '43';
+'wf' : db_pass => $db_pass, table => 'wikifur', minute => '45';
+'an' : db_pass => $db_pass, table => 'anarchopedias', minute => '47';
+'si' : db_pass => $db_pass, table => 'wikisite', minute => '51';
+'ne' : db_pass => $db_pass, table => 'neoseeker', minute => '53';
+'wv' : db_pass => $db_pass, table => 'wikiversity', minute => '34';
+'re' : db_pass => $db_pass, table => 'referata', minute => '57';
+'ro' : db_pass => $db_pass, table => 'rodovid', minute => '1';
+'lx' : db_pass => $db_pass, table => 'lxde', minute => '59';
+'sw' : db_pass => $db_pass, table => 'shoutwiki', minute => '36';
+'w3' : db_pass => $db_pass, table => 'w3cwikis', minute => '27';
+'ga' : db_pass => $db_pass, table => 'gamepedias', minute => '29';
+'sf' : db_pass => $db_pass, table => 'sourceforge', minute => '24';
+'mh' : db_pass => $db_pass, table => 'miraheze', minute => '6';
 }
 
 # imports (fetching lists of wikis itself) usage: @

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife133dbcaaac31ccdd3bee2c4f9cb45e5e0e4e3b
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] VisualEditor/VisualEditor[master]: Follow-up Id3f663ea6: Use filter function instead of remove

[jenkins-bot (Code Review)]

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

Change subject: Follow-up Id3f663ea6: Use filter function instead of remove
..


Follow-up Id3f663ea6: Use filter function instead of remove

Remove only works on nodes with a parent.

Change-Id: Ic2ee6222992a0c6cd8bd06508d611c3f72ef72bd
---
M src/ce/nodes/ve.ce.GeneratedContentNode.js
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/src/ce/nodes/ve.ce.GeneratedContentNode.js 
b/src/ce/nodes/ve.ce.GeneratedContentNode.js
index 09af0b2..3d18ac5 100644
--- a/src/ce/nodes/ve.ce.GeneratedContentNode.js
+++ b/src/ce/nodes/ve.ce.GeneratedContentNode.js
@@ -108,7 +108,12 @@
// Filter out link and style tags for bug 50043
// Previously filtered out meta tags, but restore these as they
// can be made visible.
-   $rendering.filter( 'link, style' ).remove();
+   // As of jQuery 3 we can't use $.not( 'tagName' ) as that doesn't
+   // match text nodes. Also we can't $.remove these elements as they
+   // aren't attached to anything.
+   $rendering = $rendering.filter( function ( i, node ) {
+   return node.tagName !== 'LINK' && node.tagName !== 'STYLE';
+   } );
// Also remove link and style tags nested inside other tags
$rendering.find( 'link, style' ).remove();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2ee6222992a0c6cd8bd06508d611c3f72ef72bd
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: C. Scott Ananian 
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] VisualEditor/VisualEditor[master]: Factor out link/style tag filtering into ve.filterMetaElements

[jenkins-bot (Code Review)]

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

Change subject: Factor out link/style tag filtering into ve.filterMetaElements
..


Factor out link/style tag filtering into ve.filterMetaElements

Also rewrite ve.ce.GeneratedContentNode#render without jQuery.

Change-Id: I478fe1f39164b9fd7e71987b818b8f668d1a7020
---
M src/ce/nodes/ve.ce.GeneratedContentNode.js
M src/ve.utils.js
2 files changed, 39 insertions(+), 24 deletions(-)

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



diff --git a/src/ce/nodes/ve.ce.GeneratedContentNode.js 
b/src/ce/nodes/ve.ce.GeneratedContentNode.js
index 3d18ac5..b726f08 100644
--- a/src/ce/nodes/ve.ce.GeneratedContentNode.js
+++ b/src/ce/nodes/ve.ce.GeneratedContentNode.js
@@ -95,47 +95,41 @@
  * implementation, otherwise you should call the parent implementation first 
and modify its
  * return value.
  *
- * @param {HTMLElement[]} domElements Clones of the DOM elements from the store
+ * @param {Node[]} domElements Clones of the DOM elements from the store
  * @return {HTMLElement[]} Clones of the DOM elements in the right document, 
with modifications
  */
 ve.ce.GeneratedContentNode.prototype.getRenderedDomElements = function ( 
domElements ) {
-   var i, len, $rendering,
+   var rendering,
doc = this.getElementDocument();
 
-   // Clone the elements into the target document
-   $rendering = $( ve.copyDomElements( domElements, doc ) );
+   rendering = ve.filterMetaElements(
+   // Clone the elements into the target document
+   ve.copyDomElements( domElements, doc )
+   );
 
-   // Filter out link and style tags for bug 50043
-   // Previously filtered out meta tags, but restore these as they
-   // can be made visible.
-   // As of jQuery 3 we can't use $.not( 'tagName' ) as that doesn't
-   // match text nodes. Also we can't $.remove these elements as they
-   // aren't attached to anything.
-   $rendering = $rendering.filter( function ( i, node ) {
-   return node.tagName !== 'LINK' && node.tagName !== 'STYLE';
-   } );
-   // Also remove link and style tags nested inside other tags
-   $rendering.find( 'link, style' ).remove();
-
-   if ( $rendering.length ) {
+   if ( rendering.length ) {
// Span wrap root text nodes so they can be measured
-   for ( i = 0, len = $rendering.length; i < len; i++ ) {
-   if ( $rendering[ i ].nodeType === Node.TEXT_NODE ) {
-   $rendering[ i ] = $( '' ).append( 
$rendering[ i ] )[ 0 ];
+   rendering = rendering.map( function ( node ) {
+   var span;
+   if ( node.nodeType === Node.TEXT_NODE ) {
+   span = document.createElement( 'span' );
+   span.appendChild( node );
+   return span;
}
-   }
+   return node;
+   } );
} else {
-   $rendering = $( '' );
+   rendering = [ document.createElement( 'span' ) ];
}
 
// Render the computed values of some attributes
ve.resolveAttributes(
-   $rendering.toArray(),
+   rendering,
domElements[ 0 ].ownerDocument,
ve.dm.Converter.static.computedAttributes
);
 
-   return $rendering.toArray();
+   return rendering;
 };
 
 /**
diff --git a/src/ve.utils.js b/src/ve.utils.js
index d54950e..362b848 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -752,6 +752,27 @@
 };
 
 /**
+ * Filter out metadata elements
+ *
+ * @param {Node[]} contents DOM nodes
+ * @return {Node[]} Filtered DOM nodes
+ */
+ve.filterMetaElements = function ( contents ) {
+   // Filter out link and style tags for T52043
+   // Previously filtered out meta tags, but restore these as they
+   // can be made visible with CSS.
+   // As of jQuery 3 we can't use $.not( 'tagName' ) as that doesn't
+   // match text nodes. Also we can't $.remove these elements as they
+   // aren't attached to anything.
+   contents = contents.filter( function ( node ) {
+   return node.tagName !== 'LINK' && node.tagName !== 'STYLE';
+   } );
+   // Also remove link and style tags nested inside other tags
+   $( contents ).find( 'link, style' ).remove();
+   return contents;
+};
+
+/**
  * Create an HTMLDocument from an HTML string.
  *
  * The html parameter is supposed to be a full HTML document with a doctype 
and an `` tag.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I478fe1f39164b9fd7e71987b818b8f668d1a7020

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Hygiene: Rename builder vars on require preview/model

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Rename builder vars on require preview/model
..


Hygiene: Rename builder vars on require preview/model

preview/model is just a module/namespace object, not a builder class or
similar.

This patch changes a couple of imports to reference some of the exposed
functions of the preview/model where required.

In a shiny future, this pattern would be:

const { createModel, createNullModel } =
  require( '../preview/model' )

Bug: T165018
Change-Id: If6ad4611538ca4f24e2443c0c3ed433275e995a6
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/gateway/mediawiki.js
M src/gateway/rest.js
4 files changed, 9 insertions(+), 7 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6ad4611538ca4f24e2443c0c3ed433275e995a6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Test: Upgrade mw-node-qunit and use globs

[jenkins-bot (Code Review)]

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

Change subject: Test: Upgrade mw-node-qunit and use globs
..


Test: Upgrade mw-node-qunit and use globs

To get cross-shell and OS glob support and fix some of the sinon
deprecation warnings regarding getConfig.

Bug: T168054
Change-Id: Idd6d47c1e63836c8429156cd9030ef9fda4479b1
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 3353389..d34cc4a 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "scripts": {
 "start": "webpack -w",
 "build": "NODE_ENV=production webpack",
-"test:node": "mw-node-qunit `find tests/node-qunit -type f -name '*.js'` | 
tap-dot",
+"test:node": "mw-node-qunit 'tests/node-qunit/**/*.js' | tap-dot",
 "test:dev": "grunt lint && npm run test:node",
 "test": " npm run check-built-assets && npm run test:dev && npm run doc",
 "doc": "jsdoc -c jsdoc.json",
@@ -25,7 +25,7 @@
 "istanbul": "^0.4.5",
 "jsdoc": "^3.4.3",
 "mock-require": "^2.0.1",
-"mw-node-qunit": "^2.0.0",
+"mw-node-qunit": "^2.1.0",
 "nodemon": "^1.11.0",
 "redux": "3.6.0",
 "redux-thunk": "2.2.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd6d47c1e63836c8429156cd9030ef9fda4479b1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
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: Simplify gateways

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Simplify gateways
..


Hygiene: Simplify gateways

gateway/*/rest were copies of gateway/restProvider just passing
a different provider. Docs were the same, they were untested, and
looking at them they seemed like unnecessary abstraction.

This patch removes the plain vs html structure, and separates gateways
like before, by endpoint.

There is a light utility in gateway/restFormatters.js that adapts the
call from the rest gateway to use formatters.js functions. It needs
testing, that I'll add in the next patch.

The flow for creating a gateway ends up as follows:

1. index.js calls gateway/index#createGateway( mw.config )
2. createGateway chooses based on wgPopupsGateway and invokes
  * mediawiki.js#createMediaWikiApiGateway or
  * rest.js#createRESTBaseGateway w/ restFormatters.js#parsePlainTextResponse or
  * rest.js#createRESTBaseGateway w/ restFormatters.js#parseHTMLResponse

Changes:
* Removed src/gateway/{plain,html}/rest.js
  * Extracted formatter functions to src/gateway/restFormatters.js
* src/gateway/plain/mediawiki.js -> src/gateway/mediawiki.js
 * tests/node-qunit/gateway/plain/mediawiki.test.js ->
   tests/node-qunit/gateway/mediawiki.test.js
* gateway/restProvider{,.test}.js -> gateway/rest{,.test}.js
* Change gateway/index.js#createGateway to properly call the rest
  gateways with the rest formatters

Bug: T165018
Change-Id: Ia75695dfc192aad5bc581a68882514bad6c29646
---
M resources/dist/index.js
M resources/dist/index.js.map
D src/gateway/html/rest.js
M src/gateway/index.js
R src/gateway/mediawiki.js
D src/gateway/plain/rest.js
R src/gateway/rest.js
A src/gateway/restFormatters.js
M tests/node-qunit/gateway/index.test.js
R tests/node-qunit/gateway/mediawiki.test.js
R tests/node-qunit/gateway/rest.test.js
11 files changed, 45 insertions(+), 90 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia75695dfc192aad5bc581a68882514bad6c29646
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update tests for new thumb url methods

[Mholloway (Code Review)]

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

Change subject: Update tests for new thumb url methods
..

Update tests for new thumb url methods

Hygiene: moved some tests from the obsolete org.wikipedia.server package
to org.wikipedia.dataclient.

Added testing for the new stuff.

Bug: T166409
Change-Id: I217e233386549cc11cd776ba3d48ef0735f0cf32
---
R app/src/test/java/org/wikipedia/dataclient/BasePageLeadTest.java
A 
app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
M app/src/test/java/org/wikipedia/dataclient/page/BasePageClientTest.java
D app/src/test/java/org/wikipedia/dataclient/restbase/RbPageLeadTest.java
A app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageLeadTest.java
M app/src/test/java/org/wikipedia/page/PageTest.java
D app/src/test/java/org/wikipedia/server/mwapi/MwMobileViewPageLeadTest.java
A app/src/test/res/raw/page_lead_mw.json
A app/src/test/res/raw/page_lead_rb.json
9 files changed, 460 insertions(+), 110 deletions(-)


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

diff --git a/app/src/test/java/org/wikipedia/server/BasePageLeadTest.java 
b/app/src/test/java/org/wikipedia/dataclient/BasePageLeadTest.java
similarity index 96%
rename from app/src/test/java/org/wikipedia/server/BasePageLeadTest.java
rename to app/src/test/java/org/wikipedia/dataclient/BasePageLeadTest.java
index 7148f28..b3dd22c 100644
--- a/app/src/test/java/org/wikipedia/server/BasePageLeadTest.java
+++ b/app/src/test/java/org/wikipedia/dataclient/BasePageLeadTest.java
@@ -1,9 +1,10 @@
-package org.wikipedia.server;
+package org.wikipedia.dataclient;
 
 import android.support.annotation.NonNull;
 
 import org.wikipedia.dataclient.mwapi.MwServiceError;
 import org.wikipedia.dataclient.mwapi.page.MwMobileViewPageLead;
+import org.wikipedia.dataclient.page.BasePageClientTest;
 import org.wikipedia.dataclient.page.PageLeadProperties;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -13,7 +14,7 @@
 /**
  * Common test code for the two PageLead variants.
  */
-public abstract class BasePageLeadTest {
+public abstract class BasePageLeadTest extends BasePageClientTest {
 protected static final int ID = 15580374;
 protected static final long REVISION = 664887982L;
 protected static final int LANGUAGE_COUNT = 45;
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
 
b/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
new file mode 100644
index 000..3c66cf4
--- /dev/null
+++ 
b/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
@@ -0,0 +1,91 @@
+package org.wikipedia.dataclient.mwapi.page;
+
+import android.support.annotation.NonNull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.wikipedia.dataclient.BasePageLeadTest;
+import org.wikipedia.dataclient.page.PageClient;
+import org.wikipedia.dataclient.page.PageLead;
+import org.wikipedia.test.TestRunner;
+import org.wikipedia.testlib.TestLatch;
+
+import okhttp3.CacheControl;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.fail;
+import static org.wikipedia.json.GsonUnmarshaller.unmarshal;
+
+@RunWith(TestRunner.class) public class MwMobileViewPageLeadTest extends 
BasePageLeadTest {
+private PageClient subject;
+
+@Before public void setUp() throws Throwable {
+super.setUp();
+subject = new MwPageClient(service(MwPageService.class));
+}
+
+@Test public void testEnglishMainPage() throws Exception {
+MwMobileViewPageLead pageLead = unmarshal(MwMobileViewPageLead.class, 
wrapInMobileview(getEnglishMainPageJson()));
+MwMobileViewPageLead.Mobileview props = pageLead.getMobileview();
+verifyEnglishMainPage(props);
+}
+
+
+@Test public void testUnprotectedDisambiguationPage() throws Exception {
+MwMobileViewPageLead pageLead = unmarshal(MwMobileViewPageLead.class,
+wrapInMobileview(getUnprotectedDisambiguationPageJson()));
+MwMobileViewPageLead.Mobileview props = pageLead.getMobileview();
+verifyUnprotectedDisambiguationPage(props);
+}
+
+/**
+ * Custom deserializer; um, yeah /o\.
+ * An earlier version had issues with protection settings that don't 
include "edit" protection.
+ */
+@Test public void testProtectedButNoEditProtectionPage() throws Exception {
+MwMobileViewPageLead pageLead = unmarshal(MwMobileViewPageLead.class,
+wrapInMobileview(getProtectedButNoEditProtectionPageJson()));
+MwMobileViewPageLead.Mobileview props = pageLead.getMobileview();
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update PageLead thumb url methods and save a thumb in the sy...

[Mholloway (Code Review)]

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

Change subject: Update PageLead thumb url methods and save a thumb in the sync 
service
..

Update PageLead thumb url methods and save a thumb in the sync service

Bug: T166409
Change-Id: Id58d37760cb2ccfe5b24e0feba11b6fb547d8417
---
M 
app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLead.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
M app/src/main/java/org/wikipedia/dataclient/page/PageLead.java
M app/src/main/java/org/wikipedia/dataclient/page/PageLeadProperties.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageLead.java
M app/src/main/java/org/wikipedia/savedpages/PageImageUrlParser.java
7 files changed, 58 insertions(+), 27 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLead.java
 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLead.java
index fe80c46..72a5320 100644
--- 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLead.java
+++ 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLead.java
@@ -22,6 +22,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import static org.wikipedia.Constants.PREFERRED_THUMB_SIZE;
+import static org.wikipedia.util.ImageUrlUtil.getUrlForSize;
+
 /**
  * Gson POJO for loading the first stage of page content.
  */
@@ -85,8 +88,12 @@
 return null;
 }
 
-@Nullable @Override public String getLeadImageUrl(int leadThumbnailWidth) {
-return mobileview == null ? null : 
mobileview.getLeadImageUrl(leadThumbnailWidth);
+@Nullable @Override public String getLeadImageUrl(int leadImageWidth) {
+return mobileview == null ? null : 
mobileview.getLeadImageUrl(leadImageWidth);
+}
+
+@Nullable @Override public String getThumbUrl() {
+return mobileview == null ? null : mobileview.getThumbUrl();
 }
 
 @Nullable
@@ -117,8 +124,8 @@
 @SuppressWarnings("unused") private boolean mainpage;
 @SuppressWarnings("unused") private boolean disambiguation;
 @SuppressWarnings("unused") @Nullable private String description;
-@SuppressWarnings("unused") @Nullable private Image image;
-@SuppressWarnings("unused") @Nullable private Thumb thumb;
+@SuppressWarnings("unused") @Nullable private PageImage image;
+@SuppressWarnings("unused") @SerializedName("thumb") @Nullable private 
PageImageThumb leadImage;
 @SuppressWarnings("unused") @Nullable private Protection protection;
 @SuppressWarnings("unused") @Nullable private List sections;
 @SuppressWarnings("unused") @Nullable private PageProps pageprops;
@@ -192,7 +199,13 @@
 @Override
 @Nullable
 public String getLeadImageUrl(int leadThumbnailWidth) {
-return thumb != null ? thumb.getUrl() : null;
+return leadImage != null ? leadImage.getUrl() : null;
+}
+
+@Override
+@Nullable
+public String getThumbUrl() {
+return leadImage != null ? getUrlForSize(leadImage.getUrl(), 
PREFERRED_THUMB_SIZE) : null;
 }
 
 @Override
@@ -237,7 +250,7 @@
 /**
  * For the lead image File: page name
  */
-public static class Image {
+public static class PageImage {
 @SuppressWarnings("unused") private String file;
 
 public String getFile() {
@@ -248,7 +261,7 @@
 /**
  * For the lead image URL
  */
-public static class Thumb {
+public static class PageImageThumb {
 @SuppressWarnings("unused") private String url;
 
 public String getUrl() {
@@ -257,8 +270,7 @@
 }
 
 static class PageProps {
-@SuppressWarnings("unused") @SerializedName("wikibase_item") @Nullable
-private String wikiBaseItem;
+@SuppressWarnings("unused") @SerializedName("wikibase_item") @Nullable 
private String wikiBaseItem;
 
 @Nullable String getWikiBaseItem() {
 return wikiBaseItem;
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
index 8ff69fc..c676331 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
@@ -30,10 +30,10 @@
 @NonNull @Override public Call lead(@Nullable 
CacheControl cacheControl,
 @NonNull 
CacheOption cacheOption,
 @NonNull String 
title,
-  

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: phpcs: Set whitelist for MediaWiki.NamingConventions.ValidGl...

[Umherirrender (Code Review)]

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

Change subject: phpcs: Set whitelist for 
MediaWiki.NamingConventions.ValidGlobalName
..

phpcs: Set whitelist for MediaWiki.NamingConventions.ValidGlobalName

Instead of excluding the whole sniff, use the ignorelist to avoid adding
new wrong named globals

Change-Id: I34143c8d877b1ec0c83a56126df08ccdc8390f4b
---
M phpcs.xml
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/34/359634/1

diff --git a/phpcs.xml b/phpcs.xml
index 5077db2..46f4b81 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,7 +11,9 @@

0

-   
-   0
+   
+   
+   
+   

 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: phpcs: Set whitelist for MediaWiki.NamingConventions.ValidGl...

[Umherirrender (Code Review)]

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

Change subject: phpcs: Set whitelist for 
MediaWiki.NamingConventions.ValidGlobalName
..

phpcs: Set whitelist for MediaWiki.NamingConventions.ValidGlobalName

Instead of excluding the whole sniff, use the ignorelist to avoid adding
new wrong named globals

Change-Id: I4c8e35fe632570cf5d1957e6db1012e4ec16801f
---
M phpcs.xml
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/phpcs.xml b/phpcs.xml
index 2ef26f6..cf5193d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,7 +8,9 @@

0

-   
-   0
+   
+   
+   
+   

 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: phpcs: Set whitelist for MediaWiki.NamingConventions.ValidGl...

[Umherirrender (Code Review)]

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

Change subject: phpcs: Set whitelist for 
MediaWiki.NamingConventions.ValidGlobalName
..

phpcs: Set whitelist for MediaWiki.NamingConventions.ValidGlobalName

Instead of excluding the whole sniff, use the ignorelist to avoid adding
new wrong named globals

Change-Id: Ia60bdfb2e7c1e95519c9ea7341eaa808cd16cc6d
---
M phpcs.xml
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/35/359635/1

diff --git a/phpcs.xml b/phpcs.xml
index c724f2e..1a0d461 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -5,13 +5,15 @@


vendor
+   
+   
+   
+   
+   
 
 0
 
 
-0
-
-
 0
 
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RangeChronologicalPager: Don't clear $offset when $this->ran...

[Catrope (Code Review)]

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

Change subject: RangeChronologicalPager: Don't clear $offset when 
$this->rangeConds is set
..

RangeChronologicalPager: Don't clear $offset when $this->rangeConds is set

It has the effect of breaking pagination entirely when a date range
is set. Special:Contributions doesn't break this way because it has
its own code clearing start/end when offset is set, but Special:Newfiles
does break.

Change-Id: Ie9b26a4b54ebc608035c942b5bdc6ee26b82bc1e
---
M includes/pager/RangeChronologicalPager.php
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/359633/1

diff --git a/includes/pager/RangeChronologicalPager.php 
b/includes/pager/RangeChronologicalPager.php
index 901d576..d3cb566 100644
--- a/includes/pager/RangeChronologicalPager.php
+++ b/includes/pager/RangeChronologicalPager.php
@@ -99,13 +99,6 @@
 * @return array
 */
protected function buildQueryInfo( $offset, $limit, $descending ) {
-   if ( count( $this->rangeConds ) > 0 ) {
-   // If range conditions are set, $offset is not used.
-   // However, if range conditions aren't set, (such as 
when using paging links)
-   // use the provided offset to get the proper query.
-   $offset = '';
-   }
-
list( $tables, $fields, $conds, $fname, $options, $join_conds ) 
= parent::buildQueryInfo(
$offset,
$limit,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9b26a4b54ebc608035c942b5bdc6ee26b82bc1e
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] VisualEditor/VisualEditor[master]: Factor out link/style tag filtering into ve.filterMetaElements

[Esanders (Code Review)]

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

Change subject: Factor out link/style tag filtering into ve.filterMetaElements
..

Factor out link/style tag filtering into ve.filterMetaElements

Also rewrite ve.ce.GeneratedContentNode#render without jQuery.

Change-Id: I478fe1f39164b9fd7e71987b818b8f668d1a7020
---
M src/ce/nodes/ve.ce.GeneratedContentNode.js
M src/ve.utils.js
2 files changed, 39 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/32/359632/1

diff --git a/src/ce/nodes/ve.ce.GeneratedContentNode.js 
b/src/ce/nodes/ve.ce.GeneratedContentNode.js
index 3d18ac5..b726f08 100644
--- a/src/ce/nodes/ve.ce.GeneratedContentNode.js
+++ b/src/ce/nodes/ve.ce.GeneratedContentNode.js
@@ -95,47 +95,41 @@
  * implementation, otherwise you should call the parent implementation first 
and modify its
  * return value.
  *
- * @param {HTMLElement[]} domElements Clones of the DOM elements from the store
+ * @param {Node[]} domElements Clones of the DOM elements from the store
  * @return {HTMLElement[]} Clones of the DOM elements in the right document, 
with modifications
  */
 ve.ce.GeneratedContentNode.prototype.getRenderedDomElements = function ( 
domElements ) {
-   var i, len, $rendering,
+   var rendering,
doc = this.getElementDocument();
 
-   // Clone the elements into the target document
-   $rendering = $( ve.copyDomElements( domElements, doc ) );
+   rendering = ve.filterMetaElements(
+   // Clone the elements into the target document
+   ve.copyDomElements( domElements, doc )
+   );
 
-   // Filter out link and style tags for bug 50043
-   // Previously filtered out meta tags, but restore these as they
-   // can be made visible.
-   // As of jQuery 3 we can't use $.not( 'tagName' ) as that doesn't
-   // match text nodes. Also we can't $.remove these elements as they
-   // aren't attached to anything.
-   $rendering = $rendering.filter( function ( i, node ) {
-   return node.tagName !== 'LINK' && node.tagName !== 'STYLE';
-   } );
-   // Also remove link and style tags nested inside other tags
-   $rendering.find( 'link, style' ).remove();
-
-   if ( $rendering.length ) {
+   if ( rendering.length ) {
// Span wrap root text nodes so they can be measured
-   for ( i = 0, len = $rendering.length; i < len; i++ ) {
-   if ( $rendering[ i ].nodeType === Node.TEXT_NODE ) {
-   $rendering[ i ] = $( '' ).append( 
$rendering[ i ] )[ 0 ];
+   rendering = rendering.map( function ( node ) {
+   var span;
+   if ( node.nodeType === Node.TEXT_NODE ) {
+   span = document.createElement( 'span' );
+   span.appendChild( node );
+   return span;
}
-   }
+   return node;
+   } );
} else {
-   $rendering = $( '' );
+   rendering = [ document.createElement( 'span' ) ];
}
 
// Render the computed values of some attributes
ve.resolveAttributes(
-   $rendering.toArray(),
+   rendering,
domElements[ 0 ].ownerDocument,
ve.dm.Converter.static.computedAttributes
);
 
-   return $rendering.toArray();
+   return rendering;
 };
 
 /**
diff --git a/src/ve.utils.js b/src/ve.utils.js
index d54950e..362b848 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -752,6 +752,27 @@
 };
 
 /**
+ * Filter out metadata elements
+ *
+ * @param {Node[]} contents DOM nodes
+ * @return {Node[]} Filtered DOM nodes
+ */
+ve.filterMetaElements = function ( contents ) {
+   // Filter out link and style tags for T52043
+   // Previously filtered out meta tags, but restore these as they
+   // can be made visible with CSS.
+   // As of jQuery 3 we can't use $.not( 'tagName' ) as that doesn't
+   // match text nodes. Also we can't $.remove these elements as they
+   // aren't attached to anything.
+   contents = contents.filter( function ( node ) {
+   return node.tagName !== 'LINK' && node.tagName !== 'STYLE';
+   } );
+   // Also remove link and style tags nested inside other tags
+   $( contents ).find( 'link, style' ).remove();
+   return contents;
+};
+
+/**
  * Create an HTMLDocument from an HTML string.
  *
  * The html parameter is supposed to be a full HTML document with a doctype 
and an `` tag.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: API: Split description messages into summary + additional text

[Jforrester (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

Change-Id: I4b2b34ea9a188bd152d2348573a9e92e14525cf1
Depends-On: I778bab2b87971875aed4c804341ad59c1c6e021f
---
M Example/i18n/en.json
M Example/i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/Example/i18n/en.json b/Example/i18n/en.json
index cd64edf..ba42b15 100644
--- a/Example/i18n/en.json
+++ b/Example/i18n/en.json
@@ -9,7 +9,7 @@
"example-welcome-color-value": "$1",
"example-helloworld": "Bar",
"example-helloworld-intro": "This is the HelloWorld special page, as 
provided by the Example extension.",
-   "apihelp-query+example-description": "Get information about foo.",
+   "apihelp-query+example-summary": "Get information about foo.",
"apihelp-query+example-param-key": "Reduce the result to only one of 
the foo properties.",
"apihelp-query+example-example-1": "Get all the information about foo.",
"apihelp-query+example-example-2": "Get only information for the key 
\"do\""
diff --git a/Example/i18n/qqq.json b/Example/i18n/qqq.json
index 038df36..230e821 100644
--- a/Example/i18n/qqq.json
+++ b/Example/i18n/qqq.json
@@ -7,7 +7,7 @@
"example-welcome-title-loggedout": "Title of the Welcome interface 
logged-out users.",
"example-helloworld": "Title of Special:HelloWorld.",
"example-helloworld-intro": "Intro paragraph shown on 
Special:HelloWorld.",
-   "apihelp-query+example-description": 
"{{doc-apihelp-description|query+example}}",
+   "apihelp-query+example-summary": 
"{{doc-apihelp-summary|query+example}}",
"apihelp-query+example-param-key": 
"{{doc-apihelp-param|query+example|key}}",
"apihelp-query+example-example-1": 
"{{doc-apihelp-example|query+example}}",
"apihelp-query+example-example-2": 
"{{doc-apihelp-example|query+example}}"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b2b34ea9a188bd152d2348573a9e92e14525cf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageTweaks[master]: API: Split description messages into summary + additional text

[jenkins-bot (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

Change-Id: Id7928d4a80b8a8994b02243d21b11fc6f9eda519
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index c192e61..1ee84eb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -18,7 +18,9 @@
"imagetweaks-editor-crop": "Crop",
"imagetweaks-editor-crop-button": "Crop",
"imagetweaks-editor-cancel": "Cancel",
-   "apihelp-imagetweaks-description": "Create a derivative image based on 
an image already on the wiki. Note: There is a strong likelihood that you will 
go over the URL length limit with a request to this API module, so you should 
use a POST request instead.",
+   "apihelp-imagetweaks-description": "Create a derivative image based on 
an image already on the wiki.",
+   "apihelp-imagetweaks-extended-description": "Note: There is a strong 
likelihood that you will go over the URL length limit with a request to this 
API module, so you should use a POST request instead.",
+   "apihelp-imagetweaks-summary": "Create a derivative image based on an 
image already on the wiki. Note: There is a strong likelihood that you will go 
over the URL length limit with a request to this API module, so you should use 
a POST request instead.",
"apihelp-imagetweaks-param-text": "Initial page text for new files.",
"apihelp-imagetweaks-param-comment": "Upload comment. Also used as the 
initial page text for new files if $1text is not specified.",
"apihelp-imagetweaks-param-file": "File contents.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 21c9fac..1579274 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,6 +22,8 @@
"imagetweaks-editor-crop-button": "Finishes a crop in the image 
editor.\n{{Identical|Crop}}",
"imagetweaks-editor-cancel": "Cancels an interactive editing action, 
like cropping.\n{{Identical|Cancel}}",
"apihelp-imagetweaks-description": 
"{{doc-apihelp-description|imagetweaks}}",
+   "apihelp-imagetweaks-extended-description": 
"{{doc-apihelp-extended-description|imagetweaks}}",
+   "apihelp-imagetweaks-summary": "{{doc-apihelp-summary|imagetweaks}}",
"apihelp-imagetweaks-param-text": 
"{{doc-apihelp-param|imagetweaks|text}}",
"apihelp-imagetweaks-param-comment": 
"{{doc-apihelp-param|imagetweaks|comment}}",
"apihelp-imagetweaks-param-file": 
"{{doc-apihelp-param|imagetweaks|file}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7928d4a80b8a8994b02243d21b11fc6f9eda519
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ImageTweaks
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: API: Split description messages into summary + additional text

[jenkins-bot (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

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

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



diff --git a/i18n/en.json b/i18n/en.json
index cfcc542..7093260 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,26 +7,31 @@
},
"commentstreams-desc": "Allows commenting on wiki pages",
"apihelp-csQueryComment-description": "Return the title, user, creation 
timestamp, and wikitext of a comment. Either pageid or title must be provided.",
+   "apihelp-csQueryComment-summary": "Return the title, user, creation 
timestamp, and wikitext of a comment. Either pageid or title must be provided.",
"apihelp-csQueryComment-param-pageid": "page ID of the page which holds 
the comment to query",
"apihelp-csQueryComment-param-title": "title of the page which holds 
the comment to query",
"apihelp-csQueryComment-pageid-example": "query comment with page ID 3 
in wikitext",
"apihelp-csQueryComment-title-example": "query comment with page title 
CommentStreams:3 in wikitext",
"apihelp-csDeleteComment-description": "Delete a comment. Either pageid 
or title must be provided.",
+   "apihelp-csDeleteComment-summary": "Delete a comment. Either pageid or 
title must be provided.",
"apihelp-csDeleteComment-param-pageid": "page ID of the page which 
holds the comment to delete",
"apihelp-csDeleteComment-param-title": "title of the page which holds 
the comment to delete",
"apihelp-csDeleteComment-pageid-example": "delete comment with page ID 
3",
"apihelp-csDeleteComment-title-example": "delete comment with page 
title CommentStreams:3",
"apihelp-csPostComment-description": "Post a new comment.",
+   "apihelp-csPostComment-summary": "Post a new comment.",
"apihelp-csPostComment-param-commenttitle": "optional title for 
comment.",
"apihelp-csPostComment-param-wikitext": "wikitext for comment.",
"apihelp-csPostComment-param-associatedid": "page with which this 
comment is associated.",
"apihelp-csPostComment-param-parentid": "page ID of parent comment if 
this is a reply.",
"apihelp-csEditComment-description": "Edit an existing comment. Either 
pageid or title must be provided.",
+   "apihelp-csEditComment-summary": "Edit an existing comment. Either 
pageid or title must be provided.",
"apihelp-csEditComment-param-pageid": "page ID of the page which holds 
the comment to query",
"apihelp-csEditComment-param-title": "title of the page which holds the 
comment to query",
"apihelp-csEditComment-param-commenttitle": "optional title for 
comment.",
"apihelp-csEditComment-param-wikitext": "wikitext for comment.",
"apihelp-csVote-description": "Vote (up, down, or neutral) on a 
comment.",
+   "apihelp-csVote-summary": "Vote (up, down, or neutral) on a comment.",
"apihelp-csVote-param-pageid": "page ID of the page which holds the 
comment to be voted on",
"apihelp-csVote-param-title": "title of the page which holds the 
comment to be voted on",
"apihelp-csVote-param-vote": "vote (1, -1, or 0).",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 771a5eb..f704373 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,26 +7,31 @@
},
"commentstreams-desc": 
"{{desc|name=CommentStreams|url=http://gestalt.mitre.org/gestaltd/index.php/CommentStreams}};,
"apihelp-csQueryComment-description": 
"{{doc-apihelp-description|csQueryComment}}",
+   "apihelp-csQueryComment-summary": 
"{{doc-apihelp-summary|csQueryComment}}",
"apihelp-csQueryComment-param-pageid": 
"{{doc-apihelp-param|csQueryComment|pageid}}",
"apihelp-csQueryComment-param-title": 
"{{doc-apihelp-param|csQueryComment|title}}",
"apihelp-csQueryComment-pageid-example": 
"{{doc-apihelp-example|csQueryComment}}",
"apihelp-csQueryComment-title-example": 
"{{doc-apihelp-example|csQueryComment}}",
"apihelp-csDeleteComment-description": 
"{{doc-apihelp-description|csDeleteComment}}",
+   "apihelp-csDeleteComment-summary": 
"{{doc-apihelp-summary|csDeleteComment}}",
"apihelp-csDeleteComment-param-pageid": 
"{{doc-apihelp-param|csDeleteComment|pageid}}",
"apihelp-csDeleteComment-param-title": 
"{{doc-apihelp-param|csDeleteComment|title}}",
"apihelp-csDeleteComment-pageid-example": 
"{{doc-apihelp-example|csDeleteComment}}",
"apihelp-csDeleteComment-title-example": 
"{{doc-apihelp-example|csDeleteComment}}",
  

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertTemplate[master]: API: Split description messages into summary + additional text

[jenkins-bot (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 9beafbc..bed0353 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,5 +10,6 @@
"bs-insertTemplate-dialog-label-choose": "Choose template",
"bs-insertTemplate-dialog-label-modify": "Modify template",
"bs-insertTemplate-dialog-label-preview": "Preview",
-   "apihelp-bs-inserttemplate-store-description": "Lists all templates. 
Allows sorting, filtering and pagination. Implements ExtJS Store parameters."
+   "apihelp-bs-inserttemplate-store-description": "Lists all templates. 
Allows sorting, filtering and pagination. Implements ExtJS Store parameters.",
+   "apihelp-bs-inserttemplate-store-summary": "Lists all templates. Allows 
sorting, filtering and pagination. Implements ExtJS Store parameters."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 93f76c3..f96c4e4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,5 +12,6 @@
"bs-insertTemplate-dialog-label-choose": "Label of the template 
selection combobox",
"bs-insertTemplate-dialog-label-modify": "Label of the textarea that 
allows modification to the template syntax",
"bs-insertTemplate-dialog-label-preview": "Label of the preview area 
that shows the output of the template\n{{Identical|Preview}}",
-   "apihelp-bs-inserttemplate-store-description": "Describes the API 
endpoint that lists 
templates\n{{doc-apihelp-description|bs-inserttemplate-store}}"
+   "apihelp-bs-inserttemplate-store-description": "Describes the API 
endpoint that lists 
templates\n{{doc-apihelp-description|bs-inserttemplate-store}}",
+   "apihelp-bs-inserttemplate-store-summary": "Describes the API endpoint 
that lists templates\n{{doc-apihelp-summary|bs-inserttemplate-store}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5df82d82c3b3a8850c9ba7a51d37f9f2c4c64993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertTemplate
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageRating[master]: API: Split description messages into summary + additional text

[jenkins-bot (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

Change-Id: I3c0c06e96fff4af575b715c4f603baf9a38a94d6
---
M i18n/en.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 090e78d..b62211e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,6 +7,7 @@
]
},
"apihelp-imagerating-description": "ImageRating API module -- allows 
adding categories to a page when given a page ID",
+   "apihelp-imagerating-summary": "ImageRating API module -- allows adding 
categories to a page when given a page ID",
"apihelp-imagerating-param-categories": "URL-encoded, comma-separated 
list (string) of categories to add to the page",
"apihelp-imagerating-param-pageId": "Internal identifier of the page to 
edit",
"apihelp-imagerating-example-1": "Adds the categories \"Cute cats\", 
\"Lolcats\" and \"Internet memes\" to the page that has the internal ID 66.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c0c06e96fff4af575b715c4f603baf9a38a94d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageRating
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: API: Split description messages into summary + additional text

[jenkins-bot (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

Change-Id: I21281fd1b9fc65a7829cc50e95e9da10e6e5f01a
---
M Avatars/i18n/en.json
M Avatars/i18n/qqq.json
M Checklist/i18n/en.json
M Checklist/i18n/qqq.json
M ContextMenu/i18n/en.json
M ContextMenu/i18n/qqq.json
M Dashboards/i18n/en.json
M Dashboards/i18n/qqq.json
M ExtendedSearch/i18n/en.json
M ExtendedSearch/i18n/qqq.json
M Flexiskin/i18n/en.json
M Flexiskin/i18n/qqq.json
M FormattingHelp/i18n/en.json
M FormattingHelp/i18n/qqq.json
M GroupManager/i18n/en.json
M GroupManager/i18n/qqq.json
M InsertFile/i18n/en.json
M InsertFile/i18n/qqq.json
M InsertMagic/i18n/en.json
M InsertMagic/i18n/qqq.json
M InterWikiLinks/i18n/en.json
M InterWikiLinks/i18n/qqq.json
M NamespaceManager/i18n/en.json
M NamespaceManager/i18n/qqq.json
M PageAssignments/i18n/en.json
M PageAssignments/i18n/qqq.json
M PageTemplates/i18n/en.json
M PageTemplates/i18n/qqq.json
M PermissionManager/i18n/en.json
M PermissionManager/i18n/qqq.json
M RSSFeeder/i18n/en.json
M RSSFeeder/i18n/qqq.json
M RSSStandards/i18n/en.json
M RSSStandards/i18n/qqq.json
M Readers/i18n/en.json
M Readers/i18n/qqq.json
M Review/i18n/en.json
M Review/i18n/qqq.json
M ShoutBox/i18n/en.json
M ShoutBox/i18n/qqq.json
M SmartList/i18n/en.json
M SmartList/i18n/qqq.json
M StateBar/i18n/en.json
M StateBar/i18n/qqq.json
M Statistics/i18n/en.json
M Statistics/i18n/qqq.json
M UserManager/i18n/en.json
M UserManager/i18n/qqq.json
M UserSidebar/i18n/en.json
M UserSidebar/i18n/qqq.json
M VisualEditor/i18n/en.json
M VisualEditor/i18n/qqq.json
M WantedArticle/i18n/en.json
M WantedArticle/i18n/qqq.json
54 files changed, 108 insertions(+), 18 deletions(-)

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



diff --git a/Avatars/i18n/en.json b/Avatars/i18n/en.json
index 1a0a9f7..88f1ac2 100644
--- a/Avatars/i18n/en.json
+++ b/Avatars/i18n/en.json
@@ -22,5 +22,6 @@
"bs-avatars-set-userimage-saved": "The user picture was saved.",
"bs-avatars-file-upload-fieldset-title": "Picture upload",
"bs-avatars-auto-generate-fieldset-title": "Auto generate avatar",
-   "apihelp-bs-avatars-tasks-description": "Uploading, generating and 
setting user avatars"
+   "apihelp-bs-avatars-tasks-description": "Uploading, generating and 
setting user avatars",
+   "apihelp-bs-avatars-tasks-summary": "Uploading, generating and setting 
user avatars"
 }
diff --git a/Avatars/i18n/qqq.json b/Avatars/i18n/qqq.json
index dfbd50f..556ca64 100644
--- a/Avatars/i18n/qqq.json
+++ b/Avatars/i18n/qqq.json
@@ -22,5 +22,6 @@
"bs-avatars-set-userimage-saved": "Text for user picture successfully 
saved.",
"bs-avatars-file-upload-fieldset-title": "Fieldset title for picture 
upload",
"bs-avatars-auto-generate-fieldset-title": "Fieldset title auto 
generate avatar",
-   "apihelp-bs-avatars-tasks-description": 
"{{doc-apihelp-description|bs-avatars-tasks}}"
+   "apihelp-bs-avatars-tasks-description": 
"{{doc-apihelp-description|bs-avatars-tasks}}",
+   "apihelp-bs-avatars-tasks-summary": 
"{{doc-apihelp-summary|bs-avatars-tasks}}"
 }
diff --git a/Checklist/i18n/en.json b/Checklist/i18n/en.json
index 03cbe2c..4bde074 100644
--- a/Checklist/i18n/en.json
+++ b/Checklist/i18n/en.json
@@ -36,7 +36,10 @@
"bs-checklist-modified-check": "Modified checklist value",
"bs-checklist-update-list": "Updated list",
"apihelp-bs-checklist-available-options-store-description": "Lists all 
available options for checklist templates. Allows sorting, filtering and 
pagination. Implements ExtJS Store parameters.",
+   "apihelp-bs-checklist-available-options-store-summary": "Lists all 
available options for checklist templates. Allows sorting, filtering and 
pagination. Implements ExtJS Store parameters.",
"apihelp-bs-checklist-template-store-description": "Lists all templates 
that are valid checklist sources. Allows sorting, filtering and pagination. 
Implements ExtJS Store parameters.",
+   "apihelp-bs-checklist-template-store-summary": "Lists all templates 
that are valid checklist sources. Allows sorting, filtering and pagination. 
Implements ExtJS Store parameters.",
"apihelp-bs-checklist-tasks-description": "Provides operations for 
Checklist extension",
+   "apihelp-bs-checklist-tasks-summary": "Provides operations for 
Checklist extension",
"bs-tag-checklist": "the checklist tag"
 }
diff --git a/Checklist/i18n/qqq.json b/Checklist/i18n/qqq.json
index 9660a8b..3e3c39f 100644
--- a/Checklist/i18n/qqq.json
+++ b/Checklist/i18n/qqq.json
@@ -42,7 +42,10 @@
"bs-checklist-modified-check": "Edit summary about modifing checklist 
value",

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: API: Split description messages into summary + additional text

[jenkins-bot (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

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

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



diff --git a/i18n/en.json b/i18n/en.json
index cd22b6b..a3d98e3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -98,6 +98,7 @@
"action-polladmin": "administer polls",
"right-polladmin": "Administer polls",
"apihelp-pollny-description": "PollNY API - includes both user and 
admin functions.",
+   "apihelp-pollny-summary": "PollNY API - includes both user and admin 
functions.",
"apihelp-pollny-param-what": "What to do?",
"apihelp-pollny-param-choiceID": "Same as clicking the th 
choice via the GUI; only used when what=vote.",
"apihelp-pollny-param-pageName": "Title to check for (only used when 
what=titleExists); should be URL-encoded.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 25bc157..1b15a71 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -102,6 +102,7 @@
"action-polladmin": "{{doc-action|polladmin}}",
"right-polladmin": "{{doc-right|polladmin}}",
"apihelp-pollny-description": "{{doc-apihelp-description|pollny}}",
+   "apihelp-pollny-summary": "{{doc-apihelp-summary|pollny}}",
"apihelp-pollny-param-what": "{{doc-apihelp-param|pollny|what}}",
"apihelp-pollny-param-choiceID": 
"{{doc-apihelp-param|pollny|choiceID}}",
"apihelp-pollny-param-pageName": 
"{{doc-apihelp-param|pollny|pageName}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2661a5e601f0fba57fb4d2372f656af6cffbf224
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: API: Split description messages into summary + additional text

[jenkins-bot (Code Review)]

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

Change subject: API: Split description messages into summary + additional text
..


API: Split description messages into summary + additional text

See MediaWiki core patch I778bab2b

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

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



diff --git a/i18n/api/en.json b/i18n/api/en.json
index f35bcbf..2a63e71 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -5,13 +5,21 @@
]
},
"apihelp-bs-filebackend-store-description": "Lists all files from the 
file backend. Allows sorting, filtering and pagination. Implements ExtJS Store 
parameters.",
+   "apihelp-bs-filebackend-store-summary": "Lists all files from the file 
backend. Allows sorting, filtering and pagination. Implements ExtJS Store 
parameters.",
"apihelp-bs-user-store-description": "Lists all users from the 
database. Allows sorting, filtering and pagination. Implements ExtJS Store 
parameters.",
+   "apihelp-bs-user-store-summary": "Lists all users from the database. 
Allows sorting, filtering and pagination. Implements ExtJS Store parameters.",
"apihelp-bs-category-store-description": "Lists all categories. Allows 
sorting, filtering and pagination. Implements ExtJS Store parameters.",
+   "apihelp-bs-category-store-summary": "Lists all categories. Allows 
sorting, filtering and pagination. Implements ExtJS Store parameters.",
"apihelp-bs-adminuser-store-description": "Lists all users from the 
database with additional sensitive data. Allows sorting, filtering and 
pagination. Implements ExtJS Store parameters.",
+   "apihelp-bs-adminuser-store-summary": "Lists all users from the 
database with additional sensitive data. Allows sorting, filtering and 
pagination. Implements ExtJS Store parameters.",
"apihelp-bs-group-store-description": "Lists all groups except 
$wgImplicitGroups. Allows sorting, filtering and pagination. Implements ExtJS 
Store parameters.",
+   "apihelp-bs-group-store-summary": "Lists all groups except 
$wgImplicitGroups. Allows sorting, filtering and pagination. Implements ExtJS 
Store parameters.",
"apihelp-bs-interwiki-store-description": "Lists all interwiki links. 
Allows sorting, filtering and pagination. Implements ExtJS Store parameters.",
+   "apihelp-bs-interwiki-store-summary": "Lists all interwiki links. 
Allows sorting, filtering and pagination. Implements ExtJS Store parameters.",
"apihelp-bs-titlequery-store-description": "Lists page titles and 
(optionally) namespace prefixes based on a query term. Implements ExtJS Store 
parameters.",
+   "apihelp-bs-titlequery-store-summary": "Lists page titles and 
(optionally) namespace prefixes based on a query term. Implements ExtJS Store 
parameters.",
"apihelp-bs-wikipage-tasks-description": "Provides common operations 
for WikiPages",
+   "apihelp-bs-wikipage-tasks-summary": "Provides common operations for 
WikiPages",
"apihelp-bs-store-param-sort": "JSON string with sorting info; 
deserializes to array of objects that hold field name and 
direction for each sorting option",
"apihelp-bs-store-param-group": "JSON string with grouping info; 
deserializes to array of objects that hold field name and 
direction for each grouping option",
"apihelp-bs-store-param-filter": "JSON string with filter info; 
deserializes to array of objects that hold field name, filter 
type, and filter value for each filtering option",
@@ -35,13 +43,18 @@
"bs-wikipage-tasks-error-categories-not-valid": "Invalid 
{{PLURAL:$2|category|categories}}: $1",
"bs-wikipage-tasks-setcategories-success": "Categories have 
successfully been set.",
"apihelp-bs-wikipage-store-description": "Lists all wiki pages. Allows 
sorting, filtering and pagination. Implements ExtJS Store parameters.",
+   "apihelp-bs-wikipage-store-summary": "Lists all wiki pages. Allows 
sorting, filtering and pagination. Implements ExtJS Store parameters.",
"apihelp-bs-ping-tasks-description": "Ping task that provides 
continuous exchange of data",
+   "apihelp-bs-ping-tasks-summary": "Ping task that provides continuous 
exchange of data",
"apihelp-bs-wikisubpage-treestore-description": "Lists the subpages of 
a specific wikipage",
+   "apihelp-bs-wikisubpage-treestore-summary": "Lists the subpages of a 
specific wikipage",
"apihelp-bs-wikisubpage-treestore-param-node": "The prefixed title of 
the wikipage ",
"apihelp-bs-upload-license-store-description": "Lists all available 
licences for a file upload",
+   "apihelp-bs-upload-license-store-summary": "Lists all available 
licences for 

[MediaWiki-commits] [Gerrit] mediawiki...CategoryWatch[master]: Cleanup extension.json

[Umherirrender (Code Review)]

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

Change subject: Cleanup extension.json
..

Cleanup extension.json

Use tabs to indent
Fix indent
Use https for linking to mediawiki.org

Change-Id: Ibc3c5469da596b4f01df650eadf81ba0b4cca610
---
M CategoryWatch.php
M extension.json
2 files changed, 31 insertions(+), 31 deletions(-)


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

diff --git a/CategoryWatch.php b/CategoryWatch.php
index 0f94a00..e576d63 100644
--- a/CategoryWatch.php
+++ b/CategoryWatch.php
@@ -4,7 +4,7 @@
  * CategoryWatch extension
  * - Extends watchlist functionality to include notification about membership 
changes of watched categories
  *
- * See http://www.mediawiki.org/Extension:CategoryWatch for installation and 
usage details
+ * See https://www.mediawiki.org/Extension:CategoryWatch for installation and 
usage details
  * See http://www.organicdesign.co.nz/Extension_talk:CategoryWatch for 
development notes and disucssion
  *
  * @file
@@ -100,7 +100,7 @@

/**
 * the proper hook for save page request.
-* @see 
http://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete
+* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete
 * @param $article Article edited
 * @param $user User who edited
 * @param $content Content New article text
diff --git a/extension.json b/extension.json
index 210c00d..194d628 100644
--- a/extension.json
+++ b/extension.json
@@ -1,32 +1,32 @@
 {
-"name": "CategoryWatch",
-"version": "1.2.2, 2011-12-03",
-"author": "[http://www.organicdesign.co.nz/User:Nad User:Nad]",
-"url": "http://www.mediawiki.org/wiki/Extension:CategoryWatch;,
-"descriptionmsg": "categorywatch-desc",
-"license-name": "GPL-2.0+",
-"type": "other",
-"AutoloadClasses": {
-"CategoryWatch": "CategoryWatch.php"
-},
-"ExtensionFunctions": [
-"CategoryWatch::wfSetupCategoryWatch"
-],
-"ExtensionMessagesFiles": {
-"CategoryWatch": "CategoryWatch.i18n.php"
-},
-"Hooks": {
-"PageContentSave":[
-   "CategoryWatch::onPageContentSave"
+   "name": "CategoryWatch",
+   "version": "1.2.2, 2011-12-03",
+   "author": "[http://www.organicdesign.co.nz/User:Nad User:Nad]",
+   "url": "https://www.mediawiki.org/wiki/Extension:CategoryWatch;,
+   "descriptionmsg": "categorywatch-desc",
+   "license-name": "GPL-2.0+",
+   "type": "other",
+   "AutoloadClasses": {
+   "CategoryWatch": "CategoryWatch.php"
+   },
+   "ExtensionFunctions": [
+   "CategoryWatch::wfSetupCategoryWatch"
],
-"PageContentSaveComplete":[
-   "CategoryWatch::onPageContentSaveComplete"
-   ]
-},
-"config": {
-"CategoryWatchNotifyEditor": true,
-"CategoryWatchUseAutoCat": false,
-"CategoryWatchUseAutoCatRealName": false
-},
-"manifest_version": 1
+   "ExtensionMessagesFiles": {
+   "CategoryWatch": "CategoryWatch.i18n.php"
+   },
+   "Hooks": {
+   "PageContentSave": [
+   "CategoryWatch::onPageContentSave"
+   ],
+   "PageContentSaveComplete": [
+   "CategoryWatch::onPageContentSaveComplete"
+   ]
+   },
+   "config": {
+   "CategoryWatchNotifyEditor": true,
+   "CategoryWatchUseAutoCat": false,
+   "CategoryWatchUseAutoCatRealName": false
+   },
+   "manifest_version": 1
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Temporarily stop storing invoice id

[Ejegg (Code Review)]

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

Change subject: Temporarily stop storing invoice id
..

Temporarily stop storing invoice id

Just commenting key lines out to make it easier to rebase the
unique-ifying change ( I96b1cbc04da9f376f74 ) on top of it.

Until then, it's more harmful than helpful to prevent the duplicates
from being entered in CiviCRM

Bug: T165918
Change-Id: Id30deb3ca050b8a3ca7dd9119f26cc04b7c29c5a
---
M sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/30/359630/1

diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
index 6028af3..7e625f6 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
@@ -61,7 +61,7 @@
'financial_type' => 'Cash',
'contribution_status' => 'Completed',
'payment_instrument' => 'Credit Card: Visa',
-   'invoice_id' => $message->get('order_id'),
+   // 'invoice_id' => $message->get('order_id'),
$campaignField => '',
);
$returnFields = array_keys( $expected );
@@ -101,7 +101,7 @@
'financial_type' => 'Cash',
'contribution_status' => 'Completed',
'payment_instrument' => 'Credit Card: Visa',
-   'invoice_id' => $message2->get('order_id'),
+   // 'invoice_id' => $message2->get('order_id'),
$campaignField => 'Benefactor Gift',
);
$this->assertArraySubset( $expected, $contribution2 );
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index aba9dd1..1426931 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -356,10 +356,10 @@
 
 // Store the identifier we generated on payments
 if ( !empty( $msg['order_id'] ) ) {
-$contribution['invoice_id'] = $msg['order_id'];
+//$contribution['invoice_id'] = $msg['order_id'];
 // The invoice_id column has a unique constraint
 if ( $msg['recurring'] ) {
-$contribution['invoice_id'] .= '|recur-' . 
UtcDate::getUtcTimestamp();
+//$contribution['invoice_id'] .= '|recur-' . 
UtcDate::getUtcTimestamp();
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Follow-up Id3f663ea6: Use filter function instead of remove

[Esanders (Code Review)]

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

Change subject: Follow-up Id3f663ea6: Use filter function instead of remove
..

Follow-up Id3f663ea6: Use filter function instead of remove

Remove only works on nodes with a parent.

Change-Id: Ic2ee6222992a0c6cd8bd06508d611c3f72ef72bd
---
M src/ce/nodes/ve.ce.GeneratedContentNode.js
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/28/359628/1

diff --git a/src/ce/nodes/ve.ce.GeneratedContentNode.js 
b/src/ce/nodes/ve.ce.GeneratedContentNode.js
index 09af0b2..3d18ac5 100644
--- a/src/ce/nodes/ve.ce.GeneratedContentNode.js
+++ b/src/ce/nodes/ve.ce.GeneratedContentNode.js
@@ -108,7 +108,12 @@
// Filter out link and style tags for bug 50043
// Previously filtered out meta tags, but restore these as they
// can be made visible.
-   $rendering.filter( 'link, style' ).remove();
+   // As of jQuery 3 we can't use $.not( 'tagName' ) as that doesn't
+   // match text nodes. Also we can't $.remove these elements as they
+   // aren't attached to anything.
+   $rendering = $rendering.filter( function ( i, node ) {
+   return node.tagName !== 'LINK' && node.tagName !== 'STYLE';
+   } );
// Also remove link and style tags nested inside other tags
$rendering.find( 'link, style' ).remove();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2ee6222992a0c6cd8bd06508d611c3f72ef72bd
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: DONOTMERGE folow up

[Jdlrobson (Code Review)]

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

Change subject: DONOTMERGE folow up
..

DONOTMERGE folow up

Change-Id: Ibd57843c6cc9c765d23aea330ee073461864f033
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/getTitle.js
3 files changed, 3 insertions(+), 3 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd57843c6cc9c765d23aea330ee073461864f033
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Switch to data-attribute for sister-search sidebar results

[Bearloga (Code Review)]

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

Change subject: Switch to data-attribute for sister-search sidebar results
..

Switch to data-attribute for sister-search sidebar results

Uses the previously missing iw-resultset-source data attribute
for tracking which sister project results and in what order.

Bug: T164854
Depends-On: I9e11a368fe4f5d79d81503fb4db1cc1649723839
Change-Id: Id13ad17c1218b0a05d0c4048264dc3db4b939179
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 1cf81f6..67a7373 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -678,7 +678,7 @@
iwResultSet = [];
$( 'li.iw-resultset' ).each( function () {
iwResultSet.push( {
-   result: $( this ).attr( 'class' 
).match( /(?:^|\s)iw-resultset--(\S+)/ )[ 1 ],
+   source: $( this ).data( 
'iw-resultset-source' ),
position: $( this ).data( 
'iw-resultset-pos' )
} );
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Correct unbalanced margins in active filters display

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Correct unbalanced margins in active filters display
..

RCFilters: Correct unbalanced margins in active filters display

Bug: T168090
Change-Id: Ic8b8736ef108b06aa61f03ae7cfd01f37fe23c30
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/359626/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index 66e6d96..361dbf8 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -11,7 +11,7 @@
border-bottom: 0;
background-color: #f8f9fa;
border-radius: 2px 2px 0 0;
-   padding: 0.3em 0.6em 0.6em 0.6em;
+   padding: 0.6em;
margin-top: 1.6em;
}
 
@@ -37,6 +37,11 @@
 
&-cell-filters {
width: 100%;
+
+   div.oo-ui-tagMultiselectWidget-group {
+   margin-top: 0.2em;
+   display: block;
+   }
}
 
&-cell-reset {

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Update VE core submodule to master (f2e03ee6f)

New changes:
bab55c44c Use absolute URLs in diff tests
fb367a07e Localisation updates from https://translatewiki.net.
ef248756c TriggerRegistry: Remove ⌘+M shortcut for removing styling on Macs

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

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



diff --git a/lib/ve b/lib/ve
index 8b8bc2f..f2e03ee 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 8b8bc2f70044f509b60d501b51ebc25cfe891ce3
+Subproject commit f2e03ee6f7fe5a3aa12601ee7181840dd1559e16

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefab4deb66621cc62bb48b368061b30a4eecd1c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Deskana 
Gerrit-Reviewer: Esanders 
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]: build: Remove Travis CI allow_failure for Postgres

[jenkins-bot (Code Review)]

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

Change subject: build: Remove Travis CI allow_failure for Postgres
..


build: Remove Travis CI allow_failure for Postgres

Now passing!

Follows-up 7399a3ec01.

Bug: T75174
Change-Id: I9cdd0aefa955f2bd91945969f6066ab67cda0d5f
---
M .travis.yml
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index baf7f03..5e2c7a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,11 +31,6 @@
   php: hhvm-3.12
 - env: dbtype=mysql dbuser=root
   php: 7
-  allow_failures:
-# Postgres support for unit tests is still buggy
-# https://phabricator.wikimedia.org/T75174
-- env: dbtype=postgres dbuser=travis
-  php: 5.5
 
 services:
   - mysql

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cdd0aefa955f2bd91945969f6066ab67cda0d5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Add a notice concerning logs and anonymity/privacy on Specia...

[Framawiki (Code Review)]

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

Change subject: Add a notice concerning logs and anonymity/privacy on 
Special:GlobalRenameRequest
..

Add a notice concerning logs and anonymity/privacy on 
Special:GlobalRenameRequest

Inspired by https://en.wikipedia.org/wiki/Template:CHU key "record"

Bug: T168098
Change-Id: I3b2f97f311fec56ffae37807b93a9d0fc9a591f8
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/25/359625/1

diff --git a/i18n/en.json b/i18n/en.json
index f8d629b..0b45fce 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -430,7 +430,7 @@
"globalrenamerequest": "Global user account rename request",
"globalrenamerequest-legend" : "Unification rename request",
"globalrenamerequest-forced": "The Wikimedia Foundation is 
[[:mw:SUL_finalisation|unifying usernames across all Wikimedia projects]]. This 
username was identified as being in use in other Wikimedia wikis and must be 
changed in order to finalize this unification. As a result, you must select a 
new username.",
-   "globalrenamerequest-pretext" : "Request a new username to be known by 
across all projects.\n\nAll of your previous contributions will be connected 
with this new username.\n\nOnce you have requested a new username, a 
notification will be sent to Wikimedia stewards to perform the rename. You will 
be notified by email when this process is completed.",
+   "globalrenamerequest-pretext" : "Request a new username to be known by 
across all projects.\n\nAll of your previous contributions will be connected 
with this new username.\n\nOnce you have requested a new username, a 
notification will be sent to global renamers to perform the rename. You will be 
notified by email when this process is completed.\n\nIf your request is related 
to a desire for anonymity/privacy, please note that a permanent log record will 
be created noting your previous name. As such, you might consider simply 
[[Special:CreateAccount|creating a separate and independent new account]] and 
having your current account renamed to something random and abandoning it.",
"globalrenamerequest-username-label": "Current username:",
"globalrenamerequest-newname-label": "Requested username:",
"globalrenamerequest-newname-help": "Enter the new username you wish to 
use, e.g., \"$1\".",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b2f97f311fec56ffae37807b93a9d0fc9a591f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Framawiki 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Reposition TagItemWidget to be center on the widget

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Reposition TagItemWidget to be center on the widget
..

RCFilters: Reposition TagItemWidget to be center on the widget

Bug: T168091
Change-Id: Iea714cb9c63d30163f01e35e447684af5f39f3ae
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/359624/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
index 886f6d4..bf75149 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
@@ -42,7 +42,6 @@
}
}, config ) );
 
-   this.positioned = false;
this.popupTimeoutShow = null;
this.popupTimeoutHide = null;
 
@@ -108,12 +107,6 @@
 
if ( labelText ) {
this.popupLabel.setLabel( labelText );
-
-   if ( !this.positioned ) {
-   // Recalculate anchor position to be center of 
the capsule item
-   this.popup.$anchor.css( 'margin-left', ( 
this.$element.width() / 2 ) );
-   this.positioned = true;
-   }
 
// Set timeout for the popup to show
this.popupTimeoutShow = setTimeout( function () {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: Add DeepSea as a theme for the Vector skin

[SamanthaNguyen (Code Review)]

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

Change subject: Add DeepSea as a theme for the Vector skin
..

Add DeepSea as a theme for the Vector skin

Change-Id: I33fd9c83be59155e4196f2c5e0ddf4c7ab10ee60
---
M extension.json
A vector/deepsea.css
2 files changed, 253 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Theme 
refs/changes/23/359623/1

diff --git a/extension.json b/extension.json
index 75298dc..3bd6d74 100644
--- a/extension.json
+++ b/extension.json
@@ -1,10 +1,11 @@
 {
"name": "Theme",
"namemsg": "theme-extensionname",
-   "version": "1.7.2",
+   "version": "1.8.0",
"author": [
"Ryan Schmidt",
-   "Jack Phoenix"
+   "Jack Phoenix",
+   "Samantha Nguyen"
],
"url": "https://www.mediawiki.org/wiki/Extension:Theme;,
"descriptionmsg": "theme-desc",
@@ -45,6 +46,13 @@
"media": "screen"
}
}
+   },
+   "themeloader.skins.vector.deepsea": {
+   "styles": {
+   "vector/deepsea.css": {
+   "media": "screen"
+   }
+   }
}
},
"ResourceFileModulePaths": {
diff --git a/vector/deepsea.css b/vector/deepsea.css
new file mode 100644
index 000..44a825d
--- /dev/null
+++ b/vector/deepsea.css
@@ -0,0 +1,243 @@
+/* colors */
+body {
+   background: #eaecf0;
+}
+
+/* main colors */
+#p-search,
+#p-personal ul li,
+div.vectorTabs ul li,
+div#mw-head div.vectorMenu h3,
+div#mw-panel div.portal div.body ul li {
+   background: #f8f9fa;
+}
+
+/* hover colors */
+#p-personal ul li:hover,
+div.vectorTabs li:hover,
+div#mw-panel div.portal div.body ul li:hover {
+   background: #fff;
+}
+
+/* headings */
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.mw-body h1,
+.mw-body h2 {
+   color: #222;
+   font-family: "Helvetica","Arial",sans-serif;
+}
+
+/* main content */
+#mw-page-base {
+   background: none;
+   height: 6em;
+}
+
+#mw-head-base {
+   height: 6em;
+   margin-top: -6em;
+   margin-left: 15%;
+}
+
+.mw-body {
+   border: 0;
+}
+
+/* personal */
+#p-personal {
+   top: 0;
+   right: 0;
+   border-radius: 0 0 0 1em;
+}
+
+#p-personal ul {
+   padding: 0;
+}
+
+#p-personal ul li {
+   margin: 0;
+}
+
+#p-personal li:first-child {
+   border-radius: 0 0 0 1em;
+}
+
+#p-personal ul li a {
+   text-decoration: none;
+   padding: .75em 1em;
+   display: block;
+}
+
+#p-personal #pt-notifications-alert,
+#p-personal #pt-notifications-notice {
+   margin: 0;
+
+}
+
+#pt-notifications-alert .mw-echo-notifications-badge,
+#pt-notifications-notice .mw-echo-notifications-badge {
+   top: 0;
+   height: 1.1em;
+   width: 1.25em;
+}
+
+#pt-notifications-alert .mw-echo-notifications-badge:before,
+#pt-notifications-notice .mw-echo-notifications-badge:before {
+   top: .125em;
+   left: .5em;
+}
+
+/* navigation */
+#left-navigation {
+   position: absolute;
+}
+
+div#mw-head div.vectorMenu h3 {
+   background-image: none;
+}
+
+#right-navigation div.emptyPortlet + div.emptyPortlet + div {
+   border-radius: 1em 0 0 0;
+}
+
+div.vectorMenu {
+   margin-right: -.5em;
+}
+
+div.vectorMenu h3 span {
+   line-height: .5;
+   padding: 1.375em 1em 0 1em;
+}
+
+div.vectorMenu h3 a {
+   top: -.25em;
+   left: 3em;
+}
+
+div.vectorMenu div.menu {
+   background-color: #fff;
+   border: 1px solid #a2a9b1;
+   border-radius: 2px;
+   box-shadow: 0 0.15em 0 0 rgba(0,0,0,0.15);
+}
+
+div.vectorMenu li a {
+   text-decoration: none;
+}
+
+div.vectorMenu li:hover {
+   background: #f9f9f9;
+}
+
+/* search */
+#p-search {
+   background: #fff;
+   height: 1.5em;
+   padding: 0.48em 1em;
+}
+
+div#simpleSearch,
+#p-search form,
+#p-search input {
+   margin: 0;
+}
+
+/* tabs */
+div.vectorTabs {
+   padding: 0;
+}
+
+div.vectorTabs,
+div.vectorTabs ul,
+div.vectorTabs ul li,
+div.vectorTabs span {
+   background-image: none;
+}
+
+div.vectorTabs li a {
+   text-decoration: none;
+   height: 1em;
+   padding: 1em;
+   display: inline-block;
+}
+
+#p-namespaces li:first-of-type,
+#p-views li:first-of-type {
+   border-radius: 1em 0 0 0;
+}
+
+#p-namespaces li:last-of-type {
+   border-radius: 0 1em 0 0;
+}
+
+/* portals */
+div#mw-panel {
+   width: 14%;
+}
+
+div#mw-panel div.portal {
+   background: none;
+   margin: 0 0 .5em 0;
+}
+
+
+div#mw-panel #p-logo + div.portal h3,
+div#mw-panel div.portal h3 {
+   background: #fff;
+   color: #444;
+   padding-left: 1.75em;
+   

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: The user_fields_privacy table has no column named "privacy", ...

[jenkins-bot (Code Review)]

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

Change subject: The user_fields_privacy table has no column named "privacy", 
but rather "ufp_privacy"
..


The user_fields_privacy table has no column named "privacy", but rather 
"ufp_privacy"

Bug: T168097
Change-Id: I74ff07577785ffccf1a88e786ae12096014da32b
---
M UserSecurity/UserSecurityClass.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/UserSecurity/UserSecurityClass.php 
b/UserSecurity/UserSecurityClass.php
index bf1e373..dc5d9bf 100644
--- a/UserSecurity/UserSecurityClass.php
+++ b/UserSecurity/UserSecurityClass.php
@@ -63,7 +63,7 @@
);
 
if ( $s ) {
-   return $s->privacy;
+   return $s->ufp_privacy;
} else {
return 'public';
}
@@ -91,8 +91,8 @@
__METHOD__
);
 
-   if ( $s && !empty( $s->privacy ) ) {
-   $privacy = $s->privacy;
+   if ( $s && !empty( $s->ufp_privacy ) ) {
+   $privacy = $s->ufp_privacy;
} else {
$privacy = 'public';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74ff07577785ffccf1a88e786ae12096014da32b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Adjust font size to fit UI standard

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Adjust font size to fit UI standard
..

RCFilters: Adjust font size to fit UI standard

Bug: T168089
Change-Id: I17cd6c1ee57ce6b4d686676142af5c63615d4f00
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/359620/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index 1a29459..c05fa35 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -3,6 +3,7 @@
width: 100%;
// Make sure this uses the interface direction, not the content 
direction
direction: ltr;
+   font-size: 12.8 / 14em;
 
&-viewToggleButtons {
margin-top: 1em;

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

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

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Updates revscoring to 1.3.14 and pytz to 2017.2

[Halfak (Code Review)]

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

Change subject: Updates revscoring to 1.3.14 and pytz to 2017.2
..


Updates revscoring to 1.3.14 and pytz to 2017.2

Change-Id: I384cc7dd4408e075f8d04592b87dd2a7a32de6d2
---
D pytz-2012c-py3-none-any.whl
A pytz-2017.2-py2.py3-none-any.whl
R revscoring-1.3.14-py2.py3-none-any.whl
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/pytz-2012c-py3-none-any.whl b/pytz-2012c-py3-none-any.whl
deleted file mode 100644
index ed98fab..000
--- a/pytz-2012c-py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/pytz-2017.2-py2.py3-none-any.whl b/pytz-2017.2-py2.py3-none-any.whl
new file mode 100644
index 000..27f3995
--- /dev/null
+++ b/pytz-2017.2-py2.py3-none-any.whl
Binary files differ
diff --git a/revscoring-1.3.13-py2.py3-none-any.whl 
b/revscoring-1.3.14-py2.py3-none-any.whl
similarity index 86%
rename from revscoring-1.3.13-py2.py3-none-any.whl
rename to revscoring-1.3.14-py2.py3-none-any.whl
index 4adc012..775d89c 100644
--- a/revscoring-1.3.13-py2.py3-none-any.whl
+++ b/revscoring-1.3.14-py2.py3-none-any.whl
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I384cc7dd4408e075f8d04592b87dd2a7a32de6d2
Gerrit-PatchSet: 2
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Halfak 
Gerrit-Reviewer: Halfak 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Updates revscoring to 1.3.14 and pytz to 2017.2

[Halfak (Code Review)]

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

Change subject: Updates revscoring to 1.3.14 and pytz to 2017.2
..

Updates revscoring to 1.3.14 and pytz to 2017.2

Change-Id: I384cc7dd4408e075f8d04592b87dd2a7a32de6d2
---
A pytz-2017.2-py2.py3-none-any.whl
R revscoring-1.3.14-py2.py3-none-any.whl
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/19/359619/1

diff --git a/pytz-2017.2-py2.py3-none-any.whl b/pytz-2017.2-py2.py3-none-any.whl
new file mode 100644
index 000..27f3995
--- /dev/null
+++ b/pytz-2017.2-py2.py3-none-any.whl
Binary files differ
diff --git a/revscoring-1.3.13-py2.py3-none-any.whl 
b/revscoring-1.3.14-py2.py3-none-any.whl
similarity index 86%
rename from revscoring-1.3.13-py2.py3-none-any.whl
rename to revscoring-1.3.14-py2.py3-none-any.whl
index 4adc012..775d89c 100644
--- a/revscoring-1.3.13-py2.py3-none-any.whl
+++ b/revscoring-1.3.14-py2.py3-none-any.whl
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I384cc7dd4408e075f8d04592b87dd2a7a32de6d2
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Halfak 

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

[MediaWiki-commits] [Gerrit] mediawiki...OATHAuth[master]: Add a maintenance script to disable oathauth for a username

[Reedy (Code Review)]

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

Change subject: Add a maintenance script to disable oathauth for a username
..

Add a maintenance script to disable oathauth for a username

Change-Id: I230ce0eafc7576a84dd577dd594ed46236924688
---
A maintenance/disableOATHAuthForUser.php
1 file changed, 41 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth 
refs/changes/18/359618/1

diff --git a/maintenance/disableOATHAuthForUser.php 
b/maintenance/disableOATHAuthForUser.php
new file mode 100644
index 000..a20d7fb
--- /dev/null
+++ b/maintenance/disableOATHAuthForUser.php
@@ -0,0 +1,41 @@
+mDescription = 'Remove OATHAuth from a specific user';
+   $this->addArg( 'user', 'The username to remove OATHAuth from.' 
);
+   $this->requireExtension( 'OATHAuth' );
+   }
+
+   public function execute() {
+   $username = $this->getArg( 0 );
+
+   $user = User::newFromName( $username );
+   if ( $user->getId() === 0 ) {
+   $this->error( "User $username doesn't exist!", 1 );
+   }
+
+   $repo = OATHAuthHooks::getOATHUserRepository();
+
+   $oathUser = $repo->findByUser( $user );
+
+   if ( $oathUser->getKey() === null ) {
+   $this->error( "User $username doesn't have OATHAuth 
enabled!", 1 );
+   }
+
+   $repo->remove( $oathUser );
+   $this->output( "OATHAuth disabled for $username." );
+   }
+}
+
+$maintClass = "DisableOATHAuthForUser";
+require_once RUN_MAINTENANCE_IF_MAIN;
+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: The user_fields_table has no column named "privacy", but rat...

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359617 )

Change subject: The user_fields_table has no column named "privacy", but rather 
"ufp_privacy"
..

The user_fields_table has no column named "privacy", but rather "ufp_privacy"

Bug: T168097
Change-Id: I74ff07577785ffccf1a88e786ae12096014da32b
---
M UserSecurity/UserSecurityClass.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/UserSecurity/UserSecurityClass.php 
b/UserSecurity/UserSecurityClass.php
index bf1e373..dc5d9bf 100644
--- a/UserSecurity/UserSecurityClass.php
+++ b/UserSecurity/UserSecurityClass.php
@@ -63,7 +63,7 @@
);
 
if ( $s ) {
-   return $s->privacy;
+   return $s->ufp_privacy;
} else {
return 'public';
}
@@ -91,8 +91,8 @@
__METHOD__
);
 
-   if ( $s && !empty( $s->privacy ) ) {
-   $privacy = $s->privacy;
+   if ( $s && !empty( $s->ufp_privacy ) ) {
+   $privacy = $s->ufp_privacy;
} else {
$privacy = 'public';
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74ff07577785ffccf1a88e786ae12096014da32b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Minor: DRYing of requires

[Subramanya Sastry (Code Review)]

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

Change subject: Minor: DRYing of requires
..

Minor: DRYing of requires

Change-Id: I6f83275d2fd61759935b6ab731d92dcd981334f3
---
M lib/wt2html/DOMPostProcessor.js
1 file changed, 24 insertions(+), 17 deletions(-)


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

diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js
index 8935b42..ba0b82d 100644
--- a/lib/wt2html/DOMPostProcessor.js
+++ b/lib/wt2html/DOMPostProcessor.js
@@ -13,25 +13,32 @@
 var DOMTraverser = require('../utils/DOMTraverser.js').DOMTraverser;
 
 // processors
-var markFosteredContent = 
require('./pp/processors/markFosteredContent.js').markFosteredContent;
-var handleUnbalancedTables = 
require('./pp/processors/handleUnbalancedTables.js').handleUnbalancedTables;
-var markTreeBuilderFixups = 
require('./pp/processors/markTreeBuilderFixups.js').markTreeBuilderFixups;
-var normalize = require('./pp/processors/normalize.js').normalize;
-var cleanupFormattingTagFixup = 
require('./pp/processors/cleanupFormattingTagFixup.js').cleanupFormattingTagFixup;
-var migrateTemplateMarkerMetas = 
require('./pp/processors/migrateTemplateMarkerMetas.js').migrateTemplateMarkerMetas;
-var handlePres = require('./pp/processors/handlePres.js').handlePres;
-var migrateTrailingNLs = 
require('./pp/processors/migrateTrailingNLs.js').migrateTrailingNLs;
-var computeDSR = require('./pp/processors/computeDSR.js').computeDSR;
-var wrapTemplates = require('./pp/processors/wrapTemplates.js').wrapTemplates;
+var requireProcessor = function(p) {
+   return require('./pp/processors/' + p + '.js')[p];
+};
+var markFosteredContent = requireProcessor('markFosteredContent');
+var handleUnbalancedTables = requireProcessor('handleUnbalancedTables');
+var markTreeBuilderFixups = requireProcessor('markTreeBuilderFixups');
+var normalize = requireProcessor('normalize');
+var cleanupFormattingTagFixup = requireProcessor('cleanupFormattingTagFixup');
+var migrateTemplateMarkerMetas = 
requireProcessor('migrateTemplateMarkerMetas');
+var handlePres = requireProcessor('handlePres');
+var migrateTrailingNLs = requireProcessor('migrateTrailingNLs');
+var computeDSR = requireProcessor('computeDSR');
+var wrapTemplates = requireProcessor('wrapTemplates');
 
 // handlers
-var logWikitextFixup = require('./pp/handlers/linter.js').logWikitextFixups;
-var CleanUp = require('./pp/handlers/cleanup.js');
-var headings = require('./pp/handlers/headings.js');
-var unpackDOMFragments = 
require('./pp/handlers/unpackDOMFragments.js').unpackDOMFragments;
-var TableFixups = require('./pp/handlers/tableFixups.js').TableFixups;
-var handleLinkNeighbours = 
require('./pp/handlers/handleLinkNeighbours.js').handleLinkNeighbours;
-var liFixups = require('./pp/handlers/liFixups.js');
+var requireHandlers = function(file) {
+   return require('./pp/handlers/' + file + '.js');
+};
+
+var logWikitextFixup = requireHandlers('linter').logWikitextFixups;
+var CleanUp = requireHandlers('cleanup');
+var headings = requireHandlers('headings');
+var unpackDOMFragments = 
requireHandlers('unpackDOMFragments').unpackDOMFragments;
+var TableFixups = requireHandlers('tableFixups').TableFixups;
+var handleLinkNeighbours = 
requireHandlers('handleLinkNeighbours').handleLinkNeighbours;
+var liFixups = requireHandlers('liFixups');
 
 // map from mediawiki metadata names to RDFa property names
 var metadataMap = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f83275d2fd61759935b6ab731d92dcd981334f3
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] mediawiki...parsoid[master]: Bump HTML version to 1.5.0

[jenkins-bot (Code Review)]

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

Change subject: Bump HTML version to 1.5.0
..


Bump HTML version to 1.5.0

* Now that Parsoid HTML has redlinks, disambig links, and
  redirect links marked up in its output, bump the version
  so clients that want to can specifically request this version
  from RESTbase.

Change-Id: I224e8c740c7d5666b64fac24994a81c2f12f33c9
---
M bin/roundtrip-test.js
M lib/config/MWParserEnvironment.js
M tests/mocha/api.js
M tests/mocha/templatedata.js
4 files changed, 14 insertions(+), 15 deletions(-)

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



diff --git a/bin/roundtrip-test.js b/bin/roundtrip-test.js
index 6d0ff63..e8468e7 100755
--- a/bin/roundtrip-test.js
+++ b/bin/roundtrip-test.js
@@ -16,8 +16,7 @@
 
 var gzip = Promise.promisify(require('zlib').gzip, false);
 
-var defaultContentVersion = '1.4.0';
-
+var defaultContentVersion = '1.5.0';
 
 function displayDiff(type, count) {
var pad = (10 - type.length);  // Be positive!
diff --git a/lib/config/MWParserEnvironment.js 
b/lib/config/MWParserEnvironment.js
index 66448a7..bca09ca 100644
--- a/lib/config/MWParserEnvironment.js
+++ b/lib/config/MWParserEnvironment.js
@@ -695,7 +695,7 @@
  *
  * @property {Array} availableVersions
  */
-MWParserEnvironment.prototype.availableVersions = ['1.4.0', '2.0.0'];
+MWParserEnvironment.prototype.availableVersions = ['1.5.0', '2.0.0'];
 
 /**
  * The default content version that Parsoid will generate.
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 15fe03a..b8d81ec 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -22,7 +22,7 @@
 parsoidOptions.useBatchAPI = true;
 parsoidOptions.linting = true;
 
-var defaultContentVersion = '1.4.0';
+var defaultContentVersion = '1.5.0';
 
 describe('Parsoid API', function() {
var api, runner;
@@ -236,7 +236,7 @@
request(api)
.post(mockDomain + '/v3/transform/wikitext/to/html/')
.set('Accept',
-   'text/html; 
profile="https://www.mediawiki.org/wiki/Specs/HTML/1.4.0;; q=0.5,' +
+   'text/html; 
profile="https://www.mediawiki.org/wiki/Specs/HTML/1.5.0;; q=0.5,' +
'text/html; 
profile="https://www.mediawiki.org/wiki/Specs/HTML/2.0.0;; q=0.8')
.send({ wikitext: '== h2 ==' })
.expect(200)
@@ -249,7 +249,7 @@
request(api)
.post(mockDomain + 
'/v3/transform/wikitext/to/pagebundle/')
.set('Accept',
-   'application/json; 
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/1.4.0;; q=0.5,' +
+   'application/json; 
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/1.5.0;; q=0.5,' +
'application/json; 
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/2.0.0;; q=0.8')
.send({ wikitext: '== h2 ==' })
.expect(200)
@@ -281,7 +281,7 @@
.set('Accept', 'text/html; 
profile="mediawiki.org/specs/html/1.2.1"')
.send({ wikitext: '{{echo|hi}}' })
.expect(200)
-   .expect(acceptableHtmlResponse('1.4.0'))
+   .expect(acceptableHtmlResponse('1.5.0'))
.end(done);
});
 
@@ -291,12 +291,12 @@
.set('Accept', 'text/html; 
profile="mediawiki.org/specs/html/1.2.1"')
.send({ wikitext: '{{echo|hi}}' })
.expect(200)
-   .expect(acceptablePageBundleResponse('1.4.0'))
+   .expect(acceptablePageBundleResponse('1.5.0'))
.end(done);
});
 
it('should accept requests for content version 1.x (html)', 
function(done) {
-   var contentVersion = '1.4.0';
+   var contentVersion = '1.5.0';
request(api)
.post(mockDomain + '/v3/transform/wikitext/to/html/')
.set('Accept', 'text/html; 
profile="https://www.mediawiki.org/wiki/Specs/HTML/' + contentVersion + '"')
@@ -307,7 +307,7 @@
});
 
it('should accept requests for content version 1.x 
(pagebundle)', function(done) {
-   var contentVersion = '1.4.0';
+   var contentVersion = '1.5.0';
request(api)
.post(mockDomain + 
'/v3/transform/wikitext/to/pagebundle/')
.set('Accept', 'application/json; 

[MediaWiki-commits] [Gerrit] mediawiki...Modern[master]: Add stylelint for less file

[jenkins-bot (Code Review)]

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

Change subject: Add stylelint for less file
..


Add stylelint for less file

Less file was added with Id7642234b8513b66c0a3b750cc95092141bcffb7

Change-Id: Id61108b8dc183696f4569271b7665725bc184a33
---
M Gruntfile.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 0ce27d0..750f53b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,6 +18,7 @@
stylelint: {
all: [
'**/*.css',
+   '**/*.less',
'!node_modules/**'
]
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id61108b8dc183696f4569271b7665725bc184a33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: SamanthaNguyen 
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]: Hygiene: Variable tweaks

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Variable tweaks
..


Hygiene: Variable tweaks

* redColorBase is available in core. So use it.
* The table of contents padding bottom is derived arbitarily. It makes
more sense to derive it from the font size itself. headingMargin has
nothing to do with this value.
* Introduce more explicit @redLinkColor variable
* Update usages to use @colorErrorText in core

Change-Id: I322bfa6e6dd1e1fa54e1b16ca104be137b88217a
---
M minerva.less/minerva.variables.less
M mobile.less/mobile.variables.less
M resources/mobile.pagelist.styles/pagelist.less
M resources/mobile.talk.overlays/TalkOverlay.less
M resources/mobile.toc/toc.less
M resources/skins.minerva.content.styles/links.less
6 files changed, 8 insertions(+), 14 deletions(-)

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



diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index 1be290f..6c922be 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -36,6 +36,7 @@
 @semiTransparent: rgba( 0, 0, 0, 0.8 );
 
 @linkColor: #002bb8;
+@redLinkColor: @colorErrorText;
 @lastModifiedBarActiveBackgroundColor: #00af89;
 @toastNotificationColor: @colorGray2;
 
diff --git a/mobile.less/mobile.variables.less 
b/mobile.less/mobile.variables.less
index 7f3808a..e4980ff 100644
--- a/mobile.less/mobile.variables.less
+++ b/mobile.less/mobile.variables.less
@@ -25,8 +25,6 @@
 @grayLight: @colorGray12;
 @grayLightest: @colorGray14;
 
-// note this is also used for red links
-@redBase: @colorErrorText;
 // information messages, e.g. empty watchlist message
 @infoColor: @colorGray7;
 // background color for help screens/tutorials
diff --git a/resources/mobile.pagelist.styles/pagelist.less 
b/resources/mobile.pagelist.styles/pagelist.less
index c268f66..fa16190 100644
--- a/resources/mobile.pagelist.styles/pagelist.less
+++ b/resources/mobile.pagelist.styles/pagelist.less
@@ -144,11 +144,6 @@
margin-bottom: 0.65em;
}
}
-
-   // something on watchlist that doesn't exist
-   .title.new h3 {
-   color: @redBase;
-   }
 }
 
 // FIXME: combine with a similar pattern in modules/NotificationsOverlay.less
diff --git a/resources/mobile.talk.overlays/TalkOverlay.less 
b/resources/mobile.talk.overlays/TalkOverlay.less
index bf96f6b..4a09f6f 100644
--- a/resources/mobile.talk.overlays/TalkOverlay.less
+++ b/resources/mobile.talk.overlays/TalkOverlay.less
@@ -6,7 +6,7 @@
 
 .talk-overlay {
.error {
-   border: solid 1px @redBase;
+   border: solid 1px @colorErrorText;
}
 
.comment {
diff --git a/resources/mobile.toc/toc.less b/resources/mobile.toc/toc.less
index 43faf3f..7097976 100644
--- a/resources/mobile.toc/toc.less
+++ b/resources/mobile.toc/toc.less
@@ -1,9 +1,5 @@
 @import 'mobile.variables';
 
-// FIXME: `mobile.` LESS modules should not import `minerva.` LESS modules.
-// Move Minerva specific rules into skinStyles.
-@import 'minerva.variables';
-
 @paddingHorizontal: 24px;
 @iconSize: 16px;
 @iconHeadingGap: 12px;
@@ -40,7 +36,7 @@
font-size: ( 7 * @fontSize ) / 8;
width: auto;
> ul {
-   padding-bottom: @fontSize + @headingMargin;
+   padding-bottom: @fontSize + 0.5em;
}
 
ul {
diff --git a/resources/skins.minerva.content.styles/links.less 
b/resources/skins.minerva.content.styles/links.less
index 5153b86..5e2b599 100644
--- a/resources/skins.minerva.content.styles/links.less
+++ b/resources/skins.minerva.content.styles/links.less
@@ -21,7 +21,11 @@
&.new,
&.new:visited,
&.new:hover {
-   color: @redBase;
+   color: @redLinkColor;
+   // Take care of headings in page lists.
+   > * {
+   color: @redLinkColor;
+   }
}
 
&.external {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I322bfa6e6dd1e1fa54e1b16ca104be137b88217a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: DONOTMERGE: Testing auto rebaser

[Jdlrobson (Code Review)]

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

Change subject: DONOTMERGE: Testing auto rebaser
..

DONOTMERGE: Testing auto rebaser

Change-Id: If4109cf28a0e781125386f9e67c5110ffb43a6ec
---
M .eslintrc.json
M resources/dist/index.js
M resources/dist/index.js.map
M src/getTitle.js
4 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/73/359573/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4109cf28a0e781125386f9e67c5110ffb43a6ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Modern[master]: Add stylelint for less file

[Umherirrender (Code Review)]

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

Change subject: Add stylelint for less file
..

Add stylelint for less file

Less file was added with Id7642234b8513b66c0a3b750cc95092141bcffb7

Change-Id: Id61108b8dc183696f4569271b7665725bc184a33
---
M Gruntfile.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Modern 
refs/changes/59/359559/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 0ce27d0..750f53b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,6 +18,7 @@
stylelint: {
all: [
'**/*.css',
+   '**/*.less',
'!node_modules/**'
]
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id61108b8dc183696f4569271b7665725bc184a33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Only use what you need

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Only use what you need
..


Hygiene: Only use what you need

Don't import files unless they are used.
Note, CI will complain if a variable is not available.

Where mobile. prefixed modules are using minerva. prefixed
modules note them with FIXMEs. We'll fix these in a follow up.

Change-Id: I7cbdec09b5aa78427d52f643663c42def17c577a
---
M minerva.less/minerva.mixins.less
M minerva.less/minerva.variables.less
M mobile.less/mobile.variables.less
M resources/mobile.ajax.styles/spinner.less
M resources/mobile.backtotop/backtotop.less
M resources/mobile.categories.overlays/categories.less
M resources/mobile.editor.common/editor.less
M resources/mobile.editor.ve/VisualEditorOverlay.less
M resources/mobile.fallbackeditor.styles/fallbackeditor.less
M resources/mobile.gallery/gallery.less
M resources/mobile.issues/issues.less
M resources/mobile.languages.structured/LanguageOverlay.less
M resources/mobile.mediaViewer/mediaViewer.less
M resources/mobile.messageBox.styles/messageBox.less
M resources/mobile.notifications.filter.overlay/NotificationsFilterOverlay.less
M resources/mobile.notifications.overlay/NotificationsOverlay.less
M resources/mobile.pagelist.styles/pagelist.less
M resources/mobile.pagesummary.styles/pagesummary.less
M resources/mobile.pointerOverlay/PointerOverlay.less
M resources/mobile.references/references.less
M resources/mobile.search/SearchOverlay.less
M resources/mobile.special.mobilediff.styles/mobilediff.less
M resources/mobile.special.mobileoptions.styles/mobileoptions.less
M resources/mobile.special.nearby.styles/specialNearby.less
M resources/mobile.special.pagefeed.styles/pagefeed.less
M resources/mobile.startup/Overlay.less
M resources/mobile.startup/drawer.less
M resources/mobile.startup/panel.less
M resources/mobile.talk.overlays/TalkOverlay.less
M resources/mobile.toc/toc.less
M resources/mobile.toggle/toggle.less
M resources/mobile.watchstar/watchstar.less
M resources/skins.minerva.base.styles/images.less
33 files changed, 89 insertions(+), 51 deletions(-)

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



diff --git a/minerva.less/minerva.mixins.less b/minerva.less/minerva.mixins.less
index aae771e..fd123ed 100644
--- a/minerva.less/minerva.mixins.less
+++ b/minerva.less/minerva.mixins.less
@@ -1,3 +1,4 @@
+@import 'mobile.variables';
 @import 'mediawiki.mixins.less';
 @import 'mediawiki.mixins.animation.less';
 
diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index cbe1091..1be290f 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -72,9 +72,6 @@
 // Wiki specific variables
 @infoboxWidth: 320px;
 
-// indicators
-@indicatorFontSize: 0.4em;
-
 @lastModifiedBarBgColor: @chromeColor;
 @lastModifiedBarActiveBgColor: @lastModifiedBarActiveBackgroundColor;
 @lastModifiedBarTextColor: @colorGray6;
diff --git a/mobile.less/mobile.variables.less 
b/mobile.less/mobile.variables.less
index d55f787..7f3808a 100644
--- a/mobile.less/mobile.variables.less
+++ b/mobile.less/mobile.variables.less
@@ -11,6 +11,7 @@
 // OOJs specific icon variables
 @baseIconSize: 24px;
 @targetIconSize: 32px;
+@indicatorFontSize: 0.4em;
 
 // FIXME: This is very minerva specific but used by mobile.toc
 @tocFontSize: 0.8em;
diff --git a/resources/mobile.ajax.styles/spinner.less 
b/resources/mobile.ajax.styles/spinner.less
index a4d5297..57aba9f 100644
--- a/resources/mobile.ajax.styles/spinner.less
+++ b/resources/mobile.ajax.styles/spinner.less
@@ -1,5 +1,3 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
 @import 'mediawiki.mixins.less';
 
 // FIXME: Standardise on a loading class (update ConfirmEdit extension)
diff --git a/resources/mobile.backtotop/backtotop.less 
b/resources/mobile.backtotop/backtotop.less
index 49537bb..ee3c74a 100644
--- a/resources/mobile.backtotop/backtotop.less
+++ b/resources/mobile.backtotop/backtotop.less
@@ -1,5 +1,9 @@
+@import 'mobile.variables';
+@import 'mediawiki.mixins.less';
+
+// FIXME: `mobile.` LESS modules should not import `minerva.` LESS modules.
+// Move Minerva specific rules into skinStyles.
 @import 'minerva.variables';
-@import 'minerva.mixins';
 
 .backtotop {
/* initially hide the element */
diff --git a/resources/mobile.categories.overlays/categories.less 
b/resources/mobile.categories.overlays/categories.less
index 0e8c6f7..d0225b7 100644
--- a/resources/mobile.categories.overlays/categories.less
+++ b/resources/mobile.categories.overlays/categories.less
@@ -1,5 +1,4 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
+@import 'mediawiki.ui/variables';
 
 .category-suggestions {
button {
diff --git a/resources/mobile.editor.common/editor.less 
b/resources/mobile.editor.common/editor.less
index e1c39f4..4fc225a 100644
--- 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use short array syntax

[jenkins-bot (Code Review)]

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

Change subject: Use short array syntax
..


Use short array syntax

Done by phpcbf over composer fix

Change-Id: Ic8e3234b712e5a26f819806cebe823a3281314df
---
M Flow.php
M FlowActions.php
M Hooks.php
M container.php
M includes/Actions/Action.php
M includes/Actions/PurgeAction.php
M includes/Actions/ViewAction.php
M includes/Api/ApiFlow.php
M includes/Api/ApiFlowBase.php
M includes/Api/ApiFlowBaseGet.php
M includes/Api/ApiFlowBasePost.php
M includes/Api/ApiFlowEditHeader.php
M includes/Api/ApiFlowEditPost.php
M includes/Api/ApiFlowEditTitle.php
M includes/Api/ApiFlowEditTopicSummary.php
M includes/Api/ApiFlowLockTopic.php
M includes/Api/ApiFlowModeratePost.php
M includes/Api/ApiFlowModerateTopic.php
M includes/Api/ApiFlowNewTopic.php
M includes/Api/ApiFlowReply.php
M includes/Api/ApiFlowSearch.php
M includes/Api/ApiFlowUndoEditHeader.php
M includes/Api/ApiFlowUndoEditPost.php
M includes/Api/ApiFlowUndoEditTopicSummary.php
M includes/Api/ApiFlowViewHeader.php
M includes/Api/ApiFlowViewPost.php
M includes/Api/ApiFlowViewPostHistory.php
M includes/Api/ApiFlowViewTopic.php
M includes/Api/ApiFlowViewTopicHistory.php
M includes/Api/ApiFlowViewTopicList.php
M includes/Api/ApiFlowViewTopicSummary.php
M includes/Api/ApiParsoidUtilsFlow.php
M includes/Api/ApiQueryPropFlowInfo.php
M includes/Block/Block.php
M includes/Block/BoardHistory.php
M includes/Block/Header.php
M includes/Block/Topic.php
M includes/Block/TopicList.php
M includes/Block/TopicSummary.php
M includes/BlockFactory.php
M includes/BoardMover.php
M includes/Collection/AbstractCollection.php
M includes/Collection/LocalCacheAbstractCollection.php
M includes/Collection/PostCollection.php
M includes/Content/BoardContentHandler.php
M includes/Conversion/Utils.php
M includes/Data/Compactor/FeatureCompactor.php
M includes/Data/Compactor/ShallowCompactor.php
M includes/Data/Index.php
M includes/Data/Index/BoardHistoryIndex.php
M includes/Data/Index/FeatureIndex.php
M includes/Data/Index/PostRevisionTopicHistoryIndex.php
M includes/Data/Index/TopKIndex.php
M includes/Data/Index/UniqueFeatureIndex.php
M includes/Data/Listener/NotificationListener.php
M includes/Data/Listener/RecentChangesListener.php
M includes/Data/Listener/ReferenceRecorder.php
M includes/Data/Listener/WatchTopicListener.php
M includes/Data/Listener/WorkflowTopicListListener.php
M includes/Data/ManagerGroup.php
M includes/Data/Mapper/BasicObjectMapper.php
M includes/Data/Mapper/CachingObjectMapper.php
M includes/Data/ObjectLocator.php
M includes/Data/ObjectManager.php
M includes/Data/ObjectStorage.php
M includes/Data/Pager/HistoryPager.php
M includes/Data/Pager/Pager.php
M includes/Data/Storage/BasicDbStorage.php
M includes/Data/Storage/BoardHistoryStorage.php
M includes/Data/Storage/DbStorage.php
M includes/Data/Storage/PostRevisionBoardHistoryStorage.php
M includes/Data/Storage/PostRevisionStorage.php
M includes/Data/Storage/PostRevisionTopicHistoryStorage.php
M includes/Data/Storage/PostSummaryRevisionBoardHistoryStorage.php
M includes/Data/Storage/RevisionStorage.php
M includes/Data/Storage/TopicListStorage.php
M includes/Data/Utils/Merger.php
M includes/Data/Utils/MultiDimArray.php
M includes/Data/Utils/RecentChangeFactory.php
M includes/Data/Utils/ResultDuplicator.php
M includes/Data/Utils/UserMerger.php
M includes/DbFactory.php
M includes/Dump/Exporter.php
M includes/Dump/Importer.php
M includes/Exception/ExceptionHandling.php
M includes/FlowActions.php
M includes/Formatter/AbstractFormatter.php
M includes/Formatter/AbstractQuery.php
M includes/Formatter/BaseTopicListFormatter.php
M includes/Formatter/BoardHistoryQuery.php
M includes/Formatter/CategoryViewerFormatter.php
M includes/Formatter/CategoryViewerQuery.php
M includes/Formatter/ChangesListFormatter.php
M includes/Formatter/ChangesListQuery.php
M includes/Formatter/CheckUserFormatter.php
M includes/Formatter/CheckUserQuery.php
M includes/Formatter/ContributionsFormatter.php
M includes/Formatter/ContributionsQuery.php
M includes/Formatter/FeedItemFormatter.php
M includes/Formatter/HistoryQuery.php
M includes/Formatter/IRCLineUrlFormatter.php
M includes/Formatter/PostHistoryQuery.php
M includes/Formatter/PostSummaryQuery.php
M includes/Formatter/RevisionDiffViewFormatter.php
M includes/Formatter/RevisionFormatter.php
M includes/Formatter/RevisionUndoViewFormatter.php
M includes/Formatter/RevisionViewFormatter.php
M includes/Formatter/RevisionViewQuery.php
M includes/Formatter/SinglePostQuery.php
M includes/Formatter/TocTopicListFormatter.php
M includes/Formatter/TopicFormatter.php
M includes/Formatter/TopicHistoryQuery.php
M includes/Formatter/TopicListFormatter.php
M includes/Formatter/TopicListQuery.php
M includes/Import/ArchiveNameHelper.php
M includes/Import/Converter.php
M includes/Import/Importer.php
M includes/Import/LiquidThreadsApi/CachedData.php
M 

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: GUI update

[jenkins-bot (Code Review)]

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

Change subject: GUI update
..


GUI update

Change-Id: I6dbc21f0eac801dd012e96c0657a755aad2130e5
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/gui b/gui
index 8204c12..b0d91f7 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 8204c12af9d501fe4e38cb83655f50e5ba03dfef
+Subproject commit b0d91f781bd9eae96ab2cc8749a6c5c0110862e9

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Enable user-supplied options via UPDATER_OPTS

[jenkins-bot (Code Review)]

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

Change subject: Enable user-supplied options via UPDATER_OPTS
..


Enable user-supplied options via UPDATER_OPTS

Change-Id: I5e8fb181ae35f0e9cb6df06813e0d4a9041eee42
---
M dist/src/script/runUpdate.sh
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/dist/src/script/runUpdate.sh b/dist/src/script/runUpdate.sh
index 6793ba3..f26e43a 100755
--- a/dist/src/script/runUpdate.sh
+++ b/dist/src/script/runUpdate.sh
@@ -13,8 +13,9 @@
  -XX:+UseGCLogFileRotation \
  -XX:NumberOfGCLogFiles=10 \
  -XX:GCLogFileSize=20M"
-
 NAMESPACE=wdq
+UPDATER_OPTS=${UPDATER_OPTS:-""}
+
 while getopts h:c:n:l:t:s option
 do
   case "${option}"
@@ -66,4 +67,4 @@
 SPARQL_URL=$HOST/$CONTEXT/namespace/$NAMESPACE/sparql
 AGENT=-javaagent:lib/jolokia-jvm-1.3.1-agent.jar=port=8778,host=localhost
 echo "Updating via $SPARQL_URL"
-java -cp $CP $MEMORY $GC_LOGS $LOG $TIMEOUT_ARG $AGENT $MAIN $ARGS --sparqlUrl 
$SPARQL_URL "$@"
+java -cp $CP $MEMORY $GC_LOGS $LOG $TIMEOUT_ARG $AGENT ${UPDATER_OPTS} $MAIN 
$ARGS --sparqlUrl $SPARQL_URL "$@"

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

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

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Make readme look pretty

[Paladox (Code Review)]

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

Change subject: Make readme look pretty
..


Make readme look pretty

Change-Id: Ia8d31b5f922883d37f6193486429257b68931e74
---
M README.md
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/README.md b/README.md
index 82fa165..e390c84 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,7 @@
 ## Access
 To access the webui for this instance, click 
[here](https://gerrit-icinga.wmflabs.org).
 
+# Bugs
+
+Please report bugs, 
[here](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=Labs-project-icinga2)
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8d31b5f922883d37f6193486429257b68931e74
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Zppix 
Gerrit-Reviewer: Paladox 

___
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 OOjs UI buttons on EditPage for plwiki

[Jforrester (Code Review)]

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

Change subject: Enable OOjs UI buttons on EditPage for plwiki
..

Enable OOjs UI buttons on EditPage for plwiki

Bug: T162849
Change-Id: I99f7a5e41c93ff4efa9b18b56047e55841cfa2c5
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5189b46..e64a608 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14640,6 +14640,7 @@
'default' => false,
'mediawikiwiki' => true,
'fawiki' => true, // T162849
+   'plwiki' => true, // T162849
 ],
 
 'wgCiteResponsiveReferences' => [

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: GUI update

[Smalyshev (Code Review)]

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

Change subject: GUI update
..

GUI update

Change-Id: I6dbc21f0eac801dd012e96c0657a755aad2130e5
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/gui b/gui
index 8204c12..b0d91f7 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 8204c12af9d501fe4e38cb83655f50e5ba03dfef
+Subproject commit b0d91f781bd9eae96ab2cc8749a6c5c0110862e9

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Enable user-supplied options via UPDATER_OPTS

[Smalyshev (Code Review)]

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

Change subject: Enable user-supplied options via UPDATER_OPTS
..

Enable user-supplied options via UPDATER_OPTS

Change-Id: I5e8fb181ae35f0e9cb6df06813e0d4a9041eee42
---
M dist/src/script/runUpdate.sh
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/dist/src/script/runUpdate.sh b/dist/src/script/runUpdate.sh
index 6793ba3..f26e43a 100755
--- a/dist/src/script/runUpdate.sh
+++ b/dist/src/script/runUpdate.sh
@@ -13,8 +13,9 @@
  -XX:+UseGCLogFileRotation \
  -XX:NumberOfGCLogFiles=10 \
  -XX:GCLogFileSize=20M"
-
 NAMESPACE=wdq
+UPDATER_OPTS=${UPDATER_OPTS:-""}
+
 while getopts h:c:n:l:t:s option
 do
   case "${option}"
@@ -66,4 +67,4 @@
 SPARQL_URL=$HOST/$CONTEXT/namespace/$NAMESPACE/sparql
 AGENT=-javaagent:lib/jolokia-jvm-1.3.1-agent.jar=port=8778,host=localhost
 echo "Updating via $SPARQL_URL"
-java -cp $CP $MEMORY $GC_LOGS $LOG $TIMEOUT_ARG $AGENT $MAIN $ARGS --sparqlUrl 
$SPARQL_URL "$@"
+java -cp $CP $MEMORY $GC_LOGS $LOG $TIMEOUT_ARG $AGENT ${UPDATER_OPTS} $MAIN 
$ARGS --sparqlUrl $SPARQL_URL "$@"

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

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

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Make readme look pretty

[Zppix (Code Review)]

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

Change subject: Make readme look pretty
..

Make readme look pretty

Change-Id: Ia8d31b5f922883d37f6193486429257b68931e74
---
M README.md
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/06/359506/2

diff --git a/README.md b/README.md
index 82fa165..e390c84 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,7 @@
 ## Access
 To access the webui for this instance, click 
[here](https://gerrit-icinga.wmflabs.org).
 
+# Bugs
+
+Please report bugs, 
[here](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=Labs-project-icinga2)
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8d31b5f922883d37f6193486429257b68931e74
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Zppix 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Change the input icon on interaction

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Change the input icon on interaction
..

RCFilters: Change the input icon on interaction

Bug: T166917
Change-Id: I72ed88c25d2dfbbafa35cd802d2b9718aa7ba6c8
---
M resources/Resources.php
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/359508/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 575ff5a..c6a228b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1859,6 +1859,7 @@
'oojs-ui.styles.icons-editing-styling',
'oojs-ui.styles.icons-interactions',
'oojs-ui.styles.icons-content',
+   'oojs-ui.styles.icons-layout',
],
],
'mediawiki.special' => [
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 268138f..27b6ea1 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -56,7 +56,7 @@
)
},
input: {
-   icon: 'search',
+   icon: 'menu',
placeholder: mw.msg( 
'rcfilters-search-placeholder' )
}
}, config ) );
@@ -221,6 +221,8 @@
this.input.setValue( '' );
}
}
+
+   this.input.setIcon( isVisible ? 'search' : 'menu' );
};
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Fix indentation

[Umherirrender (Code Review)]

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

Change subject: Fix indentation
..

Fix indentation

Change-Id: Ie2e6cb887cc1e5db644cef0370f6d73dbd0b5627
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Sniffs/Usage/DirUsageSniff.php
M MediaWiki/ruleset.xml
3 files changed, 23 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/07/359507/1

diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php 
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index bcea386..28464e3 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -307,13 +307,13 @@
}
// end if
$params[] = [
-'tag'=> $tag,
-'type'   => $type,
-'var'=> $var,
-'comment'=> $comment,
-'type_space' => $typeSpace,
-'var_space'  => $varSpace,
-   ];
+   'tag'=> $tag,
+   'type'   => $type,
+   'var'=> $var,
+   'comment'=> $comment,
+   'type_space' => $typeSpace,
+   'var_space'  => $varSpace,
+   ];
}
// end foreach
$realParams  = $phpcsFile->getMethodParameters( $stackPtr );
@@ -339,9 +339,9 @@
if ( $param['type_space'] !== $spaces ) {
$error = 'Expected %s spaces after parameter 
type; %s found';
$data  = [
- $spaces,
- $param['type_space'],
-];
+   $spaces,
+   $param['type_space'],
+   ];
$fix = $phpcsFile->addFixableError( $error, 
$param['tag'], 'SpacingAfterParamType', $data );
if ( $fix === true ) {
$content  = $param['type'];
@@ -358,9 +358,9 @@
if ( $realName !== $param['var'] ) {
$code = 'ParamNameNoMatch';
$data = [
-$param['var'],
-$realName,
-   ];
+   $param['var'],
+   $realName,
+   ];
$error = 'Doc comment for parameter %s 
does not match ';
if ( strtolower( $param['var'] ) === 
strtolower( $realName ) ) {
$error .= 'case of ';
@@ -385,9 +385,9 @@
ltrim( $param['comment'] ) !== '' ) {
$error = 'Expected %s spaces after parameter 
name; %s found';
$data  = [
- $spaces,
- $param['var_space'],
-];
+   $spaces,
+   $param['var_space'],
+   ];
$fix = $phpcsFile->addFixableError( $error, 
$param['tag'], 'SpacingAfterParamName', $data );
if ( $fix === true ) {
$content  = $param['type'];
diff --git a/MediaWiki/Sniffs/Usage/DirUsageSniff.php 
b/MediaWiki/Sniffs/Usage/DirUsageSniff.php
index cfc05eb..b933eff 100644
--- a/MediaWiki/Sniffs/Usage/DirUsageSniff.php
+++ b/MediaWiki/Sniffs/Usage/DirUsageSniff.php
@@ -34,11 +34,11 @@
$tokens = $phpcsFile->getTokens();
 
$ignore = [
-  T_DOUBLE_COLON=> true,
-  T_OBJECT_OPERATOR => true,
-  T_FUNCTION=> true,
-  T_CONST   => true,
- ];
+   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: replace the last RT references with Phab links

[Dzahn (Code Review)]

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

Change subject: replace the last RT references with Phab links
..


replace the last RT references with Phab links

Bug: T165733
Change-Id: Iaddb74f0b133d5d6785297de7ab5bdb6c8947779
---
M modules/base/manifests/syslogs.pp
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
3 files changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/modules/base/manifests/syslogs.pp 
b/modules/base/manifests/syslogs.pp
index 2d94349..c5b83f3 100644
--- a/modules/base/manifests/syslogs.pp
+++ b/modules/base/manifests/syslogs.pp
@@ -1,4 +1,4 @@
-# handle syslog permissions (e.g. 'make common logs readable by normal users 
(RT-2712)')
+# handle syslog permissions (e.g. 'make common logs readable by normal users 
(T80830)')
 class base::syslogs (
 $readable = false,
 $logfiles = [ 'syslog', 'messages' ],
diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/files/apache/sites/main.conf
index d5edb6e..93f477a 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -172,7 +172,7 @@
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -267,7 +267,7 @@
 RewriteCond %{ENV:RW_PROTO} !=https
 RewriteRule . - [E=RW_PROTO:http]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # The rest are served by the upload cluster
@@ -329,7 +329,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.phpretry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -385,7 +385,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php
retry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -441,7 +441,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.phpretry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -498,7 +498,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php
retry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 5df3fee..7bb8360 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -173,7 +173,7 @@
 rewrite*wikipedie.cz   //cs.wikipedia.org
 rewrite*wikipedia.cz   //cs.wikipedia.org
 
-# wikimedia.ee / wikipedia.ee - RT #4566
+# wikimedia.ee / wikipedia.ee - T165733#3355736
 rewrite*wikimedia.ee   //ee.wikimedia.org
 
 rewrite*wikipedia.ee   //et.wikipedia.org
@@ -208,7 +208,7 @@
 rewrite*.wiki-pedia.org//*.wikipedia.org
 rewritewiki-pedia.org  //www.wikipedia.org
 
-# wikipedia typo domains to www. instead of en - RT #4679,#4681
+# wikipedia typo domains to www. instead of en - T165733#3355736
 funnel *wiikipedia.com //www.wikipedia.org
 funnel *wikiepdia.com  //www.wikipedia.org
 funnel *wikiepdia.org  //www.wikipedia.org
@@ -283,13 +283,13 @@
 rewritewikivoyage.eu   //www.wikivoyage.org
 rewritewikivoyage.net  //www.wikivoyage.org
 
-# Wikivoyager (RT-4333)
+# Wikivoyager (T165733#3355736)
 rewrite*.wikivoyager.org   //*.wikivoyage.org
 rewrite*.wikivoyager.de//*.wikivoyage.org
 rewritewikivoyager.org //www.wikivoyage.org
 rewritewikivoyager.de  //www.wikivoyage.org
 
-# Voyagewiki (RT-5539)
+# Voyagewiki (T165733#3355736)
 rewrite  

[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Move Echo notofication creation into a job.

[Cicalese (Code Review)]

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

Change subject: Move Echo notofication creation into a job.
..

Move Echo notofication creation into a job.

T167446

Change-Id: I779a2c4bf6d5e43b5e4a01c3c4e9ef0a054b3252
---
M extension.json
M includes/ApiCSPostComment.php
A includes/CommentStreamsNotificationJob.php
3 files changed, 155 insertions(+), 33 deletions(-)


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

diff --git a/extension.json b/extension.json
index 6cc58b6..1d05291 100644
--- a/extension.json
+++ b/extension.json
@@ -78,6 +78,9 @@
"localBasePath": "resources",
"remoteExtPath": "CommentStreams/resources"
},
+   "JobClasses": {
+   "commentstreams": "CommentStreamsNotificationJob"
+   },
"AutoloadClasses": {
"CommentStreamsHooks": "includes/CommentStreamsHooks.php",
"CommentStreams": "includes/CommentStreams.php",
@@ -88,6 +91,8 @@
"ApiCSEditComment": "includes/ApiCSEditComment.php",
"ApiCSDeleteComment": "includes/ApiCSDeleteComment.php",
"ApiCSVote": "includes/ApiCSVote.php",
+   "CommentStreamsNotificationJob":
+   "includes/CommentStreamsNotificationJob.php",
"EchoCSFormatter": "includes/EchoCSFormatter.php",
"EchoCSReplyPresentationModel": 
"includes/EchoCSReplyPresentationModel.php",
"EchoCSWatchedPresentationModel":
diff --git a/includes/ApiCSPostComment.php b/includes/ApiCSPostComment.php
index c00b7bc..8983066 100644
--- a/includes/ApiCSPostComment.php
+++ b/includes/ApiCSPostComment.php
@@ -1,6 +1,6 @@
 getParentId();
if ( is_null( $parent_id ) ) {
-   $comment_title = $comment->getCommentTitle();
+   $params['comment_title'] = $comment->getCommentTitle();
} else {
+   $params['parent_id'] = $parent_id;
$parent_page = WikiPage::newFromId( $parent_id );
if ( is_null( $parent_page ) ) {
return;
@@ -141,10 +144,14 @@
$parent_comment = Comment::newFromWikiPage( 
$parent_page );
if ( is_null( $parent_comment ) ) {
return;
-   } else {
-   $comment_title = 
$parent_comment->getCommentTitle();
}
+   $params['comment_title'] = 
$parent_comment->getCommentTitle();
}
+
+   $params['comment_id'] = $comment->getId();
+   $params['comment_author_username'] = $comment->getUsername();
+   $params['comment_author_display_name'] =
+   $comment->getUserDisplayNameUnlinked();
 
$associated_page_display_title =
$associated_page->getTitle()->getPrefixedText();
@@ -157,37 +164,18 @@

$values[$associated_title->getArticleID()];
}
}
+   $params['associated_page_display_title'] = 
$associated_page_display_title;
 
-   $extra = [
-   'comment' => $comment->getId(),
-   'comment_author_username' => $comment->getUsername(),
-   'comment_author_display_name' => 
$comment->getUserDisplayNameUnlinked(),
-   'comment_title' => $comment_title,
-   'associated_page_display_title' => 
$associated_page_display_title,
-   'comment_wikitext' => $comment->getWikitext()
-   ];
+   $params['comment_wikitext'] = $comment->getWikitext();
 
-   if ( !is_null( $parent_id ) ) {
-   EchoEvent::create( [
-   'type' => 
'commentstreams-reply-on-watched-page',
-   'title' => $associated_page->getTitle(),
-   'extra' => $extra,
-   'agent' => $this->getUser()
-   ] );
-   EchoEvent::create( [
-   'type' => 'commentstreams-reply-to-author',
-   'title' => $associated_page->getTitle(),
-   'extra' => $extra,
-   'agent' => $this->getUser()
-   ] );
-   } else {
-   EchoEvent::create( [
-   'type' => 
'commentstreams-comment-on-watched-page',
-   'title' => $associated_page->getTitle(),
-   'extra' => $extra,
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: adding data-attribute to sister-search sidebar results.

[jenkins-bot (Code Review)]

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

Change subject: adding data-attribute to sister-search sidebar results.
..


adding data-attribute to sister-search sidebar results.

Adding source identifier (iwprefix) data-attribute
to interwiki search sidebar results.

Change-Id: I9e11a368fe4f5d79d81503fb4db1cc1649723839
---
M includes/widget/search/InterwikiSearchResultSetWidget.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php 
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index 11f9364..ef93362 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -90,7 +90,8 @@
$iwResultListOutput .= Html::rawElement( 'li',
[
'class' => 'iw-resultset',
-   'data-iw-resultset-pos' => 
$iwResultSetPos
+   'data-iw-resultset-pos' => 
$iwResultSetPos,
+   'data-iw-resultset-source' => $iwPrefix
],
 
$iwResultItemOutput .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e11a368fe4f5d79d81503fb4db1cc1649723839
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak 
Gerrit-Reviewer: Bearloga 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: TTO 
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]: replace the last RT references with Phab links

[Dzahn (Code Review)]

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

Change subject: replace the last RT references with Phab links
..

replace the last RT references with Phab links

Bug: T165733
Change-Id: Iaddb74f0b133d5d6785297de7ab5bdb6c8947779
---
M modules/base/manifests/syslogs.pp
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
3 files changed, 11 insertions(+), 11 deletions(-)


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

diff --git a/modules/base/manifests/syslogs.pp 
b/modules/base/manifests/syslogs.pp
index 2d94349..c5b83f3 100644
--- a/modules/base/manifests/syslogs.pp
+++ b/modules/base/manifests/syslogs.pp
@@ -1,4 +1,4 @@
-# handle syslog permissions (e.g. 'make common logs readable by normal users 
(RT-2712)')
+# handle syslog permissions (e.g. 'make common logs readable by normal users 
(T80830)')
 class base::syslogs (
 $readable = false,
 $logfiles = [ 'syslog', 'messages' ],
diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/files/apache/sites/main.conf
index d5edb6e..93f477a 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -172,7 +172,7 @@
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -267,7 +267,7 @@
 RewriteCond %{ENV:RW_PROTO} !=https
 RewriteRule . - [E=RW_PROTO:http]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # The rest are served by the upload cluster
@@ -329,7 +329,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.phpretry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -385,7 +385,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php
retry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -441,7 +441,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.phpretry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
@@ -498,7 +498,7 @@
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php
retry=0
 RewriteRule ^/w/wiki\.phtml$ /w/index.php [L,QSA,NE]
 
-# ShortURL redirect RT-2121
+# ShortURL redirect T80309
 RewriteRule ^/s/.*$ /w/index.php
 
 # Uploads to the host-specific directory
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 5df3fee..7bb8360 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -173,7 +173,7 @@
 rewrite*wikipedie.cz   //cs.wikipedia.org
 rewrite*wikipedia.cz   //cs.wikipedia.org
 
-# wikimedia.ee / wikipedia.ee - RT #4566
+# wikimedia.ee / wikipedia.ee - T165733#3355736
 rewrite*wikimedia.ee   //ee.wikimedia.org
 
 rewrite*wikipedia.ee   //et.wikipedia.org
@@ -208,7 +208,7 @@
 rewrite*.wiki-pedia.org//*.wikipedia.org
 rewritewiki-pedia.org  //www.wikipedia.org
 
-# wikipedia typo domains to www. instead of en - RT #4679,#4681
+# wikipedia typo domains to www. instead of en - T165733#3355736
 funnel *wiikipedia.com //www.wikipedia.org
 funnel *wikiepdia.com  //www.wikipedia.org
 funnel *wikiepdia.org  //www.wikipedia.org
@@ -283,13 +283,13 @@
 rewritewikivoyage.eu   //www.wikivoyage.org
 rewritewikivoyage.net  //www.wikivoyage.org
 
-# Wikivoyager (RT-4333)
+# Wikivoyager (T165733#3355736)
 rewrite*.wikivoyager.org   //*.wikivoyage.org
 rewrite*.wikivoyager.de//*.wikivoyage.org
 rewritewikivoyager.org //www.wikivoyage.org
 rewritewikivoyager.de  //www.wikivoyage.org
 
-# Voyagewiki (RT-5539)
+# Voyagewiki (T165733#3355736)
 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ResourceLoaderSkinModule: Do not fail for specific media que...

[Code Review]

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

Change subject: ResourceLoaderSkinModule: Do not fail for specific media queries
..

ResourceLoaderSkinModule: Do not fail for specific media queries

If any of the styles given in its module definition (in the
'styles' or 'skinStyles' properties) used the same media queries
as the module's own CSS (e.g. 'all'), the module would fail with
"PHP Fatal error: [] operator not supported for strings".

This affected setting $wgResourceModuleSkinStyles for the
'mediawiki.skinning.interface' module.

Bug: T168088
Change-Id: I3effcaa4982728e707fbf9efeec4e5e78fc8aab6
---
M includes/resourceloader/ResourceLoaderSkinModule.php
1 file changed, 46 insertions(+), 16 deletions(-)


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

diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php 
b/includes/resourceloader/ResourceLoaderSkinModule.php
index 5740925..ed8acaf 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -32,30 +32,39 @@
$styles = parent::getStyles( $context );
 
$default = !is_array( $logo ) ? $logo : $logo['1x'];
-   $styles['all'][] = '.mw-wiki-logo { background-image: ' .
+
+   $this->appendStyles(
+   $styles,
+   'all',
+   '.mw-wiki-logo { background-image: ' .
CSSMin::buildUrlValue( $default ) .
-   '; }';
+   '; }'
+   );
 
if ( is_array( $logo ) ) {
if ( isset( $logo['1.5x'] ) ) {
-   $styles[
+   $this->appendStyles(
+   $styles,
'(-webkit-min-device-pixel-ratio: 1.5), 
' .
-   '(min--moz-device-pixel-ratio: 1.5), ' .
-   '(min-resolution: 1.5dppx), ' .
-   '(min-resolution: 144dpi)'
-   ][] = '.mw-wiki-logo { background-image: ' .
-   CSSMin::buildUrlValue( $logo['1.5x'] ) . ';' .
-   'background-size: 135px auto; }';
+   '(min--moz-device-pixel-ratio: 
1.5), ' .
+   '(min-resolution: 1.5dppx), ' .
+   '(min-resolution: 144dpi)',
+   '.mw-wiki-logo { background-image: ' .
+   CSSMin::buildUrlValue( 
$logo['1.5x'] ) . ';' .
+   'background-size: 135px auto; }'
+   );
}
if ( isset( $logo['2x'] ) ) {
-   $styles[
+   $this->appendStyles(
+   $styles,
'(-webkit-min-device-pixel-ratio: 2), ' 
.
-   '(min--moz-device-pixel-ratio: 2),' .
-   '(min-resolution: 2dppx), ' .
-   '(min-resolution: 192dpi)'
-   ][] = '.mw-wiki-logo { background-image: ' .
-   CSSMin::buildUrlValue( $logo['2x'] ) . ';' .
-   'background-size: 135px auto; }';
+   '(min--moz-device-pixel-ratio: 
2),' .
+   '(min-resolution: 2dppx), ' .
+   '(min-resolution: 192dpi)',
+   '.mw-wiki-logo { background-image: ' .
+   CSSMin::buildUrlValue( 
$logo['2x'] ) . ';' .
+   'background-size: 135px auto; }'
+   );
}
}
 
@@ -63,6 +72,27 @@
}
 
/**
+* Add some more CSS code to a 'styles' array in the format returned
+* by the ResourceLoaderFileModule::getStyles() method.
+*
+* @param array &$styles Associative array, keys are strings (media 
queries),
+*   values are strings or arrays
+* @param string $mediaQuery Media query, e.g. 'all' or 'print'
+* @param string $cssCode
+*/
+   private function appendStyles( &$styles, $mediaQuery, $cssCode ) {
+   if ( !isset( $styles[$mediaQuery] ) ) {
+   $styles[$mediaQuery] = 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Adjust Shortpages query with multiple content namespaces

[Anomie (Code Review)]

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

Change subject: Adjust Shortpages query with multiple content namespaces
..

Adjust Shortpages query with multiple content namespaces

MariaDB can't effectively use the page_redirect_namespace_len index when
there are multiple namespaces. Instead, let's query each namespace
individually and UNION them together.

Bug: T168010
Change-Id: I632fbc599e06a3c2faabd55f5d87339f968f58bb
---
M includes/specials/SpecialShortpages.php
1 file changed, 52 insertions(+), 0 deletions(-)


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

diff --git a/includes/specials/SpecialShortpages.php 
b/includes/specials/SpecialShortpages.php
index 3282a7a..3cc3cc4 100644
--- a/includes/specials/SpecialShortpages.php
+++ b/includes/specials/SpecialShortpages.php
@@ -65,6 +65,58 @@
];
}
 
+   public function reallyDoQuery( $limit, $offset = false ) {
+   $fname = static::class . '::reallyDoQuery';
+   $dbr = $this->getRecacheDB();
+   $query = $this->getQueryInfo();
+   $order = $this->getOrderFields();
+
+   if ( $this->sortDescending() ) {
+   foreach ( $order as &$field ) {
+   $field .= ' DESC';
+   }
+   }
+
+   $tables = isset( $query['tables'] ) ? (array)$query['tables'] : 
[];
+   $fields = isset( $query['fields'] ) ? (array)$query['fields'] : 
[];
+   $conds = isset( $query['conds'] ) ? (array)$query['conds'] : [];
+   $options = isset( $query['options'] ) ? 
(array)$query['options'] : [];
+   $join_conds = isset( $query['join_conds'] ) ? 
(array)$query['join_conds'] : [];
+
+   if ( $limit !== false ) {
+   $options['LIMIT'] = intval( $limit );
+   }
+
+   if ( $offset !== false ) {
+   $options['OFFSET'] = intval( $offset );
+   }
+
+   $namespaces = $conds['page_namespace'];
+   if ( count( $namespaces ) === 1 ) {
+   $options['ORDER BY'] = $order;
+   $res = $dbr->select( $tables, $fields, $conds, $fname,
+   $options, $join_conds
+   );
+   } else {
+   unset( $conds['page_namespace'] );
+   $options['INNER ORDER BY'] = $order;
+   $options['ORDER BY'] = [ 'value' . ( 
$this->sortDescending() ? ' DESC' : '' ) ];
+   $sql = $dbr->unionConditionPermutations(
+   $tables,
+   $fields,
+   [ 'page_namespace' => $namespaces ],
+   $conds,
+   $method,
+   $options,
+   $join_conds
+   );
+   $res = $dbr->query( $sql, $fname );
+   }
+
+   return $res;
+   }
+
+
function getOrderFields() {
return [ 'page_len' ];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I632fbc599e06a3c2faabd55f5d87339f968f58bb
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/core[master]: ApiQueryRecentChanges: Make better use of the rc_name_type_p...

[Anomie (Code Review)]

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

Change subject: ApiQueryRecentChanges: Make better use of the 
rc_name_type_patrolled_timestamp index
..

ApiQueryRecentChanges: Make better use of the rc_name_type_patrolled_timestamp 
index

If multiple namespaces or multiple types are specified, MariaDB can't
make good use of the rc_name_type_patrolled_timestamp index. It winds up
scanning the whole table using the rc_timestamp index and filtering.

To be able to use the index, we need to instead make a subquery for each
namespace+type (+ patrolled flag) we care about and UNION them all
together. This will make really large query-strings in some cases, but
the actual number of rows touched should be reasonably well bounded.

Bug: T149077
Change-Id: Ic2984a7e6d0d7917703a87400fe4e1091179743a
---
M RELEASE-NOTES-1.30
M includes/api/ApiQueryBase.php
M includes/api/ApiQueryRecentChanges.php
3 files changed, 85 insertions(+), 2 deletions(-)


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

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 0f5cb47..254da4f 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -72,7 +72,9 @@
   returning users and edit comments.
 
 === Action API internal changes in 1.30 ===
-* …
+* (T149077) ApiQueryBase has a new protected method for overriding the default
+  call to $db->select(). ApiQueryRecentChanges uses this to make better use of
+  the rc_name_type_patrolled_timestamp index.
 
 === Languages updated in 1.30 ===
 MediaWiki supports over 350 languages. Many localisations are updated
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index baefbda..8ae3d68 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -384,7 +384,7 @@
);
}
 
-   $res = $this->getDB()->select( $tables, $fields, $where, 
$method, $options, $join_conds );
+   $res = $this->reallyDoSelect( $tables, $fields, $where, 
$method, $options, $join_conds );
 
if ( $hookData !== null ) {
Hooks::run( 'ApiQueryBaseAfterQuery', [ $this, $res, 
&$hookData ] );
@@ -394,6 +394,25 @@
}
 
/**
+* Actually do the select
+*
+* This exists in case a module needs to do strange things to the query
+* just before it's sent (e.g. ApiQueryRecentChanges). Don't use it 
directly.
+*
+* @since 1.30
+* @param array $tables See IDatabase::select()
+* @param array $fields See IDatabase::select()
+* @param array $where See IDatabase::select()
+* @param string $method See IDatabase::select()
+* @param array $options See IDatabase::select()
+* @param array $join_conds See IDatabase::select()
+* @return ResultWrapper
+*/
+   protected function reallyDoSelect( $tables, $fields, $where, $method, 
$options, $join_conds ) {
+   return $this->getDB()->select( $tables, $fields, $where, 
$method, $options, $join_conds );
+   }
+
+   /**
 * Call the ApiQueryBaseProcessRow hook
 *
 * Generally, a module that passed $hookData to self::select() will call
diff --git a/includes/api/ApiQueryRecentChanges.php 
b/includes/api/ApiQueryRecentChanges.php
index 0dc01aa..4fffde3 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -411,6 +411,68 @@
}
 
/**
+* Special handling for targeting the rc_name_type_patrolled_timestamp 
index
+*
+* If there are multiple values for rc_namespace or rc_type, the query
+* can't effectively use any of the available indexes. In that 
situation,
+* turn it into a UNION ALL over the Cartesian product of the specified
+* namespaces and types (and rc_patrolled, if necessary).
+*
+* @inheritdoc
+*/
+   protected function reallyDoSelect( $tables, $fields, $where, $method, 
$options, $join_conds ) {
+   $allTypes = RecentChange::parseToRCType( 
RecentChange::getChangeTypes() );
+   sort( $allTypes );
+   sort( $where['rc_type'] );
+   if ( $where['rc_type'] == $allTypes ) {
+   unset( $where['rc_type'] );
+   }
+
+   $allNamespaces = array_merge( [ NS_MEDIA, NS_SPECIAL ], 
MWNamespace::getValidNamespaces() );
+   if ( isset( $where['rc_namespace'] ) ) {
+   sort( $allNamespaces );
+   sort( $where['rc_namespace'] );
+   if ( $where['rc_namespace'] == $allNamespaces ) {
+   unset( $where['rc_namespace'] );
+   }
+   }
+
+   if ( isset( $where['rc_namespace'] ) || isset( 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Database::unionConditionPermutations()

[Anomie (Code Review)]

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

Change subject: Add Database::unionConditionPermutations()
..

Add Database::unionConditionPermutations()

Constructs a query for the union of permutations of a set of fields, for
use in situations where the database otherwise makes poor plans due to
inability to use indexes effectively (e.g. T149077 and T168010).

Change-Id: I20980dcada664486c09198b8c45896620bd83e81
---
M includes/libs/rdbms/database/DBConnRef.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/IDatabase.php
M tests/phpunit/includes/db/DatabaseSQLTest.php
M tests/phpunit/includes/db/DatabaseTestHelper.php
5 files changed, 292 insertions(+), 0 deletions(-)


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

diff --git a/includes/libs/rdbms/database/DBConnRef.php 
b/includes/libs/rdbms/database/DBConnRef.php
index fb4122d..eb0e954 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -424,6 +424,13 @@
return $this->__call( __FUNCTION__, func_get_args() );
}
 
+   public function unionConditionPermutations(
+   $table, $vars, array $permute_conds, $extra_conds = '', $fname 
= __METHOD__,
+   $options = [], $join_conds = []
+   ) {
+   return $this->__call( __FUNCTION__, func_get_args() );
+   }
+
public function conditional( $cond, $trueVal, $falseVal ) {
return $this->__call( __FUNCTION__, func_get_args() );
}
diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 9e91592..846c901 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2470,6 +2470,78 @@
return '(' . implode( $glue, $sqls ) . ')';
}
 
+   public function unionConditionPermutations(
+   $table, $vars, array $permute_conds, $extra_conds = '', $fname 
= __METHOD__,
+   $options = [], $join_conds = []
+   ) {
+   // First, build the Cartesian product of $permute_conds
+   $conds = [ [] ];
+   foreach ( $permute_conds as $field => $values ) {
+   if ( !$values ) {
+   // Skip empty $values
+   continue;
+   }
+   $values = array_unique( $values ); // For sanity
+   $newConds = [];
+   foreach ( $conds as $cond ) {
+   foreach ( $values as $value ) {
+   $cond[$field] = $value;
+   $newConds[] = $cond; // Arrays are 
by-value, not by-reference, so this works
+   }
+   }
+   $conds = $newConds;
+   }
+
+   $extra_conds = $extra_conds === '' ? [] : (array)$extra_conds;
+
+   // If there's just one condition and no subordering, hand off to
+   // selectSQLText directly.
+   if ( count( $conds ) === 1 &&
+   ( !isset( $options['INNER ORDER BY'] ) || 
!$this->unionSupportsOrderAndLimit() )
+   ) {
+   return $this->selectSQLText(
+   $table, $vars, $conds[0] + $extra_conds, 
$fname, $options, $join_conds
+   );
+   }
+
+   // Otherwise, we need to pull out the order and limit to apply 
after
+   // the union. Then build the SQL queries for each set of 
conditions in
+   // $conds. Then union them together (using UNION ALL, because 
the
+   // product *should* already be distinct).
+   $orderBy = $this->makeOrderBy( $options );
+   $limit = isset( $options['LIMIT'] ) ? $options['LIMIT'] : null;
+   $offset = isset( $options['OFFSET'] ) ? $options['OFFSET'] : 
false;
+   $all = empty( $options['NOTALL'] ) && !in_array( 'NOTALL', 
$options );
+   if ( !$this->unionSupportsOrderAndLimit() ) {
+   unset( $options['ORDER BY'], $options['LIMIT'], 
$options['OFFSET'] );
+   } else {
+   if ( array_key_exists( 'INNER ORDER BY', $options ) ) {
+   $options['ORDER BY'] = $options['INNER ORDER 
BY'];
+   }
+   if ( $limit !== null && is_numeric( $offset ) && 
$offset != 0 ) {
+   // We need to increase the limit by the offset 
rather than
+   // using the offset directly, otherwise it'll 
skip incorrectly
+   // in the subqueries.
+   

[MediaWiki-commits] [Gerrit] integration/config[master]: Update ejegg whitelisted email

[jenkins-bot (Code Review)]

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

Change subject: Update ejegg whitelisted email
..


Update ejegg whitelisted email

He recently changed emails causing tests not to work for him anymore due to him 
no longer being whitelisted. This is re whitelisting him :)

Change-Id: I1498ebe2869b78444d1e760f5e70ee7565bc875f
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index af301ec..dd8ad18 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -91,6 +91,7 @@
 | dr\.trigon@surfeu\.ch
 | ebrahim@gnu\.org
 | ecokpo@gmail\.com
+| ejegg@ejegg\.com
 | elaa...@gmail.com
 | eloquence@gmail\.com
 | eranroz89@gmail\.com
@@ -359,6 +360,7 @@
- ^dereckson@espace-win\.org$
- ^devunt@gmail\.com$
- ^ebrahim@gnu\.org$
+   - ^ejegg@ejegg\.com$
- ^eloquence@gmail\.com$
- ^eranroz89@gmail\.com$ # Eran Roz
- ^federicoleva@tiscali\.it$ # Nemo bis

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Hide Pig Latin language entirely if $wgUsePigLatinVariant is...

[jenkins-bot (Code Review)]

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

Change subject: Hide Pig Latin language entirely if $wgUsePigLatinVariant is 
false
..


Hide Pig Latin language entirely if $wgUsePigLatinVariant is false

Previously, even if $wgUsePigLatinVariant was false, the language
would show up on Special:Preferences (and some other places) as
'en-x-piglatin - Igpay Atinlay'.

Follow-up to d8375bee241b4d134aff901c7d072aa1374c860b.

Change-Id: I08faacabca87c04299c7b535be8df1770e0a37ac
---
M languages/Language.php
M languages/data/Names.php
2 files changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/languages/Language.php b/languages/Language.php
index f84e21e..b5eef8c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -827,7 +827,7 @@
 * @return array Language code => language name
 */
private static function fetchLanguageNamesUncached( $inLanguage = null, 
$include = 'mw' ) {
-   global $wgExtraLanguageNames;
+   global $wgExtraLanguageNames, $wgUsePigLatinVariant;
 
// If passed an invalid language code to use, fallback to en
if ( $inLanguage !== null && !Language::isValidCode( 
$inLanguage ) ) {
@@ -842,6 +842,11 @@
}
 
$mwNames = $wgExtraLanguageNames + 
MediaWiki\Languages\Data\Names::$names;
+   if ( $wgUsePigLatinVariant ) {
+   // Pig Latin (for variant development)
+   $mwNames['en-x-piglatin'] = 'Igpay Atinlay';
+   }
+
foreach ( $mwNames as $mwCode => $mwName ) {
# - Prefer own MediaWiki native name when not using the 
hook
# - For other names just add if not added through the 
hook
diff --git a/languages/data/Names.php b/languages/data/Names.php
index 21479f1..76ced3e 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -146,7 +146,6 @@
'en' => 'English', # English
'en-ca' => 'Canadian English', # Canadian English
'en-gb' => 'British English', # British English
-   'en-x-piglatin' => 'Igpay Atinlay', # Pig Latin (for variant 
development)
'eo' => 'Esperanto', # Esperanto
'es' => 'español', # Spanish
'et' => 'eesti', # Estonian

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08faacabca87c04299c7b535be8df1770e0a37ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Liangent 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: adding data-attribute to sister-search sidebar results.

[Jdrewniak (Code Review)]

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

Change subject: adding data-attribute to sister-search sidebar results.
..

adding data-attribute to sister-search sidebar results.

Adding source identifier (iwprefix) data-attribute
to interwiki search sidebar results.

Change-Id: I9e11a368fe4f5d79d81503fb4db1cc1649723839
---
M includes/widget/search/InterwikiSearchResultSetWidget.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php 
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index 11f9364..ef93362 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -90,7 +90,8 @@
$iwResultListOutput .= Html::rawElement( 'li',
[
'class' => 'iw-resultset',
-   'data-iw-resultset-pos' => 
$iwResultSetPos
+   'data-iw-resultset-pos' => 
$iwResultSetPos,
+   'data-iw-resultset-source' => $iwPrefix
],
 
$iwResultItemOutput .

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Follow-up 6b83e12aee71: reenable fromrc handling, but withou...

[Catrope (Code Review)]

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

Change subject: Follow-up 6b83e12aee71: reenable fromrc handling, but without 
breaking visited links
..

Follow-up 6b83e12aee71: reenable fromrc handling, but without breaking visited 
links

Per Krinkle's recommendation on the task, use replaceState to remove fromrc=1
from the URL, so that visited links don't break.

Bug: T158458
Change-Id: I8711083c3d9add0cb09374bd2f3b8e96d740ca34
---
M modules/ext.wikimediaEvents.recentChangesClicks.js
1 file changed, 7 insertions(+), 4 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.recentChangesClicks.js 
b/modules/ext.wikimediaEvents.recentChangesClicks.js
index 5779188..9e35caf 100644
--- a/modules/ext.wikimediaEvents.recentChangesClicks.js
+++ b/modules/ext.wikimediaEvents.recentChangesClicks.js
@@ -44,7 +44,7 @@
 
if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'Recentchanges' ) {
$( '.mw-changeslist' ).on( 'click', 'a[href]', function 
( e ) {
-   var selector,
+   var selector, target,
type = 'unknown',
$link = $( this );
if ( e.which === 3 ) {
@@ -52,10 +52,9 @@
}
 
// Add fromrc=1 to the URL
-   // DISABLED for now because it messes with link 
visited colors (T158458#3161869)
-   /*target = new mw.Uri( $link.attr( 'href' ) );
+   target = new mw.Uri( $link.attr( 'href' ) );
target.extend( { fromrc: 1 } );
-   $link.attr( 'href', target.toString() );*/
+   $link.attr( 'href', target.toString() );
 
// Figure out the link type
for ( selector in linkTypes ) {
@@ -109,6 +108,10 @@
// Log an event
trackClick( type, getPageType() );
} );
+
+   // Remove fromrc=1 from the URL
+   delete uri.query.fromrc;
+   history.replaceState( null, document.title, uri );
}
 
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Use ServiceWiringFiles extension.json property

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Use ServiceWiringFiles extension.json property
..


Hygiene: Use ServiceWiringFiles extension.json property

Instead of MediaWikiServices::loadServiceWirings() use
ServiceWiringsFiles property inside extension.json

Change-Id: I1b77d9754a7ff43081ac8d95a1c4f3b0075e48b5
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 3 insertions(+), 17 deletions(-)

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



diff --git a/extension.json b/extension.json
index 85ed322..ac6c493 100644
--- a/extension.json
+++ b/extension.json
@@ -1769,9 +1769,6 @@
],
"TitleSquidURLs": [
"MobileFrontendHooks::onTitleSquidURLs"
-   ],
-   "MediaWikiServices": [
-   "MobileFrontendHooks::onMediaWikiServices"
]
},
"config": {
@@ -1906,5 +1903,8 @@
"MFLogWrappedInfoboxes": true,
"MFWatchlistEditCountThreshold": 10
},
+   "ServiceWiringFiles": [
+   "includes/ServiceWiring.php"
+   ],
"manifest_version": 1
 }
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 9c70e21..88aeeda 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1315,18 +1315,4 @@
// Set LESS importpath
$wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/minerva.less/";
}
-
-   /**
-* MediaWikiServices hook handler.
-*
-* For now, loads the ServiceWiring.php service wiring 
file. As we add more
-* top-level services, that file may need to be split up.
-*
-* @param MediaWikiServices $services
-*/
-   public static function onMediaWikiServices( MediaWikiServices $services 
) {
-   $services->loadWiringFiles( [
-   __DIR__ . '/ServiceWiring.php',
-   ] );
-   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b77d9754a7ff43081ac8d95a1c4f3b0075e48b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 
Gerrit-Reviewer: Jdlrobson 
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...ParserFunctions[master]: Complete the Esperanto magicword translation

[jenkins-bot (Code Review)]

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

Change subject: Complete the Esperanto magicword translation
..


Complete the Esperanto magicword translation

Some entries were missing, and some are completed with additional
synonyms. No synonym was deleted, despite cases where the provided words
are most likely erroneous, like "lungo" (which may have some relevancy in
Italian).

A particular effort was put to make the whole set of entry provide
consistency, with
- control flow magicwords receiving an adverbial -e form,
- function like magicwords end with jussive mood mark -u
- "function returning somithing"-like are ending with "-donu",
  a verb whose meaning include behavior of returning something

But once again, existing entries were not deleted, as they are probably
used in the wild, which might affect this consistency effort.
If wished, removing that kind of entries would require
some bot replacement work prior to their removal.

Change-Id: If4f40533f93c444ae7155c49485389d8b3981f63
---
M ParserFunctions.i18n.magic.php
1 file changed, 18 insertions(+), 10 deletions(-)

Approvals:
  Nemo bis: Looks good to me, but someone else must approve
  Raimond Spekking: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ParserFunctions.i18n.magic.php b/ParserFunctions.i18n.magic.php
index e0e0b4e..1a23411 100644
--- a/ParserFunctions.i18n.magic.php
+++ b/ParserFunctions.i18n.magic.php
@@ -162,18 +162,26 @@
 
 /** Esperanto (Esperanto) */
 $magicWords['eo'] = [
-   'expr' => [ 0, 'espr', 'esprimo' ],
+   'expr' => [ 0, 'espr', 'esprimo', 'esprime' ],
'if' => [ 0, 'se' ],
-   'ifeq' => [ 0, 'seekv', 'seekvacio' ],
-   'ifexpr' => [ 0, 'seespr', 'seeksprimo' ],
-   'iferror' => [ 0, 'seeraras' ],
-   'switch' => [ 0, 'ŝaltu', 'ŝalti', 'sxaltu', 'sxalti' ],
+   'ifeq' => [ 0, 'seekv', 'seekvacio', 'seeglas', 'laŭsamvalorade', 
'lauxsamvalorade' ],
+   'ifexpr' => [ 0, 'seespr', 'seeksprimo', 'seesprimo', 'laŭevaluade', 
'laŭevaluade' ],
+   'iferror' => [ 0, 'seeraras', 'laŭerarade', 'lauxerarade' ],
+   'switch' => [ 0, 'ŝaltu', 'ŝalti', 'sxaltu', 'sxalti', 'ŝalte', 
'sxalte' ],
'default' => [ 0, '#apriore', '#defaŭlte', '#defauxlte' ],
-   'ifexist' => [ 0, 'seekzistas' ],
-   'time' => [ 0, 'tempo' ],
-   'timel' => [ 0, 'tempoo' ],
-   'len' => [ 0, 'lungo' ],
-   'replace' => [ 0, 'anstataŭigi' ],
+   'ifexist' => [ 0, 'seekzistas', 'laŭasignade', 'lauxasignade' ],
+   'time' => [ 0, 'tempo', 'datformu' ],
+   'timel' => [ 0, 'tempoo', 'lokaĵdatdonu', 'lokajxdatdonu' ],
+   'len' => [ 0, 'lungo', 'longo', 'longdonu', 'pesu', 'pese' ],
+   'replace' => [ 0, 'anstataŭigi', 'anstataŭigu', 'anstatauxigi', 
'anstatauxigu' ],
+   'rel2abs' => [ 0, 'absolutvojdonu', 'malrelativige' ],
+   'titleparts' => [ 0, 'titolpartdonu' ],
+   'pos' => [ 0, 'ejdonu', 'lokdonu' ],
+   'rpos' => [ 0, 'lastejdonu', 'lastlokdonu' ],
+   'sub' => [ 0, 'subĉendonu', 'subcxendonu' ],
+   'count' => [ 0, 'subĉennombru', 'subcxennombru' ],
+   'explode' => [ 0, 'disĉenigu' ],
+   'urldecode' => [ 0, 'URL-malkodu', 'URI-malkodu' ],
 ];
 
 /** Spanish (español) */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4f40533f93c444ae7155c49485389d8b3981f63
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: Psychoslave 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Raimond Spekking 
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] labs...wikibugs2[master]: change old project names for projects maintained by Zppix a...

[Zppix (Code Review)]

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

Change subject: change old project names  for projects maintained by Zppix and 
add an additional project
..

change old project names  for projects maintained by Zppix and add an 
additional project

Change-Id: Iadf63c3e34af6377c8cab07857932f7e8255f725
---
M channels.yaml
M gerrit-channels.yaml
2 files changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/channels.yaml b/channels.yaml
index dce58fe..a7ee668 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -267,8 +267,9 @@
 "#wikimedia-lta":
 - Tool-Labs-tools-LTA-Knowledgebase
 "##Zppix-Wikipedia":
-- Tool-Labs-tools-Zppixbot
+- Tool-project-tools-Zppixbot
 - QuarryBot-enwiki
+- Labs-project-icinga2
 "#wikimedia-ops":
 - wikimedia-irc-freenode
 
diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index 83eb1da..dcadc66 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -215,4 +215,5 @@
 "##Zppix-Wikipedia":
  labs/tools/zppixbot:
  labs/tools/quarrybot-enwiki:
+ labs/icinga2:
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadf63c3e34af6377c8cab07857932f7e8255f725
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Introduce mobile.variables

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Introduce mobile.variables
..


Hygiene: Introduce mobile.variables

This will allow us to determine which variables to upstream  into core
and which belong explicitly to Minerva.

Changes:
* Remove unused m-background-image mixin (thanks Baha!)

Change-Id: I612cc2f95f52b249a4ed02a69aca3d9cf6216bb1
---
M includes/Minerva.hooks.php
M includes/MobileFrontend.hooks.php
M minerva.less/minerva.mixins.less
M minerva.less/minerva.variables.less
A mobile.less/mobile.mixins.less
A mobile.less/mobile.variables.less
6 files changed, 64 insertions(+), 42 deletions(-)

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



diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index 7083002..ab4899e 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -31,6 +31,19 @@
}
 
/**
+* Skin registration callback.
+*/
+   public static function onRegistration() {
+   // Set LESS importpath
+   global $wgResourceLoaderLESSImportPaths;
+   $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/minerva.less/";
+
+   if ( !ExtensionRegistry::getInstance()->isLoaded( 
'MobileFrontend' ) ) {
+   die( 'This version of the MobileFrontend extension 
requires MediaWiki 1.25+' );
+   }
+   }
+
+   /**
 * ResourceLoaderTestModules hook handler
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules
 *
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 9c70e21..aea4b46 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1303,6 +1303,7 @@
 */
public static function onRegistration() {
global $wgResourceLoaderLESSImportPaths, $wgDisableAuthManager;
+   $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/mobile.less/";
 
// modify login/registration form
if ( class_exists( AuthManager::class ) && 
!$wgDisableAuthManager ) {
@@ -1312,8 +1313,9 @@
Hooks::register( 'UserCreateForm', 
'MobileFrontendHooks::onUserCreateForm' );
}
 
-   // Set LESS importpath
-   $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/minerva.less/";
+   if ( class_exists( 'MinervaHooks' ) ) {
+   MinervaHooks::onRegistration();
+   }
}
 
/**
diff --git a/minerva.less/minerva.mixins.less b/minerva.less/minerva.mixins.less
index 4e41da1..aae771e 100644
--- a/minerva.less/minerva.mixins.less
+++ b/minerva.less/minerva.mixins.less
@@ -1,16 +1,6 @@
 @import 'mediawiki.mixins.less';
 @import 'mediawiki.mixins.animation.less';
 
-// FIXME: This mixin should not be necessary and only exists because of
-// https://phabricator.wikimedia.org/T142532
-// Please do not use it.
-.m-background-image( @url ) {
-   &:after,
-   &:before {
-   .background-image( @url );
-   }
-}
-
 // Generic mixin for applying styles to text that accompanies/adds context to 
workflows
 .secondary-text() {
font-size: 0.9em;
diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index d39c222..cbe1091 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -1,4 +1,6 @@
 @import 'mediawiki.ui/variables';
+// FIXME: Remove this dependency. Should not depend on mobile.variables
+@import 'mobile.variables.less';
 
 @skinContentBgColor: #fff;
 
@@ -28,20 +30,11 @@
 @titleSectionSpacingTop: 20px;
 @titleSectionSpacingBottom: 25px;
 
-@grayDark: @colorGray2;
-@grayMediumDark: @colorGray5;
-@grayMedium: @colorGray7;
-@grayMediumLight: @colorGray10;
-@grayLight: @colorGray12;
-@grayLightest: @colorGray14;
-
 // colors
 @chromeColor: @grayLightest;
 @chromeContentSeparator: @colorGray13;
 @semiTransparent: rgba( 0, 0, 0, 0.8 );
-// note this is also used for red links
-@redBase: @colorErrorText;
-@colorTutorial: #2e76ff;
+
 @linkColor: #002bb8;
 @lastModifiedBarActiveBackgroundColor: #00af89;
 @toastNotificationColor: @colorGray2;
@@ -53,23 +46,17 @@
 @colorWarningBackground: #feb;
 @colorWarningBorder: #fde29b;
 @colorWarningText: #850;
-@colorSuccessBackground: #e1fddf;
 @colorSuccessBorder: #b7fdb5;
-@colorSuccessText: #009000;
 @colorErrorBackground: #fae3e3;
 @colorErrorBorder: #fac5c5;
 
 // typography
-@fontFamily: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial', 
'Liberation Sans', sans-serif;
 @fontFamilyHeading: 'Linux Libertine', 'Georgia', 'Times', serif;
 @fontScalingFactor: 1;
 @contentLineHeight: 1.65;
 
 @headingMargin: 0.5em;
 @sectionIconWidth: 30px;
-
-// information 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Hide Pig Latin language entirely if $wgUsePigLatinVariant is...

[Code Review]

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

Change subject: Hide Pig Latin language entirely if $wgUsePigLatinVariant is 
false
..

Hide Pig Latin language entirely if $wgUsePigLatinVariant is false

Previously, even if $wgUsePigLatinVariant was false, the language
would show up on Special:Preferences (and some other places) as
'en-x-piglatin - Igpay Atinlay'.

Follow-up to d8375bee241b4d134aff901c7d072aa1374c860b.

Change-Id: I08faacabca87c04299c7b535be8df1770e0a37ac
---
M languages/Language.php
M languages/data/Names.php
2 files changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/languages/Language.php b/languages/Language.php
index f84e21e..b5eef8c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -827,7 +827,7 @@
 * @return array Language code => language name
 */
private static function fetchLanguageNamesUncached( $inLanguage = null, 
$include = 'mw' ) {
-   global $wgExtraLanguageNames;
+   global $wgExtraLanguageNames, $wgUsePigLatinVariant;
 
// If passed an invalid language code to use, fallback to en
if ( $inLanguage !== null && !Language::isValidCode( 
$inLanguage ) ) {
@@ -842,6 +842,11 @@
}
 
$mwNames = $wgExtraLanguageNames + 
MediaWiki\Languages\Data\Names::$names;
+   if ( $wgUsePigLatinVariant ) {
+   // Pig Latin (for variant development)
+   $mwNames['en-x-piglatin'] = 'Igpay Atinlay';
+   }
+
foreach ( $mwNames as $mwCode => $mwName ) {
# - Prefer own MediaWiki native name when not using the 
hook
# - For other names just add if not added through the 
hook
diff --git a/languages/data/Names.php b/languages/data/Names.php
index 21479f1..76ced3e 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -146,7 +146,6 @@
'en' => 'English', # English
'en-ca' => 'Canadian English', # Canadian English
'en-gb' => 'British English', # British English
-   'en-x-piglatin' => 'Igpay Atinlay', # Pig Latin (for variant 
development)
'eo' => 'Esperanto', # Esperanto
'es' => 'español', # Spanish
'et' => 'eesti', # Estonian

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08faacabca87c04299c7b535be8df1770e0a37ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Use ServiceWiringFiles extension.json property

[Pmiazga (Code Review)]

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

Change subject: Hygiene: Use ServiceWiringFiles extension.json property
..

Hygiene: Use ServiceWiringFiles extension.json property

Instead of MediaWikiServices::loadServiceWirings() use
ServiceWiringsFiles property inside extension.json

Change-Id: I1b77d9754a7ff43081ac8d95a1c4f3b0075e48b5
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 3 insertions(+), 17 deletions(-)


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

diff --git a/extension.json b/extension.json
index 85ed322..ac6c493 100644
--- a/extension.json
+++ b/extension.json
@@ -1769,9 +1769,6 @@
],
"TitleSquidURLs": [
"MobileFrontendHooks::onTitleSquidURLs"
-   ],
-   "MediaWikiServices": [
-   "MobileFrontendHooks::onMediaWikiServices"
]
},
"config": {
@@ -1906,5 +1903,8 @@
"MFLogWrappedInfoboxes": true,
"MFWatchlistEditCountThreshold": 10
},
+   "ServiceWiringFiles": [
+   "includes/ServiceWiring.php"
+   ],
"manifest_version": 1
 }
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 9c70e21..88aeeda 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1315,18 +1315,4 @@
// Set LESS importpath
$wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/minerva.less/";
}
-
-   /**
-* MediaWikiServices hook handler.
-*
-* For now, loads the ServiceWiring.php service wiring 
file. As we add more
-* top-level services, that file may need to be split up.
-*
-* @param MediaWikiServices $services
-*/
-   public static function onMediaWikiServices( MediaWikiServices $services 
) {
-   $services->loadWiringFiles( [
-   __DIR__ . '/ServiceWiring.php',
-   ] );
-   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use static parseDocument method

[jenkins-bot (Code Review)]

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

Change subject: Use static parseDocument method
..


Use static parseDocument method

Change-Id: I545a58ffcbf1c7c57c197f4858958de835a40394
Depends-On: I5b36e187a5e8bb68b47b2fccf5b46c08b81b01d9
---
M build/screenshots.diffs.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
3 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/build/screenshots.diffs.js b/build/screenshots.diffs.js
index f8c168a..2aac6fc 100644
--- a/build/screenshots.diffs.js
+++ b/build/screenshots.diffs.js
@@ -21,12 +21,12 @@
}
}
 
-   target.originalDmDoc = 
target.constructor.static.createModelFromDom( target.parseDocument( oldHtml ), 
'visual' );
+   target.originalDmDoc = 
target.constructor.static.createModelFromDom( 
target.constructor.static.parseDocument( oldHtml ), 'visual' );
 
surface.getModel().getDocument().getStore().merge( 
target.originalDmDoc.getStore() );
 
surface.getModel().getLinearFragment( new ve.Range( 0 ) 
).insertDocument(
-   target.constructor.static.createModelFromDom( 
target.parseDocument( newHtml ), 'visual' )
+   target.constructor.static.createModelFromDom( 
target.constructor.static.parseDocument( newHtml ), 'visual' )
).collapseToEnd().adjustLinearSelection( 0, 3 
).removeContent();
 
target.once( 'saveReview', function () {
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index eae257b..8605460 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -271,7 +271,7 @@
this.etag = data.etag;
this.fromEditedState = data.fromEditedState;
this.switched = data.switched || 'wteswitched' in new mw.Uri( 
location.href ).query;
-   this.doc = this.parseDocument( this.originalHtml, 
this.getDefaultMode() );
+   this.doc = this.constructor.static.parseDocument( 
this.originalHtml, this.getDefaultMode() );
 
this.remoteNotices = ve.getObjectValues( data.notices );
this.protectedClasses = data.protectedClasses;
@@ -1000,7 +1000,7 @@
baseDoc = 
target.getSurface().getModel().getDocument().getHtmlDocument();
 
if ( ve.getProp( response, 'visualeditor', 'result' ) 
=== 'success' ) {
-   doc = target.parseDocument( 
response.visualeditor.content, 'visual' );
+   doc = target.constructor.static.parseDocument( 
response.visualeditor.content, 'visual' );
body = doc.body;
// Import body to current document, then 
resolve attributes against original document (parseDocument called #fixBase)
document.adoptNode( body );
@@ -1079,7 +1079,7 @@
).then( function ( response ) {
var doc, data = response ? ( 
response.visualeditor || response.visualeditoredit ) : null;
if ( data && typeof data.content === 'string' ) 
{
-   doc = target.parseDocument( 
data.content, 'visual' );
+   doc = 
target.constructor.static.parseDocument( data.content, 'visual' );
target.originalDmDoc = 
target.constructor.static.createModelFromDom( doc, 'visual' );
deferred.resolve( function () {
return new ve.dm.VisualDiff( 
target.originalDmDoc, dmDoc );
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index b0fa020..160b5c8 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -185,26 +185,26 @@
return this.constructor.static.createModelFromDom.apply( 
this.constructor.static, arguments );
 };
 
-/* Methods */
-
 /**
  * @inheritdoc
  */
-ve.init.mw.Target.prototype.parseDocument = function ( documentString, mode ) {
+ve.init.mw.Target.static.parseDocument = function ( documentString, mode ) {
var doc;
if ( mode === 'source' ) {
// Parent method
-   doc = ve.init.mw.Target.super.prototype.parseDocument.apply( 
this, arguments );
+   doc = 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.ui.MWEducationPopupTool: Remove unnecessary manual popup ...

[jenkins-bot (Code Review)]

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

Change subject: ve.ui.MWEducationPopupTool: Remove unnecessary manual popup 
positioning
..


ve.ui.MWEducationPopupTool: Remove unnecessary manual popup positioning

OOjs UI Popups position themselves automatically relative to their
$floatableContainer these days.

Also added explicit `$floatableContainer: this.$element` in the config
(although not strictly needed, since the parent node is used by
default, this makes the code more robust in case we move the popup
somewhere else in the DOM).

Bug: T167751
Change-Id: Id4267fce6499a4c217f7dc1d18871c02dd078aee
---
M modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
index c610ae2..ecc2424 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
@@ -55,6 +55,7 @@
);
 
this.popup = new OO.ui.PopupWidget( {
+   $floatableContainer: this.$element,
$content: $popupContent,
padded: true,
width: 300
@@ -79,10 +80,6 @@
tool.$pulsatingDot.hide();
tool.$stillDot.hide();
tool.popup.toggle( true );
-   tool.popup.$element.css( {
-   left: tool.$element.width() / 2,
-   top: tool.$element.height()
-   } );
$shield.remove();
}
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4267fce6499a4c217f7dc1d18871c02dd078aee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
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]: Adjust the main menu width

[Bmansurov (Code Review)]

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

Change subject: Adjust the main menu width
..

Adjust the main menu width

* The main menu occupies 75% of the viewport width or 600px,
  whichever is smaller.
* The dismiss area occupies 25% of the viewport width or 50px,
  whichever is larger.
* Make sure that the dismiss area is always visible when the
  viewport is resized.

Bug: T152071
Change-Id: Ib5a74decd1924487f3137b1611acd2436a53c80f
---
M resources/mobile.startup/Skin.js
M resources/skins.minerva.mainMenu.styles/mainmenu.less
M resources/skins.minerva.mainMenu/MainMenu.js
3 files changed, 60 insertions(+), 11 deletions(-)


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

diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js
index 397e9da..800f972 100644
--- a/resources/mobile.startup/Skin.js
+++ b/resources/mobile.startup/Skin.js
@@ -154,6 +154,7 @@
// FIXME: Move back into events when T98200 resolved
this.$( '#mw-mf-page-center' ).on( 'click',
$.proxy( this, '_onPageCenterClick' ) );
+   M.on( 'resize:throttled', $.proxy( this, 
'adjustMainMenuWidth' ) );
},
 
/**
@@ -165,6 +166,17 @@
},
 
/**
+* Resize main menu width if it's already open
+*/
+   adjustMainMenuWidth: function () {
+   var mainMenu = this.getMainMenu();
+
+   if ( mainMenu.isOpen() ) {
+   mainMenu.setWidth();
+   }
+   },
+
+   /**
 * Load images on demand
 * @param {jQuery.Object} [$container] The container that 
should be
 *  searched for image placeholders. Defaults to "#content".
diff --git a/resources/skins.minerva.mainMenu.styles/mainmenu.less 
b/resources/skins.minerva.mainMenu.styles/mainmenu.less
index d225405..0c1e332 100644
--- a/resources/skins.minerva.mainMenu.styles/mainmenu.less
+++ b/resources/skins.minerva.mainMenu.styles/mainmenu.less
@@ -154,8 +154,6 @@
background: #fff;
position: absolute;
height: 100%;
-   // Overriden in mainmenuAnimation
-   left: @menuWidth;
}
 
.navigation-drawer,
@@ -172,10 +170,6 @@
 
 .primary-navigation-enabled {
background-color: @primaryNavBackgroundColor;
-
-   nav {
-   width: @menuWidth;
-   }
 
// FIXME: Menu shouldn't need to know about drawers but a cta drawer 
might be open
.drawer .position-fixed {
@@ -216,8 +210,6 @@
}
 
nav {
-   width: @menuWidth;
-
.transition( visibility 0s @duration );
}
 
@@ -245,8 +237,7 @@
 
 .primary-navigation-enabled.animations {
// FIXME: Menu shouldn't need to know about drawers
-   .drawer .position-fixed,
-   #mw-mf-page-center {
+   .drawer .position-fixed {
// override non-animated version
left: 0 !important;
.transform( translate( @menuWidth, 0 ) );
diff --git a/resources/skins.minerva.mainMenu/MainMenu.js 
b/resources/skins.minerva.mainMenu/MainMenu.js
index 5a45472..9fd3036 100644
--- a/resources/skins.minerva.mainMenu/MainMenu.js
+++ b/resources/skins.minerva.mainMenu/MainMenu.js
@@ -1,6 +1,7 @@
 ( function ( M, $ ) {
var browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
-   View = M.require( 'mobile.startup/View' );
+   View = M.require( 'mobile.startup/View' ),
+   $pageCenter = $( '#mw-mf-page-center' );
 
/**
 * Representation of the main menu
@@ -134,6 +135,10 @@
 * Close all open navigation drawers
 */
closeNavigationDrawers: function () {
+   if ( this.isOpen() ) {
+   this.unsetWidth();
+   }
+
// FIXME: We should be moving away from applying 
classes to the body
$( 'body' ).removeClass( 'navigation-enabled' )
.removeClass( 'secondary-navigation-enabled' )
@@ -152,10 +157,51 @@
// FIXME: We should be moving away from applying 
classes to the body
$( 'body' ).toggleClass( 'navigation-enabled' )
.toggleClass( drawerType + 
'-navigation-enabled' );
+
+   if ( drawerType === 'primary' ) {
+   this.setWidth();
+   }
+
/**
 * @event open emitted when navigation drawer is 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update session logging to include pages viewed with no WD de...

[jenkins-bot (Code Review)]

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

Change subject: Update session logging to include pages viewed with no WD 
description
..


Update session logging to include pages viewed with no WD description

Bug: T157758
Change-Id: I1f7fc6e8ee29873d3ea09a66a9d4b4f2ae40f6fa
---
M app/src/main/java/org/wikipedia/analytics/SessionData.java
M app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
3 files changed, 21 insertions(+), 2 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/analytics/SessionData.java 
b/app/src/main/java/org/wikipedia/analytics/SessionData.java
index a161dff..fc98006 100644
--- a/app/src/main/java/org/wikipedia/analytics/SessionData.java
+++ b/app/src/main/java/org/wikipedia/analytics/SessionData.java
@@ -19,6 +19,7 @@
 private int pagesFromNearby;
 private int pagesFromDisambig;
 private int pagesFromBack;
+private int pagesWithNoDescription;
 
 public void addPageViewed(HistoryEntry entry) {
 switch (entry.getSource()) {
@@ -130,10 +131,18 @@
 return pagesFromBack;
 }
 
+public int getPagesWithNoDescription() {
+return pagesWithNoDescription;
+}
+
 public void addPageFromBack() {
 this.pagesFromBack++;
 }
 
+public void addPageWithNoDescription() {
+this.pagesWithNoDescription++;
+}
+
 public int getTotalPages() {
 return pagesFromSearch + pagesFromRandom + pagesFromLangLink + 
pagesFromInternal
 + pagesFromExternal + pagesFromHistory + pagesFromSaved + 
pagesFromReadingList
diff --git a/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
index 36985f2..71e00a4 100644
--- a/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
@@ -19,7 +19,7 @@
 public static final int MIN_SESSION_TIMEOUT = 1;
 
 private static final String SCHEMA_NAME = "MobileWikiAppSessions";
-private static final int REVISION = 15522505;
+private static final int REVISION = 16885702;
 
 private SessionData sessionData;
 private long leadSectionStartTime;
@@ -73,6 +73,11 @@
 sessionData.addPageFromBack();
 }
 
+public void noDescription() {
+touchSession();
+sessionData.addPageWithNoDescription();
+}
+
 public void leadSectionFetchStart() {
 leadSectionStartTime = System.currentTimeMillis();
 }
@@ -108,6 +113,7 @@
 "fromNearby", sessionData.getPagesFromNearby(),
 "fromDisambig", sessionData.getPagesFromDisambig(),
 "fromBack", sessionData.getPagesFromBack(),
+"noDescription", sessionData.getPagesWithNoDescription(),
 "totalPages", sessionData.getTotalPages(),
 "leadLatency", sessionData.getLeadLatency(),
 "restLatency", sessionData.getRestLatency(),
diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java 
b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
index c9e21ec..e51ce4a 100644
--- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
@@ -101,7 +101,7 @@
 private CommunicationBridge bridge;
 private ObservableWebView webView;
 private SwipeRefreshLayoutWithScroll refreshView;
-@NonNull private final WikipediaApp app = WikipediaApp.getInstance();
+private WikipediaApp app = WikipediaApp.getInstance();
 private LeadImagesHandler leadImagesHandler;
 private PageToolbarHideHandler toolbarHideHandler;
 private EditHandler editHandler;
@@ -564,6 +564,10 @@
 
 editHandler.setPage(model.getPage());
 
+if (page.getTitle().getDescription() == null) {
+app.getSessionFunnel().noDescription();
+}
+
 layoutLeadImage(new Runnable() {
 @Override
 public void run() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f7fc6e8ee29873d3ea09a66a9d4b4f2ae40f6fa
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Brion VIBBER 
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...Cite[master]: Reduce column-width to 25em for Minerva skin

[Jdlrobson (Code Review)]

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

Change subject: Reduce column-width to 25em for Minerva skin
..

Reduce column-width to 25em for Minerva skin

Current Minerva skin is purposely restricted to 55.8em
This means references will never be split into 2 columns as 30em*2=60em.
Dropping it to 25em would mean the CSS applies here and no more than 2
columns would ever be used to display references.

Bug: T160497
Change-Id: I6f9b85cd6cfdb055692b1f537d569c158900f7c9
---
M extension.json
A modules/ext.cite.styles.minerva.less
2 files changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index d50281a..b682677 100644
--- a/extension.json
+++ b/extension.json
@@ -54,6 +54,9 @@
"media": "print"
}
},
+   "skinStyles": {
+   "minerva": "ext.cite.styles.minerva.less"
+   },
"position": "bottom",
"targets": [
"desktop",
diff --git a/modules/ext.cite.styles.minerva.less 
b/modules/ext.cite.styles.minerva.less
new file mode 100644
index 000..01d70ba
--- /dev/null
+++ b/modules/ext.cite.styles.minerva.less
@@ -0,0 +1,7 @@
+@import "mediawiki.mixins.less";
+
+ .mw-references-columns {
+   /* Minerva skin width is cut to 1000px  (62.5em). With margins/paddings 
included this
+   leaves 55.8em for content. This ensures that 2 columns will be used 
where possible */
+   .column-width( 25em );
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f9b85cd6cfdb055692b1f537d569c158900f7c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Disable hhvm temporarily on stretch

[Paladox (Code Review)]

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

Change subject: contint: Disable hhvm temporarily on stretch
..

contint: Disable hhvm temporarily on stretch

Reason is because hhvm is not in the repo for stretch so it fails to install 
the package causing puppet errors.

So temporarily disabling it.

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia436890f922c9c58f747ba4131b6253cb7acf160
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] operations/puppet[production]: numa.rb: add device_to_node data

[BBlack (Code Review)]

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

Change subject: numa.rb: add device_to_node data
..


numa.rb: add device_to_node data

Also, refactor slightly to stay within the strict confines of
rubocop limits (which are perverse when it comes to puppet
facts...)

Change-Id: Ie0d03813429a47bcd655d7c23d430713387453f1
---
M modules/base/lib/facter/numa.rb
1 file changed, 31 insertions(+), 28 deletions(-)

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



diff --git a/modules/base/lib/facter/numa.rb b/modules/base/lib/facter/numa.rb
index 274da4b..7084bd6 100644
--- a/modules/base/lib/facter/numa.rb
+++ b/modules/base/lib/facter/numa.rb
@@ -12,21 +12,16 @@
 # attached to a single specific node is assigned to all nodes in the output
 # here, as shown for "lo" in the first example below.
 #
-# All (two!) known uses of this data only consume the "device_to_htset" data so
-# far, so I've limited the fact data output to only that data for now to avoid
-# fact bloat.  We can expose other related data later if there's a need for it.
-# The examples below show all of the other possible intermediate data outputs,
-# for reference.
-#
 # Example with 2x numa nodes as 2x cpu dies.  Each die has 4 physical (8 
logical
 # HT) cpu cores, system would show "16 cpus" in the simple view.  eth0 and eth1
 # are each attached to a distinct node:
 #
 # numa = {
-#"node_to_htset" => { # not currently exported!
-#0 => [[0, 8], [2, 10], [4, 12], [6, 14]],
-#1 => [[1, 9], [3, 11], [5, 13], [7, 15]],
-#},
+#"device_to_node" => {
+#"eth0" => [0]
+#"eth1" => [1]
+#"lo"   => [0,1]
+#}
 #"device_to_htset" => {
 #"eth0" => [[0, 8], [2, 10], [4, 12], [6, 14]],
 #"eth1" => [[1, 9], [3, 11], [5, 13], [7, 15]],
@@ -39,8 +34,9 @@
 # single-core CPU lacking HT:
 #
 # numa = {
-#"node_to_htset" => { # not currently exported!
-#0 => [[0]]
+#"device_to_node" => {
+#"eth0" => [0],
+#"lo"   => [0],
 #}
 #"device_to_htset" => {
 #"eth0" => [[0]],
@@ -52,34 +48,41 @@
 require 'facter'
 require 'pathname'
 
-# fragments of long sysfs glob pathname, to keep line len down later
-tsl_frag1 = '/sys/devices/system/node'
-tsl_frag2 = 'cpu[0-9]*/topology/thread_siblings_list'
+def nodes_list
+  Pathname.glob('/sys/devices/system/node/node[0-9]*')
+  .map { |n| /([0-9]+)$/.match(n.to_s)[0].to_i }.sort
+end
+
+def nodes_to_htsets(nodes)
+  tsl_glob = 'cpu[0-9]*/topology/thread_siblings_list'
+  node_to_htset = {}
+  nodes.each do |n|
+node_to_htset[n] =
+  Pathname.glob("/sys/devices/system/node/node#{n}/#{tsl_glob}")
+  .map do |c|
+File.open(c).read.split(',').map(&:to_i).sort
+  end.sort.uniq
+  end
+  node_to_htset
+end
 
 Facter.add('numa') do
   setcode do
-node_to_htset = {}
+nodes = nodes_list
+node_to_htset = nodes_to_htsets(nodes)
+device_to_node = {}
 device_to_htset = {}
-nodes = Pathname.glob('/sys/devices/system/node/node[0-9]*')
-.map { |n| /([0-9]+)$/.match(n.to_s)[0].to_i }.sort
-nodes.each do |n|
-  node_to_htset[n] =
-Pathname.glob("#{tsl_frag1}/node#{n}/#{tsl_frag2}")
-.map do |c|
-  File.open(c).read.split(',').map(&:to_i).sort
-end.sort.uniq
-end
 Pathname.glob('/sys/class/net/*').sort.each do |d|
   dev = d.to_s.split('/')[4]
   nodefile = "#{d}/device/numa_node"
   raw_node = File.exist?(nodefile) ? File.open(nodefile, 'r').read.to_i : 
-1
-  dev_nodes = raw_node >= 0 ? [raw_node] : nodes
+  device_to_node[dev] = raw_node >= 0 ? [raw_node] : nodes
   device_to_htset[dev] = []
-  dev_nodes.each do |dn|
+  device_to_node[dev].each do |dn|
 device_to_htset[dev].concat(node_to_htset[dn])
   end
   device_to_htset[dev].sort!
 end
-{ 'device_to_htset' => device_to_htset }
+{ 'device_to_node' => device_to_node, 'device_to_htset' => device_to_htset 
}
   end
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0d03813429a47bcd655d7c23d430713387453f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Delete remote reading list data when user disables syncing

[jenkins-bot (Code Review)]

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

Change subject: Delete remote reading list data when user disables syncing
..


Delete remote reading list data when user disables syncing

Bug: T167311
Change-Id: Ia57c829669512d0324533226c3fae56888292ac5
---
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
6 files changed, 108 insertions(+), 16 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
index e741175..205217c 100644
--- 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
+++ 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
@@ -32,6 +32,7 @@
 import static 
org.wikipedia.readinglist.sync.RemoteReadingLists.RemoteReadingList;
 import static 
org.wikipedia.readinglist.sync.RemoteReadingLists.RemoteReadingListPage;
 import static org.wikipedia.settings.Prefs.isReadingListSyncEnabled;
+import static org.wikipedia.settings.Prefs.isReadingListsRemoteDeletePending;
 
 public class ReadingListSynchronizer {
 private static final String READING_LISTS_SYNC_OPTION = 
"userjs-reading-lists-v1";
@@ -54,14 +55,11 @@
 }
 
 public void sync() {
-// TODO: remove when ready for beta/production
-if (!ReleaseUtil.isPreBetaRelease()) {
+if (!ReleaseUtil.isPreBetaRelease()  // TODO: remove when ready for 
beta/production
+|| !User.isLoggedIn()
+|| !(isReadingListSyncEnabled() || 
isReadingListsRemoteDeletePending())) {
 syncSavedPages();
-return;
-}
-if (!User.isLoggedIn() || !isReadingListSyncEnabled()) {
-L.d("Skipping sync of reading lists.");
-syncSavedPages();
+L.d("Skipped sync of reading lists.");
 return;
 }
 CallbackTask.execute(new CallbackTask.Task() {
@@ -97,6 +95,9 @@
 
WikipediaApp.getInstance().getOnboardingStateMachine().setReadingListTutorial();
 } else {
 L.d("Local and remote reading lists are in sync.");
+if (isReadingListsRemoteDeletePending()) {
+deleteRemoteReadingLists();
+}
 }
 }
 syncSavedPages();
@@ -113,6 +114,22 @@
 WikipediaApp.getInstance().startService(new 
Intent(WikipediaApp.getInstance(), SavedPageSyncService.class));
 }
 
+private void deleteRemoteReadingLists() {
+CallbackTask.execute(new CallbackTask.Task() {
+@Override public Void execute() throws Throwable {
+UserOptionDataClientSingleton.instance().post(new 
UserOption(READING_LISTS_SYNC_OPTION, null));
+return null;
+}
+}, new CallbackTask.Callback() {
+@Override public void success(Void result) {
+Prefs.setReadingListsRemoteDeletePending(false);
+}
+@Override public void failure(Throwable caught) {
+L.e("Failed to delete remote reading lists", caught);
+}
+});
+}
+
 private class SyncRunnable implements Runnable {
 @Override
 public void run() {
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 9061c4c..7680415 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -488,6 +488,10 @@
 return getBoolean(R.string.preference_key_sync_reading_lists, true);
 }
 
+public static void setReadingListSyncEnabled(boolean enabled) {
+setBoolean(R.string.preference_key_sync_reading_lists, enabled);
+}
+
 public static boolean isReadingListSyncReminderEnabled() {
 return 
getBoolean(R.string.preference_key_reading_list_sync_reminder_enabled, true);
 }
@@ -504,5 +508,13 @@
 
setBoolean(R.string.preference_key_reading_list_login_reminder_enabled, 
enabled);
 }
 
+public static boolean isReadingListsRemoteDeletePending() {
+return 
getBoolean(R.string.preference_key_reading_lists_remote_delete_pending, false);
+}
+
+public static void setReadingListsRemoteDeletePending(boolean pending) {
+
setBoolean(R.string.preference_key_reading_lists_remote_delete_pending, 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: [DNM] Test jshint

[EBernhardson (Code Review)]

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

Change subject: [DNM] Test jshint
..

[DNM] Test jshint

Change-Id: Id1ac20b74ceae5796f7855421fa39749b7734d5d
---
M README
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/README b/README
index 176e1c3..05959bf 100644
--- a/README
+++ b/README
@@ -16,3 +16,4 @@
 Using the config value `wgWMEReadingDepthEnabled` it is possible to capture
 information on user sessions. More information can be found at:
 https://phabricator.wikimedia.org/T155639
+

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

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

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