date:20180123

[MediaWiki-commits] [Gerrit] mediawiki...RSS[master]: Add prefix support to URL whitelist

2018-01-23 Thread Samwilson (Code Review)

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

Change subject: Add prefix support to URL whitelist
..

Add prefix support to URL whitelist

Permit URLs in the whitelist to end in '*' in order to permit any
that start with the given prefix.

Bug: T185087
Change-Id: I458aa74f1862d4da6bf162f996ff4a8b3dcba580
---
M RSSHooks.php
M extension.json
2 files changed, 60 insertions(+), 26 deletions(-)


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

diff --git a/RSSHooks.php b/RSSHooks.php
index 3968257..4c598e3 100644
--- a/RSSHooks.php
+++ b/RSSHooks.php
@@ -1,5 +1,7 @@
 getTitle()->getNamespace();
@@ -39,30 +40,10 @@
return RSSUtils::RSSError( 
'rss-deprecated-wgrssallowedfeeds-found' );
}
 
-   # disallow because there is no whitelist at all or an empty 
whitelist
-
-   if ( !isset( $wgRSSUrlWhitelist )
-   || !is_array( $wgRSSUrlWhitelist )
-   || ( count( $wgRSSUrlWhitelist ) === 0 ) ) {
-   return RSSUtils::RSSError( 'rss-empty-whitelist',
-   $input
-   );
-
-   }
-
-   # disallow the feed url because the url is not whitelisted;  or
-   # disallow because the wildcard joker is not present to allow 
any feed url
-   # which can be dangerous
-
-   if ( !( in_array( $input, $wgRSSUrlWhitelist ) )
-   && !( in_array( "*", $wgRSSUrlWhitelist ) ) ) {
-   $listOfAllowed = 
$parser->getFunctionLang()->listToText( $wgRSSUrlWhitelist );
-   $numberAllowed = $parser->getFunctionLang()->formatNum( 
count( $wgRSSUrlWhitelist ) );
-
-   return RSSUtils::RSSError( 'rss-url-is-not-whitelisted',
-   [ $input, $listOfAllowed, $numberAllowed ]
-   );
-
+   // Check the input against the configured whitelist of URLs.
+   $whitelistError = static::checkAgainstWhitelist( $input, 
$parser->getFunctionLang() );
+   if ( $whitelistError ) {
+   return $whitelistError;
}
 
if ( !Http::isValidURI( $input ) ) {
@@ -93,4 +74,54 @@
return $rss->renderFeed( $parser, $frame );
}
 
+   /**
+* Check whether a given URL is in the configured whitelist of RSS URLs.
+* @param string $inputUrl The URL to check. Can be '*' to allow any,
+* or end in '*' to allow any prefix.
+* @param Language $language The language to use for the error message 
list and numbers.
+* @return string The error message if the URL is not allowed, or an 
empty string if it is.
+*/
+   protected static function checkAgainstWhitelist( $inputUrl, Language 
$language ) {
+   // Get the whitelist.
+   $whitelist = MediaWikiServices::getInstance()
+   ->getConfigFactory()
+   ->makeConfig('RSS' )
+   ->get( 'RSSUrlWhitelist' );
+
+   // Disallow because there is an empty whitelist.
+   if ( !isset( $whitelist ) || !is_array( $whitelist ) || ( 
count( $whitelist ) === 0 ) ) {
+   return RSSUtils::RSSError( 'rss-empty-whitelist', 
$inputUrl );
+   }
+
+   // Check for exact match or asterisk.
+   $whitelisted = in_array( $inputUrl, $whitelist ) || in_array( 
'*', $whitelist );
+   // Otherwise, check for a match for URLs that end in an 
asterisk (T185087).
+   if ( !$whitelisted ) {
+   $whitelistedUrls = array_filter(
+   $whitelist,
+   function ( $whitelistedUrl ) use ( $inputUrl ) {
+   if ( substr( $whitelistedUrl, -1 ) !== 
'*' ) {
+   // If it's not a wildcard 
whitelisted URL.
+   return false;
+   }
+   // See if the supplied URL starts with 
the whitelisted prefix.
+   $whitelistedPrefix = substr( 
$whitelistedUrl, 0, -1 );
+   $inputUrlPrefix = substr( $inputUrl, 0, 
strlen( $whitelistedPrefix ) );
+   return $inputUrlPrefix === 
$whitelistedPrefix;
+   }
+   );
+   // It's whitelisted if it matches any of the whitelist 
prefixes.
+   $whitelisted = ( count( $whitelistedUrls ) > 0 );
+   }
+   if ( !$whitelisted ) {
+

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: CommentNode: Protect against call after teardown

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: CommentNode: Protect against call after teardown
..


CommentNode: Protect against call after teardown

Change-Id: I276cc64e522556f482f9fc7d0bb43f32d521defa
---
M src/ce/nodes/ve.ce.CommentNode.js
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/src/ce/nodes/ve.ce.CommentNode.js 
b/src/ce/nodes/ve.ce.CommentNode.js
index 210a931..a2030e3 100644
--- a/src/ce/nodes/ve.ce.CommentNode.js
+++ b/src/ce/nodes/ve.ce.CommentNode.js
@@ -95,7 +95,13 @@
  * @inheritdoc
  */
 ve.ce.CommentNode.prototype.createInvisibleIcon = function () {
-   var icon = new OO.ui.ButtonWidget( {
+   var icon;
+   // Check the node hasn't been destroyed, as this method is
+   // called after an rAF in ve.ce.FocusableNode
+   if ( !this.getModel() ) {
+   return;
+   }
+   icon = new OO.ui.ButtonWidget( {
classes: [ 've-ce-focusableNode-invisibleIcon' ],
framed: false,
icon: this.constructor.static.iconWhenInvisible,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I276cc64e522556f482f9fc7d0bb43f32d521defa
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Divec 
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...mobileapps[master]: Hygiene: fix diff tests

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: fix diff tests
..


Hygiene: fix diff tests

mw-redirect classes were added to a few links.

Change-Id: Ife970e33459b64e3af7175deb355d03fbdf838a8
---
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 3dc7cf4..11b309d 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -82,14 +82,14 @@
   },
   {
 "id": 9,
-"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media 
help.\n\n",
+"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media help.\n\n",
 "toclevel": 1,
 "line": "Audio",
 "anchor": "Audio"
   },
   {
 "id": 10,
-"text": "\n\n\n\n\n\nThe Dilbert 
Principle\nhttps://upload.wikimedia.org/wikipedia/commons/6/6d/The_Dilbert_Principle.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(56 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/commons/transcoded/6/6d/The_Dilbert_Principle.ogg/The_Dilbert_Principle.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media 
help.\n\n",
+"text": "\n\n\n\n\n\nThe Dilbert 
Principle\nhttps://upload.wikimedia.org/wikipedia/commons/6/6d/The_Dilbert_Principle.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(56 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/commons/transcoded/6/6d/The_Dilbert_Principle.ogg/The_Dilbert_Principle.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media help.\n\n",
 "toclevel": 1,
 "line": "Spoken Wikipedia",
 "anchor": "Spoken_Wikipedia"
diff --git 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 3cd4804..b7fc1cf 100644
--- 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -236,14 +236,14 @@
   },
   {
 "id": 9,
-"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media 
help.\n\n",
+"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;
 type=\"audio/mpeg\"

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: fix jsdoc in extractLeadIntroduction

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: fix jsdoc in extractLeadIntroduction
..


Hygiene: fix jsdoc in extractLeadIntroduction

Change-Id: I1268821bfcf65470202ca76ff21143236772f63a
---
M lib/transformations/extractLeadIntroduction.js
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/lib/transformations/extractLeadIntroduction.js 
b/lib/transformations/extractLeadIntroduction.js
index 7661b2c..0157f73 100644
--- a/lib/transformations/extractLeadIntroduction.js
+++ b/lib/transformations/extractLeadIntroduction.js
@@ -3,22 +3,22 @@
 const NodeType = require('../nodeType');
 const _ = require('underscore');
 
-/*
+/**
  * Check whether a node has any content.
- * @param {!DOMElement} node
- * @return {!Boolean} whether the node is empty after all whitespace is 
stripped.
+ * @param {!Element} node
+ * @return {!boolean} whether the node is empty after all whitespace is 
stripped.
  */
 function isEmpty(node) {
 return node.textContent.trim().length === 0;
 }
 
-/*
+/**
  * Extracts the first non-empty paragraph from an article and any
  * nodes that follow it that are not themselves paragraphs.
  * @param {!Document} doc representing article
- * @param {Boolean} removeNodes when set the lead introduction will
+ * @param {boolean} removeNodes when set the lead introduction will
  *  be removed from the input DOM tree.
- * @return {String} representing article introduction
+ * @return {string} representing article introduction
  */
 function extractLeadIntroduction(doc, removeNodes) {
 let p = '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1268821bfcf65470202ca76ff21143236772f63a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
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...GoogleDocTag[master]: Convert GoogleDocsTag to use extension registation

2018-01-23 Thread Jayprakash12345 (Code Review)

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

Change subject: Convert GoogleDocsTag to use extension registation
..

Convert GoogleDocsTag to use extension registation

Bug: T185621
Change-Id: I00b6b8867fae24c736bfb302daf65841828dc13f
---
M GoogleDocTag.php
A extension.json
2 files changed, 36 insertions(+), 14 deletions(-)


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

diff --git a/GoogleDocTag.php b/GoogleDocTag.php
index 3e5635f..68a88bf 100644
--- a/GoogleDocTag.php
+++ b/GoogleDocTag.php
@@ -1,16 +1,15 @@
  __FILE__,
-   'name'   => 'GoogleDocTag',
-   'descriptionmsg' => 'googledoctag-desc',
-   'author' => array( 'Reddo', 'Luis Felipe Schenone' ),
-   'version'=> '0.4.0',
-   'url'=> 
'http://www.mediawiki.org/wiki/Extension:GoogleDocTag',
-);
-
-$wgMessagesDirs['GoogleDocTag'] = __DIR__ . '/i18n';
-
-$wgAutoloadClasses['GoogleDocTag'] = __DIR__ . '/GoogleDocTag.body.php';
-
-$wgHooks['ParserFirstCallInit'][] = 'GoogleDocTag::setParserHook';
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'GoogleDocTag' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['GoogleDocTag'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for the GoogleDocTag 
extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the GoogleDocTag extension requires MediaWiki 
1.29+' );
+}
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..90fb327
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,23 @@
+{
+   "name": "GoogleDocTag",
+   "version": "0.5.0",
+   "author": [
+   "Reddo",
+   "Luis Felipe Schenone"
+   ],
+   "url": "http://www.mediawiki.org/wiki/Extension:GoogleDocTag;,
+   "descriptionmsg": "googledoctag-desc",
+   "type": "parserhook",
+   "MessagesDirs": {
+   "GoogleDocTag": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "GoogleDocTag": "GoogleDocTag.body.php"
+   },
+   "Hooks": {
+   "ParserFirstCallInit": "GoogleDocTag::setParserHook"
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00b6b8867fae24c736bfb302daf65841828dc13f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleDocTag
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: fix diff tests

2018-01-23 Thread BearND (Code Review)

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

Change subject: Hygiene: fix diff tests
..

Hygiene: fix diff tests

mw-redirect classes were added to a few links.

Change-Id: Ife970e33459b64e3af7175deb355d03fbdf838a8
---
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/15/406015/1

diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 3dc7cf4..11b309d 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -82,14 +82,14 @@
   },
   {
 "id": 9,
-"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media 
help.\n\n",
+"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media help.\n\n",
 "toclevel": 1,
 "line": "Audio",
 "anchor": "Audio"
   },
   {
 "id": 10,
-"text": "\n\n\n\n\n\nThe Dilbert 
Principle\nhttps://upload.wikimedia.org/wikipedia/commons/6/6d/The_Dilbert_Principle.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(56 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/commons/transcoded/6/6d/The_Dilbert_Principle.ogg/The_Dilbert_Principle.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media 
help.\n\n",
+"text": "\n\n\n\n\n\nThe Dilbert 
Principle\nhttps://upload.wikimedia.org/wikipedia/commons/6/6d/The_Dilbert_Principle.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(56 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/commons/transcoded/6/6d/The_Dilbert_Principle.ogg/The_Dilbert_Principle.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media help.\n\n",
 "toclevel": 1,
 "line": "Spoken Wikipedia",
 "anchor": "Spoken_Wikipedia"
diff --git 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 3cd4804..b7fc1cf 100644
--- 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -236,14 +236,14 @@
   },
   {
 "id": 9,
-"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;
 type=\"audio/mpeg\" data-title=\"MP3\" 
data-shorttitle=\"MP3\">\n\nProblems playing this file? See media 
help.\n\n",
+"text": "\n\n\n\n\n\nAnvil of Crom 
(sample)\nhttps://upload.wikimedia.org/wikipedia/en/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg\;
 type=\"audio/ogg; codecs=vorbis\" data-title=\"Original Ogg file 
(65 kbps)\" data-shorttitle=\"Ogg source\">https://upload.wikimedia.org/wikipedia/en/transcoded/0/0d/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg/Anvil_of_Crom_%28sample%29_by_Basil_Poledouris.ogg.mp3\;

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Follow-up 6bb7939a79: use GenderCache

2018-01-23 Thread Catrope (Code Review)

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

Change subject: Follow-up 6bb7939a79: use GenderCache
..

Follow-up 6bb7939a79: use GenderCache

Change-Id: I7511af52822ca2c99e08cf04cd07c880959325b4
---
M Thanks.hooks.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index e325d98..376018a 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -101,6 +101,7 @@
);
}
 
+   $genderCache = 
MediaWikiServices::getInstance()->getGenderCache();
// Add 'thank' link
$tooltip = wfMessage( 'thanks-thank-tooltip' )
->params( $wgUser->getName(), 
$recipient->getName() )
@@ -113,7 +114,7 @@
'href' => SpecialPage::getTitleFor( 'Thanks', 
$rev->getId() )->getFullURL(),
'title' => $tooltip,
'data-revision-id' => $rev->getId(),
-   'data-recipient-gender' => 
$recipient->getOption( 'gender' ) ?: 'unknown',
+   'data-recipient-gender' => 
$genderCache->getGenderOf( $recipient->getName(), __METHOD__ ),
],
wfMessage( 'thanks-thank', $wgUser, 
$recipient->getName() )->text()
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7511af52822ca2c99e08cf04cd07c880959325b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
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]: CommentNode: Protect against call after teardown

2018-01-23 Thread Esanders (Code Review)

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

Change subject: CommentNode: Protect against call after teardown
..

CommentNode: Protect against call after teardown

Change-Id: I276cc64e522556f482f9fc7d0bb43f32d521defa
---
M src/ce/nodes/ve.ce.CommentNode.js
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/13/406013/1

diff --git a/src/ce/nodes/ve.ce.CommentNode.js 
b/src/ce/nodes/ve.ce.CommentNode.js
index 210a931..a2030e3 100644
--- a/src/ce/nodes/ve.ce.CommentNode.js
+++ b/src/ce/nodes/ve.ce.CommentNode.js
@@ -95,7 +95,13 @@
  * @inheritdoc
  */
 ve.ce.CommentNode.prototype.createInvisibleIcon = function () {
-   var icon = new OO.ui.ButtonWidget( {
+   var icon;
+   // Check the node hasn't been destroyed, as this method is
+   // called after an rAF in ve.ce.FocusableNode
+   if ( !this.getModel() ) {
+   return;
+   }
+   icon = new OO.ui.ButtonWidget( {
classes: [ 've-ce-focusableNode-invisibleIcon' ],
framed: false,
icon: this.constructor.static.iconWhenInvisible,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I276cc64e522556f482f9fc7d0bb43f32d521defa
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] VisualEditor/VisualEditor[master]: rebaser: Only apply artificial delay to submitChange events

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: rebaser: Only apply artificial delay to submitChange events
..


rebaser: Only apply artificial delay to submitChange events

For debugging, delaying welcomeNewClient and disconnect is unhelpful. Events
without their own delay still wait for prior delayed events to complete.

Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
---
M rebaser/server.js
1 file changed, 9 insertions(+), 5 deletions(-)

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



diff --git a/rebaser/server.js b/rebaser/server.js
index 2bf6280..d9bca0c 100644
--- a/rebaser/server.js
+++ b/rebaser/server.js
@@ -146,10 +146,13 @@
} );
 }
 
-function addStep( docName, generatorFunc ) {
-   var pending = Promise.resolve( pendingForDoc.get( docName ) ),
-   delayPromise = wait( artificialDelay );
-   pending = Promise.all( [ pending, delayPromise ] )
+function addStep( docName, generatorFunc, addDelay ) {
+   var pending,
+   parallel = [ Promise.resolve( pendingForDoc.get( docName ) ) ];
+   if ( addDelay && artificialDelay > 0 ) {
+   parallel.push( wait( artificialDelay ) );
+   }
+   pending = Promise.all( parallel )
.then( function () {
return ve.spawn( generatorFunc );
} )
@@ -165,7 +168,8 @@
 };
 
 function handleEvent( context, eventName, data ) {
-   addStep( context.docName, handlers[ eventName ]( context, data ) );
+   var addDelay = eventName === 'submitChange';
+   addStep( context.docName, handlers[ eventName ]( context, data ), 
addDelay );
 }
 
 function makeConnectionHandler( docName ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 
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] operations/mediawiki-config[master]: Allow bureaucrats to add/remove 'accountcreator' permission ...

2018-01-23 Thread Jayprakash12345 (Code Review)

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

Change subject: Allow bureaucrats to add/remove 'accountcreator' permission on 
Wikidata
..

Allow bureaucrats to add/remove 'accountcreator' permission on Wikidata

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/12/406012/2

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb57bdf..0821e6a 100755
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10529,6 +10529,7 @@
'bureaucrat' => [
'flood', // T50013
'wikidata-staff', // T74459
+   'accountcreator', // T185597
],
'wikidata-staff' => [
'wikidata-staff', // T74459
@@ -11295,6 +11296,7 @@
'bureaucrat' => [
'flood', // T50013
'wikidata-staff', // T74459
+   'accountcreator', // T185597
],
'wikidata-staff' => [
'wikidata-staff', // T74459

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b69e609f02174afe6a1298a69a39413ac305fdc
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
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]: Failing test case for losing annotations

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Failing test case for losing annotations
..


Failing test case for losing annotations

Change-Id: I5ca3d475760e14f3ece788107f3a002a17729ec9
---
M src/dm/ve.dm.Change.js
M tests/dm/ve.dm.RebaseServer.test.js
2 files changed, 124 insertions(+), 11 deletions(-)

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



diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index a582371..4d18362 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -690,21 +690,17 @@
 /**
  * Remove change transactions from history
  *
- * @param {ve.dm.Document} documentModel
+ * @param {ve.dm.Document} doc
  * @throws {Error} If this change does not end at the top of the history
  */
-ve.dm.Change.prototype.removeFromHistory = function ( documentModel ) {
-   var storeLength;
-   if ( this.start + this.getLength() !== 
documentModel.completeHistory.length ) {
+ve.dm.Change.prototype.removeFromHistory = function ( doc ) {
+   if ( this.start + this.getLength() !== doc.completeHistory.length ) {
throw new Error( 'this ends at ' + ( this.start + 
this.getLength() ) +
-   ' but history ends at ' + 
documentModel.completeHistory.length );
+   ' but history ends at ' + doc.completeHistory.length );
}
-   documentModel.completeHistory.length -= this.transactions.length;
-   storeLength = documentModel.store.getLength();
-   this.stores.forEach( function ( store ) {
-   storeLength -= store.getLength();
-   } );
-   documentModel.store.truncate( storeLength );
+   doc.completeHistory.length -= this.transactions.length;
+   doc.storeLengthAtHistoryLength -= this.transactions.length;
+   doc.store.truncate( doc.storeLengthAtHistoryLength[ 
doc.completeHistory.length ] );
 };
 
 /**
diff --git a/tests/dm/ve.dm.RebaseServer.test.js 
b/tests/dm/ve.dm.RebaseServer.test.js
index aa6b9ec..637062e 100644
--- a/tests/dm/ve.dm.RebaseServer.test.js
+++ b/tests/dm/ve.dm.RebaseServer.test.js
@@ -282,6 +282,123 @@
[ '1', 'deliver' ],
[ 'server', 'assertHist', 'abXYZ' ]
]
+   },
+   {
+   name: 'Double client-side rebase with 
annotation and other preceding transaction',
+   initialData: [
+   { type: 'paragraph' },
+   { type: '/paragraph' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ],
+   clients: [ '1', '2' ],
+   ops: [
+   // Client 1 applies a local change that 
inserts 'Q'
+   [ '1', 'apply', [
+   [ 'insert', 1, [ 'Q' ], 3 ]
+   ] ],
+
+   // Client 2 submits two changes
+   [ '2', 'apply', [
+   [ 'insert', 1, [ 'a' ], 3 ]
+   ] ],
+   [ '2', 'submit' ],
+   [ '2', 'apply', [
+   [ 'insert', 2, [ 'b' ], 3 ]
+   ] ],
+   [ '2', 'submit' ],
+
+   // Client 1 rebases its local change 
over client 2's first change
+   [ '2', 'deliver' ],
+   [ 'server', 'assertHist', 'a' ],
+   [ '1', 'receive' ],
+   [ '1', 'assertHist', 'a/Q!' ],
+   // Client 1 submits its local change
+   [ '1', 'submit' ],
+
+   // Client 1 applies a local change that 
introduces an annotation
+   [ '1', 'apply', {
+   start: 1,
+   transactions: [
+   {
+   operations: [
+   { type: 
'retain', length: 2 },
+   { type: 
'replace', remove: [], insert: [
+

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Make transferbot.py use source interwiki in edit su...

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: [bugfix] Make transferbot.py use source interwiki in edit 
summary
..


[bugfix] Make transferbot.py use source interwiki in edit summary

Bug: T185603
Change-Id: I713eeb7cbd528faae2aa5ccb0bc5e98b7b4dea87
---
M scripts/transferbot.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scripts/transferbot.py b/scripts/transferbot.py
index 6b6f229..e727e64 100755
--- a/scripts/transferbot.py
+++ b/scripts/transferbot.py
@@ -134,7 +134,7 @@
'gen_args': gen_args, 'prefix': prefix})
 
 for page in gen:
-summary = "Moved page from %s" % page.title(asLink=True)
+summary = 'Moved page from %s' % page.title(asLink=True, insite=tosite)
 targetpage = pywikibot.Page(tosite, prefix + page.title())
 edithistpage = pywikibot.Page(tosite, prefix + page.title() +
   '/edithistory')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I713eeb7cbd528faae2aa5ccb0bc5e98b7b4dea87
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dvorapa 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Revert "Add vcr cassettes for some classes in wikibase_tests...

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Add vcr cassettes for some classes in wikibase_tests.py"
..


Revert "Add vcr cassettes for some classes in wikibase_tests.py"

Wikidata job is failing on travis-ci:
https://travis-ci.org/wikimedia/pywikibot/jobs/332124662

This reverts commit 7bc840c690aff853b4e109b924b18f3d953ecf2c.

Change-Id: I19926f79dba6ce358764195380e3c8000eebf89b
---
D tests/cassettes/wikidata.wikidata/TestNamespaces.test_empty_wikibase_page.yaml
D 
tests/cassettes/wikidata.wikidata/TestNamespaces.test_item_unknown_namespace.yaml
D 
tests/cassettes/wikidata.wikidata/TestNamespaces.test_wikibase_namespace_selection.yaml
D tests/cassettes/wikidata.wikidata/TestRedirects.test_normal_item.yaml
D tests/cassettes/wikidata.wikidata/TestRedirects.test_redirect_item.yaml
D tests/cassettes/wikipedia.af/TestLinks.test_iterlinks_filtering.yaml
M tests/wikibase_tests.py
7 files changed, 0 insertions(+), 2,363 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19926f79dba6ce358764195380e3c8000eebf89b
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Rafidaslam 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
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...Collection[master]: Add @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tags
..


Add @covers tags

Change-Id: I002484ea45adae69bd58be83b011831d89e8d5d8
---
M tests/phpunit/SpecialCollectionTest.php
M tests/phpunit/includes/BookRendererTest.php
M tests/phpunit/includes/DataProviderTest.php
M tests/phpunit/includes/HeadingCounterTest.php
4 files changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/SpecialCollectionTest.php 
b/tests/phpunit/SpecialCollectionTest.php
index c84643c..33f9cb3 100644
--- a/tests/phpunit/SpecialCollectionTest.php
+++ b/tests/phpunit/SpecialCollectionTest.php
@@ -2,9 +2,14 @@
 
 namespace MediaWiki\Extensions\Collection;
 
+use MediaWikiCoversValidator;
 use SpecialCollection;
 
+/**
+ * @covers SpecialCollection
+ */
 class SpecialCollectionTest extends \PHPUnit_Framework_TestCase {
+   use MediaWikiCoversValidator;
 
public function provideMoveItemInCollection() {
return [
diff --git a/tests/phpunit/includes/BookRendererTest.php 
b/tests/phpunit/includes/BookRendererTest.php
index a46d704..d50ccdb 100644
--- a/tests/phpunit/includes/BookRendererTest.php
+++ b/tests/phpunit/includes/BookRendererTest.php
@@ -7,6 +7,9 @@
 use TemplateParser;
 use Title;
 
+/**
+ * @covers \MediaWiki\Extensions\Collection\BookRenderer
+ */
 class BookRendererTest extends MediaWikiTestCase {
const TEMPLATE_DIR = '/../../../templates';
 
diff --git a/tests/phpunit/includes/DataProviderTest.php 
b/tests/phpunit/includes/DataProviderTest.php
index 91dbddc..76b8e8a 100644
--- a/tests/phpunit/includes/DataProviderTest.php
+++ b/tests/phpunit/includes/DataProviderTest.php
@@ -7,6 +7,9 @@
 use Title;
 use VirtualRESTServiceClient;
 
+/**
+ * @covers \MediaWiki\Extensions\Collection\DataProvider
+ */
 class DataProviderTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/includes/HeadingCounterTest.php 
b/tests/phpunit/includes/HeadingCounterTest.php
index 917e537..fdb3718 100644
--- a/tests/phpunit/includes/HeadingCounterTest.php
+++ b/tests/phpunit/includes/HeadingCounterTest.php
@@ -3,8 +3,13 @@
 namespace MediaWiki\Extensions\Collection;
 
 use LogicException;
+use MediaWikiCoversValidator;
 
+/**
+ * @covers \MediaWiki\Extensions\Collection\HeadingCounter
+ */
 class HeadingCounterTest extends \PHPUnit_Framework_TestCase {
+   use MediaWikiCoversValidator;
 
/**
 * @dataProvider provideIncrementAndGet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I002484ea45adae69bd58be83b011831d89e8d5d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Add @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tags
..


Add @covers tags

Change-Id: Ib8cf432b58470c9218519639379c83254acef1c8
---
M tests/phpunit/AttributeManagerTest.php
M tests/phpunit/BundlerTest.php
M tests/phpunit/ContainmentSetTest.php
M tests/phpunit/DiffParserTest.php
M tests/phpunit/DiscussionParserTest.php
M tests/phpunit/EchoDbFactoryTest.php
M tests/phpunit/HooksTest.php
M tests/phpunit/NotifUserTest.php
M tests/phpunit/UserLocatorTest.php
M tests/phpunit/api/ApiEchoMarkReadTest.php
M tests/phpunit/api/ApiEchoNotificationsTest.php
M tests/phpunit/cache/TitleLocalCacheTest.php
M tests/phpunit/controller/NotificationControllerTest.php
M tests/phpunit/gateway/UserNotificationGatewayTest.php
M tests/phpunit/iterator/FilteredSequentialIteratorTest.php
M tests/phpunit/maintenance/SupressionMaintenanceTest.php
M tests/phpunit/mapper/AbstractMapperTest.php
M tests/phpunit/mapper/EventMapperTest.php
M tests/phpunit/mapper/NotificationMapperTest.php
M tests/phpunit/mapper/TargetPageMapperTest.php
M tests/phpunit/model/NotificationTest.php
M tests/phpunit/model/TargetPageTest.php
22 files changed, 52 insertions(+), 3 deletions(-)

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



diff --git a/tests/phpunit/AttributeManagerTest.php 
b/tests/phpunit/AttributeManagerTest.php
index f9b0c93..25fd443 100644
--- a/tests/phpunit/AttributeManagerTest.php
+++ b/tests/phpunit/AttributeManagerTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/406006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8cf432b58470c9218519639379c83254acef1c8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Assigning eqsin PCCW peering IPs

2018-01-23 Thread Ayounsi (Code Review)

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

Change subject: Assigning eqsin PCCW peering IPs
..


Assigning eqsin PCCW peering IPs

Change-Id: Ib3c0c0c9c43b9ee681caeaa98eff83f931600d8a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
2 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 65e4e65..7593fa7 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -64,7 +64,13 @@
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 ; 2001:df2:e500:fe00::/56 - Infrastructure IPs
+
+; 2001:df2:e500:fe00::/64 - PCCW peering
 $ORIGIN 0.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+;2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   TBD PCCW
+
+
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index 5b4b585..ff525b6 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -38,6 +38,10 @@
 132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
 133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
 
+; 103.102.166.134/31  -- PCCW peering
+134 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+; 135 1H IN PTR   PCCW TBD.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Assigning eqsin PCCW peering IPs

2018-01-23 Thread Ayounsi (Code Review)

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

Change subject: Assigning eqsin PCCW peering IPs
..

Assigning eqsin PCCW peering IPs

Change-Id: Ib3c0c0c9c43b9ee681caeaa98eff83f931600d8a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/11/406011/1

diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 65e4e65..7593fa7 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -64,7 +64,13 @@
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 ; 2001:df2:e500:fe00::/56 - Infrastructure IPs
+
+; 2001:df2:e500:fe00::/64 - PCCW peering
 $ORIGIN 0.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+;2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   TBD PCCW
+
+
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index 5b4b585..ff525b6 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -38,6 +38,10 @@
 132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
 133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
 
+; 103.102.166.134/31  -- PCCW peering
+134 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+; 135 1H IN PTR   PCCW TBD.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Revert "Add vcr cassettes for some classes in wikibase_tests...

2018-01-23 Thread Dalba (Code Review)

Hello John Vandenberg, jenkins-bot, Rafidaslam, Xqt, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "Add vcr cassettes for some classes in wikibase_tests.py"
..

Revert "Add vcr cassettes for some classes in wikibase_tests.py"

Wikidata test is failing on travis-ci. 
https://travis-ci.org/wikimedia/pywikibot/jobs/332124662

This reverts commit 7bc840c690aff853b4e109b924b18f3d953ecf2c.

Change-Id: I19926f79dba6ce358764195380e3c8000eebf89b
---
D tests/cassettes/wikidata.wikidata/TestNamespaces.test_empty_wikibase_page.yaml
D 
tests/cassettes/wikidata.wikidata/TestNamespaces.test_item_unknown_namespace.yaml
D 
tests/cassettes/wikidata.wikidata/TestNamespaces.test_wikibase_namespace_selection.yaml
D tests/cassettes/wikidata.wikidata/TestRedirects.test_normal_item.yaml
D tests/cassettes/wikidata.wikidata/TestRedirects.test_redirect_item.yaml
D tests/cassettes/wikipedia.af/TestLinks.test_iterlinks_filtering.yaml
M tests/wikibase_tests.py
7 files changed, 0 insertions(+), 2,363 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/10/406010/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19926f79dba6ce358764195380e3c8000eebf89b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Rafidaslam 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix][TEST] cc: Get cleanUpSectionHeaders working with tabs

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: [bugfix][TEST] cc: Get cleanUpSectionHeaders working with tabs
..


[bugfix][TEST] cc: Get cleanUpSectionHeaders working with tabs

+ limit heading level to MediaWiki's maximum of 6
+ fix regex for headings containing equal sign
+ replace actual tab character in tests by escape sequence

Bug: T185392
Change-Id: I0bafdf3db015d3bca7622219085307d524b51ee7
---
M pywikibot/cosmetic_changes.py
M tests/cosmetic_changes_tests.py
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index 009eed5..a3dee44 100755
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -649,7 +649,7 @@
 return text
 return textlib.replaceExcept(
 text,
-r'(?m)^(={1,7}) *(?P[^=]+?) *\1 *\r?\n',
+r'(?m)^(={1,6})[ \t]*(?P.*[^\s=])[ \t]*\1[ \t]*\r?\n',
 r'\1 \g \1%s' % config.LS,
 ['comment', 'math', 'nowiki', 'pre'])
 
diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py
index 6e22088..64c6a34 100644
--- a/tests/cosmetic_changes_tests.py
+++ b/tests/cosmetic_changes_tests.py
@@ -72,7 +72,7 @@
  self.cct.removeUselessSpaces(' Foo  bar '))
 # tab
 self.assertEqual('Fo bar',
- self.cct.removeUselessSpaces('Fo bar  '))
+ self.cct.removeUselessSpaces('Fo bar\t'))
 
 def test_removeNonBreakingSpaceBeforePercent(self):
 """Test removeNonBreakingSpaceBeforePercent method."""
@@ -83,6 +83,12 @@
 """Test cleanUpSectionHeaders method."""
 self.assertEqual('=== Header ===\n',
  self.cct.cleanUpSectionHeaders('===Header===\n'))
+# tab
+self.assertEqual('=== Header ===\n',
+ self.cct.cleanUpSectionHeaders('===Header===\t\n'))
+# tabs inside
+self.assertEqual('=== Header ===\n',
+ self.cct.cleanUpSectionHeaders('===\tHeader\t===\n'))
 
 def test_putSpacesInLists(self):
 """Test putSpacesInLists method."""

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bafdf3db015d3bca7622219085307d524b51ee7
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dvorapa 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: Dvorapa 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: TerraCodes 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Public API for the tempWikitextEditor

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Public API for the tempWikitextEditor
..


Public API for the tempWikitextEditor

Allows users to know when the widget has been constructed,
and access it (e.g. to set an initial selection)

Bug: T185279
Change-Id: I3678996bcf644cc889dd168ac3ce48b5c3633ec1
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 7ca66e2..0119981 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -137,6 +137,8 @@
// but hopefully this temporary textarea won't be visible for 
too long.
tempWikitextEditor.adjustSize().moveCursorToStart();
ve.track( 'mwedit.ready', { mode: 'source' } );
+   mw.libs.ve.tempWikitextEditor = tempWikitextEditor;
+   mw.hook( 've.wikitextInteractive' ).fire();
}
 
function syncTempWikitextEditor() {
@@ -161,7 +163,7 @@
function teardownTempWikitextEditor() {
// Destroy widget and placeholder
tempWikitextEditor.$element.remove();
-   tempWikitextEditor = null;
+   mw.libs.ve.tempWikitextEditor = tempWikitextEditor = null;
tempWikitextEditorData = null;
$toolbarPlaceholder.remove();
$toolbarPlaceholder = null;
@@ -392,6 +394,8 @@
if ( mode === 'visual' ) {
// 'mwedit.ready' has already been 
fired for source mode in setupTempWikitextEditor
ve.track( 'mwedit.ready', { mode: mode 
} );
+   } else if ( !tempWikitextEditor ) {
+   mw.hook( 've.wikitextInteractive' 
).fire();
}
ve.track( 'mwedit.loaded', { mode: mode } );
} )

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Sync tempWikitextEditor just before building target, not on ...

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Sync tempWikitextEditor just before building target, not on 
every change
..


Sync tempWikitextEditor just before building target, not on every change

Also ensure tempWikitextEditor is always torn down, even if
target setup fails.

Change-Id: Idc30a9dc00491b8c85353d73cb9ff70afea1d51c
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
4 files changed, 47 insertions(+), 26 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d9f9d40..7ca66e2 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -21,7 +21,7 @@
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, 
veEditSourceUri, isViewPage, isEditPage,
pageCanLoadEditor, init, targetPromise, enable, tempdisable, 
autodisable,
tabPreference, enabledForUser, initialWikitext, oldId,
-   isLoading, tempWikitextEditor, $toolbarPlaceholder,
+   isLoading, tempWikitextEditor, tempWikitextEditorData, 
$toolbarPlaceholder,
editModes = {
edit: 'visual'
},
@@ -101,24 +101,20 @@
init.$loading.detach();
}
if ( tempWikitextEditor ) {
-   // eslint-disable-next-line no-use-before-define
-   ve.init.target.toolbarSetupDeferred.then( 
teardownTempWikitextEditor );
+   if ( ve.init && ve.init.target ) {
+   // eslint-disable-next-line no-use-before-define
+   ve.init.target.toolbarSetupDeferred.then( 
teardownTempWikitextEditor );
+   } else {
+   // Target didn't get created. Teardown editor 
anyway.
+   // eslint-disable-next-line no-use-before-define
+   teardownTempWikitextEditor();
+   }
}
}
 
function setupTempWikitextEditor( data ) {
-   tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( 
{
-   value: data.content,
-   onChange: function () {
-   // Write changes back to response data object,
-   // which will be used to construct the surface.
-   data.content = tempWikitextEditor.getValue();
-   // TODO: Consider writing changes using a
-   // transaction so they can be undone.
-   // For now, just mark surface as pre-modified
-   data.fromEditedState = true;
-   }
-   } );
+   tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( 
{ value: data.content } );
+   tempWikitextEditorData = data;
 
// Create an equal-height placeholder for the toolbar to avoid 
vertical jump
// when the real toolbar is ready.
@@ -143,18 +139,30 @@
ve.track( 'mwedit.ready', { mode: 'source' } );
}
 
+   function syncTempWikitextEditor() {
+   var newContent = tempWikitextEditor.getValue();
+
+   if ( newContent !== tempWikitextEditorData.content ) {
+   // Write changes back to response data object,
+   // which will be used to construct the surface.
+   tempWikitextEditorData.content = newContent;
+   // TODO: Consider writing changes using a
+   // transaction so they can be undone.
+   // For now, just mark surface as pre-modified
+   tempWikitextEditorData.fromEditedState = true;
+   }
+
+   // Store the last-seen selection and pass to the target
+   tempWikitextEditorData.initialSourceRange = 
tempWikitextEditor.getRange();
+
+   tempWikitextEditor.$element.prop( 'readonly', true );
+   }
+
function teardownTempWikitextEditor() {
-   var range,
-   nativeRange = tempWikitextEditor.getRange(),
-   surfaceModel = ve.init.target.getSurface().getModel();
-
-   // Transfer the last-seen selection to the VE surface
-

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Add @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tags
..


Add @covers tags

Change-Id: I1e99261acb13c86e96c1b2dd1cb61918ebc660c2
---
M tests/phpunit/CaptchaAuthenticationRequestTest.php
M tests/phpunit/CaptchaPreAuthenticationProviderTest.php
M tests/phpunit/HTMLFancyCaptchaFieldTest.php
M tests/phpunit/HTMLReCaptchaFieldTest.php
M tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
M tests/phpunit/HTMLSubmittedValueFieldTest.php
M tests/phpunit/QuestyCaptchaTest.php
M tests/phpunit/ReCaptchaAuthenticationRequestTest.php
M tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php
M tests/phpunit/SimpleCaptcha/CaptchaTest.php
10 files changed, 28 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/CaptchaAuthenticationRequestTest.php 
b/tests/phpunit/CaptchaAuthenticationRequestTest.php
index 31f8ab0..380716f 100644
--- a/tests/phpunit/CaptchaAuthenticationRequestTest.php
+++ b/tests/phpunit/CaptchaAuthenticationRequestTest.php
@@ -2,6 +2,9 @@
 
 use MediaWiki\Auth\AuthenticationRequestTestCase;
 
+/**
+ * @covers CaptchaAuthenticationRequest
+ */
 class CaptchaAuthenticationRequestTest extends AuthenticationRequestTestCase {
public function setUp() {
parent::setUp();
diff --git a/tests/phpunit/CaptchaPreAuthenticationProviderTest.php 
b/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
index eb06f5a..8e56c36 100644
--- a/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
+++ b/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
@@ -5,6 +5,7 @@
 use Wikimedia\TestingAccessWrapper;
 
 /**
+ * @covers CaptchaPreAuthenticationProvider
  * @group Database
  */
 class CaptchaPreAuthenticationProviderTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/HTMLFancyCaptchaFieldTest.php 
b/tests/phpunit/HTMLFancyCaptchaFieldTest.php
index 9c3bbe3..37fa727 100644
--- a/tests/phpunit/HTMLFancyCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLFancyCaptchaFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . '/../../FancyCaptcha/HTMLFancyCaptchaField.php';
 
+/**
+ * @covers HTMLFancyCaptchaField
+ */
 class HTMLFancyCaptchaFieldTest extends PHPUnit_Framework_TestCase {
public function testGetHTML() {
$html = $this->getForm( [ 'imageUrl' => 'https://example.com/' 
] )->getHTML( false );
diff --git a/tests/phpunit/HTMLReCaptchaFieldTest.php 
b/tests/phpunit/HTMLReCaptchaFieldTest.php
index 0ec600f..0754cd7 100644
--- a/tests/phpunit/HTMLReCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLReCaptchaFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . '/../../ReCaptcha/HTMLReCaptchaField.php';
 
+/**
+ * @covers HTMLReCaptchaField
+ */
 class HTMLReCaptchaFieldTest extends PHPUnit_Framework_TestCase {
public function testSubmit() {
$form = new HTMLForm( [
diff --git a/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php 
b/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
index 206f8fa..cc14e36 100644
--- a/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . 
'/../../ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php';
 
+/**
+ * @covers HTMLReCaptchaNoCaptchaField
+ */
 class HTMLReCaptchaNoCaptchaFieldTest extends PHPUnit_Framework_TestCase {
public function testSubmit() {
$form = new HTMLForm( [
diff --git a/tests/phpunit/HTMLSubmittedValueFieldTest.php 
b/tests/phpunit/HTMLSubmittedValueFieldTest.php
index 8fa114c..4029a8c 100644
--- a/tests/phpunit/HTMLSubmittedValueFieldTest.php
+++ b/tests/phpunit/HTMLSubmittedValueFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . '/../../ReCaptcha/HTMLSubmittedValueField.php';
 
+/**
+ * @covers HTMLSubmittedValueField
+ */
 class HTMLSubmittedValueFieldTest extends PHPUnit_Framework_TestCase {
public function testSubmit() {
$form = new HTMLForm( [
diff --git a/tests/phpunit/QuestyCaptchaTest.php 
b/tests/phpunit/QuestyCaptchaTest.php
index 5a9480a..e76469b 100644
--- a/tests/phpunit/QuestyCaptchaTest.php
+++ b/tests/phpunit/QuestyCaptchaTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/406002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e99261acb13c86e96c1b2dd1cb61918ebc660c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...EmailAuth[master]: Add @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tags
..


Add @covers tags

Change-Id: I563018db8baaeba1066537a42435df90d42eee3d
---
M tests/phpunit/EmailAuthAuthenticationRequestTest.php
M tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/EmailAuthAuthenticationRequestTest.php 
b/tests/phpunit/EmailAuthAuthenticationRequestTest.php
index 82c8db8..2e0280f 100644
--- a/tests/phpunit/EmailAuthAuthenticationRequestTest.php
+++ b/tests/phpunit/EmailAuthAuthenticationRequestTest.php
@@ -4,6 +4,9 @@
 
 use MediaWiki\Auth\AuthenticationRequestTestCase;
 
+/**
+ * @covers \MediaWiki\Extensions\EmailAuth\EmailAuthAuthenticationRequest
+ */
 class EmailAuthAuthenticationRequestTest extends AuthenticationRequestTestCase 
{
protected function getInstance( array $args = [] ) {
return new EmailAuthAuthenticationRequest();
diff --git a/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php 
b/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
index a237eba..5ef6f1d 100644
--- a/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
+++ b/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
@@ -12,6 +12,9 @@
 use User;
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers 
\MediaWiki\Extensions\EmailAuth\EmailAuthSecondaryAuthenticationProvider
+ */
 class EmailAuthSecondaryAuthenticationProviderTest extends MediaWikiTestCase {
/** @var 
EmailAuthSecondaryAuthenticationProvider|PHPUnit_Framework_MockObject_MockObject
 */
protected $provider;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I563018db8baaeba1066537a42435df90d42eee3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ExtensionDistributor[master]: Tweak @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Tweak @covers tags
..


Tweak @covers tags

Change-Id: I0d83aa5b93696c21e0583f48cae5a494701690f4
---
M tests/phpunit/specials/SpecialExtensionDistributorTest.php
M tests/phpunit/specials/SpecialSkinDistributorTest.php
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/specials/SpecialExtensionDistributorTest.php 
b/tests/phpunit/specials/SpecialExtensionDistributorTest.php
index 2a4b28d..2e7cdb9 100644
--- a/tests/phpunit/specials/SpecialExtensionDistributorTest.php
+++ b/tests/phpunit/specials/SpecialExtensionDistributorTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @covers SpecialExtensionDistributor
+ * @covers SpecialBaseDistributor
  *
  * @group SpecialPage
  *
diff --git a/tests/phpunit/specials/SpecialSkinDistributorTest.php 
b/tests/phpunit/specials/SpecialSkinDistributorTest.php
index 698c459..7344359 100644
--- a/tests/phpunit/specials/SpecialSkinDistributorTest.php
+++ b/tests/phpunit/specials/SpecialSkinDistributorTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @covers SpecialSkinDistributor
+ * @covers SpecialBaseDistributor
  *
  * @group SpecialPage
  *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d83aa5b93696c21e0583f48cae5a494701690f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Add @covers tag

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tag
..


Add @covers tag

Change-Id: Idd3ee3ad400854973933f80da5d0ff5e307aa1ea
---
M tests/phpunit/DateManipulatorTest.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/DateManipulatorTest.php 
b/tests/phpunit/DateManipulatorTest.php
index 4446104..db818a6 100644
--- a/tests/phpunit/DateManipulatorTest.php
+++ b/tests/phpunit/DateManipulatorTest.php
@@ -6,6 +6,9 @@
 
 use ContentTranslation\DateManipulator;
 
+/**
+ * @covers \ContentTranslation\DateManipulator
+ */
 class DateManipulatorTest extends \PHPUnit_Framework_TestCase {
public function testConstructor() {
$this->assertInstanceOf(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd3ee3ad400854973933f80da5d0ff5e307aa1ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Adds PageQualityLevelLookup

2018-01-23 Thread Tpt (Code Review)

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

Change subject: Adds PageQualityLevelLookup
..

Adds PageQualityLevelLookup

Change-Id: Ief0459292f90b742337f68d622e638a40c41bf38
---
M ProofreadPage.body.php
M extension.json
M includes/Context.php
M includes/Page/ProofreadPageDbConnector.php
M includes/Parser/PagesTagParser.php
A includes/page/DatabasePageQualityLevelLookup.php
A includes/page/PageQualityLevelLookup.php
M tests/phpunit/ContextTest.php
A tests/phpunit/Page/DatabasePageQualityLevelLookupTest.php
A tests/phpunit/Page/PageQualityLevelLookupMock.php
M tests/phpunit/ProofreadPageTestCase.php
11 files changed, 267 insertions(+), 149 deletions(-)


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

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index b50dea5..8f00ac4 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -146,72 +146,39 @@
 
/**
 * Hook function
-* @param array $page_ids Prefixed DB keys of the pages linked to, 
indexed by page_id
+* @param array $pageIds Prefixed DB keys of the pages linked to, 
indexed by page_id
 * @param array &$colours CSS classes, indexed by prefixed DB keys
 * @return bool
 */
-   public static function onGetLinkColours( $page_ids, &$colours ) {
+   public static function onGetLinkColours( $pageIds, &$colours ) {
global $wgTitle;
if ( !isset( $wgTitle ) ) {
return true;
}
-   self::getLinkColours( $page_ids, $colours );
+
+   $inIndexNamespace = $wgTitle->inNamespace( 
self::getIndexNamespaceId() );
+   $pageQualityLevelLookup = 
Context::getDefaultContext()->getPageQualityLevelLookup();
+
+   $pageTitles = array_map( function ( $prefixedDbKey ) {
+   return Title::newFromText( $prefixedDbKey );
+   }, $pageIds );
+   $pageQualityLevelLookup->prefetchQualityLevelForTitles( 
$pageTitles );
+
+   /** @var Title|null $pageTitle */
+   foreach ( $pageTitles as $pageTitle ) {
+   if ( $pageTitle !== null && $pageTitle->inNamespace( 
self::getPageNamespaceId() ) ) {
+   $pageLevel = 
$pageQualityLevelLookup->getQualityLevelForPageTitle( $pageTitle );
+   if ( $pageLevel !== null ) {
+   $classes = 
"prp-pagequality-{$pageLevel}";
+   if ( $inIndexNamespace ) {
+   $classes .= " 
quality{$pageLevel}";
+   }
+   
$colours[$pageTitle->getPrefixedDBkey()] = $classes;
+   }
+   }
+   }
+
return true;
-   }
-
-   /**
-* Return the quality colour codes to pages linked from an index page
-* @param array $page_ids Prefixed DB keys of the pages linked to, 
indexed by page_id
-* @param array $colours CSS classes, indexed by prefixed DB keys
-*/
-   private static function getLinkColours( $page_ids, &$colours ) {
-   global $wgTitle;
-
-   $page_namespace_id = self::getPageNamespaceId();
-   $in_index_namespace = $wgTitle->inNamespace( 
self::getIndexNamespaceId() );
-
-   $values = [];
-   foreach ( $page_ids as $id => $pdbk ) {
-   $title = Title::newFromText( $pdbk );
-   // consider only link in page namespace
-   if ( $title->inNamespace( $page_namespace_id ) ) {
-   if ( $in_index_namespace ) {
-   $colours[$pdbk] = 'quality1 
prp-pagequality-1';
-   } else {
-   $colours[$pdbk] = 'prp-pagequality-1';
-   }
-   $values[] = intval( $id );
-   }
-   }
-
-   // Get the names of the quality categories.  Replaces earlier 
code which
-   // called wfMessage()->inContentLanguagE() 5 times for each 
page.
-   // ISSUE: Should the number of quality levels be adjustable?
-   // ISSUE 2: Should this array be saved as a member variable?
-   // How often is this code called anyway?
-   $qualityCategories = [];
-   for ( $i = 0; $i < 5; $i++ ) {
-   $cat = Title::makeTitleSafe( NS_CATEGORY,
-   wfMessage( "proofreadpage_quality{$i}_category" 
)->inContentLanguage()->text() );
-   if ( $cat ) {
-

[MediaWiki-commits] [Gerrit] mediawiki...CookieWarning[master]: Add @covers tag

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tag
..


Add @covers tag

Change-Id: Ie424a310f6a30c820cb692fa2ddcb25087868837
---
M tests/phpunit/includes/CookieWarning.hooksTest.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/CookieWarning.hooksTest.php 
b/tests/phpunit/includes/CookieWarning.hooksTest.php
index 115c3cc..e7e46af 100644
--- a/tests/phpunit/includes/CookieWarning.hooksTest.php
+++ b/tests/phpunit/includes/CookieWarning.hooksTest.php
@@ -1,5 +1,6 @@
 https://gerrit.wikimedia.org/r/406005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie424a310f6a30c820cb692fa2ddcb25087868837
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CookieWarning
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Add @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tags
..


Add @covers tags

Change-Id: I6301074db667e2ac12bb4954b813d55def939ea3
---
M tests/phpunit/CollaborationHubContentHandlerTest.php
M tests/phpunit/CollaborationHubContentTest.php
M tests/phpunit/CollaborationHubTOCTest.php
M tests/phpunit/CollaborationKitImageTest.php
M tests/phpunit/CollaborationListContentHandlerTest.php
M tests/phpunit/CollaborationListContentTest.php
6 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/CollaborationHubContentHandlerTest.php 
b/tests/phpunit/CollaborationHubContentHandlerTest.php
index c3a93e1..6ef6889 100644
--- a/tests/phpunit/CollaborationHubContentHandlerTest.php
+++ b/tests/phpunit/CollaborationHubContentHandlerTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationHubContentHandler
+ */
 class CollaborationHubContentHandlerTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/CollaborationHubContentTest.php 
b/tests/phpunit/CollaborationHubContentTest.php
index bdd3cce..d0f3ee5 100644
--- a/tests/phpunit/CollaborationHubContentTest.php
+++ b/tests/phpunit/CollaborationHubContentTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationHubContent
+ */
 class CollaborationHubContentTest extends MediaWikiTestCase {
 
private $content;
diff --git a/tests/phpunit/CollaborationHubTOCTest.php 
b/tests/phpunit/CollaborationHubTOCTest.php
index 4751900..5bb5f7d 100644
--- a/tests/phpunit/CollaborationHubTOCTest.php
+++ b/tests/phpunit/CollaborationHubTOCTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationHubTOC
+ */
 class CollaborationHubTOCTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/CollaborationKitImageTest.php 
b/tests/phpunit/CollaborationKitImageTest.php
index 0e60e10..2f89644 100644
--- a/tests/phpunit/CollaborationKitImageTest.php
+++ b/tests/phpunit/CollaborationKitImageTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationKitImage
+ */
 class CollaborationKitImageTest extends MediaWikiTestCase {
 
private $str;
diff --git a/tests/phpunit/CollaborationListContentHandlerTest.php 
b/tests/phpunit/CollaborationListContentHandlerTest.php
index 9c4c03b..0c0dcd9 100644
--- a/tests/phpunit/CollaborationListContentHandlerTest.php
+++ b/tests/phpunit/CollaborationListContentHandlerTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationListContentHandler
+ */
 class CollaborationListContentHandlerTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/CollaborationListContentTest.php 
b/tests/phpunit/CollaborationListContentTest.php
index 15c1aeb..35111fc 100644
--- a/tests/phpunit/CollaborationListContentTest.php
+++ b/tests/phpunit/CollaborationListContentTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationListContent
+ */
 class CollaborationListContentTest extends MediaWikiTestCase {
 
private $content;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6301074db667e2ac12bb4954b813d55def939ea3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: revthank: Clarify confirmation message and change yes/no mes...

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: revthank: Clarify confirmation message and change yes/no 
messages
..


revthank: Clarify confirmation message and change yes/no messages

Bug: T159302
Change-Id: I49ac7d644f207fe76a49efd650b727e33049b3af
---
M extension.json
M i18n/en.json
M modules/ext.thanks.revthank.js
3 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5e30b49..89dbae3 100644
--- a/extension.json
+++ b/extension.json
@@ -76,7 +76,7 @@
"thanks-confirmation2",
"thanks-thank-tooltip-no",
"thanks-thank-tooltip-yes",
-   "ok",
+   "thanks-button-thank",
"cancel"
],
"dependencies": [
diff --git a/i18n/en.json b/i18n/en.json
index 80d8501..50464f4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -22,7 +22,7 @@
"thanks-thank-tooltip": "{{GENDER:$1|Send}} a thank you notification to 
this {{GENDER:$2|user}}",
"thanks-thank-tooltip-no": "{{GENDER:$1|Cancel}} the thank you 
notification",
"thanks-thank-tooltip-yes": "{{GENDER:$1|Send}} the thank you 
notification",
-   "thanks-confirmation2": "{{GENDER:$1|Send}} public thanks for this 
edit?",
+   "thanks-confirmation2": "All thanks are public. {{GENDER:$1|Send}} 
thanks?",
"thanks-thanked-notice": "{{GENDER:$3|You}} thanked $1 for 
{{GENDER:$2|his|her|their}} edit.",
"thanks": "Send thanks",
"thanks-submit": "Send thanks",
diff --git a/modules/ext.thanks.revthank.js b/modules/ext.thanks.revthank.js
index e577d28..cf4e5c3 100644
--- a/modules/ext.thanks.revthank.js
+++ b/modules/ext.thanks.revthank.js
@@ -64,7 +64,9 @@
$thankLink.confirmable( {
i18n: {
confirm: mw.msg( 
'thanks-confirmation2', mw.user ),
+   no: mw.msg( 'cancel' ),
noTitle: mw.msg( 
'thanks-thank-tooltip-no', mw.user ),
+   yes: mw.msg( 'thanks-button-thank', 
mw.user, $thankLink.data( 'recipient-gender' ) ),
yesTitle: mw.msg( 
'thanks-thank-tooltip-yes', mw.user )
},
handler: function ( e ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49ac7d644f207fe76a49efd650b727e33049b3af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
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...ExtensionDistributor[master]: Tweak @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Tweak @covers tags
..

Tweak @covers tags

Change-Id: I0d83aa5b93696c21e0583f48cae5a494701690f4
---
M tests/phpunit/specials/SpecialExtensionDistributorTest.php
M tests/phpunit/specials/SpecialSkinDistributorTest.php
2 files changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/specials/SpecialExtensionDistributorTest.php 
b/tests/phpunit/specials/SpecialExtensionDistributorTest.php
index 2a4b28d..2e7cdb9 100644
--- a/tests/phpunit/specials/SpecialExtensionDistributorTest.php
+++ b/tests/phpunit/specials/SpecialExtensionDistributorTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @covers SpecialExtensionDistributor
+ * @covers SpecialBaseDistributor
  *
  * @group SpecialPage
  *
diff --git a/tests/phpunit/specials/SpecialSkinDistributorTest.php 
b/tests/phpunit/specials/SpecialSkinDistributorTest.php
index 698c459..7344359 100644
--- a/tests/phpunit/specials/SpecialSkinDistributorTest.php
+++ b/tests/phpunit/specials/SpecialSkinDistributorTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @covers SpecialSkinDistributor
+ * @covers SpecialBaseDistributor
  *
  * @group SpecialPage
  *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d83aa5b93696c21e0583f48cae5a494701690f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.31.0-wmf.17]: NWE: Don't attempt to set selection on unattached textarea

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: NWE: Don't attempt to set selection on unattached textarea
..


NWE: Don't attempt to set selection on unattached textarea

Prevents an exception being thrown in Firefox <= 52.

Bug: T185304
Change-Id: Ic9a43e3cf12d4cc566cebb328f8e807e464af634
(cherry picked from commit f2568c8d7db19b8ad594bbcff11194ed6e062677)
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
2 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index a737d41..832dadc 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -139,7 +139,8 @@
 
// Resize the textarea to fit content. We could do this more 
often (e.g. on change)
// but hopefully this temporary textarea won't be visible for 
too long.
-   tempWikitextEditor.adjustSize().focus();
+   // Support: Firefox =< 52
+   tempWikitextEditor.adjustSize().moveCursorToStart();
ve.track( 'mwedit.ready', { mode: 'source' } );
}
 
diff --git a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js 
b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
index 829ef78..5bc228c 100644
--- a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
+++ b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
@@ -34,9 +34,18 @@
} )
.val( config.value )
.on( 'input', config.onChange );
+};
 
+/**
+ * Focus the input and move the cursor to the start.
+ *
+ * @chainable
+ */
+mw.libs.ve.MWTempWikitextEditorWidget.prototype.moveCursorToStart = function 
() {
// Move cursor to start
this.$element[ 0 ].setSelectionRange( 0, 0 );
+   this.focus();
+   return this;
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9a43e3cf12d4cc566cebb328f8e807e464af634
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.31.0-wmf.17
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Mattflaschen 
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...EmailAuth[master]: Add @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags
..

Add @covers tags

Change-Id: I563018db8baaeba1066537a42435df90d42eee3d
---
M tests/phpunit/EmailAuthAuthenticationRequestTest.php
M tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
2 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/EmailAuthAuthenticationRequestTest.php 
b/tests/phpunit/EmailAuthAuthenticationRequestTest.php
index 82c8db8..2e0280f 100644
--- a/tests/phpunit/EmailAuthAuthenticationRequestTest.php
+++ b/tests/phpunit/EmailAuthAuthenticationRequestTest.php
@@ -4,6 +4,9 @@
 
 use MediaWiki\Auth\AuthenticationRequestTestCase;
 
+/**
+ * @covers \MediaWiki\Extensions\EmailAuth\EmailAuthAuthenticationRequest
+ */
 class EmailAuthAuthenticationRequestTest extends AuthenticationRequestTestCase 
{
protected function getInstance( array $args = [] ) {
return new EmailAuthAuthenticationRequest();
diff --git a/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php 
b/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
index a237eba..5ef6f1d 100644
--- a/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
+++ b/tests/phpunit/EmailAuthSecondaryAuthenticationProviderTest.php
@@ -12,6 +12,9 @@
 use User;
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers 
\MediaWiki\Extensions\EmailAuth\EmailAuthSecondaryAuthenticationProvider
+ */
 class EmailAuthSecondaryAuthenticationProviderTest extends MediaWikiTestCase {
/** @var 
EmailAuthSecondaryAuthenticationProvider|PHPUnit_Framework_MockObject_MockObject
 */
protected $provider;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I563018db8baaeba1066537a42435df90d42eee3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Add @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags
..

Add @covers tags

Change-Id: Ib8cf432b58470c9218519639379c83254acef1c8
---
M tests/phpunit/AttributeManagerTest.php
M tests/phpunit/BundlerTest.php
M tests/phpunit/ContainmentSetTest.php
M tests/phpunit/DiffParserTest.php
M tests/phpunit/DiscussionParserTest.php
M tests/phpunit/EchoDbFactoryTest.php
M tests/phpunit/HooksTest.php
M tests/phpunit/NotifUserTest.php
M tests/phpunit/UserLocatorTest.php
M tests/phpunit/api/ApiEchoMarkReadTest.php
M tests/phpunit/api/ApiEchoNotificationsTest.php
M tests/phpunit/cache/TitleLocalCacheTest.php
M tests/phpunit/controller/NotificationControllerTest.php
M tests/phpunit/gateway/UserNotificationGatewayTest.php
M tests/phpunit/iterator/FilteredSequentialIteratorTest.php
M tests/phpunit/maintenance/SupressionMaintenanceTest.php
M tests/phpunit/mapper/AbstractMapperTest.php
M tests/phpunit/mapper/EventMapperTest.php
M tests/phpunit/mapper/NotificationMapperTest.php
M tests/phpunit/mapper/TargetPageMapperTest.php
M tests/phpunit/model/NotificationTest.php
M tests/phpunit/model/TargetPageTest.php
22 files changed, 52 insertions(+), 3 deletions(-)


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

diff --git a/tests/phpunit/AttributeManagerTest.php 
b/tests/phpunit/AttributeManagerTest.php
index f9b0c93..25fd443 100644
--- a/tests/phpunit/AttributeManagerTest.php
+++ b/tests/phpunit/AttributeManagerTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/406006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: MWMultiVersion: don't add --wiki is it's already present

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: MWMultiVersion: don't add --wiki is it's already present
..


MWMultiVersion: don't add --wiki is it's already present

Otherwise, stuff like SiteConfiguration::getConfig() breaks

Change-Id: I5d7a257e7e7875b87b529cf8c698de73cc807be6
---
M puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git 
a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb 
b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
index f8ecf8f..9b2db18 100644
--- a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
+++ b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
@@ -186,8 +186,10 @@
global $IP;
if ( strpos( $script, "{$IP}/" ) === 0 ) {
$script = substr( $script, strlen( "{$IP}/" ) );
-   $wiki = wfWikiId();
-   array_unshift( $params, "--wiki=$wiki" );
+   if ( strpos( $params[0], '--wiki' ) !== 0 ) {
+   $wiki = wfWikiId();
+   array_unshift( $params, "--wiki=$wiki" );
+   }
$options['wrapper'] = __DIR__ . '/MWScript.php';
}
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d7a257e7e7875b87b529cf8c698de73cc807be6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack::main: move standard/firewall includes to roles

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: openstack::main: move standard/firewall includes to roles
..


openstack::main: move standard/firewall includes to roles

Change-Id: Ife0ca839c9e821c7fa8bfdbd4a92d67af2782d4d
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
M modules/role/manifests/wmcs/openstack/main/services_primary.pp
M modules/role/manifests/wmcs/openstack/main/services_secondary.pp
M modules/role/manifests/wmcs/openstack/main/wikitech.pp
5 files changed, 7 insertions(+), 11 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 0c6c313..2ca7f64 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -903,15 +903,11 @@
 # and the powerdns auth and recursive services for instances.
 node 'labservices1001.wikimedia.org' {
 role(wmcs::openstack::main::services_primary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
 node 'labservices1002.wikimedia.org' {
 role(wmcs::openstack::main::services_secondary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1078,8 +1074,6 @@
 
 node 'labcontrol1001.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1091,8 +1085,6 @@
 #  'keystone endpoint-create' and 'keystone endpoint-delete.'
 node 'labcontrol1002.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1925,9 +1917,6 @@
 node 'silver.wikimedia.org' {
 role(wmcs::openstack::main::wikitech)
 include ::role::mariadb::wikitech
-include ::base::firewall
-include ::standard
-
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/wmcs/openstack/main/control.pp 
b/modules/role/manifests/wmcs/openstack/main/control.pp
index ae03aa8..8531daa 100644
--- a/modules/role/manifests/wmcs/openstack/main/control.pp
+++ b/modules/role/manifests/wmcs/openstack/main/control.pp
@@ -1,6 +1,7 @@
 class role::wmcs::openstack::main::control {
 system::role { $name: }
 include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::rabbitmq
 include ::profile::openstack::main::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_primary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
index eb4b1ec..ca0e8a4 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_primary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_primary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
index 1653e6a..ed2c8b1 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_secondary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/wikitech.pp 
b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
index a6997ed..1496a4f 100644
--- a/modules/role/manifests/wmcs/openstack/main/wikitech.pp
+++ b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::wikitech {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::wikitech::service

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CookieWarning[master]: Add @covers tag

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tag
..

Add @covers tag

Change-Id: Ie424a310f6a30c820cb692fa2ddcb25087868837
---
M tests/phpunit/includes/CookieWarning.hooksTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/tests/phpunit/includes/CookieWarning.hooksTest.php 
b/tests/phpunit/includes/CookieWarning.hooksTest.php
index 115c3cc..e7e46af 100644
--- a/tests/phpunit/includes/CookieWarning.hooksTest.php
+++ b/tests/phpunit/includes/CookieWarning.hooksTest.php
@@ -1,5 +1,6 @@
 https://gerrit.wikimedia.org/r/406005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie424a310f6a30c820cb692fa2ddcb25087868837
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CookieWarning
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Add @covers tag

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tag
..

Add @covers tag

Change-Id: Idd3ee3ad400854973933f80da5d0ff5e307aa1ea
---
M tests/phpunit/DateManipulatorTest.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/DateManipulatorTest.php 
b/tests/phpunit/DateManipulatorTest.php
index 4446104..db818a6 100644
--- a/tests/phpunit/DateManipulatorTest.php
+++ b/tests/phpunit/DateManipulatorTest.php
@@ -6,6 +6,9 @@
 
 use ContentTranslation\DateManipulator;
 
+/**
+ * @covers \ContentTranslation\DateManipulator
+ */
 class DateManipulatorTest extends \PHPUnit_Framework_TestCase {
public function testConstructor() {
$this->assertInstanceOf(

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack::main: move standard/firewall includes to roles

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: openstack::main: move standard/firewall includes to roles
..

openstack::main: move standard/firewall includes to roles

Change-Id: Ife0ca839c9e821c7fa8bfdbd4a92d67af2782d4d
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
M modules/role/manifests/wmcs/openstack/main/services_primary.pp
M modules/role/manifests/wmcs/openstack/main/services_secondary.pp
M modules/role/manifests/wmcs/openstack/main/wikitech.pp
5 files changed, 7 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/406003/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 0eda878..31ea2e4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -907,15 +907,11 @@
 # and the powerdns auth and recursive services for instances.
 node 'labservices1001.wikimedia.org' {
 role(wmcs::openstack::main::services_primary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
 node 'labservices1002.wikimedia.org' {
 role(wmcs::openstack::main::services_secondary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1082,8 +1078,6 @@
 
 node 'labcontrol1001.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1095,8 +1089,6 @@
 #  'keystone endpoint-create' and 'keystone endpoint-delete.'
 node 'labcontrol1002.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1929,9 +1921,6 @@
 node 'silver.wikimedia.org' {
 role(wmcs::openstack::main::wikitech)
 include ::role::mariadb::wikitech
-include ::base::firewall
-include ::standard
-
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/wmcs/openstack/main/control.pp 
b/modules/role/manifests/wmcs/openstack/main/control.pp
index ae03aa8..8531daa 100644
--- a/modules/role/manifests/wmcs/openstack/main/control.pp
+++ b/modules/role/manifests/wmcs/openstack/main/control.pp
@@ -1,6 +1,7 @@
 class role::wmcs::openstack::main::control {
 system::role { $name: }
 include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::rabbitmq
 include ::profile::openstack::main::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_primary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
index eb4b1ec..ca0e8a4 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_primary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_primary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
index 1653e6a..ed2c8b1 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_secondary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/wikitech.pp 
b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
index a6997ed..1496a4f 100644
--- a/modules/role/manifests/wmcs/openstack/main/wikitech.pp
+++ b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::wikitech {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::wikitech::service

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs::puppetmaster: move standard/firewall include to roles

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: wmcs::puppetmaster: move standard/firewall include to roles
..


wmcs::puppetmaster: move standard/firewall include to roles

Change-Id: Ifc7479dcccab94cc4fb0fea5a4b1f9f1ed8806ba
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 0eda878..0c6c313 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -891,15 +891,11 @@
 
 node 'labpuppetmaster1001.wikimedia.org' {
 role(wmcs::openstack::main::puppetmaster::frontend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
 node 'labpuppetmaster1002.wikimedia.org' {
 role(wmcs::openstack::main::puppetmaster::backend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp 
b/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
index abb28d6..04ad540 100644
--- a/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
+++ b/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::puppetmaster::backend {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::puppetmaster::backend
diff --git 
a/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp 
b/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
index 88e3b14..6a879cb 100644
--- a/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
+++ b/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::puppetmaster::frontend {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::puppetmaster::frontend

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use jQuery 3 .catch( fn ) instead of .then( null, fn )

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Use jQuery 3 .catch( fn ) instead of .then( null, fn )
..


Use jQuery 3 .catch( fn ) instead of .then( null, fn )

Change-Id: I676eec0acf25690c2b2dd0b9a414be5fee887395
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d9f9d40..48ea296 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -207,8 +207,7 @@
mw.libs.ve.targetLoader.addPlugin( 
function () {
// Run 
VisualEditorPreloadModules, but if they fail, we still want to continue
// loading, so convert failure 
to success
-   return mw.loader.using( 
conf.preloadModules ).then(
-   null,
+   return mw.loader.using( 
conf.preloadModules ).catch(
function () {
return 
$.Deferred().resolve();
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Add @covers tag

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tag
..


Add @covers tag

Change-Id: I390ce3ee59e607c329249363d11cdde26c83a23c
---
M tests/phpunit/WorkflowTest.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/tests/phpunit/WorkflowTest.php b/tests/phpunit/WorkflowTest.php
index 9c79f19..ec20cd9 100644
--- a/tests/phpunit/WorkflowTest.php
+++ b/tests/phpunit/WorkflowTest.php
@@ -12,6 +12,7 @@
 use User;
 
 /**
+ * @covers \ArticleCreationWorkflow\Workflow
  * @group ArticleCreationWorkflow
  */
 class WorkflowTest extends MediaWikiTestCase {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I390ce3ee59e607c329249363d11cdde26c83a23c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: 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...Thanks[master]: revthank: Embed gender of thanks recipients in the page

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: revthank: Embed gender of thanks recipients in the page
..


revthank: Embed gender of thanks recipients in the page

That way we don't have to do an API request to get the gender,
and we'll also be able to use gender-sensitive messages in the
confirmation step.

Bug: T159302
Change-Id: I9097bd976f8da1632577a3f4438b9f1186baca88
---
M Thanks.hooks.php
M modules/ext.thanks.revthank.js
2 files changed, 8 insertions(+), 15 deletions(-)

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



diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index a55c7fb..e325d98 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -113,6 +113,7 @@
'href' => SpecialPage::getTitleFor( 'Thanks', 
$rev->getId() )->getFullURL(),
'title' => $tooltip,
'data-revision-id' => $rev->getId(),
+   'data-recipient-gender' => 
$recipient->getOption( 'gender' ) ?: 'unknown',
],
wfMessage( 'thanks-thank', $wgUser, 
$recipient->getName() )->text()
);
diff --git a/modules/ext.thanks.revthank.js b/modules/ext.thanks.revthank.js
index 872703d..e577d28 100644
--- a/modules/ext.thanks.revthank.js
+++ b/modules/ext.thanks.revthank.js
@@ -36,11 +36,9 @@
.then(
// Success
function () {
-   var username = $thankLink.closest(
-   source === 'history' ? 'li' : 
'td'
-   ).find( 'a.mw-userlink' ).text();
-   // Get the user who was thanked (for 
gender purposes)
-   return mw.thanks.getUserGender( 
username );
+   $thankElement.before( mw.message( 
'thanks-thanked', mw.user, $thankLink.data( 'recipient-gender' ) ).escaped() );
+   $thankElement.remove();
+   mw.thanks.thanked.push( $thankLink );
},
// Fail
function ( errorCode ) {
@@ -57,31 +55,25 @@
OO.ui.alert( mw.msg( 
'thanks-error-undefined', errorCode ) );
}
}
-   )
-   .then( function ( recipientGender ) {
-   $thankElement.before( mw.message( 
'thanks-thanked', mw.user, recipientGender ).escaped() );
-   $thankElement.remove();
-   mw.thanks.thanked.push( $thankLink );
-   } );
+   );
}
 
function addActionToLinks( $content ) {
+   var $thankLink = $content.find( 'a.mw-thanks-thank-link' );
if ( mw.config.get( 'thanks-confirmation-required' ) ) {
-   $content.find( 'a.mw-thanks-thank-link' ).confirmable( {
+   $thankLink.confirmable( {
i18n: {
confirm: mw.msg( 
'thanks-confirmation2', mw.user ),
noTitle: mw.msg( 
'thanks-thank-tooltip-no', mw.user ),
yesTitle: mw.msg( 
'thanks-thank-tooltip-yes', mw.user )
},
handler: function ( e ) {
-   var $thankLink = $( this );
e.preventDefault();
sendThanks( $thankLink, 
$thankLink.closest( '.jquery-confirmable-wrapper' ) );
}
} );
} else {
-   $content.find( 'a.mw-thanks-thank-link' ).click( 
function ( e ) {
-   var $thankLink = $( this );
+   $thankLink.click( function ( e ) {
e.preventDefault();
sendThanks( $thankLink, $thankLink );
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9097bd976f8da1632577a3f4438b9f1186baca88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Add @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags
..

Add @covers tags

Change-Id: I1e99261acb13c86e96c1b2dd1cb61918ebc660c2
---
M tests/phpunit/CaptchaAuthenticationRequestTest.php
M tests/phpunit/CaptchaPreAuthenticationProviderTest.php
M tests/phpunit/HTMLFancyCaptchaFieldTest.php
M tests/phpunit/HTMLReCaptchaFieldTest.php
M tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
M tests/phpunit/HTMLSubmittedValueFieldTest.php
M tests/phpunit/QuestyCaptchaTest.php
M tests/phpunit/ReCaptchaAuthenticationRequestTest.php
M tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php
M tests/phpunit/SimpleCaptcha/CaptchaTest.php
10 files changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/02/406002/1

diff --git a/tests/phpunit/CaptchaAuthenticationRequestTest.php 
b/tests/phpunit/CaptchaAuthenticationRequestTest.php
index 31f8ab0..380716f 100644
--- a/tests/phpunit/CaptchaAuthenticationRequestTest.php
+++ b/tests/phpunit/CaptchaAuthenticationRequestTest.php
@@ -2,6 +2,9 @@
 
 use MediaWiki\Auth\AuthenticationRequestTestCase;
 
+/**
+ * @covers CaptchaAuthenticationRequest
+ */
 class CaptchaAuthenticationRequestTest extends AuthenticationRequestTestCase {
public function setUp() {
parent::setUp();
diff --git a/tests/phpunit/CaptchaPreAuthenticationProviderTest.php 
b/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
index eb06f5a..8e56c36 100644
--- a/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
+++ b/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
@@ -5,6 +5,7 @@
 use Wikimedia\TestingAccessWrapper;
 
 /**
+ * @covers CaptchaPreAuthenticationProvider
  * @group Database
  */
 class CaptchaPreAuthenticationProviderTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/HTMLFancyCaptchaFieldTest.php 
b/tests/phpunit/HTMLFancyCaptchaFieldTest.php
index 9c3bbe3..37fa727 100644
--- a/tests/phpunit/HTMLFancyCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLFancyCaptchaFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . '/../../FancyCaptcha/HTMLFancyCaptchaField.php';
 
+/**
+ * @covers HTMLFancyCaptchaField
+ */
 class HTMLFancyCaptchaFieldTest extends PHPUnit_Framework_TestCase {
public function testGetHTML() {
$html = $this->getForm( [ 'imageUrl' => 'https://example.com/' 
] )->getHTML( false );
diff --git a/tests/phpunit/HTMLReCaptchaFieldTest.php 
b/tests/phpunit/HTMLReCaptchaFieldTest.php
index 0ec600f..0754cd7 100644
--- a/tests/phpunit/HTMLReCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLReCaptchaFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . '/../../ReCaptcha/HTMLReCaptchaField.php';
 
+/**
+ * @covers HTMLReCaptchaField
+ */
 class HTMLReCaptchaFieldTest extends PHPUnit_Framework_TestCase {
public function testSubmit() {
$form = new HTMLForm( [
diff --git a/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php 
b/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
index 206f8fa..cc14e36 100644
--- a/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . 
'/../../ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php';
 
+/**
+ * @covers HTMLReCaptchaNoCaptchaField
+ */
 class HTMLReCaptchaNoCaptchaFieldTest extends PHPUnit_Framework_TestCase {
public function testSubmit() {
$form = new HTMLForm( [
diff --git a/tests/phpunit/HTMLSubmittedValueFieldTest.php 
b/tests/phpunit/HTMLSubmittedValueFieldTest.php
index 8fa114c..4029a8c 100644
--- a/tests/phpunit/HTMLSubmittedValueFieldTest.php
+++ b/tests/phpunit/HTMLSubmittedValueFieldTest.php
@@ -2,6 +2,9 @@
 
 require_once __DIR__ . '/../../ReCaptcha/HTMLSubmittedValueField.php';
 
+/**
+ * @covers HTMLSubmittedValueField
+ */
 class HTMLSubmittedValueFieldTest extends PHPUnit_Framework_TestCase {
public function testSubmit() {
$form = new HTMLForm( [
diff --git a/tests/phpunit/QuestyCaptchaTest.php 
b/tests/phpunit/QuestyCaptchaTest.php
index 5a9480a..e76469b 100644
--- a/tests/phpunit/QuestyCaptchaTest.php
+++ b/tests/phpunit/QuestyCaptchaTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/406002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e99261acb13c86e96c1b2dd1cb61918ebc660c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] labs/private[master]: add fake keys for wmcspuppetmaster to allow compiling

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: add fake keys for wmcspuppetmaster to allow compiling
..


add fake keys for wmcspuppetmaster to allow compiling

Fix puppet compiling on nodes using the wmcspuppetmaster
role.

invalid secret wmcspuppetmaster/puppet_pubkey.pem at
/srv/jenkins-workspace/puppet-compiler/9808/change/src/modules/puppetmaster/manifests/web_frontend.pp

Change-Id: Ic32547e1389247ed1a7a63c7c9f8f9be9aab190a
---
A modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
A modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem 
b/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
new file mode 100644
index 000..c659c02
--- /dev/null
+++ b/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
@@ -0,0 +1,3 @@
+-BEGIN RSA PRIVATE KEY-
+SNAKEOIL
+-END RSA PRIVATE KEY-
\ No newline at end of file
diff --git a/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem 
b/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
new file mode 100644
index 000..66cb1dc
--- /dev/null
+++ b/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
@@ -0,0 +1,3 @@
+-BEGIN CERTIFICATE-
+SNAKEOIL
+-END CERTIFICATE-
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic32547e1389247ed1a7a63c7c9f8f9be9aab190a
Gerrit-PatchSet: 2
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] labs/private[master]: add fake keys for wmcspuppetmaster to allow compiling

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: add fake keys for wmcspuppetmaster to allow compiling
..

add fake keys for wmcspuppetmaster to allow compiling

Fix puppet compiling on nodes using the wmcspuppetmaster
role.

invalid secret wmcspuppetmaster/puppet_pubkey.pem at
/srv/jenkins-workspace/puppet-compiler/9808/change/src/modules/puppetmaster/manifests/web_frontend.pp

Change-Id: Ic32547e1389247ed1a7a63c7c9f8f9be9aab190a
---
A modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
A modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/01/406001/1

diff --git a/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem 
b/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
new file mode 100644
index 000..59df7d3
--- /dev/null
+++ b/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
@@ -0,0 +1,7 @@
+<<< HEAD
+SNAKEOIL
+===
+-BEGIN RSA PRIVATE KEY-
+SNAKEOIL
+-BEGIN RSA PRIVATE KEY-
+>>> 831c778... add fake puppet_priv/pubkey for wmcspuppetmaster to enable 
compiling
diff --git a/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem 
b/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
new file mode 100644
index 000..e3d82e0
--- /dev/null
+++ b/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
@@ -0,0 +1,7 @@
+<<< HEAD
+SNAKEOIL
+===
+-BEGIN CERTIFICATE-
+SNAKEOIL
+-END CERTIFICATE-
+>>> 831c778... add fake puppet_priv/pubkey for wmcspuppetmaster to enable 
compiling

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic32547e1389247ed1a7a63c7c9f8f9be9aab190a
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove workaround for old PHP JSON handling bug

2018-01-23 Thread MaxSem (Code Review)

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

Change subject: Remove workaround for old PHP JSON handling bug
..

Remove workaround for old PHP JSON handling bug

The bug was fixed in PHP 5.5.12, which makes this irrelevant with
PHP 7 transition.

Change-Id: If21d2c4f68b1c6996e6685a42711ed188bee51d7
---
M includes/json/FormatJson.php
1 file changed, 0 insertions(+), 9 deletions(-)


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

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 0c77a7b..0907c12 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -129,11 +129,6 @@
$pretty = $pretty ? '' : false;
}
 
-   static $bug66021;
-   if ( $pretty !== false && $bug66021 === null ) {
-   $bug66021 = json_encode( [], JSON_PRETTY_PRINT ) !== 
'[]';
-   }
-
// PHP escapes '/' to prevent breaking out of inline script 
blocks using '',
// which is hardly useful when '<' and '>' are escaped (and 
inadequate), and such
// escaping negatively impacts the human readability of URLs 
and similar strings.
@@ -147,10 +142,6 @@
}
 
if ( $pretty !== false ) {
-   // Workaround for 

-   if ( $bug66021 ) {
-   $json = preg_replace( self::WS_CLEANUP_REGEX, 
'', $json );
-   }
if ( $pretty !== '' ) {
// Change the four-space indent to a tab indent
$json = str_replace( "\n", "\n\t", $json );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Add @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags
..

Add @covers tags

Change-Id: I002484ea45adae69bd58be83b011831d89e8d5d8
---
M tests/phpunit/SpecialCollectionTest.php
M tests/phpunit/includes/BookRendererTest.php
M tests/phpunit/includes/DataProviderTest.php
M tests/phpunit/includes/HeadingCounterTest.php
4 files changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/SpecialCollectionTest.php 
b/tests/phpunit/SpecialCollectionTest.php
index c84643c..33f9cb3 100644
--- a/tests/phpunit/SpecialCollectionTest.php
+++ b/tests/phpunit/SpecialCollectionTest.php
@@ -2,9 +2,14 @@
 
 namespace MediaWiki\Extensions\Collection;
 
+use MediaWikiCoversValidator;
 use SpecialCollection;
 
+/**
+ * @covers SpecialCollection
+ */
 class SpecialCollectionTest extends \PHPUnit_Framework_TestCase {
+   use MediaWikiCoversValidator;
 
public function provideMoveItemInCollection() {
return [
diff --git a/tests/phpunit/includes/BookRendererTest.php 
b/tests/phpunit/includes/BookRendererTest.php
index a46d704..d50ccdb 100644
--- a/tests/phpunit/includes/BookRendererTest.php
+++ b/tests/phpunit/includes/BookRendererTest.php
@@ -7,6 +7,9 @@
 use TemplateParser;
 use Title;
 
+/**
+ * @covers \MediaWiki\Extensions\Collection\BookRenderer
+ */
 class BookRendererTest extends MediaWikiTestCase {
const TEMPLATE_DIR = '/../../../templates';
 
diff --git a/tests/phpunit/includes/DataProviderTest.php 
b/tests/phpunit/includes/DataProviderTest.php
index 91dbddc..76b8e8a 100644
--- a/tests/phpunit/includes/DataProviderTest.php
+++ b/tests/phpunit/includes/DataProviderTest.php
@@ -7,6 +7,9 @@
 use Title;
 use VirtualRESTServiceClient;
 
+/**
+ * @covers \MediaWiki\Extensions\Collection\DataProvider
+ */
 class DataProviderTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/includes/HeadingCounterTest.php 
b/tests/phpunit/includes/HeadingCounterTest.php
index 917e537..fdb3718 100644
--- a/tests/phpunit/includes/HeadingCounterTest.php
+++ b/tests/phpunit/includes/HeadingCounterTest.php
@@ -3,8 +3,13 @@
 namespace MediaWiki\Extensions\Collection;
 
 use LogicException;
+use MediaWikiCoversValidator;
 
+/**
+ * @covers \MediaWiki\Extensions\Collection\HeadingCounter
+ */
 class HeadingCounterTest extends \PHPUnit_Framework_TestCase {
+   use MediaWikiCoversValidator;
 
/**
 * @dataProvider provideIncrementAndGet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I002484ea45adae69bd58be83b011831d89e8d5d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Add @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags
..

Add @covers tags

Change-Id: I6301074db667e2ac12bb4954b813d55def939ea3
---
M tests/phpunit/CollaborationHubContentHandlerTest.php
M tests/phpunit/CollaborationHubContentTest.php
M tests/phpunit/CollaborationHubTOCTest.php
M tests/phpunit/CollaborationKitImageTest.php
M tests/phpunit/CollaborationListContentHandlerTest.php
M tests/phpunit/CollaborationListContentTest.php
6 files changed, 18 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/CollaborationHubContentHandlerTest.php 
b/tests/phpunit/CollaborationHubContentHandlerTest.php
index c3a93e1..6ef6889 100644
--- a/tests/phpunit/CollaborationHubContentHandlerTest.php
+++ b/tests/phpunit/CollaborationHubContentHandlerTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationHubContentHandler
+ */
 class CollaborationHubContentHandlerTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/CollaborationHubContentTest.php 
b/tests/phpunit/CollaborationHubContentTest.php
index bdd3cce..d0f3ee5 100644
--- a/tests/phpunit/CollaborationHubContentTest.php
+++ b/tests/phpunit/CollaborationHubContentTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationHubContent
+ */
 class CollaborationHubContentTest extends MediaWikiTestCase {
 
private $content;
diff --git a/tests/phpunit/CollaborationHubTOCTest.php 
b/tests/phpunit/CollaborationHubTOCTest.php
index 4751900..5bb5f7d 100644
--- a/tests/phpunit/CollaborationHubTOCTest.php
+++ b/tests/phpunit/CollaborationHubTOCTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationHubTOC
+ */
 class CollaborationHubTOCTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/CollaborationKitImageTest.php 
b/tests/phpunit/CollaborationKitImageTest.php
index 0e60e10..2f89644 100644
--- a/tests/phpunit/CollaborationKitImageTest.php
+++ b/tests/phpunit/CollaborationKitImageTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationKitImage
+ */
 class CollaborationKitImageTest extends MediaWikiTestCase {
 
private $str;
diff --git a/tests/phpunit/CollaborationListContentHandlerTest.php 
b/tests/phpunit/CollaborationListContentHandlerTest.php
index 9c4c03b..0c0dcd9 100644
--- a/tests/phpunit/CollaborationListContentHandlerTest.php
+++ b/tests/phpunit/CollaborationListContentHandlerTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationListContentHandler
+ */
 class CollaborationListContentHandlerTest extends MediaWikiTestCase {
 
/**
diff --git a/tests/phpunit/CollaborationListContentTest.php 
b/tests/phpunit/CollaborationListContentTest.php
index 15c1aeb..35111fc 100644
--- a/tests/phpunit/CollaborationListContentTest.php
+++ b/tests/phpunit/CollaborationListContentTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers CollaborationListContent
+ */
 class CollaborationListContentTest extends MediaWikiTestCase {
 
private $content;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6301074db667e2ac12bb4954b813d55def939ea3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Add @covers tag

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tag
..

Add @covers tag

Change-Id: I390ce3ee59e607c329249363d11cdde26c83a23c
---
M tests/phpunit/WorkflowTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow 
refs/changes/97/405997/1

diff --git a/tests/phpunit/WorkflowTest.php b/tests/phpunit/WorkflowTest.php
index 9c79f19..ec20cd9 100644
--- a/tests/phpunit/WorkflowTest.php
+++ b/tests/phpunit/WorkflowTest.php
@@ -12,6 +12,7 @@
 use User;
 
 /**
+ * @covers \ArticleCreationWorkflow\Workflow
  * @group ArticleCreationWorkflow
  */
 class WorkflowTest extends MediaWikiTestCase {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I390ce3ee59e607c329249363d11cdde26c83a23c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: cover: Convert coverage sub-nav from breadcrumbs to nav-tabs

2018-01-23 Thread Krinkle (Code Review)

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

Change subject: cover: Convert coverage sub-nav from breadcrumbs to nav-tabs
..

cover: Convert coverage sub-nav from breadcrumbs to nav-tabs

Breadcrumbs are mainly intended as a way to go from a subpage back
to an ancestor. Not as a way of going to a subpage.

Given the similarity, it looks somewhat confusing to see the breadcrumbs
visually end with 'MediaWiki extensions' when the user isn't actually
on that page.

Nav-tabs seems like a more appropiate fit within the building blocks
that Bootstrap provides.

Change-Id: Ic7b0cf9d76ed79f12074adf07d054e1fd2456746
---
M shared/CoveragePage.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/95/405995/1

diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index 8bb60e5..9418a7e 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -50,18 +50,18 @@
if ( $this->pageName === 'Test coverage' ) {
$href = $this->fixNavUrl( '/cover-extensions/' );
$breadcrumbs = <<
-   Coverage home
+
+   Coverage home
MediaWiki extensions
-
+
 HTML;
} else {
$href = $this->fixNavUrl( '/cover/' );
$breadcrumbs = <<
+
Coverage home
-   MediaWiki extensions
-
+   MediaWiki extensions
+
 HTML;
}
$this->addHtmlContent( $breadcrumbs );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7b0cf9d76ed79f12074adf07d054e1fd2456746
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: cover: Add sort=cover parameter to coverage report

2018-01-23 Thread Krinkle (Code Review)

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

Change subject: cover: Add sort=cover parameter to coverage report
..

cover: Add sort=cover parameter to coverage report

When enabled, the sorting changes from alphabetical by name, to be
ascending by coverage percentage. This helps identify projects with
low code coverage, and as potential area to contribute.

Change-Id: I4ff4bb7191ad8579427cf74fd865fe23b85b234d
---
M shared/CoveragePage.php
1 file changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/96/405996/1

diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index 9418a7e..389c7a6 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -47,6 +47,8 @@
$results = glob( $this->coverageDir . '/*/clover.xml' );
$this->embedCSS( file_get_contents( __DIR__ . '/cover.css' ) );
 
+   $sort = isset( $_GET['sort'] ) ? (string)$_GET['sort'] : null;
+
if ( $this->pageName === 'Test coverage' ) {
$href = $this->fixNavUrl( '/cover-extensions/' );
$breadcrumbs = <addHtmlContent( $sortNav );
$this->addHtmlContent( '' );
$html = '';
+   $clovers = [];
foreach ( $results as $clover ) {
-   $info = $this->parseClover( $clover );
+   $clovers[$clover] = $this->parseClover( $clover );
+   }
+   if ( isset( $_GET['sort'] ) && $_GET['sort'] === 'cov' ) {
+   // Order by coverage, ascending
+   uasort( $clovers, function ( $a, $b ) {
+   if ( $a['percent'] === $b['percent'] ) {
+   return 0;
+   }
+   return ( $a['percent'] < $b['percent'] ) ? -1 : 
1;
+   } );
+   }
+   foreach ( $clovers as $clover => $info ) {
$dirName = htmlspecialchars( basename( dirname( $clover 
) ) );
$percent = (string)round( $info['percent'] );
$color = $this->getLevelColor( $info['percent'] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ff4bb7191ad8579427cf74fd865fe23b85b234d
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: [WIP] Failing test case for losing annotations

2018-01-23 Thread Catrope (Code Review)

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

Change subject: [WIP] Failing test case for losing annotations
..

[WIP] Failing test case for losing annotations

Change-Id: I5ca3d475760e14f3ece788107f3a002a17729ec9
---
M tests/dm/ve.dm.RebaseServer.test.js
1 file changed, 115 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/94/405994/1

diff --git a/tests/dm/ve.dm.RebaseServer.test.js 
b/tests/dm/ve.dm.RebaseServer.test.js
index aa6b9ec..51b1510 100644
--- a/tests/dm/ve.dm.RebaseServer.test.js
+++ b/tests/dm/ve.dm.RebaseServer.test.js
@@ -282,9 +282,124 @@
[ '1', 'deliver' ],
[ 'server', 'assertHist', 'abXYZ' ]
]
+   },
+   {
+   name: 'Double client-side rebase with 
annotation and other preceding transaction',
+   initialData: [
+   { type: 'paragraph' },
+   { type: '/paragraph' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ],
+   clients: [ '1', '2' ],
+   ops: [
+   // Client 1 applies a local change that 
inserts 'Q'
+   [ '1', 'apply', [
+   [ 'insert', 1, [ 'Q' ], 3 ]
+   ] ],
+
+   // Client 2 submits two changes
+   [ '2', 'apply', [
+   [ 'insert', 1, [ 'a' ], 3 ]
+   ] ],
+   [ '2', 'submit' ],
+   [ '2', 'apply', [
+   [ 'insert', 2, [ 'b' ], 3 ]
+   ] ],
+   [ '2', 'submit' ],
+
+   // Client 1 rebases its local change 
over client 2's first change
+   [ '2', 'deliver' ],
+   [ 'server', 'assertHist', 'a' ],
+   [ '1', 'receive' ],
+   [ '1', 'assertHist', 'a/Q!' ],
+   // Client 1 submits its local change
+   [ '1', 'submit' ],
+
+   // Client 1 applies a local change that 
introduces an annotation
+   [ '1', 'apply', {
+   start: 1,
+   transactions: [
+   {
+   operations: [
+   { type: 
'retain', length: 2 },
+   { type: 
'replace', remove: [], insert: [
+   
[ 'X', [ 'h123' ] ],
+   
[ 'Y', [ 'h123' ] ],
+   
[ 'Z', [ 'h123' ] ]
+   ] },
+   { type: 
'retain', length: 3 }
+   ],
+   authorId: '1'
+   }
+   ],
+   stores: [
+   {
+   hashes: [ 
'h123' ],
+   hashStore: {
+   h123: {
+   
type: 'annotation',
+   
value: {
+   
type: 'textStyle/bold'
+   
}
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: OutputPage: Make filterModules() public

2018-01-23 Thread Code Review

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

Change subject: OutputPage: Make filterModules() public
..

OutputPage: Make filterModules() public

To make it easier for extensions to support 'safemode' parameter.

Example in VE: I7e9b61a5012a027c76aa6bdb22096d7391957913.

Bug: T185303
Change-Id: Ia1c1f7eef5af22925100ebe0a37a9a6ba0808fe5
---
M includes/OutputPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index fc7fbf7..d9a4ebd 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -528,7 +528,7 @@
 * @param string $type
 * @return array
 */
-   protected function filterModules( array $modules, $position = null,
+   public function filterModules( array $modules, $position = null,
$type = ResourceLoaderModule::TYPE_COMBINED
) {
$resourceLoader = $this->getResourceLoader();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1c1f7eef5af22925100ebe0a37a9a6ba0808fe5
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...VisualEditor[master]: Support 'safemode' parameter

2018-01-23 Thread Code Review

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

Change subject: Support 'safemode' parameter
..

Support 'safemode' parameter

This moves 'preloadModules' from global VE config (wgVisualEditorConfig)
to per-page VE config (wgVisualEditor).

Bug: T185303
Depends-On: Ia1c1f7eef5af22925100ebe0a37a9a6ba0808fe5
Change-Id: I7e9b61a5012a027c76aa6bdb22096d7391957913
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
2 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index cfd8ce6..d1b4aa0 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -785,6 +785,7 @@
 * @return bool Always true
 */
public static function onMakeGlobalVariablesScript( array &$vars, 
OutputPage $out ) {
+   $veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$pageLanguage = $out->getTitle()->getPageLanguage();
$fallbacks = $pageLanguage->getConverter()->getVariantFallbacks(
$pageLanguage->getPreferredVariant()
@@ -796,6 +797,7 @@
'pageVariantFallbacks' => $fallbacks,
'usePageImages' => defined( 'PAGE_IMAGES_INSTALLED' ),
'usePageDescriptions' => defined( 'WBC_VERSION' ),
+   'preloadModules' => $out->filterModules( 
$veConfig->get( 'VisualEditorPreloadModules' ) ),
];
 
return true;
@@ -822,7 +824,6 @@
 
$vars['wgVisualEditorConfig'] = [
'disableForAnons' => $veConfig->get( 
'VisualEditorDisableForAnons' ),
-   'preloadModules' => $veConfig->get( 
'VisualEditorPreloadModules' ),
'preferenceModules' => $veConfig->get( 
'VisualEditorPreferenceModules' ),
'namespaces' => $availableNamespaces,
'contentModels' => $availableContentModels,
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 48ea296..6847638 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -207,7 +207,7 @@
mw.libs.ve.targetLoader.addPlugin( 
function () {
// Run 
VisualEditorPreloadModules, but if they fail, we still want to continue
// loading, so convert failure 
to success
-   return mw.loader.using( 
conf.preloadModules ).catch(
+   return mw.loader.using( 
mw.config.get( 'wgVisualEditor' ).preloadModules ).catch(
function () {
return 
$.Deferred().resolve();
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: VE MobileFrontend: fix call to _fixIosHeader

2018-01-23 Thread DLynch (Code Review)

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

Change subject: VE MobileFrontend: fix call to _fixIosHeader
..

VE MobileFrontend: fix call to _fixIosHeader

Needs to be a jQuery object, not a selector. a952a5fcb9 changed the parameter
for this and missed this call.

Change-Id: I257575a7a90b484fe615b1314842c313d2225891
---
M resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git 
a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js 
b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
index 938ef74..763cb88 100644
--- a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
+++ b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
@@ -159,7 +159,7 @@
// we have to do it here because contenteditable elements still do not
// exist when postRender is executed
// FIXME: Don't call a private method that is outside the class.
-   this.overlay._fixIosHeader( '[contenteditable]' );
+   this.overlay._fixIosHeader( $( '[contenteditable]' ) );
 
this.maybeShowWelcomeDialog();
 };

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs::puppetmaster: move standard/firewall include to roles

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: wmcs::puppetmaster: move standard/firewall include to roles
..

wmcs::puppetmaster: move standard/firewall include to roles

Change-Id: Ifc7479dcccab94cc4fb0fea5a4b1f9f1ed8806ba
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/405990/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 0eda878..0c6c313 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -891,15 +891,11 @@
 
 node 'labpuppetmaster1001.wikimedia.org' {
 role(wmcs::openstack::main::puppetmaster::frontend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
 node 'labpuppetmaster1002.wikimedia.org' {
 role(wmcs::openstack::main::puppetmaster::backend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp 
b/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
index abb28d6..04ad540 100644
--- a/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
+++ b/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::puppetmaster::backend {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::puppetmaster::backend
diff --git 
a/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp 
b/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
index 88e3b14..6a879cb 100644
--- a/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
+++ b/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::puppetmaster::frontend {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::puppetmaster::frontend

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Blacklist ogv.js's wasm on iOS 11.2.5 as well

2018-01-23 Thread Brion VIBBER (Code Review)

Brion VIBBER has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405989 )

Change subject: Blacklist ogv.js's wasm on iOS 11.2.5 as well
..

Blacklist ogv.js's wasm on iOS 11.2.5 as well

Work around upstream breakage in webkit.

Change-Id: I95dcdbfc78d28ce2d53c01d460b344c1e3dc4da9
---
M resources/ext.tmh.player.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/89/405989/1

diff --git a/resources/ext.tmh.player.js b/resources/ext.tmh.player.js
index 4260aaa..0528af6 100644
--- a/resources/ext.tmh.player.js
+++ b/resources/ext.tmh.player.js
@@ -137,7 +137,7 @@
base: mw.OgvJsSupport.basePath(),
 
// Disable WebAssembly on iOS 11.2.2, where 
it's broken.
-   wasm: ( typeof WebAssembly === 'object' ) && !( 
navigator.userAgent.match( /(iPhone|iPad); CPU OS 11_2_2/ ) )
+   wasm: ( typeof WebAssembly === 'object' ) && !( 
navigator.userAgent.match( /(iPhone|iPad); CPU OS 11_2_[2-5]/ ) )
};
globalConfig.techOrder.push( 'ogvjs' );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95dcdbfc78d28ce2d53c01d460b344c1e3dc4da9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use jQuery 3 .catch( fn ) instead of .then( null, fn )

2018-01-23 Thread Code Review

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

Change subject: Use jQuery 3 .catch( fn ) instead of .then( null, fn )
..

Use jQuery 3 .catch( fn ) instead of .then( null, fn )

Change-Id: I676eec0acf25690c2b2dd0b9a414be5fee887395
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d9f9d40..48ea296 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -207,8 +207,7 @@
mw.libs.ve.targetLoader.addPlugin( 
function () {
// Run 
VisualEditorPreloadModules, but if they fail, we still want to continue
// loading, so convert failure 
to success
-   return mw.loader.using( 
conf.preloadModules ).then(
-   null,
+   return mw.loader.using( 
conf.preloadModules ).catch(
function () {
return 
$.Deferred().resolve();
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Fix and add @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Fix and add @covers tags
..


Fix and add @covers tags

Change-Id: Ifa11ee418e016c103fb0ac6b32a790a2977aec8d
---
M tests/phpunit/ApiQueryExtractsTest.php
M tests/phpunit/ExtractFormatterTest.php
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/ApiQueryExtractsTest.php 
b/tests/phpunit/ApiQueryExtractsTest.php
index 6c8d317..ebebfcb 100644
--- a/tests/phpunit/ApiQueryExtractsTest.php
+++ b/tests/phpunit/ApiQueryExtractsTest.php
@@ -1,14 +1,17 @@
 getMockBuilder( 'IContextSource' )
->disableOriginalConstructor()
diff --git a/tests/phpunit/ExtractFormatterTest.php 
b/tests/phpunit/ExtractFormatterTest.php
index 60a8ef3..6c491cc 100644
--- a/tests/phpunit/ExtractFormatterTest.php
+++ b/tests/phpunit/ExtractFormatterTest.php
@@ -8,6 +8,7 @@
 use TextExtracts\ExtractFormatter;
 
 /**
+ * @covers \TextExtracts\ExtractFormatter
  * @group TextExtracts
  */
 class ExtractFormatterTest extends MediaWikiTestCase {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa11ee418e016c103fb0ac6b32a790a2977aec8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
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...AdvancedSearch[master]: Add @covers tag

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tag
..


Add @covers tag

Change-Id: Iffaf2b5be32fbf14bdbc785c90fb5dd5302906c7
---
M tests/phpunit/MimeTypeConfiguratorTest.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/MimeTypeConfiguratorTest.php 
b/tests/phpunit/MimeTypeConfiguratorTest.php
index d8d02dd..be01c4a 100644
--- a/tests/phpunit/MimeTypeConfiguratorTest.php
+++ b/tests/phpunit/MimeTypeConfiguratorTest.php
@@ -6,6 +6,9 @@
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 
+/**
+ * @covers \AdvancedSearch\MimeTypeConfigurator
+ */
 class MimeTypeConfiguratorTest extends TestCase {
 
const EXT_SINGLE_MIMETYPE = 'singletype';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffaf2b5be32fbf14bdbc785c90fb5dd5302906c7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
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]: horizon: move standard/firewall include to role

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: horizon: move standard/firewall include to role
..


horizon: move standard/firewall include to role

Change-Id: Icd6ff2fbe3bc3d826cb38ef607e86f6e0b30ca71
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/horizon.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 71bc824..0eda878 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -121,8 +121,6 @@
 node 'californium.wikimedia.org' {
 role(striker::web)
 include ::role::wmcs::openstack::main::horizon
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 
 interface::add_ip6_mapped { 'main': }
diff --git a/modules/role/manifests/wmcs/openstack/main/horizon.pp 
b/modules/role/manifests/wmcs/openstack/main/horizon.pp
index 9f1587b..20c5a98 100644
--- a/modules/role/manifests/wmcs/openstack/main/horizon.pp
+++ b/modules/role/manifests/wmcs/openstack/main/horizon.pp
@@ -2,6 +2,8 @@
 # role::wmcs::openstack::main::web when labweb* is finished
 class role::wmcs::openstack::main::horizon {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::horizon::dashboard

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Update video.js to v6

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Update video.js to v6
..


Update video.js to v6

* update video.js to 6.6.0
* switched from videojs-resolution-switcher to videojs-resolution-switcher-v6
* res switcher icon is still broken, but switching works
* removed videojs-replay, video.js natively does this now
* updated volume config
* patched videojs-ogvjs to fix WebM support
* hack WebAssembly off for iOS 11.2.2
* patched videojs-responsive-layout for IE 11 and VJS 6
* fixed spacing for JS checks

Bug: T165815
Change-Id: I6a0a45e4b84c72fb8535ee86a71221f68284aefd
---
M Gruntfile.js
M TimedMediaHandlerHooks.php
M package.json
A patches/videojs-ogvjs-webm.patch
A patches/videojs-responsive-classes.patch
A patches/videojs-responsive-layout-ie11.patch
D patches/videojs.defaults.patch
M resources/ext.tmh.player.js
M resources/mw-info-button/mw-info-button.js
M resources/videojs-ogvjs/videojs-ogvjs.js
D resources/videojs-replay/lang/en.js
D resources/videojs-replay/videojs-replay.css
D resources/videojs-replay/videojs-replay.js
M resources/videojs-resolution-switcher/videojs-resolution-switcher.js
M resources/videojs-responsive-layout/videojs-responsive-layout.js
A resources/videojs-responsive-layout/videojs-responsive-layout.min.js
M resources/videojs/font/VideoJS.eot
M resources/videojs/font/VideoJS.svg
M resources/videojs/font/VideoJS.ttf
M resources/videojs/font/VideoJS.woff
M resources/videojs/lang/ar.js
M resources/videojs/lang/de.js
M resources/videojs/lang/el.js
M resources/videojs/lang/en.js
M resources/videojs/lang/es.js
M resources/videojs/lang/fa.js
M resources/videojs/lang/fr.js
A resources/videojs/lang/gl.js
A resources/videojs/lang/he.js
M resources/videojs/lang/nl.js
M resources/videojs/lang/pl.js
A resources/videojs/lang/pt-PT.js
M resources/videojs/lang/ru.js
A resources/videojs/lang/sk.js
M resources/videojs/lang/tr.js
M resources/videojs/lang/uk.js
M resources/videojs/lang/vi.js
M resources/videojs/lang/zh-CN.js
M resources/videojs/lang/zh-TW.js
M resources/videojs/video-js.css
M resources/videojs/video-js.swf
M resources/videojs/video.js
42 files changed, 23,959 insertions(+), 22,357 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a0a45e4b84c72fb8535ee86a71221f68284aefd
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Toolbars: Replace $.width with clientWidth/offsetWidth

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Toolbars: Replace $.width with clientWidth/offsetWidth
..


Toolbars: Replace $.width with clientWidth/offsetWidth

Bug: T185599
Change-Id: I8f36244f1d605424594c1a61b5d107b3075213fa
---
M src/Toolbar.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/src/Toolbar.js b/src/Toolbar.js
index 7720b5d..559bc2a 100644
--- a/src/Toolbar.js
+++ b/src/Toolbar.js
@@ -388,7 +388,7 @@
 OO.ui.Toolbar.prototype.onWindowResize = function () {
this.$element.toggleClass(
'oo-ui-toolbar-narrow',
-   this.$bar.width() <= this.getNarrowThreshold()
+   this.$bar[ 0 ].clientWidth <= this.getNarrowThreshold()
);
 };
 
@@ -401,7 +401,7 @@
  */
 OO.ui.Toolbar.prototype.getNarrowThreshold = function () {
if ( this.narrowThreshold === null ) {
-   this.narrowThreshold = this.$group.width() + 
this.$actions.width();
+   this.narrowThreshold = this.$group[ 0 ].offsetWidth + 
this.$actions[ 0 ].offsetWidth;
}
return this.narrowThreshold;
 };

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: horizon: move standard/firewall include to role

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: horizon: move standard/firewall include to role
..

horizon: move standard/firewall include to role

Change-Id: Icd6ff2fbe3bc3d826cb38ef607e86f6e0b30ca71
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/horizon.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/405987/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 71bc824..0eda878 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -121,8 +121,6 @@
 node 'californium.wikimedia.org' {
 role(striker::web)
 include ::role::wmcs::openstack::main::horizon
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 
 interface::add_ip6_mapped { 'main': }
diff --git a/modules/role/manifests/wmcs/openstack/main/horizon.pp 
b/modules/role/manifests/wmcs/openstack/main/horizon.pp
index 9f1587b..20c5a98 100644
--- a/modules/role/manifests/wmcs/openstack/main/horizon.pp
+++ b/modules/role/manifests/wmcs/openstack/main/horizon.pp
@@ -2,6 +2,8 @@
 # role::wmcs::openstack::main::web when labweb* is finished
 class role::wmcs::openstack::main::horizon {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::horizon::dashboard

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Add @covers tag

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Add @covers tag
..

Add @covers tag

Change-Id: Iffaf2b5be32fbf14bdbc785c90fb5dd5302906c7
---
M tests/phpunit/MimeTypeConfiguratorTest.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/MimeTypeConfiguratorTest.php 
b/tests/phpunit/MimeTypeConfiguratorTest.php
index d8d02dd..be01c4a 100644
--- a/tests/phpunit/MimeTypeConfiguratorTest.php
+++ b/tests/phpunit/MimeTypeConfiguratorTest.php
@@ -6,6 +6,9 @@
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 
+/**
+ * @covers \AdvancedSearch\MimeTypeConfigurator
+ */
 class MimeTypeConfiguratorTest extends TestCase {
 
const EXT_SINGLE_MIMETYPE = 'singletype';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffaf2b5be32fbf14bdbc785c90fb5dd5302906c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site: remove duplicate firewall include on some appservers

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: site: remove duplicate firewall include on some appservers
..


site: remove duplicate firewall include on some appservers

mediawiki::appservers alredy includes base::firewall,
it's duplicate to add it in site.pp as well nowadays
and causes a style warning.

Change-Id: I25038812cb5171b14e3473bb789fa2858e8c0ba3
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index fefd1f0..71bc824 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1561,7 +1561,6 @@
 #mw2097, mw2100-mw2117 are appservers
 node /^mw2(097|10[0-9]|11[0-7])\.codfw\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 #mw2120-2147 are api appservers

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site: remove duplicate firewall include on some appservers

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: site: remove duplicate firewall include on some appservers
..

site: remove duplicate firewall include on some appservers

mediawiki::appservers alredy includes base::firewall,
it's duplicate to add it in site.pp as well nowadays
and causes a style warning.

Change-Id: I25038812cb5171b14e3473bb789fa2858e8c0ba3
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/405984/1

diff --git a/manifests/site.pp b/manifests/site.pp
index fefd1f0..71bc824 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1561,7 +1561,6 @@
 #mw2097, mw2100-mw2117 are appservers
 node /^mw2(097|10[0-9]|11[0-7])\.codfw\.wmnet$/ {
 role(mediawiki::appserver)
-include ::base::firewall
 }
 
 #mw2120-2147 are api appservers

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add a hook into LanguageConverter#getPreferredVariant() to a...

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Add a hook into LanguageConverter#getPreferredVariant() to 
allow extensions to pull the desired variant from cookies (or other such source)
..


Add a hook into LanguageConverter#getPreferredVariant() to allow extensions to 
pull the desired variant from cookies (or other such source)

Example implementation using this hook: wikiHow's ChineseVariantSelector
extension, installed on zh.wikihow.com, which uses cookies to store the
preferred language variant, allowing anonymous users to change the
language variant without registering/logging in.

Change-Id: I5295a26578b45a8d51f2b7550938088fec18404f
---
M docs/hooks.txt
M languages/LanguageConverter.php
2 files changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/docs/hooks.txt b/docs/hooks.txt
index 3ff3365..c21ce8a 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1662,6 +1662,13 @@
 'GetIP': modify the ip of the current user (called only once).
 &$ip: string holding the ip as determined so far
 
+'GetLangPreferredVariant': Called in LanguageConverter#getPreferredVariant() to
+  allow fetching the language variant code from cookies or other such
+  alternative storage.
+&$req: language variant from the URL (string) or boolean false if no variant
+  was specified in the URL; the value of this variable comes from
+  LanguageConverter#getURLVariant()
+
 'GetLinkColours': modify the CSS class of an array of page links.
 $linkcolour_ids: array of prefixed DB keys of the pages linked to,
   indexed by page_id.
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 6d0368c..d9e64b4 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -160,6 +160,8 @@
 
$req = $this->getURLVariant();
 
+   Hooks::run( 'GetLangPreferredVariant', [ &$req ] );
+
if ( $wgUser->isSafeToLoad() && $wgUser->isLoggedIn() && !$req 
) {
$req = $this->getUserVariant();
} elseif ( !$req ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5295a26578b45a8d51f2b7550938088fec18404f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Liangent 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Toolbars: Replace $.height with clientHeight/offsetHeight

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Toolbars: Replace $.height with clientHeight/offsetHeight
..


Toolbars: Replace $.height with clientHeight/offsetHeight

Bug: T185599
Change-Id: I43fbce8f221553e9ae03f8385f39a19de01e8eb7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 2b16d96..3f4fddf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -256,7 +256,8 @@
} else {
setTimeout( function () {
toolbar.$element
-   .css( 'height', 
toolbar.$bar.outerHeight() )
+   // Avoid $bar[ 0 ].offsetHeight as this 
returns null in IE9 when $bar is position:fixed
+   .css( 'height', toolbar.$bar[ 0 
].clientHeight )
.addClass( 
've-init-mw-desktopArticleTarget-toolbar-open' );
setTimeout( function () {
// Clear to allow growth during use and 
when resizing window
@@ -1151,7 +1152,8 @@
return deferred.resolve().promise();
}
 
-   this.toolbar.$element.css( 'height', this.toolbar.$bar.outerHeight() );
+   // Avoid $bar[ 0 ].offsetHeight as this returns null in IE9 when $bar 
is position:fixed
+   this.toolbar.$element.css( 'height', this.toolbar.$bar[ 0 
].clientHeight );
setTimeout( function () {
target.toolbar.$element
.css( 'height', '0' )

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Lower caching length on doc.wikimedia.org

2018-01-23 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403401 )

Change subject: contint: Lower caching length on doc.wikimedia.org
..


contint: Lower caching length on doc.wikimedia.org

These files are auto-generated and published by Jenkins, but often older
versions remain cached by varnish.

Apache will now send a Cache-Control header to tell varnish to only cache the
content for an hour. Since these are mostly static HTML/JS/CSS with a few PHP
scripts, there shouldn't be a performance impact.

Bug: T184255
Change-Id: I4092bb26007cba53157d29557fc1902fd746c055
---
M modules/contint/templates/apache/doc.wikimedia.org.erb
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/contint/templates/apache/doc.wikimedia.org.erb 
b/modules/contint/templates/apache/doc.wikimedia.org.erb
index 889e3ea..d811431 100644
--- a/modules/contint/templates/apache/doc.wikimedia.org.erb
+++ b/modules/contint/templates/apache/doc.wikimedia.org.erb
@@ -20,6 +20,9 @@
 RewriteCond %{REQUEST_FILENAME} -d
 RewriteRule ^(.+[^/])$ https://doc.wikimedia.org/$1/ [R=301,QSA]
 
+# Lower caching length (T184255)
+Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+
 # Back-compat for T73060: Redirect mediawiki-core/master/php/html/ to 
mediawiki-core/master/php/
 RewriteRule ^mediawiki-core/master/php/html/(.*)$ 
https://doc.wikimedia.org/mediawiki-core/master/php/$1 [L,QSA]
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4092bb26007cba53157d29557fc1902fd746c055
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Toolbars: Replace $.width with clientWidth/offsetWidth

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Toolbars: Replace $.width with clientWidth/offsetWidth
..


Toolbars: Replace $.width with clientWidth/offsetWidth

Bug: T185599
Change-Id: Id32e38f85eb11f4574ef72ce45df06dde43251b4
---
M src/ui/ve.ui.PositionedTargetToolbar.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/src/ui/ve.ui.PositionedTargetToolbar.js 
b/src/ui/ve.ui.PositionedTargetToolbar.js
index 5cc557c..e429d43 100644
--- a/src/ui/ve.ui.PositionedTargetToolbar.js
+++ b/src/ui/ve.ui.PositionedTargetToolbar.js
@@ -104,7 +104,7 @@
  */
 ve.ui.PositionedTargetToolbar.prototype.calculateOffset = function () {
this.elementOffset = this.$element.offset();
-   this.elementOffset.right = this.$window.width() - 
this.$element.outerWidth() - this.elementOffset.left;
+   this.elementOffset.right = document.documentElement.clientWidth - 
this.$element[ 0 ].offsetWidth - this.elementOffset.left;
 };
 
 /**
@@ -133,7 +133,7 @@
  */
 ve.ui.PositionedTargetToolbar.prototype.float = function () {
if ( !this.floating ) {
-   this.height = this.$element.height();
+   this.height = this.$element[ 0 ].offsetHeight;
// When switching into floating mode, set the height of the 
wrapper and
// move the bar to the same offset as the in-flow element
this.$element

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Fix and add @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Fix and add @covers tags
..

Fix and add @covers tags

Change-Id: Ifa11ee418e016c103fb0ac6b32a790a2977aec8d
---
M tests/phpunit/ApiQueryExtractsTest.php
M tests/phpunit/ExtractFormatterTest.php
2 files changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/tests/phpunit/ApiQueryExtractsTest.php 
b/tests/phpunit/ApiQueryExtractsTest.php
index 6c8d317..ebebfcb 100644
--- a/tests/phpunit/ApiQueryExtractsTest.php
+++ b/tests/phpunit/ApiQueryExtractsTest.php
@@ -1,14 +1,17 @@
 getMockBuilder( 'IContextSource' )
->disableOriginalConstructor()
diff --git a/tests/phpunit/ExtractFormatterTest.php 
b/tests/phpunit/ExtractFormatterTest.php
index 60a8ef3..6c491cc 100644
--- a/tests/phpunit/ExtractFormatterTest.php
+++ b/tests/phpunit/ExtractFormatterTest.php
@@ -8,6 +8,7 @@
 use TextExtracts\ExtractFormatter;
 
 /**
+ * @covers \TextExtracts\ExtractFormatter
  * @group TextExtracts
  */
 class ExtractFormatterTest extends MediaWikiTestCase {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa11ee418e016c103fb0ac6b32a790a2977aec8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Phan: resolve and reenable PhanAccessMethodProtected

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Phan: resolve and reenable PhanAccessMethodProtected
..


Phan: resolve and reenable PhanAccessMethodProtected

Change-Id: I2bd7c787012f4f54600f3289d9d0d725f87788bc
---
M includes/Preferences.php
M includes/libs/filebackend/FileBackendMultiWrite.php
M includes/preferences/DefaultPreferencesFactory.php
M tests/phan/config.php
4 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/includes/Preferences.php b/includes/Preferences.php
index f08b155..f65b2ce 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -303,6 +303,8 @@
/**
 * Handle the form submission if everything validated properly
 *
+* @deprecated since 1.31, use PreferencesFactory
+*
 * @param array $formData
 * @param PreferencesForm $form
 * @return bool|Status|string
diff --git a/includes/libs/filebackend/FileBackendMultiWrite.php 
b/includes/libs/filebackend/FileBackendMultiWrite.php
index f8ca7e5..9c367af 100644
--- a/includes/libs/filebackend/FileBackendMultiWrite.php
+++ b/includes/libs/filebackend/FileBackendMultiWrite.php
@@ -87,6 +87,9 @@
 *  This will apply such updates post-send for web 
requests. Note that
 *  any checks from "syncChecks" are still 
synchronous.
 *
+* Bogus warning
+* @suppress PhanAccessMethodProtected
+*
 * @param array $config
 * @throws FileBackendError
 */
diff --git a/includes/preferences/DefaultPreferencesFactory.php 
b/includes/preferences/DefaultPreferencesFactory.php
index 0391b30..a23d644 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -1617,7 +1617,7 @@
 * @param PreferencesForm $form
 * @return bool|Status|string
 */
-   protected function legacySaveFormData( $formData, PreferencesForm $form 
) {
+   public function legacySaveFormData( $formData, PreferencesForm $form ) {
return $this->saveFormData( $formData, $form );
}
 
diff --git a/tests/phan/config.php b/tests/phan/config.php
index 52a565c..84132b9 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -294,8 +294,6 @@
 * to this black-list to inhibit them from being reported.
 */
'suppress_issue_types' => [
-   // approximate error count: 1
-   "PhanAccessMethodProtected",
// approximate error count: 29
"PhanCommentParamOnEmptyParamList",
// approximate error count: 33

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bd7c787012f4f54600f3289d9d0d725f87788bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labtest: move firewall/standard includes to roles

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: labtest: move firewall/standard includes to roles
..


labtest: move firewall/standard includes to roles

Change-Id: I95b3dfd8e37eabde3ba462c3a5646bda1d384262
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/labtest/control.pp
M modules/role/manifests/wmcs/openstack/labtest/net.pp
M modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
M modules/role/manifests/wmcs/openstack/labtest/services.pp
M modules/role/manifests/wmcs/openstack/labtest/web.pp
M modules/role/manifests/wmcs/openstack/labtestn/control.pp
M modules/role/manifests/wmcs/openstack/labtestn/services.pp
8 files changed, 11 insertions(+), 9 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 49a604b..fefd1f0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -943,25 +943,18 @@
 
 node 'labtestnet2001.codfw.wmnet' {
 role(wmcs::openstack::labtest::net)
-include ::standard
 }
 
 node 'labtestcontrol2001.wikimedia.org' {
 role(wmcs::openstack::labtest::control)
-include ::standard
-include ::base::firewall
 }
 
 node 'labtestcontrol2003.wikimedia.org' {
 role(wmcs::openstack::labtestn::control)
-include ::standard
-include ::base::firewall
 }
 
 node 'labtestpuppetmaster2001.wikimedia.org' {
 role(wmcs::openstack::labtest::puppetmaster::frontend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
@@ -973,7 +966,6 @@
 
 node /labtestservices200[23]\.wikimedia\.org/ {
 role(wmcs::openstack::labtestn::services)
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
@@ -1116,7 +1108,6 @@
 node 'labtestweb2001.wikimedia.org' {
 role(wmcs::openstack::labtest::web)
 include ::role::mariadb::wikitech
-include ::base::firewall
 include ::ldap::role::client::labs
 
 interface::add_ip6_mapped { 'main': }
diff --git a/modules/role/manifests/wmcs/openstack/labtest/control.pp 
b/modules/role/manifests/wmcs/openstack/labtest/control.pp
index 8e23130..d9cd896 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/control.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/control.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::labtest::control {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::labtest::observerenv
 include ::profile::openstack::labtest::rabbitmq
 include ::profile::openstack::labtest::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/labtest/net.pp 
b/modules/role/manifests/wmcs/openstack/labtest/net.pp
index d0e98dd..dfa2c6c 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/net.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/net.pp
@@ -1,5 +1,6 @@
 class role::wmcs::openstack::labtest::net {
 system::role { $name: }
+include ::standard
 include ::profile::openstack::labtest::cloudrepo
 include ::profile::openstack::labtest::nova::common
 include ::profile::openstack::labtest::nova::network::service
diff --git 
a/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp 
b/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
index aa7f4df..3925ed5 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::labtest::puppetmaster::frontend {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::labtest::clientlib
 include ::profile::openstack::labtest::observerenv
 include ::profile::openstack::labtest::puppetmaster::frontend
diff --git a/modules/role/manifests/wmcs/openstack/labtest/services.pp 
b/modules/role/manifests/wmcs/openstack/labtest/services.pp
index 94796a0..e569c58 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/services.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/services.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::labtest::services {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::labtest::cloudrepo
 include ::profile::openstack::labtest::pdns::auth::db
 include ::profile::openstack::labtest::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/labtest/web.pp 
b/modules/role/manifests/wmcs/openstack/labtest/web.pp
index f45d26f..cbff3c7 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/web.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/web.pp
@@ -1,6 +1,7 @@
 class role::wmcs::openstack::labtest::web {
 system::role { $name: }
 include

[MediaWiki-commits] [Gerrit] operations/puppet[production]: adding Ramsey Isler to statistics-privatedata-users

2018-01-23 Thread RobH (Code Review)

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

Change subject: adding Ramsey Isler to statistics-privatedata-users
..

adding Ramsey Isler to statistics-privatedata-users

adding user to statistics-privatedata-users per request

Bug: T185356
Change-Id: I20e4962896cf9dd4c8462b7b9688919b5ec4b6f0
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/405982/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ef2ebb5..f1bc173 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -199,7 +199,7 @@
   leila, nettrom, mforns, bmansurov, tbayer, joal, imarlier,
   madhuvishy, tjones, legoktm, dcausse, bearloga, atgomez, dstrine,
   joewalsh, marktraceur, mtizzoni, panisson, paolotti, ciro, 
melodykramer,
-  fdans, shiladsen, esanders]
+  fdans, shiladsen, esanders, risler]
   statistics-users:
 gid: 726
 description: Access statistics number crunching hosts. NO PRIVS.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: adding new shell user Ramsey Isler

2018-01-23 Thread RobH (Code Review)

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

Change subject: adding new shell user Ramsey Isler
..

adding new shell user Ramsey Isler

Adding Ramsey Isler to shell users, followup patch will add user to
groups.

Bug: T185356
Change-Id: I4b0e8fc74ccb5362ffad35a6804e697a24849a29
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/405981/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index b4d6313..ef2ebb5 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2694,6 +2694,15 @@
 - ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCyCPFZyyNoNnyQH0dk/+XYmVpnxri8Z5nOg1vW6r82UAPjtquqAp79a6XEs28F5yRDob9z3wtqK1U9seVt6wf3t5+4k4B0cBR8oplLPBfI/CTAKdqugI0XwvjYxEp3KV77sF9SVOfFexhs1vOD5WRnJnQ3WpBkCo9bW7X/xq+oMchz8knCvHQ7NqAe+poJLHjMjJnaRSnZviQn5RSyset13c0kzevxDzvE7BugYR3p329ZrKpp17wPVOt4lnoXnokItZF9WqY4/nLaZIAieCuXLrA8rNIvsciNvKeMuWhaPd1v5UdFMG/jQ2jaHA74Sxxds7VgCrhJK9YHtyXV4JYmbiDGbh4nIsgpSd3w8dnRM/6TcxWMmnLkePS1uzYOfaTp/SONFoNqwPrF3hsm9Pg9O4f4vdSxoZ/3B7hO7yD/BlYrYVU7UDOgwuxjBTX2JhnZpCgmAX9P9sNMprHrcGDrLpeqGBH6E6Vx/z6QwBpatf/Q8WVJJU2Q5wqBvqEibl5rmDE8b+Eyw/k1gRoxNYp7bV81e5ht4e7hLbXkFVdn64JCavKur6mXCbGFPlklgCA/svpJLUl7dcdm+s67V615r8CzIyDwl7e8sGc+586X4zM1Uqvy84xL5l/ASLTObSkU5p3xgNWyEWYm+fTu0l0PdgoOxtEFg8nM89N/XdAFHw==
 mneis...@wikimedia.org
 uid: 18650
 email: mneis...@wikimedia.org
+  risler:
+ensure: present
+gid: 500
+name: risler
+realname: Ramsey Isler
+ssh_keys:
+- ssh-ed25519 
C3NzaC1lZDI1NTE5IN7/rMDCncb17UZvNwiSTRnrs2ouQbvobZJy0UfOeXCb 
ed25519-key-20180119
+uid: 17779
+email: ris...@wikimedia.org
 
 ldap_only_users:
   abartov:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fixing past patchsets

2018-01-23 Thread RobH (Code Review)

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

Change subject: fixing past patchsets
..


fixing past patchsets

I left off ssh-rsa from the ssh key entries on the two previous shell
requests.  I suppose they worked due to the rsa being the default type.

No bug, since its cleaning up old patches.

Change-Id: I5a5464aab7a32c57ca979b32bccbf0e056638506
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 71828f5..b4d6313 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2682,7 +2682,7 @@
 name: cy534
 realname:  Christian Covington
 ssh_keys:
-- 
B3NzaC1yc2EDAQABAAACAQDBxzztOka1AJvg4W3N4OnYbvr4nz+iDg3mgWlG8f0jbIc1tY9Ned8yfxd8mK+/K/TGMRBGxIwanODE+tvvKHOsULtYrlElIbd25eZY1PAAhWalrhbVZefPHgW3OLuA60FKcZeggJAiOYs9Q4jV0m8ZngIgVPSkrbF/Kr9Jg+HSERDaFmZL/CDy4f9QHsPBU+E6R0C5A06wnCmPwPE3aUhhBwahwxqgkftBywepszho3GTuDYRtS1XuCBobVpmCqkArchY9938AfBb4gI6sf+0ooaxt5e3O9QU1iLphGoRxEfe+u33Crqcf7HXfGnE750q4auNA4UpPJseOLhW7o43zKwJKrR/kb4s5qx91nq0P1HOChHEFrbzPQlAfnGrz3Cw8SLD38+eUryHpVwIw2WNr43a584Qye+CVzWCylcSjEzLsN+PCG4hlukAcWok+W8gQjfTgUCCpMuWG42Wb5GwAGlTtiy8iqLqYSLauWDP5DMm6bYUKFOgzHYseUYZ4CbvCol6SSuy61qt7BHveIvK4G60OkqdJ7LVB62scm714/VkrHJzX0pu3k7C0/89evHKZ1CuN3KNIQn7fMdVpY41kn7wNxHC/VYO2f2v8cmFxv0Ewr31ILPU2zUJz0+Pj0Bpd92ePtre6FJP76IOBHyGjchGFTn+2qwStMuIQ0uFKHw==
 christian@christian-XPS-15-9550
+- ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDBxzztOka1AJvg4W3N4OnYbvr4nz+iDg3mgWlG8f0jbIc1tY9Ned8yfxd8mK+/K/TGMRBGxIwanODE+tvvKHOsULtYrlElIbd25eZY1PAAhWalrhbVZefPHgW3OLuA60FKcZeggJAiOYs9Q4jV0m8ZngIgVPSkrbF/Kr9Jg+HSERDaFmZL/CDy4f9QHsPBU+E6R0C5A06wnCmPwPE3aUhhBwahwxqgkftBywepszho3GTuDYRtS1XuCBobVpmCqkArchY9938AfBb4gI6sf+0ooaxt5e3O9QU1iLphGoRxEfe+u33Crqcf7HXfGnE750q4auNA4UpPJseOLhW7o43zKwJKrR/kb4s5qx91nq0P1HOChHEFrbzPQlAfnGrz3Cw8SLD38+eUryHpVwIw2WNr43a584Qye+CVzWCylcSjEzLsN+PCG4hlukAcWok+W8gQjfTgUCCpMuWG42Wb5GwAGlTtiy8iqLqYSLauWDP5DMm6bYUKFOgzHYseUYZ4CbvCol6SSuy61qt7BHveIvK4G60OkqdJ7LVB62scm714/VkrHJzX0pu3k7C0/89evHKZ1CuN3KNIQn7fMdVpY41kn7wNxHC/VYO2f2v8cmFxv0Ewr31ILPU2zUJz0+Pj0Bpd92ePtre6FJP76IOBHyGjchGFTn+2qwStMuIQ0uFKHw==
 christian@christian-XPS-15-9550
 uid: 18627
 email: christian.t.coving...@gmail.com
   mneisler:
@@ -2691,7 +2691,7 @@
 name: mneisler
 realname: Megan Neisler
 ssh_keys:
-- 
B3NzaC1yc2EDAQABAAACAQCyCPFZyyNoNnyQH0dk/+XYmVpnxri8Z5nOg1vW6r82UAPjtquqAp79a6XEs28F5yRDob9z3wtqK1U9seVt6wf3t5+4k4B0cBR8oplLPBfI/CTAKdqugI0XwvjYxEp3KV77sF9SVOfFexhs1vOD5WRnJnQ3WpBkCo9bW7X/xq+oMchz8knCvHQ7NqAe+poJLHjMjJnaRSnZviQn5RSyset13c0kzevxDzvE7BugYR3p329ZrKpp17wPVOt4lnoXnokItZF9WqY4/nLaZIAieCuXLrA8rNIvsciNvKeMuWhaPd1v5UdFMG/jQ2jaHA74Sxxds7VgCrhJK9YHtyXV4JYmbiDGbh4nIsgpSd3w8dnRM/6TcxWMmnLkePS1uzYOfaTp/SONFoNqwPrF3hsm9Pg9O4f4vdSxoZ/3B7hO7yD/BlYrYVU7UDOgwuxjBTX2JhnZpCgmAX9P9sNMprHrcGDrLpeqGBH6E6Vx/z6QwBpatf/Q8WVJJU2Q5wqBvqEibl5rmDE8b+Eyw/k1gRoxNYp7bV81e5ht4e7hLbXkFVdn64JCavKur6mXCbGFPlklgCA/svpJLUl7dcdm+s67V615r8CzIyDwl7e8sGc+586X4zM1Uqvy84xL5l/ASLTObSkU5p3xgNWyEWYm+fTu0l0PdgoOxtEFg8nM89N/XdAFHw==
 mneis...@wikimedia.org
+- ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCyCPFZyyNoNnyQH0dk/+XYmVpnxri8Z5nOg1vW6r82UAPjtquqAp79a6XEs28F5yRDob9z3wtqK1U9seVt6wf3t5+4k4B0cBR8oplLPBfI/CTAKdqugI0XwvjYxEp3KV77sF9SVOfFexhs1vOD5WRnJnQ3WpBkCo9bW7X/xq+oMchz8knCvHQ7NqAe+poJLHjMjJnaRSnZviQn5RSyset13c0kzevxDzvE7BugYR3p329ZrKpp17wPVOt4lnoXnokItZF9WqY4/nLaZIAieCuXLrA8rNIvsciNvKeMuWhaPd1v5UdFMG/jQ2jaHA74Sxxds7VgCrhJK9YHtyXV4JYmbiDGbh4nIsgpSd3w8dnRM/6TcxWMmnLkePS1uzYOfaTp/SONFoNqwPrF3hsm9Pg9O4f4vdSxoZ/3B7hO7yD/BlYrYVU7UDOgwuxjBTX2JhnZpCgmAX9P9sNMprHrcGDrLpeqGBH6E6Vx/z6QwBpatf/Q8WVJJU2Q5wqBvqEibl5rmDE8b+Eyw/k1gRoxNYp7bV81e5ht4e7hLbXkFVdn64JCavKur6mXCbGFPlklgCA/svpJLUl7dcdm+s67V615r8CzIyDwl7e8sGc+586X4zM1Uqvy84xL5l/ASLTObSkU5p3xgNWyEWYm+fTu0l0PdgoOxtEFg8nM89N/XdAFHw==
 mneis...@wikimedia.org
 uid: 18650
 email: mneis...@wikimedia.org
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a5464aab7a32c57ca979b32bccbf0e056638506
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fixing past patchsets

2018-01-23 Thread RobH (Code Review)

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

Change subject: fixing past patchsets
..

fixing past patchsets

I left off ssh-rsa from the ssh key entries on the two previous shell
requests.  I suppose they worked due to the rsa being the default type.

No bug, since its cleaning up old patches.

Change-Id: I5a5464aab7a32c57ca979b32bccbf0e056638506
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/405980/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 71828f5..b4d6313 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2682,7 +2682,7 @@
 name: cy534
 realname:  Christian Covington
 ssh_keys:
-- 
B3NzaC1yc2EDAQABAAACAQDBxzztOka1AJvg4W3N4OnYbvr4nz+iDg3mgWlG8f0jbIc1tY9Ned8yfxd8mK+/K/TGMRBGxIwanODE+tvvKHOsULtYrlElIbd25eZY1PAAhWalrhbVZefPHgW3OLuA60FKcZeggJAiOYs9Q4jV0m8ZngIgVPSkrbF/Kr9Jg+HSERDaFmZL/CDy4f9QHsPBU+E6R0C5A06wnCmPwPE3aUhhBwahwxqgkftBywepszho3GTuDYRtS1XuCBobVpmCqkArchY9938AfBb4gI6sf+0ooaxt5e3O9QU1iLphGoRxEfe+u33Crqcf7HXfGnE750q4auNA4UpPJseOLhW7o43zKwJKrR/kb4s5qx91nq0P1HOChHEFrbzPQlAfnGrz3Cw8SLD38+eUryHpVwIw2WNr43a584Qye+CVzWCylcSjEzLsN+PCG4hlukAcWok+W8gQjfTgUCCpMuWG42Wb5GwAGlTtiy8iqLqYSLauWDP5DMm6bYUKFOgzHYseUYZ4CbvCol6SSuy61qt7BHveIvK4G60OkqdJ7LVB62scm714/VkrHJzX0pu3k7C0/89evHKZ1CuN3KNIQn7fMdVpY41kn7wNxHC/VYO2f2v8cmFxv0Ewr31ILPU2zUJz0+Pj0Bpd92ePtre6FJP76IOBHyGjchGFTn+2qwStMuIQ0uFKHw==
 christian@christian-XPS-15-9550
+- ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDBxzztOka1AJvg4W3N4OnYbvr4nz+iDg3mgWlG8f0jbIc1tY9Ned8yfxd8mK+/K/TGMRBGxIwanODE+tvvKHOsULtYrlElIbd25eZY1PAAhWalrhbVZefPHgW3OLuA60FKcZeggJAiOYs9Q4jV0m8ZngIgVPSkrbF/Kr9Jg+HSERDaFmZL/CDy4f9QHsPBU+E6R0C5A06wnCmPwPE3aUhhBwahwxqgkftBywepszho3GTuDYRtS1XuCBobVpmCqkArchY9938AfBb4gI6sf+0ooaxt5e3O9QU1iLphGoRxEfe+u33Crqcf7HXfGnE750q4auNA4UpPJseOLhW7o43zKwJKrR/kb4s5qx91nq0P1HOChHEFrbzPQlAfnGrz3Cw8SLD38+eUryHpVwIw2WNr43a584Qye+CVzWCylcSjEzLsN+PCG4hlukAcWok+W8gQjfTgUCCpMuWG42Wb5GwAGlTtiy8iqLqYSLauWDP5DMm6bYUKFOgzHYseUYZ4CbvCol6SSuy61qt7BHveIvK4G60OkqdJ7LVB62scm714/VkrHJzX0pu3k7C0/89evHKZ1CuN3KNIQn7fMdVpY41kn7wNxHC/VYO2f2v8cmFxv0Ewr31ILPU2zUJz0+Pj0Bpd92ePtre6FJP76IOBHyGjchGFTn+2qwStMuIQ0uFKHw==
 christian@christian-XPS-15-9550
 uid: 18627
 email: christian.t.coving...@gmail.com
   mneisler:
@@ -2691,7 +2691,7 @@
 name: mneisler
 realname: Megan Neisler
 ssh_keys:
-- 
B3NzaC1yc2EDAQABAAACAQCyCPFZyyNoNnyQH0dk/+XYmVpnxri8Z5nOg1vW6r82UAPjtquqAp79a6XEs28F5yRDob9z3wtqK1U9seVt6wf3t5+4k4B0cBR8oplLPBfI/CTAKdqugI0XwvjYxEp3KV77sF9SVOfFexhs1vOD5WRnJnQ3WpBkCo9bW7X/xq+oMchz8knCvHQ7NqAe+poJLHjMjJnaRSnZviQn5RSyset13c0kzevxDzvE7BugYR3p329ZrKpp17wPVOt4lnoXnokItZF9WqY4/nLaZIAieCuXLrA8rNIvsciNvKeMuWhaPd1v5UdFMG/jQ2jaHA74Sxxds7VgCrhJK9YHtyXV4JYmbiDGbh4nIsgpSd3w8dnRM/6TcxWMmnLkePS1uzYOfaTp/SONFoNqwPrF3hsm9Pg9O4f4vdSxoZ/3B7hO7yD/BlYrYVU7UDOgwuxjBTX2JhnZpCgmAX9P9sNMprHrcGDrLpeqGBH6E6Vx/z6QwBpatf/Q8WVJJU2Q5wqBvqEibl5rmDE8b+Eyw/k1gRoxNYp7bV81e5ht4e7hLbXkFVdn64JCavKur6mXCbGFPlklgCA/svpJLUl7dcdm+s67V615r8CzIyDwl7e8sGc+586X4zM1Uqvy84xL5l/ASLTObSkU5p3xgNWyEWYm+fTu0l0PdgoOxtEFg8nM89N/XdAFHw==
 mneis...@wikimedia.org
+- ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCyCPFZyyNoNnyQH0dk/+XYmVpnxri8Z5nOg1vW6r82UAPjtquqAp79a6XEs28F5yRDob9z3wtqK1U9seVt6wf3t5+4k4B0cBR8oplLPBfI/CTAKdqugI0XwvjYxEp3KV77sF9SVOfFexhs1vOD5WRnJnQ3WpBkCo9bW7X/xq+oMchz8knCvHQ7NqAe+poJLHjMjJnaRSnZviQn5RSyset13c0kzevxDzvE7BugYR3p329ZrKpp17wPVOt4lnoXnokItZF9WqY4/nLaZIAieCuXLrA8rNIvsciNvKeMuWhaPd1v5UdFMG/jQ2jaHA74Sxxds7VgCrhJK9YHtyXV4JYmbiDGbh4nIsgpSd3w8dnRM/6TcxWMmnLkePS1uzYOfaTp/SONFoNqwPrF3hsm9Pg9O4f4vdSxoZ/3B7hO7yD/BlYrYVU7UDOgwuxjBTX2JhnZpCgmAX9P9sNMprHrcGDrLpeqGBH6E6Vx/z6QwBpatf/Q8WVJJU2Q5wqBvqEibl5rmDE8b+Eyw/k1gRoxNYp7bV81e5ht4e7hLbXkFVdn64JCavKur6mXCbGFPlklgCA/svpJLUl7dcdm+s67V615r8CzIyDwl7e8sGc+586X4zM1Uqvy84xL5l/ASLTObSkU5p3xgNWyEWYm+fTu0l0PdgoOxtEFg8nM89N/XdAFHw==
 mneis...@wikimedia.org
 uid: 18650
 email: mneis...@wikimedia.org
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/lucene-explain-parser[master]: Fix license to match https://spdx.org/licenses/

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Fix license to match https://spdx.org/licenses/
..


Fix license to match https://spdx.org/licenses/

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

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



diff --git a/composer.json b/composer.json
index 5a01e7f..b4b0380 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
 "name": "wikimedia/lucene-explain-parser",
 "description": "Parsing and pretty-printing Lucene explain data",
 "type": "library",
-"license": "Apache 2.0",
+"license": "Apache-2.0",
 "require": { "php": ">=5.5.9" },
 "autoload": {
 "psr-4": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b16a5ef4ea92bac830aa7c2269929b757f97c0d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/lucene-explain-parser
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] wikimedia/lucene-explain-parser[master]: Fix license to match https://spdx.org/licenses/

2018-01-23 Thread Smalyshev (Code Review)

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

Change subject: Fix license to match https://spdx.org/licenses/
..

Fix license to match https://spdx.org/licenses/

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/lucene-explain-parser 
refs/changes/79/405979/1

diff --git a/composer.json b/composer.json
index 5a01e7f..b4b0380 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
 "name": "wikimedia/lucene-explain-parser",
 "description": "Parsing and pretty-printing Lucene explain data",
 "type": "library",
-"license": "Apache 2.0",
+"license": "Apache-2.0",
 "require": { "php": ">=5.5.9" },
 "autoload": {
 "psr-4": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b16a5ef4ea92bac830aa7c2269929b757f97c0d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/lucene-explain-parser
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs::nfs: move standard includes from site to roles

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: labs::nfs: move standard includes from site to roles
..


labs::nfs: move standard includes from site to roles

This should be no-oop on everything but cleans up site.pp
and fixes a couple style violations (for including standard
in site).

Change-Id: I8fcf7bcf75500df92421915d5b47e99d3053834f
---
M manifests/site.pp
M modules/role/manifests/labs/nfs/misc.pp
M modules/role/manifests/labs/nfs/secondary.pp
M modules/role/manifests/labs/nfs/secondary_backup/misc.pp
M modules/role/manifests/labs/nfs/secondary_backup/tools.pp
5 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 2205aa3..49a604b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1187,14 +1187,12 @@
 
 node 'labstore1003.eqiad.wmnet' {
 role(labs::nfs::misc)
-include ::standard
 # Do not enable yet
 # include ::base::firewall
 }
 
 node /labstore100[45]\.eqiad\.wmnet/ {
 role(labs::nfs::secondary)
-include ::standard
 # Do not enable yet
 # include ::base::firewall
 }
@@ -1211,14 +1209,12 @@
 
 node 'labstore2003.codfw.wmnet' {
 role(labs::nfs::secondary_backup::tools)
-include ::standard
 # Do not enable yet
 # include ::base::firewall
 }
 
 node 'labstore2004.codfw.wmnet' {
 role(labs::nfs::secondary_backup::misc)
-include ::standard
 # Do not enable yet
 # include ::base::firewall
 }
diff --git a/modules/role/manifests/labs/nfs/misc.pp 
b/modules/role/manifests/labs/nfs/misc.pp
index 47972b3..b739f53 100644
--- a/modules/role/manifests/labs/nfs/misc.pp
+++ b/modules/role/manifests/labs/nfs/misc.pp
@@ -13,6 +13,7 @@
 description => 'Labs NFS service (misc)',
 }
 
+include ::standard
 include labstore
 include rsync::server
 include labstore::backup_keys
diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index 36920d0..36c3d10 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -8,6 +8,7 @@
 description => 'NFS secondary share cluster',
 }
 
+include ::standard
 require ::profile::openstack::main::clientlib
 require ::profile::openstack::main::observerenv
 include labstore::fileserver::secondary
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
index cd910bd..ceb2766 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
@@ -1,5 +1,6 @@
 class role::labs::nfs::secondary_backup::misc {
 
+include ::standard
 include role::labs::nfs::secondary_backup::base
 
 file { '/srv/backup/misc':
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
index fd7c4c5..827c7fd 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
@@ -1,5 +1,6 @@
 class role::labs::nfs::secondary_backup::tools {
 
+include ::standard
 include role::labs::nfs::secondary_backup::base
 
 file { '/srv/backup/tools':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Improve @covers tags

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Improve @covers tags
..


Improve @covers tags

Change-Id: I3df3698b5d3f3eae95db8c740c611f365ff9cb31
---
M tests/phpunit/parserTest.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/parserTest.php b/tests/phpunit/parserTest.php
index d3b998e..7dd13a2 100644
--- a/tests/phpunit/parserTest.php
+++ b/tests/phpunit/parserTest.php
@@ -25,6 +25,12 @@
  * @licence GNU GPL v2+
  * @author Marius Hoch < h...@online.de >
  */
+
+/**
+ * @covers AbuseFilterCachingParser
+ * @covers AbuseFilterParser
+ * @covers AbuseFilterTokenizer
+ */
 class AbuseFilterParserTest extends MediaWikiTestCase {
/**
 * @return AbuseFilterParser
@@ -38,7 +44,7 @@
}
 
/**
-* @return [AbuseFilterParser]
+* @return AbuseFilterParser[]
 */
static function getParsers() {
static $parsers = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3df3698b5d3f3eae95db8c740c611f365ff9cb31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: apache: rm helper_scripts class, mv script to deployment_server

2018-01-23 Thread Dzahn (Code Review)

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

Change subject: apache: rm helper_scripts class, mv script to deployment_server
..


apache: rm helper_scripts class, mv script to deployment_server

Remove the "helper_scripts" class from the apache module.

All it does is install the apache-fast-test script but that isn't actually
used in the apache module itself. Instead it is used in the
deployment_server profile, so tin/naos.

In I0142b229bfccd77cb9 i copied apache-fast-test from apache
module to the new httpd module which will replace the apache module.

Now move the file out of there as well and into profile/files/..
instead because it isn't actually for servers, it's for clients
where users run tests against servers.

Change-Id: If759d72e502401b835332d66e7d48f7b4489d8fe
---
D modules/apache/manifests/helper_scripts.pp
R modules/profile/files/mediawiki/deployment/server/apache-fast-test
M modules/profile/manifests/mediawiki/deployment/server.pp
3 files changed, 8 insertions(+), 12 deletions(-)

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



diff --git a/modules/apache/manifests/helper_scripts.pp 
b/modules/apache/manifests/helper_scripts.pp
deleted file mode 100644
index e613be1..000
--- a/modules/apache/manifests/helper_scripts.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# helper scripts for apache changes
-class apache::helper_scripts {
-
-file  { '/usr/local/bin/apache-fast-test':
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/apache/apache-fast-test',
-}
-
-}
diff --git a/modules/httpd/files/apache-fast-test 
b/modules/profile/files/mediawiki/deployment/server/apache-fast-test
similarity index 100%
rename from modules/httpd/files/apache-fast-test
rename to modules/profile/files/mediawiki/deployment/server/apache-fast-test
diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp 
b/modules/profile/manifests/mediawiki/deployment/server.pp
index 050ca4f..9fff686 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -28,7 +28,6 @@
 }
 
 class {'::apache': }
-class {'::apache::helper_scripts': }
 class {'::mysql': }
 
 include network::constants
@@ -116,4 +115,12 @@
 # determining the state of git repos during deployments.
 require_package('percona-toolkit', 'tig')
 require_package('php5-readline') # bug T126262
+
+# helper scripts for apache changes
+file  { '/usr/local/bin/apache-fast-test':
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/profile/mediawiki/deployment/server/apache-fast-test',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Improve @covers tags

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Improve @covers tags
..

Improve @covers tags

Change-Id: I3df3698b5d3f3eae95db8c740c611f365ff9cb31
---
M tests/phpunit/parserTest.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/tests/phpunit/parserTest.php b/tests/phpunit/parserTest.php
index d3b998e..7dd13a2 100644
--- a/tests/phpunit/parserTest.php
+++ b/tests/phpunit/parserTest.php
@@ -25,6 +25,12 @@
  * @licence GNU GPL v2+
  * @author Marius Hoch < h...@online.de >
  */
+
+/**
+ * @covers AbuseFilterCachingParser
+ * @covers AbuseFilterParser
+ * @covers AbuseFilterTokenizer
+ */
 class AbuseFilterParserTest extends MediaWikiTestCase {
/**
 * @return AbuseFilterParser
@@ -38,7 +44,7 @@
}
 
/**
-* @return [AbuseFilterParser]
+* @return AbuseFilterParser[]
 */
static function getParsers() {
static $parsers = null;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3df3698b5d3f3eae95db8c740c611f365ff9cb31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Make transferbot.py use source interwiki in edit su...

2018-01-23 Thread Dvorapa (Code Review)

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

Change subject: [bugfix] Make transferbot.py use source interwiki in edit 
summary
..

[bugfix] Make transferbot.py use source interwiki in edit summary

Bug: T185603
Change-Id: I713eeb7cbd528faae2aa5ccb0bc5e98b7b4dea87
---
M scripts/transferbot.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/77/405977/1

diff --git a/scripts/transferbot.py b/scripts/transferbot.py
index 6b6f229..6ae1ece 100755
--- a/scripts/transferbot.py
+++ b/scripts/transferbot.py
@@ -134,7 +134,7 @@
'gen_args': gen_args, 'prefix': prefix})
 
 for page in gen:
-summary = "Moved page from %s" % page.title(asLink=True)
+summary = "Moved page from %s" % page.title(asLink=True, 
insite=fromsite)
 targetpage = pywikibot.Page(tosite, prefix + page.title())
 edithistpage = pywikibot.Page(tosite, prefix + page.title() +
   '/edithistory')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I713eeb7cbd528faae2aa5ccb0bc5e98b7b4dea87
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dvorapa 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ve.ui.DesktopContext: Remove unused CSS

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: ve.ui.DesktopContext: Remove unused CSS
..


ve.ui.DesktopContext: Remove unused CSS

We don't use the CSS class .oo-ui-context-menu on anything.

Change-Id: I9c2db64fe300f8104a509a79b3621253356e5f02
---
M src/ui/styles/ve.ui.DesktopContext.css
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/src/ui/styles/ve.ui.DesktopContext.css 
b/src/ui/styles/ve.ui.DesktopContext.css
index bce557d..0b62f08 100644
--- a/src/ui/styles/ve.ui.DesktopContext.css
+++ b/src/ui/styles/ve.ui.DesktopContext.css
@@ -55,7 +55,3 @@
 .ve-ui-surface-dir-rtl .ve-ui-desktopContext > .oo-ui-popupWidget:not( 
.oo-ui-popupWidget-anchored ) .oo-ui-popupWidget-popup {
margin-left: 0.5em;
 }
-
-.ve-ui-desktopContext > .oo-ui-popupWidget:not( .oo-ui-popupWidget-anchored ) 
.oo-ui-context-menu {
-   right: 0;
-}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: MWMultiVersion: don't add --wiki is it's already present

2018-01-23 Thread MaxSem (Code Review)

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

Change subject: MWMultiVersion: don't add --wiki is it's already present
..

MWMultiVersion: don't add --wiki is it's already present

Otherwise, stuff like SiteConfiguration::getConfig() breaks

Change-Id: I5d7a257e7e7875b87b529cf8c698de73cc807be6
---
M puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/76/405976/1

diff --git 
a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb 
b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
index f8ecf8f..18e9655 100644
--- a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
+++ b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
@@ -186,8 +186,10 @@
global $IP;
if ( strpos( $script, "{$IP}/" ) === 0 ) {
$script = substr( $script, strlen( "{$IP}/" ) );
-   $wiki = wfWikiId();
-   array_unshift( $params, "--wiki=$wiki" );
+   if ( strpos( $params[0], '--wiki' ) !== 0 ) {
+   $wiki = wfWikiId();
+   array_unshift( $params, "--wi_ki=$wiki" );
+   }
$options['wrapper'] = __DIR__ . '/MWScript.php';
}
return true;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Change "comment" to "post" in English messages

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Change "comment" to "post" in English messages
..


Change "comment" to "post" in English messages

Bug: T144630
Change-Id: I02770a384e0d57c95a80cdf81290af66323ae3ab
---
M i18n/en.json
1 file changed, 18 insertions(+), 18 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 7982702..5a53bb9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -57,22 +57,22 @@
"flow-topic-collapse-siderail": "Read at full width",
"flow-topic-expand-siderail": "Read at fixed width",
"flow-edit-header-link": "Edit description",
-   "flow-post-moderated-toggle-hide-show": "Show comment 
{{GENDER:$1|hidden}} by $2",
-   "flow-post-moderated-toggle-delete-show": "Show comment 
{{GENDER:$1|deleted}} by $2",
-   "flow-post-moderated-toggle-suppress-show": "Show comment 
{{GENDER:$1|suppressed}} by $2",
-   "flow-post-moderated-toggle-hide-hide": "Hide comment 
{{GENDER:$1|hidden}} by $2",
-   "flow-post-moderated-toggle-delete-hide": "Hide comment 
{{GENDER:$1|deleted}} by $2",
-   "flow-post-moderated-toggle-suppress-hide": "Hide comment 
{{GENDER:$1|suppressed}} by $2",
+   "flow-post-moderated-toggle-hide-show": "Show post {{GENDER:$1|hidden}} 
by $2",
+   "flow-post-moderated-toggle-delete-show": "Show post 
{{GENDER:$1|deleted}} by $2",
+   "flow-post-moderated-toggle-suppress-show": "Show post 
{{GENDER:$1|suppressed}} by $2",
+   "flow-post-moderated-toggle-hide-hide": "Hide post {{GENDER:$1|hidden}} 
by $2",
+   "flow-post-moderated-toggle-delete-hide": "Hide post 
{{GENDER:$1|deleted}} by $2",
+   "flow-post-moderated-toggle-suppress-hide": "Hide post 
{{GENDER:$1|suppressed}} by $2",
"flow-topic-moderated-reason-prefix": "Reason:",
-   "flow-hide-post-content": "This comment was {{GENDER:$1|hidden}} by $1 
([$2 history])",
+   "flow-hide-post-content": "This post was {{GENDER:$1|hidden}} by $1 
([$2 history])",
"flow-hide-title-content": "This topic was {{GENDER:$1|hidden}} by $1",
"flow-hide-header-content": "{{GENDER:$1|Hidden}} by $2",
"flow-hide-usertext": "$1",
-   "flow-delete-post-content": "This comment was {{GENDER:$1|deleted}} by 
$1 ([$2 history])",
+   "flow-delete-post-content": "This post was {{GENDER:$1|deleted}} by $1 
([$2 history])",
"flow-delete-title-content": "This topic was {{GENDER:$1|deleted}} by 
$1",
"flow-delete-header-content": "{{GENDER:$1|Deleted}} by $2",
"flow-delete-usertext": "$1",
-   "flow-suppress-post-content": "This comment was 
{{GENDER:$1|suppressed}} by $1 ([$2 history])",
+   "flow-suppress-post-content": "This post was {{GENDER:$1|suppressed}} 
by $1 ([$2 history])",
"flow-suppress-title-content": "This topic was {{GENDER:$1|suppressed}} 
by $1",
"flow-suppress-header-content": "{{GENDER:$1|Suppressed}} by $2",
"flow-suppress-usertext": "Username suppressed",
@@ -226,7 +226,7 @@
"flow-edit-title-submit-anonymously": "Change title anonymously",
"flow-edit-post-submit": "Submit changes",
"flow-edit-post-submit-anonymously": "Submit changes anonymously",
-   "flow-rev-message-edit-post": "$1 {{GENDER:$2|edited}} a [$3 comment] 
on \"$4\"",
+   "flow-rev-message-edit-post": "$1 {{GENDER:$2|edited}} a [$3 post] on 
\"$4\"",
"flow-rev-message-edit-post-recentchanges": "$1",
"flow-rev-message-edit-post-recentchanges-summary": 
"{{GENDER:$2|Edited}} a post",
"flow-rev-message-edit-post-contributions": "",
@@ -251,14 +251,14 @@
"flow-rev-message-create-topic-summary-irc": "$2 {{GENDER:$2|created}} 
topic summary on $3",
"flow-rev-message-edit-topic-summary": "$1 {{GENDER:$2|edited}} topic 
summary on $3",
"flow-rev-message-edit-topic-summary-irc": "$2 {{GENDER:$2|edited}} 
topic summary on $3",
-   "flow-rev-message-hid-post": "$1 {{GENDER:$2|hid}} a [$4 comment] on 
\"$6\" ($5)",
-   "flow-rev-message-hid-post-irc": "$2 {{GENDER:$2|hid}} a comment on 
\"$6\" ($5)",
-   "flow-rev-message-deleted-post": "$1 {{GENDER:$2|deleted}} a [$4 
comment] on \"$6\" ($5)",
-   "flow-rev-message-deleted-post-irc": "$2 {{GENDER:$2|deleted}} a 
comment on \"$6\" ($5)",
-   "flow-rev-message-suppressed-post": "$1 {{GENDER:$2|suppressed}} a [$4 
comment] on \"$6\" ($5)",
-   "flow-rev-message-suppressed-post-irc": "$2 {{GENDER:$2|suppressed}} a 
comment on \"$6\" ($5)",
-   "flow-rev-message-restored-post": "$1 {{GENDER:$2|restored}} a [$4 
comment] on \"$6\" ($5)",
-   "flow-rev-message-restored-post-irc": "$2 {{GENDER:$2|restored}} a 
comment on \"$6\" ($5)",
+   "flow-rev-message-hid-post": "$1 {{GENDER:$2|hid}} a [$4 post] on 
\"$6\" ($5)",
+

[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Fix @covers annotation

2018-01-23 Thread MaxSem (Code Review)

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

Change subject: Fix @covers annotation
..

Fix @covers annotation

Change-Id: Id6b2b1fcd14ea0d0aa544ff4dd26b3252a2c4797
---
M tests/phpunit/ApiQueryExtractsTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TextExtracts 
refs/changes/75/405975/1

diff --git a/tests/phpunit/ApiQueryExtractsTest.php 
b/tests/phpunit/ApiQueryExtractsTest.php
index 6c8d317..0eb8f12 100644
--- a/tests/phpunit/ApiQueryExtractsTest.php
+++ b/tests/phpunit/ApiQueryExtractsTest.php
@@ -5,7 +5,7 @@
 use TextExtracts\ApiQueryExtracts;
 
 /**
- * @covers ApiQueryExtracts
+ * @covers TextExtracts/ApiQueryExtracts
  * @group TextExtracts
  */
 class ApiQueryExtractsTest extends PHPUnit_Framework_TestCase {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Deprecate wfShellWikiCmd()

2018-01-23 Thread MaxSem (Code Review)

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

Change subject: Deprecate wfShellWikiCmd()
..

Deprecate wfShellWikiCmd()

Bug: T184339

Change-Id: Ic86a451e0e9d609e06865a4969560d151efa844c
---
M RELEASE-NOTES-1.31
M includes/GlobalFunctions.php
M includes/SiteConfiguration.php
M includes/specialpage/LoginSignupSpecialPage.php
M maintenance/Maintenance.php
M tests/phpunit/maintenance/MaintenanceTest.php
6 files changed, 114 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/405974/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 5e14aee..629321b 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -186,6 +186,7 @@
 * The driver 'mysql' for MySQL, deprecated in MediaWiki 1.30, has been removed.
   The driver has been deprecated since PHP 5.5 and was removed in PHP 7.0. The
   default driver for MySQL has been 'mysqli' since MediaWiki 1.22.
+* The function wfShellWikiCmd() has been deprecated, use 
Maintenance::makeScriptCommand().
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is 
supported,
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a06d721..d6ace5a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2375,6 +2375,8 @@
  * Note that $parameters should be a flat array and an option with an argument
  * should consist of two consecutive items in the array (do not use "--option 
value").
  *
+ * @deprecated since 1.31, use Maintenance::executeMaintenanceScript()
+ *
  * @param string $script MediaWiki cli script path
  * @param array $parameters Arguments and options to the script
  * @param array $options Associative array of options:
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 2d1d961..93f26f4 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -546,19 +546,21 @@
} else {
$this->cfgCache[$wiki] = [];
}
-   $retVal = 1;
-   $cmd = wfShellWikiCmd(
+   $result = Maintenance::makeScriptCommand(
"$IP/maintenance/getConfiguration.php",
[
'--wiki', $wiki,
'--settings', implode( ' ', $settings ),
-   '--format', 'PHP'
+   '--format', 'PHP',
]
-   );
-   // ulimit5.sh breaks this call
-   $data = trim( wfShellExec( $cmd, $retVal, [], [ 
'memory' => 0, 'filesize' => 0 ] ) );
-   if ( $retVal != 0 || !strlen( $data ) ) {
-   throw new MWException( "Failed to run 
getConfiguration.php." );
+   )
+   // limit.sh breaks this call
+   ->limits( [ 'memory' => 0, 'filesize' => 0 ] )
+   ->execute();
+
+   $data = trim( $result->getStdout() );
+   if ( $result->getExitCode() != 0 || !strlen( $data ) ) {
+   throw new MWException( "Failed to run 
getConfiguration.php: {$result->getStdout()}" );
}
$res = unserialize( $data );
if ( !is_array( $res ) ) {
diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index d6ace0a..f1f422d 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -735,6 +735,7 @@
 
$titleObj = $this->getPageTitle();
$user = $this->getUser();
+   $this->getConfig();
$template = new FakeAuthTemplate();
 
// Pre-fill username (if not creating an account, T46775).
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 5adbee5..ef2edde 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -25,6 +25,8 @@
 require_once __DIR__ . '/../includes/PHPVersionCheck.php';
 wfEntryPointCheck( 'cli' );
 
+use MediaWiki\Shell\Command;
+use MediaWiki\Shell\Shell;
 use Wikimedia\Rdbms\DBReplicationWaitError;
 
 /**
@@ -670,6 +672,34 @@
}
 
/**
+* Generate a Command object to run a MediaWiki CLI script.
+* Note that $parameters should be a flat array and an option with an 
argument
+* should consist of two consecutive items in the array (do not use 
"--option value").
+*
+* @param string $script MediaWiki CLI script path
+* @param

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCLFilters specific message for invalid target page

2018-01-23 Thread Sbisson (Code Review)

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

Change subject: RCLFilters specific message for invalid target page
..

RCLFilters specific message for invalid target page

* always hide the big red .errorbox when rcfilters
  is enabled

* always identify the changes-list section with
  .mw-changeslist or .mw-changeslist-empty

* conditionally add .mw-changeslist-empty-
  to the changeslist section when the reason for it
  being empty is known

* handle RCL being empty because the specified title
  is invalid or inter-wiki

Bug: T184952
Change-Id: I5dd974f5f769503e89301dd22bdfd3d49b0dd11f
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchangeslinked.php
M resources/Resources.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
7 files changed, 24 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/405973/1

diff --git a/includes/specialpage/ChangesListSpecialPage.php 
b/includes/specialpage/ChangesListSpecialPage.php
index 282d764..af4ff1d 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -838,7 +838,7 @@
 */
protected function outputTimeout() {
$this->getOutput()->addHTML(
-   '' .
+   '' .
$this->msg( 'recentchanges-timeout' )->parse() .
''
);
diff --git a/includes/specials/SpecialRecentchangeslinked.php 
b/includes/specials/SpecialRecentchangeslinked.php
index d4aef6c..181b4db 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -65,7 +65,6 @@
$outputPage->addHTML(
Html::errorBox( $this->msg( 'allpagesbadtitle' 
)->parse() )
);
-
return false;
}
 
@@ -295,12 +294,19 @@
}
 
protected function outputNoResults() {
-   if ( $this->getTargetTitle() === false ) {
+   $targetTitle = $this->getTargetTitle();
+   if ( $targetTitle === false ) {
$this->getOutput()->addHTML(
-   '' .
+   '' .
$this->msg( 'recentchanges-notargetpage' 
)->parse() .
''
);
+   } elseif ( !$targetTitle || $targetTitle->isExternal() ) {
+   $this->getOutput()->addHTML(
+   '' .
+   $this->msg( 'allpagesbadtitle' )->parse() .
+   ''
+   );
} else {
parent::outputNoResults();
}
diff --git a/resources/Resources.php b/resources/Resources.php
index 0e9ab18..41835b3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1919,6 +1919,7 @@
'recentchanges-timeout',
'recentchanges-network',
'recentchanges-notargetpage',
+   'allpagesbadtitle',
'quotation-marks',
],
'dependencies' => [
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 4b78175..3c1fdf8 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -320,6 +320,8 @@
info.noResultsDetails = 'NO_RESULTS_TIMEOUT';
} else if ( $root.find( '.mw-changeslist-notargetpage' 
).length ) {
info.noResultsDetails = 
'NO_RESULTS_NO_TARGET_PAGE';
+   } else if ( $root.find( 
'.mw-changeslist-invalidtargetpage' ).length ) {
+   info.noResultsDetails = 
'NO_RESULTS_INVALID_TARGET_PAGE';
} else {
info.noResultsDetails = 'NO_RESULTS_NORMAL';
}
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 1f72484..d181532 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -78,12 +78,7 @@
{
$topSection: $topSection,

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Sync tempWikitextEditor just before building target, not on ...

2018-01-23 Thread Esanders (Code Review)

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

Change subject: Sync tempWikitextEditor just before building target, not on 
every change
..

Sync tempWikitextEditor just before building target, not on every change

Change-Id: Idc30a9dc00491b8c85353d73cb9ff70afea1d51c
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
2 files changed, 21 insertions(+), 15 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d9f9d40..e971dff 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -21,7 +21,7 @@
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, 
veEditSourceUri, isViewPage, isEditPage,
pageCanLoadEditor, init, targetPromise, enable, tempdisable, 
autodisable,
tabPreference, enabledForUser, initialWikitext, oldId,
-   isLoading, tempWikitextEditor, $toolbarPlaceholder,
+   isLoading, tempWikitextEditor, tempWikitextEditorData, 
$toolbarPlaceholder,
editModes = {
edit: 'visual'
},
@@ -107,18 +107,8 @@
}
 
function setupTempWikitextEditor( data ) {
-   tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( 
{
-   value: data.content,
-   onChange: function () {
-   // Write changes back to response data object,
-   // which will be used to construct the surface.
-   data.content = tempWikitextEditor.getValue();
-   // TODO: Consider writing changes using a
-   // transaction so they can be undone.
-   // For now, just mark surface as pre-modified
-   data.fromEditedState = true;
-   }
-   } );
+   tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( 
{ value: data.content } );
+   tempWikitextEditorData = data;
 
// Create an equal-height placeholder for the toolbar to avoid 
vertical jump
// when the real toolbar is ready.
@@ -143,6 +133,19 @@
ve.track( 'mwedit.ready', { mode: 'source' } );
}
 
+   function syncTempWikitextEditor() {
+   var newContent = tempWikitextEditor.getValue();
+   if ( newContent !== tempWikitextEditorData.content ) {
+   // Write changes back to response data object,
+   // which will be used to construct the surface.
+   tempWikitextEditorData.content = newContent;
+   // TODO: Consider writing changes using a
+   // transaction so they can be undone.
+   // For now, just mark surface as pre-modified
+   tempWikitextEditorData.fromEditedState = true;
+   }
+   }
+
function teardownTempWikitextEditor() {
var range,
nativeRange = tempWikitextEditor.getRange(),
@@ -155,6 +158,7 @@
// Destroy widget and placeholder
tempWikitextEditor.$element.remove();
tempWikitextEditor = null;
+   tempWikitextEditorData = null;
$toolbarPlaceholder.remove();
$toolbarPlaceholder = null;
 
@@ -372,6 +376,9 @@
init.$loading.detach();
// If target was already loaded, ensure the 
mode is correct
target.setDefaultMode( mode );
+   if ( tempWikitextEditor ) {
+   syncTempWikitextEditor();
+   }
activatePromise = target.activate( dataPromise 
);
$( '#content' ).prepend( init.$loading );
return activatePromise;
diff --git a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js 
b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
index 5bc228c..baf53dd 100644
--- a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
+++ b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js
@@ -32,8 +32,7 @@
lang: lang,
dir: dir
} )
-   .val( config.value )
-   .on( 'input', config.onChange );
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove dot from summary used by fixDoubleRedirects.php

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Remove dot from summary used by fixDoubleRedirects.php
..


Remove dot from summary used by fixDoubleRedirects.php

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

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 42ea35c..4cabfda 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1916,7 +1916,7 @@
"doubleredirects-summary": "",
"doubleredirectstext": "This page lists pages that redirect to other 
redirect pages.\nEach row contains links to the first and second redirect, as 
well as the target of the second redirect, which is usually the \"real\" target 
page to which the first redirect should point.\nCrossed out entries 
have been solved.",
"double-redirect-fixed-move": "[[$1]] has been moved.\nIt was 
automatically updated and now it redirects to [[$2]].",
-   "double-redirect-fixed-maintenance": "Automatically fixing double 
redirect from [[$1]] to [[$2]] in a maintenance job.",
+   "double-redirect-fixed-maintenance": "Automatically fixing double 
redirect from [[$1]] to [[$2]] in a maintenance job",
"double-redirect-fixer": "Redirect fixer",
"brokenredirects": "Broken redirects",
"brokenredirects-summary": "",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae6ab7787fcf8150f738cf361c545c796ce84f16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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...WikibaseQualityConstraints[master]: Don’t load gadget when not in edit mode

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Don’t load gadget when not in edit mode
..


Don’t load gadget when not in edit mode

If Wikibase is not in edit mode – for example, because we’re on a diff
page, or on an older revision – don’t show constraint reports either.

(Note that wbIsEditView is a page-wide property, independent of user
permissions: if a registered user lacks permissions to edit a protected
page, it still makes sense to show them constraint violations, since
they can at least alert others to them on talk pages or project chat.)

Bug: T184623
Change-Id: Ic169e8e34ae2a291f24b17c6fab680af161be6e7
---
M modules/gadget-skip.js
M modules/gadget.js
M src/WikibaseQualityConstraintsHooks.php
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/modules/gadget-skip.js b/modules/gadget-skip.js
index 3921674..cdc2b58 100644
--- a/modules/gadget-skip.js
+++ b/modules/gadget-skip.js
@@ -1 +1 @@
-return !mw.config.exists( 'wbEntityId' ) || mw.config.get( 'wgMFMode' );
+return !mw.config.exists( 'wbEntityId' ) || mw.config.get( 'wgMFMode' ) || 
!mw.config.get( 'wbIsEditView' );
diff --git a/modules/gadget.js b/modules/gadget.js
index da4d542..0983a7d 100644
--- a/modules/gadget.js
+++ b/modules/gadget.js
@@ -291,8 +291,8 @@
 
entityId = mw.config.get( 'wbEntityId' );
 
-   if ( entityId === null || mw.config.get( 'wgMFMode' ) ) {
-   // no entity or mobile frontend, skip
+   if ( entityId === null || mw.config.get( 'wgMFMode' ) || 
!mw.config.get( 'wbIsEditView' ) ) {
+   // no entity, mobile frontend, or not editing (diff, oldid, …) 
– skip
return;
}
 
diff --git a/src/WikibaseQualityConstraintsHooks.php 
b/src/WikibaseQualityConstraintsHooks.php
index 1dd1de7..71f32af 100644
--- a/src/WikibaseQualityConstraintsHooks.php
+++ b/src/WikibaseQualityConstraintsHooks.php
@@ -132,6 +132,9 @@
if ( !$out->getUser()->isLoggedIn() ) {
return;
}
+   if ( !$out->getJsConfigVars()['wbIsEditView'] ) {
+   return;
+   }
 
if ( self::isGadgetEnabledForUserName( 
$out->getUser()->getName(), time() ) ) {
$out->addModules( 'wikibase.quality.constraints.gadget' 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic169e8e34ae2a291f24b17c6fab680af161be6e7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Run coverage for a bunch of MediaWiki extensions

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Run coverage for a bunch of MediaWiki extensions
..


Run coverage for a bunch of MediaWiki extensions

I checked that these all have "includes" and "tests/phpunit"
directories.

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f7daffb..415de3f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2811,6 +2811,8 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/AccountInfo
 template:
@@ -2837,6 +2839,8 @@
   - name: extension-unittests-generic
   - name: mediawiki-core-qunit-selenium-jessie
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/AdminLinks
 template:
@@ -2895,6 +2899,8 @@
   - name: extension-qunit-composer
 experimental:
   - mwext-mw-selenium-composer-jessie
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Arrays
 template:
@@ -2916,6 +2922,8 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/BaseHooks
 template:
@@ -2926,6 +2934,8 @@
 template:
   - name: mwgate-npm
   - name: extension-unittests-generic
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/BlameMaps
 template:
@@ -2953,6 +2963,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Buggy
 template:
@@ -2973,6 +2985,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/CategoryTagSorter
 template:
@@ -3085,6 +3099,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/CodeEditor
 template:
@@ -3114,6 +3130,7 @@
 postmerge:
   - mwext-doxygen-publish
   - mwext-jsduck-publish
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/CollapsibleVector
 template:
@@ -3124,6 +3141,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Collection/OfflineContentGenerator
 template:
@@ -3165,12 +3184,16 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/ContentTranslation
 template:
   - name: mwgate-npm
   - name: extension-unittests-generic
   - name: extension-qunit-generic
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/ContributionScores
 template:
@@ -3323,6 +3346,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/DonationInterface
 template:
@@ -3370,6 +3395,8 @@
   - name: mediawiki-core-qunit-selenium-jessie
   - name: mwext-ruby-jessie
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/EditAccount
 template:
@@ -3410,6 +3437,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Elastica
 template:
@@ -3427,6 +3456,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/EmailAuthorization
 template:
@@ -3447,6 +3478,8 @@
 template:
   - name: extension-unittests-non-voting
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/EventLogging
 template:
@@ -3456,6 +3489,7 @@
   - name: extension-jsduck
   - name: mwgate-npm
 postmerge:
+  - mwext-phpunit-coverage-publish
   - mwext-jsduck-publish
 
   - name: eventlogging
@@ -3482,6 +3516,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   -

[MediaWiki-commits] [Gerrit] integration/config[master]: Run coverage for a bunch of MediaWiki extensions

2018-01-23 Thread Legoktm (Code Review)

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

Change subject: Run coverage for a bunch of MediaWiki extensions
..

Run coverage for a bunch of MediaWiki extensions

I checked that these all have "includes" and "tests/phpunit"
directories.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/41/405941/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f7daffb..415de3f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2811,6 +2811,8 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/AccountInfo
 template:
@@ -2837,6 +2839,8 @@
   - name: extension-unittests-generic
   - name: mediawiki-core-qunit-selenium-jessie
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/AdminLinks
 template:
@@ -2895,6 +2899,8 @@
   - name: extension-qunit-composer
 experimental:
   - mwext-mw-selenium-composer-jessie
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Arrays
 template:
@@ -2916,6 +2922,8 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/BaseHooks
 template:
@@ -2926,6 +2934,8 @@
 template:
   - name: mwgate-npm
   - name: extension-unittests-generic
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/BlameMaps
 template:
@@ -2953,6 +2963,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Buggy
 template:
@@ -2973,6 +2985,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/CategoryTagSorter
 template:
@@ -3085,6 +3099,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/CodeEditor
 template:
@@ -3114,6 +3130,7 @@
 postmerge:
   - mwext-doxygen-publish
   - mwext-jsduck-publish
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/CollapsibleVector
 template:
@@ -3124,6 +3141,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Collection/OfflineContentGenerator
 template:
@@ -3165,12 +3184,16 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/ContentTranslation
 template:
   - name: mwgate-npm
   - name: extension-unittests-generic
   - name: extension-qunit-generic
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/ContributionScores
 template:
@@ -3323,6 +3346,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/DonationInterface
 template:
@@ -3370,6 +3395,8 @@
   - name: mediawiki-core-qunit-selenium-jessie
   - name: mwext-ruby-jessie
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/EditAccount
 template:
@@ -3410,6 +3437,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Elastica
 template:
@@ -3427,6 +3456,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/EmailAuthorization
 template:
@@ -3447,6 +3478,8 @@
 template:
   - name: extension-unittests-non-voting
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/EventLogging
 template:
@@ -3456,6 +3489,7 @@
   - name: extension-jsduck
   - name: mwgate-npm
 postmerge:
+  - mwext-phpunit-coverage-publish
   - mwext-jsduck-publish
 
   - name: eventlogging
@@ -3482,6 +3516,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Update Coveralls URLs

2018-01-23 Thread jenkins-bot (Code Review)

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

Change subject: Update Coveralls URLs
..


Update Coveralls URLs

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

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



diff --git a/README.md b/README.md
index 4b39354..3545455 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@
 
 [travis-badge]: 
https://travis-ci.org/wikimedia/mediawiki-extensions-WikibaseQualityConstraints.svg?branch=master
 [travis]: 
https://travis-ci.org/wikimedia/mediawiki-extensions-WikibaseQualityConstraints
-[coveralls-badge]: 
https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikibaseQualityConstraints/badge.svg
-[coveralls]: 
https://coveralls.io/r/wikimedia/mediawiki-extensions-WikibaseQualityConstraints
+[coveralls-badge]: 
https://coveralls.io/repos/github/wikimedia/mediawiki-extensions-WikibaseQualityConstraints/badge.svg
+[coveralls]: 
https://coveralls.io/github/wikimedia/mediawiki-extensions-WikibaseQualityConstraints
 [scrutinizer-badge]: 
https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikibaseQualityConstraints/badges/quality-score.png?b=master
 [scrutinizer]: 
https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikibaseQualityConstraints/?branch=master
 [wbq]: https://github.com/wikimedia/mediawiki-extensions-WikibaseQuality.git

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64bc71d98ea5a36aa5a7e5932a80731bbec3334e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Toolbars: Replace $.height with clientHeight/offsetHeight

2018-01-23 Thread Esanders (Code Review)

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

Change subject: Toolbars: Replace $.height with clientHeight/offsetHeight
..

Toolbars: Replace $.height with clientHeight/offsetHeight

Bug: T185599
Change-Id: I43fbce8f221553e9ae03f8385f39a19de01e8eb7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 2b16d96..3f4fddf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -256,7 +256,8 @@
} else {
setTimeout( function () {
toolbar.$element
-   .css( 'height', 
toolbar.$bar.outerHeight() )
+   // Avoid $bar[ 0 ].offsetHeight as this 
returns null in IE9 when $bar is position:fixed
+   .css( 'height', toolbar.$bar[ 0 
].clientHeight )
.addClass( 
've-init-mw-desktopArticleTarget-toolbar-open' );
setTimeout( function () {
// Clear to allow growth during use and 
when resizing window
@@ -1151,7 +1152,8 @@
return deferred.resolve().promise();
}
 
-   this.toolbar.$element.css( 'height', this.toolbar.$bar.outerHeight() );
+   // Avoid $bar[ 0 ].offsetHeight as this returns null in IE9 when $bar 
is position:fixed
+   this.toolbar.$element.css( 'height', this.toolbar.$bar[ 0 
].clientHeight );
setTimeout( function () {
target.toolbar.$element
.css( 'height', '0' )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43fbce8f221553e9ae03f8385f39a19de01e8eb7
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] apps...wikipedia[master]: POC: check whether reading lists are disabled server-side.

2018-01-23 Thread Dbrant (Code Review)

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

Change subject: POC: check whether reading lists are disabled server-side.
..

POC: check whether reading lists are disabled server-side.

Change-Id: Ibd1fe9a123c10649dc48727ed8b837f052aeda65
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
2 files changed, 13 insertions(+), 6 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 494f6e3..57c6c43 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -26,6 +26,7 @@
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.crash.CrashReportActivity;
 import org.wikipedia.events.NetworkConnectEvent;
+import org.wikipedia.events.ReadingListsNotSetUpEvent;
 import org.wikipedia.events.SplitLargeListsEvent;
 import org.wikipedia.events.ThemeChangeEvent;
 import org.wikipedia.events.WikipediaZeroEnterEvent;
@@ -235,6 +236,14 @@
 .setPositiveButton(android.R.string.ok, null)
 .show();
 }
+
+@Subscribe public void on(ReadingListsNotSetUpEvent event) {
+Prefs.setReadingListSyncEnabled(false);
+new AlertDialog.Builder(BaseActivity.this)
+.setMessage("Reading lists are no longer set up!")
+.setPositiveButton(android.R.string.ok, null)
+.show();
+}
 }
 
 }
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
index 090fcab..f88b6cb 100644
--- 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
+++ 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
@@ -15,6 +15,7 @@
 import org.wikipedia.auth.AccountUtil;
 import org.wikipedia.csrf.CsrfTokenClient;
 import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.events.ReadingListsNotSetUpEvent;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.readinglist.database.ReadingList;
 import org.wikipedia.readinglist.database.ReadingListDbHelper;
@@ -408,18 +409,15 @@
 }
 
 } catch (Throwable t) {
-/*
-// In case we want to automatically setup lists for the user:
 if (client.isErrorType(t, "not-set-up")) {
 try {
-L.d("Setting up remote reading lists...");
-client.setup(getCsrfToken(wiki, csrfToken));
-shouldRetry = true;
+
+WikipediaApp.getInstance().getBus().post(new 
ReadingListsNotSetUpEvent());
+
 } catch (Throwable caught) {
 t = caught;
 }
 }
-*/
 if (client.isErrorType(t, "notloggedin")) {
 try {
 L.d("Server doesn't believe we're logged in, so logging 
in...");

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

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

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Chmod yearly mediacounts directory so ezachte's scripts can ...

2018-01-23 Thread Ottomata (Code Review)

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

Change subject: Chmod yearly mediacounts directory so ezachte's scripts can 
write top1000 files
..

Chmod yearly mediacounts directory so ezachte's scripts can write top1000 files

Bug: T185419
Change-Id: Ie3849f6869b40c4174d30bfeff8c8f04b5a5d079
---
M oozie/mediacounts/archive/workflow.xml
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/38/405938/1

diff --git a/oozie/mediacounts/archive/workflow.xml 
b/oozie/mediacounts/archive/workflow.xml
index 1c0b11d..fdc4ec0 100644
--- a/oozie/mediacounts/archive/workflow.xml
+++ b/oozie/mediacounts/archive/workflow.xml
@@ -155,6 +155,18 @@
 
 
 
+
+
+
+
+
+
+<--
+We need newly created year directories to be group writeable so 
@ezachte
+can create top1000 files.  T185419
+-->
+
+
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3849f6869b40c4174d30bfeff8c8f04b5a5d079
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

1 2 3 >

1 - 100 of 272 matches

Mail list logo