[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Use PSR-4

2017-12-15 Thread Code Review
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398620 )

Change subject: Use PSR-4
..

Use PSR-4

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


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

diff --git a/extension.json b/extension.json
index 84ceb09..fb89956 100644
--- a/extension.json
+++ b/extension.json
@@ -8,25 +8,8 @@
"descriptionmsg": "readinglists-desc",
"license-name": "GPL-2.0+",
"type": "other",
-   "AutoloadClasses": {
-   "MediaWiki\\Extensions\\ReadingLists\\HookHandler": 
"src/HookHandler.php",
-   "MediaWiki\\Extensions\\ReadingLists\\Utils": "src/Utils.php",
-   "MediaWiki\\Extensions\\ReadingLists\\ReadingListRepository": 
"src/ReadingListRepository.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\ReadingListRepositoryException": 
"src/ReadingListRepositoryException.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\ReverseInterwikiLookupInterface": 
"src/ReverseInterwikiLookupInterface.php",
-   "MediaWiki\\Extensions\\ReadingLists\\ReverseInterwikiLookup": 
"src/ReverseInterwikiLookup.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiQueryReadingListEntries": 
"src/Api/ApiQueryReadingListEntries.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiQueryReadingLists": 
"src/Api/ApiQueryReadingLists.php",
-   "MediaWiki\\Extensions\\ReadingLists\\Api\\ApiQueryTrait": 
"src/Api/ApiQueryTrait.php",
-   "MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingLists": 
"src/Api/ApiReadingLists.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingListsCreateEntry": 
"src/Api/ApiReadingListsCreateEntry.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingListsCreate": 
"src/Api/ApiReadingListsCreate.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingListsDeleteEntry": 
"src/Api/ApiReadingListsDeleteEntry.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingListsDelete": 
"src/Api/ApiReadingListsDelete.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingListsSetup": 
"src/Api/ApiReadingListsSetup.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingListsTeardown": 
"src/Api/ApiReadingListsTeardown.php",
-   
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingListsUpdate": 
"src/Api/ApiReadingListsUpdate.php",
-   "MediaWiki\\Extensions\\ReadingLists\\Api\\ApiTrait": 
"src/Api/ApiTrait.php"
+   "AutoloadNamespaces": {
+   "MediaWiki\\Extensions\\ReadingLists\\": "src/"
},
"APIModules": {
"readinglists": 
"MediaWiki\\Extensions\\ReadingLists\\Api\\ApiReadingLists"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d42c60dc29f40bbf927c122f1f681d62d0c5e53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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


[MediaWiki-commits] [Gerrit] mediawiki...ReplaceText[master]: Re-order files to keep the top level clean

2017-12-15 Thread MarkAHershberger (Code Review)
MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398619 )

Change subject: Re-order files to keep the top level clean
..

Re-order files to keep the top level clean

Change-Id: I981f43ac397ac6f79df093abb94ab77ba4100a6c
---
M extension.json
R maintenance/ReplaceAll.php
R modules/ReplaceText.css
R modules/ReplaceText.js
R modules/ReplaceTextSearch.js
R src/Hook.php
R src/Job.php
R src/Search.php
R src/SpecialPage.php
R src/i18n/Alias.php
10 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText 
refs/changes/19/398619/1

diff --git a/extension.json b/extension.json
index a4f4ccf..56f0c4b 100644
--- a/extension.json
+++ b/extension.json
@@ -31,13 +31,13 @@
]
},
"ExtensionMessagesFiles": {
-   "ReplaceTextAlias": "ReplaceText.alias.php"
+   "ReplaceTextAlias": "src/i18n/Alias.php"
},
"AutoloadClasses": {
-   "MediaWiki\\Extension\\ReplaceText\\Hook": 
"ReplaceText.hooks.php",
-   "MediaWiki\\Extension\\ReplaceText\\SpecialPage": 
"SpecialReplaceText.php",
-   "MediaWiki\\Extension\\ReplaceText\\Job": "ReplaceTextJob.php",
-   "MediaWiki\\Extension\\ReplaceText\\Search": 
"ReplaceTextSearch.php"
+   "MediaWiki\\Extension\\ReplaceText\\Hook": "src/Hook.php",
+   "MediaWiki\\Extension\\ReplaceText\\SpecialPage": 
"src/SpecialPage.php",
+   "MediaWiki\\Extension\\ReplaceText\\Job": "src/Job.php",
+   "MediaWiki\\Extension\\ReplaceText\\Search": "src/Search.php"
},
"Hooks": {
"AdminLinks": [
@@ -70,8 +70,8 @@
}
},
"ResourceFileModulePaths": {
-   "localBasePath": "",
-   "remoteExtPath": "ReplaceText"
+   "localBasePath": "modules",
+   "remoteExtPath": "ReplaceText/modules"
},
"manifest_version": 1
 }
diff --git a/replaceAll.php b/maintenance/ReplaceAll.php
similarity index 99%
rename from replaceAll.php
rename to maintenance/ReplaceAll.php
index a93c52a..6254323 100755
--- a/replaceAll.php
+++ b/maintenance/ReplaceAll.php
@@ -32,7 +32,7 @@
  *
  */
 
-namespace MediaWiki\\Extension\\ReplaceText;
+namespace MediaWiki\Extension\ReplaceText;
 
 use Maintenance;
 use MWException;
diff --git a/ReplaceText.css b/modules/ReplaceText.css
similarity index 100%
rename from ReplaceText.css
rename to modules/ReplaceText.css
diff --git a/ReplaceText.js b/modules/ReplaceText.js
similarity index 100%
rename from ReplaceText.js
rename to modules/ReplaceText.js
diff --git a/ReplaceTextSearch.js b/modules/ReplaceTextSearch.js
similarity index 100%
rename from ReplaceTextSearch.js
rename to modules/ReplaceTextSearch.js
diff --git a/ReplaceText.hooks.php b/src/Hook.php
similarity index 95%
rename from ReplaceText.hooks.php
rename to src/Hook.php
index 636cb1c..8832c38 100644
--- a/ReplaceText.hooks.php
+++ b/src/Hook.php
@@ -20,7 +20,7 @@
  * 02110-1301, USA.
  */
 
-namespace MediaWiki\\Extension\\ReplaceText;
+namespace MediaWiki\Extension\ReplaceText;
 
 use ALTree;
 use ALRow;
diff --git a/ReplaceTextJob.php b/src/Job.php
similarity index 98%
rename from ReplaceTextJob.php
rename to src/Job.php
index 090d2a5..9ce5c30 100644
--- a/ReplaceTextJob.php
+++ b/src/Job.php
@@ -25,7 +25,7 @@
  * @author Ankit Garg
  */
 
-namespace MediaWiki\\Extension\\ReplaceText;
+namespace MediaWiki\Extension\ReplaceText;
 
 use Title;
 use User;
diff --git a/ReplaceTextSearch.php b/src/Search.php
similarity index 97%
rename from ReplaceTextSearch.php
rename to src/Search.php
index 74657e0..2354e2b 100644
--- a/ReplaceTextSearch.php
+++ b/src/Search.php
@@ -23,7 +23,7 @@
  * @author Mark A. Hershberger 
  */
 
-namespace MediaWiki\\Extension\\ReplaceText;
+namespace MediaWiki\Extension\ReplaceText;
 
 use DatabasePostgres;
 use Title;
diff --git a/SpecialReplaceText.php b/src/SpecialPage.php
similarity index 98%
rename from SpecialReplaceText.php
rename to src/SpecialPage.php
index 83e8445..f98fe78 100644
--- a/SpecialReplaceText.php
+++ b/src/SpecialPage.php
@@ -25,7 +25,7 @@
  * @author Mark A. Hershberger 
  */
 
-namespace MediaWiki\\Extension\\ReplaceText;
+namespace MediaWiki\Extension\ReplaceText;
 
 use Html;
 use JobQueueGroup;
diff --git a/ReplaceText.alias.php b/src/i18n/Alias.php
similarity index 100%
rename from ReplaceText.alias.php
rename to src/i18n/Alias.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I981f43ac397ac6f79df093abb94ab77ba4100a6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReplaceText
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 


[MediaWiki-commits] [Gerrit] mediawiki...ReplaceText[master]: Refactor and bump version to 1.3

2017-12-15 Thread MarkAHershberger (Code Review)
MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398618 )

Change subject: Refactor and bump version to 1.3
..

Refactor and bump version to 1.3

* Address any phpcs issues.
* Put everything in MediaWiki\Extension\ReplaceText namespace.
* Break up big functions into smaller bite-size pieces.
* Create and use modules for CSS and JS.
* Assign my copyright to NicheWork LLC

Change-Id: I251188efa2fc1fbf0563b0e1f792a912d077d8c9
---
M README
A ReplaceText.css
M ReplaceText.hooks.php
M ReplaceText.js
M ReplaceText.php
M ReplaceTextJob.php
A ReplaceTextSearch.js
M ReplaceTextSearch.php
M SpecialReplaceText.php
M extension.json
M replaceAll.php
11 files changed, 1,141 insertions(+), 468 deletions(-)


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

diff --git a/README b/README
index 1e0859b..95bdc72 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Replace Text Extension
 
-Version 1.2
+Version 1.3
 Yaron Koren and Niklas Laxström
 
 This is free software licenced under the GNU General Public Licence. Please
diff --git a/ReplaceText.css b/ReplaceText.css
new file mode 100644
index 000..2b65254
--- /dev/null
+++ b/ReplaceText.css
@@ -0,0 +1,4 @@
+.rt-searchmatch {
+font-weight: bold;
+font-size: 1.4em;
+}
diff --git a/ReplaceText.hooks.php b/ReplaceText.hooks.php
index 4edf513..636cb1c 100644
--- a/ReplaceText.hooks.php
+++ b/ReplaceText.hooks.php
@@ -1,11 +1,40 @@
 getSection( wfMessage( 
'adminlinks_general' )->text() );
+use ALTree;
+use ALRow;
+
+class Hook {
+
+   /**
+* Hook for AdminLinks to include ReplaceText
+* @param ALTree $adminLinksTree the tree
+*/
+   public static function addToAdminLinks( ALTree $adminLinksTree ) {
+   $generalSection = $adminLinksTree->getSection(
+   wfMessage( 'adminlinks_general' )->text()
+   );
$extensionsRow = $generalSection->getRow( 'extensions' );
 
if ( is_null( $extensionsRow ) ) {
@@ -14,8 +43,6 @@
}
 
$extensionsRow->addItem( ALItem::newFromSpecialPage( 
'ReplaceText' ) );
-
-   return true;
}
 
 }
diff --git a/ReplaceText.js b/ReplaceText.js
index 666c462..9efc327 100644
--- a/ReplaceText.js
+++ b/ReplaceText.js
@@ -1,17 +1,27 @@
-function invertSelections() {
-   'use strict';
+/* @license GPL 2.0 */
+/* @author Yaron Koren */
+( function ( mw, $ ) {
+   $( function () {
+   invertSelections = function() {
+   'use strict';
 
-   var form = document.getElementById('choose_pages' ),
-   num_elements = form.elements.length,
-   i,
-   cur_element;
+   var form = document.getElementById( 'choose_pages' ),
+   num_elements = form.elements.length,
+   i,
+   cur_element;
 
-   for (i = 0; i < num_elements; i++) {
-   cur_element = form.elements[i];
+   for ( i = 0; i < num_elements; i++ ) {
+   cur_element = form.elements[i];
 
-   if (cur_element.type === "checkbox" && cur_element.id !== 
'create-redirect' &&
-   cur_element.id !== 'watch-pages' && cur_element.id !== 
'doEnotif' ) {
-   form.elements[i].checked = form.elements[i].checked !== 
true;
-   }
-   }
-}
+   if (
+   cur_element.type === "checkbox" &&
+   cur_element.id !== 
'create-redirect' &&
+   cur_element.id !== 
'watch-pages' &&
+   cur_element.id !== 'doEnotif'
+   ) {
+   form.elements[i].checked = 
form.elements[i].checked !== true;
+   }
+   }
+   };
+   } );
+}( mediaWiki, jQuery ) );
diff --git a/ReplaceText.php b/ReplaceText.php
index 81c592a..62b12a3 100644
--- a/ReplaceText.php
+++ b/ReplaceText.php
@@ -34,14 +34,14 @@
die();
 }
 
-define( 'REPLACE_TEXT_VERSION', '1.2' );
+define( 'REPLACE_TEXT_VERSION', '1.3' );
 
 // credits
 $wgExtensionCredits['specialpage'][] = [
'path' => __FILE__,
'name' => 'Replace Text',
'version' => REPLACE_TEXT_VERSION,
-   'author' => [ 'Yaron Koren', 'Niklas Laxström', '...' ],
+   'author' => [ 'Yaron Koren', 'Niklas Laxström', '[https://hexmode.com/ 
Mark A. Hershberger]', '...' ],
'url' => 'https://www.mediawiki.org/wiki/Extension:Replace_Text',
'descriptionmsg' => 'replacetext-desc',
'license-name' => 'GPL-2.0+'
@@ -49,19 +49,19 @@
 
 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: Add minus-x to "composer test"

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398613 )

Change subject: Add minus-x to "composer test"
..


Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Id1497bf95924d27cc5b1bce05b742ed604213b2a
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 1d68729..082f166 100644
--- a/composer.json
+++ b/composer.json
@@ -10,11 +10,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": [
+   "minus-x fix ."
+   ],
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1497bf95924d27cc5b1bce05b742ed604213b2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...TorBlock[master]: Move maintenance script to own folder

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398617 )

Change subject: Move maintenance script to own folder
..

Move maintenance script to own folder

Added alias file under old name, because it could be run from cron.

Change-Id: Ibd6ee1dcbd387d5a208896b9f0059ad0c03e9eba
---
M .phpcs.xml
M loadExitNodes.php
A maintenance/loadExitNodes.php
3 files changed, 62 insertions(+), 53 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index bf67ffa..4b8c076 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,13 +2,15 @@
 


-   






+   
+   */maintenance/*
+   
.


diff --git a/loadExitNodes.php b/loadExitNodes.php
index 33ea603..9f88653 100644
--- a/loadExitNodes.php
+++ b/loadExitNodes.php
@@ -1,56 +1,7 @@
 http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Extensions
+ * Alias file for renamed maintenance script in version 1.30.
+ * Backward compatibilty for cron jobs.
  */
-
-require_once getenv( 'MW_INSTALL_PATH' ) !== false
-   ? getenv( 'MW_INSTALL_PATH' ) . "/maintenance/Maintenance.php"
-   : __DIR__ . '/../../maintenance/Maintenance.php';
-
-/**
- * Maintenance script to load/reload the list of Tor exit nodes.
- *
- * @ingroup Maintenance
- * @ingroup Extensions
- */
-class LoadExitNodes extends Maintenance {
-   public function __construct() {
-   parent::__construct();
-   $this->mDescription = "Load the list of Tor exit nodes.";
-   $this->addOption( 'force', 'Force loading of exit nodes from 
the server rather than cache.' );
-   $this->requireExtension( "TorBlock" );
-   }
-
-   public function execute() {
-   if ( $this->getOption( 'force', false ) ) {
-   TorExitNodes::loadExitNodes();
-   }
-   $nodes = TorExitNodes::getExitNodes();
-   if ( !$nodes ) {
-   $this->error( "Could not load exit nodes.", true );
-   }
-   $this->output( 'Successfully loaded ' . count( $nodes ) . " 
exit nodes.\n" );
-   }
-}
-
-$maintClass = 'LoadExitNodes';
-require_once RUN_MAINTENANCE_IF_MAIN;
+require_once __DIR__ . '/maintenance/loadExitNodes.php';
diff --git a/maintenance/loadExitNodes.php b/maintenance/loadExitNodes.php
new file mode 100644
index 000..4c258b3
--- /dev/null
+++ b/maintenance/loadExitNodes.php
@@ -0,0 +1,56 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+require_once getenv( 'MW_INSTALL_PATH' ) !== false
+   ? getenv( 'MW_INSTALL_PATH' ) . "/maintenance/Maintenance.php"
+   : __DIR__ . '/../../../maintenance/Maintenance.php';
+
+/**
+ * Maintenance script to load/reload the list of Tor exit nodes.
+ *
+ * @ingroup Maintenance
+ * @ingroup Extensions
+ */
+class LoadExitNodes extends Maintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->mDescription = "Load the list of Tor exit nodes.";
+   $this->addOption( 'force', 'Force loading of exit nodes from 
the server rather than cache.' );
+   $this->requireExtension( "TorBlock" );
+   }
+
+   public function execute() {
+   if ( $this->getOption( 'force', false ) ) {
+   TorExitNodes::loadExitNodes();
+   }
+   $nodes = TorExitNodes::getExitNodes();
+   if ( !$nodes ) {
+   $this->error( "Could not load exit nodes.", true );
+   }
+   $this->output( 'Successfully loaded ' . count( $nodes ) . " 
exit nodes.\n" );
+   }
+}
+
+$maintClass = 'LoadExitNodes';
+require_once RUN_MAINTENANCE_IF_MAIN;

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...BlueSky[master]: Add minus-x to "composer test"

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398612 )

Change subject: Add minus-x to "composer test"
..


Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Id51ae956027b680b6082249537491c2c5abcfac9
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index aebd773..dfca38b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": [
+   "minus-x fix ."
+   ],
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id51ae956027b680b6082249537491c2c5abcfac9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSky
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T45094 span to sup change

2017-12-15 Thread Sbailey (Code Review)
Sbailey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398616 )

Change subject: T45094 span to sup change
..

T45094 span to sup change

Change-Id: I7c83d12dd900682799c124ddae1a8689969d5e8c
---
M lib/ext/Cite/index.js
M tests/citeParserTests.txt
2 files changed, 66 insertions(+), 66 deletions(-)


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

diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index ced0b51..77982d6 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -424,7 +424,7 @@
 
// Add ref-index linkback
var doc = node.ownerDocument;
-   var span = doc.createElement('span');
+   var span = doc.createElement('sup');
var content = dp.content;
var dataMw = Util.clone(DU.getDataMw(node));
var body;
diff --git a/tests/citeParserTests.txt b/tests/citeParserTests.txt
index 5e29443..38f98d3 100644
--- a/tests/citeParserTests.txt
+++ b/tests/citeParserTests.txt
@@ -631,7 +631,7 @@
 
 
 !! html/parsoid
-[1]
+[1]
 ↑  ">[bar]
 !! end
 
@@ -651,7 +651,7 @@
 
 
 !! html/parsoid
-[1]
+[1]
 ↑  [bar]
 !! end
 
@@ -670,9 +670,9 @@
 C 
 
 !! html/parsoid
-A [1]
-B [2]
-C [3]
+A [1]
+B [2]
+C [3]
 
 ↑  foo
 ↑  foo
@@ -687,8 +687,8 @@
 B 
 
 !! html/parsoid
-A [1]
-B [1]
+A [1]
+B [1]
 
 1 
2  foo
 
@@ -702,9 +702,9 @@
 C 
 
 !! html/parsoid
-A [1]
-B [1]
-C [1]
+A [1]
+B [1]
+C [1]
 
 1 
2 3 
 foo
 
@@ -717,7 +717,7 @@
 A foo
 
 !! html/parsoid
-A [1]
+A [1]
 
 ↑  foo
 
@@ -732,7 +732,7 @@
 
 
 !! html/parsoid
-A [1]
+A [1]
 
 
 ↑  This is a bolded link 
and this is a transclusion
@@ -751,7 +751,7 @@
 
 
 !! html/parsoid
-A [1]
+A [1]
 
 
 ↑  foo
@@ -779,7 +779,7 @@
 
 
 !! html/parsoid
-A [1]
+A [1]
 
 
 ↑  foo
@@ -803,7 +803,7 @@
 
 
 !! html/parsoid
-A [1] B C}}
+A [1] B C}}
 
 ↑  foo 
{{echo|
 
@@ -815,7 +815,7 @@
 A  foo 
 
@@ -828,7 +828,7 @@
 
 
 !! html/parsoid
-A [1] B C
+A [1] B C
 
 
 
@@ -843,8 +843,8 @@
 C bar D
 
 !! html/parsoid
-A [1] B
-C [2] D
+A [1] B
+C [2] D
 
 ↑  foo
 ↑  bar
@@ -865,8 +865,8 @@
 a
 
 
-b [1]
-[2]
+b [1]
+[2]
 
 c
 
@@ -882,8 +882,8 @@
  B
 
 !! html/parsoid
-[1] A
-[2] B
+[1] A
+[2] B
 
 ↑  foo
 ↑  bar
@@ -901,7 +901,7 @@
 
 
 !! html/parsoid
-[1] baz/ref>
+[1] baz/ref>
 
 ↑  foo ref>bar
 !! end
@@ -914,8 +914,8 @@
 
 
 !! html/parsoid
-A1 [1] A2 [1]
-B1 [2] B2 [2]
+A1 [1] A2 [1]
+B1 [2] B2 [2]
 
 1 
2  foo1 
2  bar
 
@@ -931,7 +931,7 @@
 
 
 !! html/parsoid
-A [1]
+A [1]
 
 ↑  foo
 !! end
@@ -944,8 +944,8 @@
 
 
 !! html/parsoid
-[1]
-[2]
+[1]
+[2]
 
 ↑  foo↑  ve-created 
name
 
@@ -968,7 +968,7 @@
 
 
 !! html/parsoid
-[1]
+[1]
 
 
 
@@ -997,7 +997,7 @@
 
 
 !! html/parsoid
-1 [1] 2 [1]
+1 [1] 2 [1]
 
 
 1 2 
 foo
@@ -1013,9 +1013,9 @@
 
 
 !! html/parsoid
-A [1]
-B [1]
-C [1]
+A [1]
+B [1]
+C [1]
 
 1 
2 3 
 Foo one
 
@@ -1040,9 +1040,9 @@
 
 
 !! html/parsoid
-A [a 1]
-B [b 1]
-C [1]
+A [a 1]
+B [b 1]
+C [1]
 
 
 ↑ 
 foo
@@ -1066,12 +1066,12 @@
 
 
 !! html/parsoid
-A [1]
+A [1]
 
 ↑  foo
 
 
-B [1]
+B [1]
 
 
 ↑  bar
@@ -1090,13 +1090,13 @@
 
 
 !! html/parsoid
-A [a 1]
-B [1]
+A [a 1]
+B [1]
 
 ↑  afoo
 
 
-C [2]
+C [2]
 
 ↑  bfoo↑  cfoo
 
@@ -1116,11 +1116,11 @@
 This should just get lost.
 
 !! html/parsoid
-A [1]
-B [2]
+A [1]
+B [2]
 
 
-↑  foo↑  bar
+↑  foo↑  bar
 
 !! end
 
@@ -1129,7 +1129,7 @@
 !! wikitext
 Foo {{echo|}}
 !! html/parsoid
-[1] ↑  Foo
+[1] ↑  Foo
 
 !! end
 
@@ -1145,15 +1145,15 @@
 foo
 
 !! html/parsoid
-A [1]
-B [X 1]
+A [1]
+B [X 1]
 
 
 
 ↑  foo bar for 
a
 
 
-
+
 ↑  foo
 
 !! end
@@ -1164,7 +1164,7 @@
 X{{echo|foo {{echo|bar}} and {{echo|baz}} boo}}
 
 !! html/parsoid
-X[1]
+X[1]
 ↑  foo bar and baz boo
 
 !! end
@@ -1179,7 +1179,7 @@
 A foo
 B bar
 !! html/parsoid
-A [1] B [inexistent 1]
+A [1] B [inexistent 1]
 
 ↑  foo
 
@@ -1223,7 +1223,7 @@
 
 
 !! html/parsoid
-[1]
+[1]
 
 ↑  hi
 
@@ -1243,7 +1243,7 @@
 
 
 !! html/parsoid
-a[1]
+a[1]
 
 references>
 ↑  foo
@@ -1266,8 +1266,8 @@
 test hi {{refinref}}
 
 !! html/parsoid
-test [1]
-↑  hi [2]↑  ho
+test [1]
+↑  hi [2]↑  ho
 !! end
 
 ## Parsoid responsive references tests
@@ -1282,7 +1282,7 @@
 !! wikitext
 Test 12
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1296,7 +1296,7 @@
 !! wikitext
 Test 12
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1310,7 +1310,7 @@
 !! wikitext
 Test 12
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1324,7 +1324,7 @@
 Test 12
 
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1338,7 +1338,7 @@
 Test 12
 
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1352,7 +1352,7 @@
 Test 12
 
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1366,7 +1366,7 @@
 Test 12
 
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1380,7 +1380,7 @@
 Test 12
 
 !! html/parsoid
-Test [1][2]
+Test [1][2]
 ↑  1↑  2
 !! end
 
@@ -1394,7 +1394,7 @@
 

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Fix case of file ApiQueryConfiguredPages.php

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398615 )

Change subject: Fix case of file ApiQueryConfiguredPages.php
..

Fix case of file ApiQueryConfiguredPages.php

Makes MediaWiki.Files.ClassMatchesFilename.WrongCase pass

Change-Id: I7e9c8d58c1fb3f0605f8dd8d0d90d9b1f5b6463d
---
M .phpcs.xml
M FlaggedRevs.php
R api/reports/ApiQueryConfiguredpages.php
3 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index beff47f..1e755d5 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -5,7 +5,6 @@



-   



@@ -14,6 +13,9 @@



+   
+   */maintenance/*
+   

frontend/language/

diff --git a/FlaggedRevs.php b/FlaggedRevs.php
index bcd048d..e22582d 100644
--- a/FlaggedRevs.php
+++ b/FlaggedRevs.php
@@ -337,7 +337,7 @@
 # ReviewedPages for API
 $wgAutoloadClasses['ApiQueryReviewedpages'] = 
"$apiReportDir/ApiQueryReviewedpages.php";
 # ConfiguredPages for API
-$wgAutoloadClasses['ApiQueryConfiguredpages'] = 
"$apiReportDir/ApiQueryConfiguredPages.php";
+$wgAutoloadClasses['ApiQueryConfiguredpages'] = 
"$apiReportDir/ApiQueryConfiguredpages.php";
 # Flag metadata for pages for API
 $wgAutoloadClasses['ApiQueryFlagged'] = "$apiReportDir/ApiQueryFlagged.php";
 # Site flag config for API
diff --git a/api/reports/ApiQueryConfiguredPages.php 
b/api/reports/ApiQueryConfiguredpages.php
similarity index 100%
rename from api/reports/ApiQueryConfiguredPages.php
rename to api/reports/ApiQueryConfiguredpages.php

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Fix case of class TreeRepositoryDbTest

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398614 )

Change subject: Fix case of class TreeRepositoryDbTest
..

Fix case of class TreeRepositoryDbTest

Makes MediaWiki.Files.ClassMatchesFilename.WrongCase pass

Change-Id: I1ecea7e84c379b31dc1164d566e8217a57b1eaf1
---
M .phpcs.xml
M extension.json
M tests/phpunit/Repository/TreeRepositoryDbTest.php
3 files changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index 367d4ae..6cc6593 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -11,12 +11,14 @@



-   





+   
+   */maintenance/*
+   



diff --git a/extension.json b/extension.json
index e238aa4..429fe21 100644
--- a/extension.json
+++ b/extension.json
@@ -1366,7 +1366,7 @@
"Flow\\Tests\\PermissionsTest": 
"tests/phpunit/PermissionsTest.php",
"Flow\\Tests\\PostRevisionTestCase": 
"tests/phpunit/PostRevisionTestCase.php",
"Flow\\Tests\\Repository\\TreeRepositoryTest": 
"tests/phpunit/Repository/TreeRepositoryTest.php",
-   "Flow\\Tests\\Repository\\TreeRepositorydbTest": 
"tests/phpunit/Repository/TreeRepositoryDbTest.php",
+   "Flow\\Tests\\Repository\\TreeRepositoryDbTest": 
"tests/phpunit/Repository/TreeRepositoryDbTest.php",
"Flow\\Tests\\SpamFilter\\AbuseFilterTest": 
"tests/phpunit/SpamFilter/AbuseFilterTest.php",
"Flow\\Tests\\SpamFilter\\ConfirmEditTest": 
"tests/phpunit/SpamFilter/ConfirmEditTest.php",
"Flow\\Tests\\SpamFilter\\ContentLengthFilterTest": 
"tests/phpunit/SpamFilter/ContentLengthFilterTest.php",
diff --git a/tests/phpunit/Repository/TreeRepositoryDbTest.php 
b/tests/phpunit/Repository/TreeRepositoryDbTest.php
index 224651e..cb34482 100644
--- a/tests/phpunit/Repository/TreeRepositoryDbTest.php
+++ b/tests/phpunit/Repository/TreeRepositoryDbTest.php
@@ -10,7 +10,7 @@
  * @group Flow
  * @group Database
  */
-class TreeRepositorydbTest extends FlowTestCase {
+class TreeRepositoryDbTest extends FlowTestCase {
protected $tablesUsed = [ 'flow_tree_node' ];
 
public function testSomething() {

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: Add minus-x to "composer test"

2017-12-15 Thread Rafidaslam (Code Review)
Rafidaslam has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398613 )

Change subject: Add minus-x to "composer test"
..

Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Id1497bf95924d27cc5b1bce05b742ed604213b2a
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/13/398613/1

diff --git a/composer.json b/composer.json
index 1d68729..082f166 100644
--- a/composer.json
+++ b/composer.json
@@ -10,11 +10,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": [
+   "minus-x fix ."
+   ],
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1497bf95924d27cc5b1bce05b742ed604213b2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

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


[MediaWiki-commits] [Gerrit] mediawiki...BlueSky[master]: Add minus-x to "composer test"

2017-12-15 Thread Rafidaslam (Code Review)
Rafidaslam has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398612 )

Change subject: Add minus-x to "composer test"
..

Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Id51ae956027b680b6082249537491c2c5abcfac9
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky 
refs/changes/12/398612/1

diff --git a/composer.json b/composer.json
index aebd773..dfca38b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": [
+   "minus-x fix ."
+   ],
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id51ae956027b680b6082249537491c2c5abcfac9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSky
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix tooltip accessibility for screen readers

2017-12-15 Thread Divadsn (Code Review)
Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398611 )

Change subject: Fix tooltip accessibility for screen readers
..

Fix tooltip accessibility for screen readers

By replacing original-title attribute with aria-label,
we can ensure that every tooltip will be accessible
for accessibility tools like screen readers.

Works with Echo extension, but I am not sure if there
are extensions who are using the original-title attribute.

Tested with ChromeVox on Chrome 62.0.3202.94.

Bug: T54711
Change-Id: I19500c4e8ccbdcb8288b9c2299a29b3f8a31639d
---
M resources/src/jquery.tipsy/jquery.tipsy.js
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/398611/1

diff --git a/resources/src/jquery.tipsy/jquery.tipsy.js 
b/resources/src/jquery.tipsy/jquery.tipsy.js
index ddda432..dc719cf 100644
--- a/resources/src/jquery.tipsy/jquery.tipsy.js
+++ b/resources/src/jquery.tipsy/jquery.tipsy.js
@@ -111,8 +111,8 @@
 
 fixTitle: function() {
 var $e = this.$element;
-if ($e.attr('title') || typeof($e.attr('original-title')) != 
'string') {
-$e.attr('original-title', $e.attr('title') || 
'').removeAttr('title');
+if ($e.attr('title') || typeof($e.attr('aria-label')) != 'string') 
{
+$e.attr('aria-label', $e.attr('title') || 
'').removeAttr('title');
 }
 },
 
@@ -120,7 +120,7 @@
 var title, $e = this.$element, o = this.options;
 this.fixTitle();
 if (typeof o.title == 'string') {
-title = $e.attr(o.title == 'title' ? 'original-title' : 
o.title);
+title = $e.attr(o.title == 'title' ? 'aria-label' : o.title);
 } else if (typeof o.title == 'function') {
 title = o.title.call($e[0]);
 }
@@ -257,7 +257,7 @@
  * @param prefer (string, e.g. 'n', 'sw', 'w') - the direction to prefer
  *if there are no viewable region edges effecting the tooltip's
  *gravity. It will try to vary from this minimally, for example,
- *if 'sw' is preferred and an element is near the right viewable 
+ *if 'sw' is preferred and an element is near the right viewable
  *region edge, but not the top edge, it will set the gravity for
  *that element's tooltip to be 'se', preserving the southern
  *component.

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use uppercase "All" language code on smaller screens

2017-12-15 Thread Petar.petkovic (Code Review)
Petar.petkovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398610 )

Change subject: Use uppercase "All" language code on smaller screens
..

Use uppercase "All" language code on smaller screens

- Don't apply bcp47 on "All" pseudo language code, preventing the code
from going lowercase on smaller screens.
- Move registering of 'x-all' pseudo language code from dashboard to
language filter.
- Add default options to consturctor documentation of language filter.

Bug: T182947
Change-Id: I62c8b4dd8c87d0ffa951980b69d7c13f9ee97758
---
M modules/dashboard/ext.cx.dashboard.js
M modules/ui/mw.cx.ui.LanguageFilter.js
2 files changed, 19 insertions(+), 18 deletions(-)


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

diff --git a/modules/dashboard/ext.cx.dashboard.js 
b/modules/dashboard/ext.cx.dashboard.js
index da455b3..7f3efa6 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -69,13 +69,6 @@
CXDashboard.prototype.init = function () {
var self = this;
 
-   // 'all' could be valid language code, so we use extension 
mechanism and go with 'x-all'
-   $.uls.data.addLanguage( 'x-all', {
-   script: 'Latn',
-   regions: [ 'WW' ],
-   autonym: mw.msg( 
'cx-translation-filter-uls-all-languages' )
-   } );
-
// Render the main components
this.render();
 
diff --git a/modules/ui/mw.cx.ui.LanguageFilter.js 
b/modules/ui/mw.cx.ui.LanguageFilter.js
index 5b96f31..ec4b06d 100644
--- a/modules/ui/mw.cx.ui.LanguageFilter.js
+++ b/modules/ui/mw.cx.ui.LanguageFilter.js
@@ -1,13 +1,21 @@
 'use strict';
 
+// Register 'All languages' in ULS data
+// 'all' could be valid language code, so we use extension mechanism and go 
with 'x-all'
+$.uls.data.addLanguage( 'x-all', {
+   script: 'Latn',
+   regions: [ 'WW' ],
+   autonym: mw.msg( 'cx-translation-filter-uls-all-languages' )
+} );
+
 /**
  * Language filter
  *
  * @class
  * @param {Object} [config] Configuration object
- * @cfg {boolean} [canBeSame] True if source and target language can be the 
same langauge
- * @cfg {boolean} [canBeUndefined] True if source or target language can be 
unset
- * @cfg {boolean} [updateLocalStorage] True if this language selector can 
update local storage,
+ * @cfg {boolean} [canBeSame=false] True if source and target language can be 
the same langauge
+ * @cfg {boolean} [canBeUndefined=false] True if source or target language can 
be unset
+ * @cfg {boolean} [updateLocalStorage=false] True if this language selector 
can update local storage,
  * when source or target language changes
  * @cfg {Function} [onSourceLanguageChange] Callback invoked when source 
language changes
  * @cfg {Function} [onTargetLanguageChange] Callback invoked when target 
language changes
@@ -308,10 +316,12 @@
  * @param {string} language
  */
 mw.cx.ui.LanguageFilter.prototype.setFilterLabel = function ( $filter, 
language ) {
-   var langProps;
+   var langProps, filterLabel;
 
-   if ( ( this.canBeUndefined && !language ) ) {
-   language = mw.msg( 'cx-translation-filter-label-all-languages' 
);
+   if ( this.canBeUndefined && !language ) {
+   language = filterLabel = mw.msg( 
'cx-translation-filter-label-all-languages' );
+   } else {
+   filterLabel = mw.language.bcp47( language );
}
 
langProps = {
@@ -319,11 +329,9 @@
dir: $.uls.data.getDir( language )
};
 
-   $filter.prop( langProps )
-   .text( this.isNarrowScreenSize ?
-   mw.language.bcp47( language ) :
-   $.uls.data.getAutonym( language )
-   );
+   $filter
+   .prop( langProps )
+   .text( this.isNarrowScreenSize ? filterLabel : 
$.uls.data.getAutonym( language ) );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62c8b4dd8c87d0ffa951980b69d7c13f9ee97758
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Scap: bump version to 3.7.4-2"

2017-12-15 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398603 )

Change subject: Revert "Scap: bump version to 3.7.4-2"
..


Revert "Scap: bump version to 3.7.4-2"

This reverts commit 8b7eae257c945afb65224310aba77d099b62a178.

Change-Id: I8c78acbe85cc102b8b9554e3ba1fadbc703b2ce5
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 313dc7f..fa3aa8f 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-2',
+$version = '3.7.4-1',
 ) {
 package { 'scap':
 ensure => $version,

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Move classes to own files

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398609 )

Change subject: Move classes to own files
..

Move classes to own files

Makes MediaWiki.Files.OneClassPerFile.MultipleFound pass

Change-Id: I3b08a69fe7990d6fe5f71cda51d6ac01f11aad2d
---
M .phpcs.xml
M extension.json
A includes/AbuseFilterChangesList.php
A includes/TableDiffFormatterFullContext.php
M includes/Views/AbuseFilterView.php
M includes/Views/AbuseFilterViewDiff.php
M includes/Views/AbuseFilterViewExamine.php
M includes/Views/AbuseFilterViewHistory.php
M includes/Views/AbuseFilterViewList.php
A includes/pagers/AbuseFilterExaminePager.php
A includes/pagers/AbuseFilterHistoryPager.php
A includes/pagers/AbuseFilterPager.php
A includes/pagers/AbuseLogPager.php
A includes/pagers/GlobalAbuseFilterPager.php
M includes/special/SpecialAbuseLog.php
15 files changed, 680 insertions(+), 673 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index acf946c..236df9f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,11 +4,12 @@



-   
-   



+   
+   */maintenance/*
+   

AbuseFilter\.alias\.php

diff --git a/extension.json b/extension.json
index 8a9dfc7..a652d05 100644
--- a/extension.json
+++ b/extension.json
@@ -74,25 +74,25 @@
"AbuseFilterHooks": "includes/AbuseFilter.hooks.php",
"AbuseFilterPreAuthenticationProvider": 
"includes/AbuseFilterPreAuthenticationProvider.php",
"SpecialAbuseLog": "includes/special/SpecialAbuseLog.php",
-   "AbuseLogPager": "includes/special/SpecialAbuseLog.php",
+   "AbuseLogPager": "includes/pagers/AbuseLogPager.php",
"SpecialAbuseFilter": "includes/special/SpecialAbuseFilter.php",
"AbuseLogHitFormatter": "includes/AbuseLogHitFormatter.php",
"AbuseFilterModifyLogFormatter": 
"includes/AbuseFilterModifyLogFormatter.php",
"AbuseFilterViewList": "includes/Views/AbuseFilterViewList.php",
-   "AbuseFilterPager": "includes/Views/AbuseFilterViewList.php",
-   "GlobalAbuseFilterPager": 
"includes/Views/AbuseFilterViewList.php",
+   "AbuseFilterPager": "includes/pagers/AbuseFilterPager.php",
+   "GlobalAbuseFilterPager": 
"includes/pagers/GlobalAbuseFilterPager.php",
"AbuseFilterView": "includes/Views/AbuseFilterView.php",
"AbuseFilterViewEdit": "includes/Views/AbuseFilterViewEdit.php",
"AbuseFilterViewTools": 
"includes/Views/AbuseFilterViewTools.php",
"AbuseFilterViewHistory": 
"includes/Views/AbuseFilterViewHistory.php",
-   "AbuseFilterHistoryPager": 
"includes/Views/AbuseFilterViewHistory.php",
+   "AbuseFilterHistoryPager": 
"includes/pagers/AbuseFilterHistoryPager.php",
"AbuseFilterViewRevert": 
"includes/Views/AbuseFilterViewRevert.php",
"AbuseFilterViewTestBatch": 
"includes/Views/AbuseFilterViewTestBatch.php",
"AbuseFilterViewExamine": 
"includes/Views/AbuseFilterViewExamine.php",
-   "AbuseFilterExaminePager": 
"includes/Views/AbuseFilterViewExamine.php",
-   "AbuseFilterChangesList": "includes/Views/AbuseFilterView.php",
+   "AbuseFilterExaminePager": 
"includes/pagers/AbuseFilterExaminePager.php",
+   "AbuseFilterChangesList": "includes/AbuseFilterChangesList.php",
"AbuseFilterViewDiff": "includes/Views/AbuseFilterViewDiff.php",
-   "TableDiffFormatterFullContext": 
"includes/Views/AbuseFilterViewDiff.php",
+   "TableDiffFormatterFullContext": 
"includes/TableDiffFormatterFullContext.php",
"AbuseFilterViewImport": 
"includes/Views/AbuseFilterViewImport.php",
"AbuseFilterVariableHolder": 
"includes/AbuseFilterVariableHolder.php",
"AFComputedVariable": "includes/AFComputedVariable.php",
diff --git a/includes/AbuseFilterChangesList.php 
b/includes/AbuseFilterChangesList.php
new file mode 100644
index 000..e6e7e0a
--- /dev/null
+++ b/includes/AbuseFilterChangesList.php
@@ -0,0 +1,35 @@
+examineParams ) ? [] : 
$rc->examineParams;
+
+   $title = SpecialPage::getTitleFor( 'AbuseFilter', 'examine/' . 
$rc->mAttribs['rc_id'] );
+   $examineLink = $this->linkRenderer->makeLink(
+   $title,
+   new HtmlArmor( $this->msg( 
'abusefilter-changeslist-examine' )->parse() ),
+   [],
+   $examineParams
+   );
+
+   $s .= ' '.$this->msg( 'parentheses' )->rawParams( $examineLink 
)->escaped();

[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Switch to PSR-4 autoloader

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398405 )

Change subject: Switch to PSR-4 autoloader
..


Switch to PSR-4 autoloader

Change-Id: Ie41c699f5362837dfcfe96f4957633b246fbfacc
---
M extension.json
R includes/Specials/SpecialAboutTopic.php
R includes/Specials/SpecialCreateTopicPage.php
3 files changed, 5 insertions(+), 9 deletions(-)

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



diff --git a/extension.json b/extension.json
index 44f79b4..fee1f7f 100644
--- a/extension.json
+++ b/extension.json
@@ -7,6 +7,9 @@
"descriptionmsg": "articleplaceholder-desc",
"type": "other",
"license-name": "GPL-2.0+",
+   "requires": {
+   "MediaWiki": ">= 1.31.0"
+   },
"SpecialPages": {
"AboutTopic": 
"ArticlePlaceholder\\Specials\\SpecialAboutTopic::newFromGlobalState",
"CreateTopicPage": 
"ArticlePlaceholder\\Specials\\SpecialCreateTopicPage"
@@ -16,15 +19,8 @@
"i18n"
]
},
-   "AutoloadClasses": {
-   "ArticlePlaceholder\\AboutTopicRenderer": 
"includes/AboutTopicRenderer.php",
-   "ArticlePlaceholder\\BaseTemplateToolboxHookHandler": 
"includes/BaseTemplateToolboxHookHandler.php",
-   "ArticlePlaceholder\\Hooks": "includes/Hooks.php",
-   "ArticlePlaceholder\\ItemNotabilityFilter": 
"includes/ItemNotabilityFilter.php",
-   
"ArticlePlaceholder\\Lua\\Scribunto_LuaArticlePlaceholderLibrary": 
"includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php",
-   "ArticlePlaceholder\\SearchHookHandler": 
"includes/SearchHookHandler.php",
-   "ArticlePlaceholder\\Specials\\SpecialAboutTopic": 
"includes/specials/SpecialAboutTopic.php",
-   "ArticlePlaceholder\\Specials\\SpecialCreateTopicPage": 
"includes/specials/SpecialCreateTopicPage.php"
+   "AutoloadNamespaces": {
+   "ArticlePlaceholder\\": "includes/"
},
"ExtensionMessagesFiles": {
"ArticlePlaceholderAliases": "ArticlePlaceholder.alias.php"
diff --git a/includes/specials/SpecialAboutTopic.php 
b/includes/Specials/SpecialAboutTopic.php
similarity index 100%
rename from includes/specials/SpecialAboutTopic.php
rename to includes/Specials/SpecialAboutTopic.php
diff --git a/includes/specials/SpecialCreateTopicPage.php 
b/includes/Specials/SpecialCreateTopicPage.php
similarity index 100%
rename from includes/specials/SpecialCreateTopicPage.php
rename to includes/Specials/SpecialCreateTopicPage.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie41c699f5362837dfcfe96f4957633b246fbfacc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
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...wikihiero[master]: Namespace and PSR-4 this extension

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398501 )

Change subject: Namespace and PSR-4 this extension
..


Namespace and PSR-4 this extension

Change-Id: I7e4414b2cae44883e0923e01b55ec4d696833ea9
---
M extension.json
M generateTables.php
M includes/HieroTokenizer.php
R includes/Hooks.php
M includes/SpecialHieroglyphs.php
M includes/WikiHiero.php
6 files changed, 30 insertions(+), 11 deletions(-)

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



diff --git a/extension.json b/extension.json
index ac2b6c3..ad61c34 100644
--- a/extension.json
+++ b/extension.json
@@ -10,11 +10,11 @@
"license-name": "GPL-2.0+",
"type": "parserhook",
"requires": {
-   "MediaWiki": ">= 1.25.0"
+   "MediaWiki": ">= 1.31.0"
},
"Hooks": {
"ParserFirstCallInit": [
-   "WikiHieroHooks::onParserFirstCallInit"
+   "WikiHiero\\Hooks::onParserFirstCallInit"
]
},
"MessagesDirs": {
@@ -25,17 +25,14 @@
"ExtensionMessagesFiles": {
"HieroglyphsAlias": "wikihiero.alias.php"
},
-   "AutoloadClasses": {
-   "WikiHiero": "includes/WikiHiero.php",
-   "SpecialHieroglyphs": "includes/SpecialHieroglyphs.php",
-   "HieroTokenizer": "includes/HieroTokenizer.php",
-   "WikiHieroHooks": "includes/WikiHieroHooks.php"
+   "AutoloadNamespaces": {
+   "WikiHiero\\": "includes/"
},
"ParserTestFiles": [
"tests.txt"
],
"SpecialPages": {
-   "Hieroglyphs": "SpecialHieroglyphs"
+   "Hieroglyphs": "WikiHiero\\SpecialHieroglyphs"
},
"ResourceFileModulePaths": {
"localBasePath": "modules",
diff --git a/generateTables.php b/generateTables.php
index d96bdd6..fa0d7d9 100644
--- a/generateTables.php
+++ b/generateTables.php
@@ -22,6 +22,8 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+use WikiHiero\WikiHiero;
+
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
$IP = __DIR__ . '/../..';
diff --git a/includes/HieroTokenizer.php b/includes/HieroTokenizer.php
index 1521ad0..ed373a5 100644
--- a/includes/HieroTokenizer.php
+++ b/includes/HieroTokenizer.php
@@ -18,6 +18,8 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+namespace WikiHiero;
+
 /**
  * Hieroglyphs tokenizer
  */
diff --git a/includes/WikiHieroHooks.php b/includes/Hooks.php
similarity index 70%
rename from includes/WikiHieroHooks.php
rename to includes/Hooks.php
index 40bb5b7..8b1cb2f 100644
--- a/includes/WikiHieroHooks.php
+++ b/includes/Hooks.php
@@ -1,5 +1,10 @@
  tag is used rarely, we don't need to load its body 
on every hook call,
 * so we keep our simple hook handlers here.
@@ -8,7 +13,7 @@
 * @return bool
 */
public static function onParserFirstCallInit( &$parser ) {
-   $parser->setHook( 'hiero', 'WikiHiero::parserHook' );
+   $parser->setHook( 'hiero',  WikiHiero::class . '::parserHook' );
return true;
}
 }
diff --git a/includes/SpecialHieroglyphs.php b/includes/SpecialHieroglyphs.php
index 570192e..5fb90ac 100644
--- a/includes/SpecialHieroglyphs.php
+++ b/includes/SpecialHieroglyphs.php
@@ -17,6 +17,11 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+namespace WikiHiero;
+
+use Html;
+use SpecialPage;
+
 class SpecialHieroglyphs extends SpecialPage {
const HIEROGLYPHS_PER_ROW = 10;
const CACHE_EXPIRY = 86400; // 1 day
diff --git a/includes/WikiHiero.php b/includes/WikiHiero.php
index d2dfc4c..e9972b0 100644
--- a/includes/WikiHiero.php
+++ b/includes/WikiHiero.php
@@ -1,5 +1,4 @@
 http://www.gnu.org/copyleft/gpl.html
  */
 
+namespace WikiHiero;
+
+use Config;
+use Html;
+use MWException;
+use OutputPage;
+use Parser;
+use RequestContext;
+
 class WikiHiero {
const IMAGE_EXT = 'png';
const IMAGE_PREFIX = 'hiero_';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e4414b2cae44883e0923e01b55ec4d696833ea9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
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...CirrusSearch[master]: [WIP] Move Lucene explain to outside library

2017-12-15 Thread Smalyshev (Code Review)
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398608 )

Change subject: [WIP] Move Lucene explain to outside library
..

[WIP] Move Lucene explain to outside library

Replaces Ide1a7d11086a18e820612513be7ae72b6bade3dd

Change-Id: I2abdc027e17e29b4f533e0bff3607067efd8fe51
---
M composer.json
M includes/ExplainPrinter.php
M includes/Searcher.php
3 files changed, 51 insertions(+), 5 deletions(-)


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

diff --git a/composer.json b/composer.json
index 7823a83..2bfdc94 100644
--- a/composer.json
+++ b/composer.json
@@ -4,10 +4,17 @@
"description": "Elasticsearch-powered search for MediaWiki",
"license": "GPL-2.0+",
"minimum-stability": "dev",
+   "repositories": [
+{
+"type": "vcs",
+"url": "https://github.com/smalyshev/splainer;
+}
+],
"require": {
"php": ">=5.5.9",
"composer/installers": ">=1.0.1",
-   "wikimedia/textcat": "1.2.0"
+   "wikimedia/textcat": "1.2.0",
+   "smalyshev/splainer": "dev-master"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
diff --git a/includes/ExplainPrinter.php b/includes/ExplainPrinter.php
index f192948..f920d43 100644
--- a/includes/ExplainPrinter.php
+++ b/includes/ExplainPrinter.php
@@ -2,6 +2,8 @@
 
 namespace CirrusSearch;
 
+use LuceneExplain\ExplainFactory;
+
 /**
  * Formats the result of elasticsearch explain to a (slightly) more
  * readable html format than raw json.
@@ -22,6 +24,23 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 class ExplainPrinter {
+   /** @var string */
+   private $type;
+   /** @var ExplainFactory */
+   private $explainFactory;
+
+   /**
+* @param string $type Type of explain to print
+*/
+   public function __construct( $type ) {
+   $this->type = $type;
+   $this->explainFactory = new ExplainFactory;
+   }
+
+   /**
+* @param array $queryResult Elasticsearch result
+* @return string
+*/
public function format( array $queryResult ) {
$result = [];
if ( isset( $queryResult['result']['hits']['hits'] ) ) {
@@ -30,6 +49,7 @@
foreach ( $queryResult as $qr ) {
$result[] = "{$qr['description']} on 
{$qr['path']}";
foreach ( $qr['result']['hits']['hits'] as $hit ) {
+   $explain = $this->processExplain( 
$hit['_explanation'] );
$result[] =
"" .
"" . htmlentities( 
$hit['_source']['title'] ) . "" .
@@ -43,7 +63,7 @@
"" . 
htmlentities( $hit['_score'] ) . "" .
"" .
"ES 
explain" .
-   "" . 
htmlentities( $this->formatText( $hit['_explanation'] ) ) . "" .
+   "" . 
htmlentities( $explain ) . "" .
"" .
"" .
"";
@@ -57,10 +77,29 @@
$line = $indent . $explanation['value'] . ' | ' . 
$explanation['description'] . "\n";
if ( isset( $explanation['details'] ) ) {
foreach ( $explanation['details'] as $subExplanation ) {
-   $line .= $this->formatText( $subExplanation, 
"$indent" );
+   $line .= $this->formatText( $subExplanation, 
"$indent   " );
}
}
 
return $line;
}
+
+   /**
+* Only visible for test purposes
+*
+* @param array $explanation
+* @return string
+*/
+   protected function processExplain( array $explanation ) {
+   if ( $this->type === 'verbose' ) {
+   return $this->formatText( $explanation );
+   }
+   $explain = $this->explainFactory->createExplain( $explanation );
+   if ( $this->type === 'hot' ) {
+   return (string)$explain->vectorize();
+   } else {
+   return (string)$explain;
+   }
+   }
+
 }
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 3c1752c..51f2a19 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -900,9 +900,9 @@
public function processRawReturn( $result, 

[MediaWiki-commits] [Gerrit] mediawiki...CommonsMetadata[master]: Switch to PSR-4 autoloader

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398406 )

Change subject: Switch to PSR-4 autoloader
..


Switch to PSR-4 autoloader

Change-Id: I591c9f242bfb760aa70098e11cce92273c572f07
---
M extension.json
R src/DataCollector.php
R src/DomNavigator.php
R src/HookHandler.php
R src/LicenseParser.php
R src/TemplateParser.php
6 files changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/extension.json b/extension.json
index 0018358..a787e06 100644
--- a/extension.json
+++ b/extension.json
@@ -5,6 +5,9 @@
"descriptionmsg": "commonsmetadata-desc",
"license-name": "GPL-2.0+",
"type": "other",
+   "requires": {
+   "MediaWiki": ">= 1.31.0"
+   },
"Hooks": {
"GetExtendedMetadata": [
"CommonsMetadata\\HookHandler::onGetExtendedMetadata"
@@ -25,12 +28,8 @@
"CommonsMetadataForceRecalculate": false,
"CommonsMetadataSetTrackingCategories": false
},
-   "AutoloadClasses": {
-   "CommonsMetadata\\HookHandler": "HookHandler.php",
-   "CommonsMetadata\\DataCollector": "DataCollector.php",
-   "CommonsMetadata\\DomNavigator": "DomNavigator.php",
-   "CommonsMetadata\\TemplateParser": "TemplateParser.php",
-   "CommonsMetadata\\LicenseParser": "LicenseParser.php"
+   "AutoloadNamespaces": {
+   "CommonsMetadata\\": "src/"
},
"TrackingCategories": [
"commonsmetadata-trackingcategory-no-license",
diff --git a/DataCollector.php b/src/DataCollector.php
similarity index 100%
rename from DataCollector.php
rename to src/DataCollector.php
diff --git a/DomNavigator.php b/src/DomNavigator.php
similarity index 100%
rename from DomNavigator.php
rename to src/DomNavigator.php
diff --git a/HookHandler.php b/src/HookHandler.php
similarity index 100%
rename from HookHandler.php
rename to src/HookHandler.php
diff --git a/LicenseParser.php b/src/LicenseParser.php
similarity index 100%
rename from LicenseParser.php
rename to src/LicenseParser.php
diff --git a/TemplateParser.php b/src/TemplateParser.php
similarity index 100%
rename from TemplateParser.php
rename to src/TemplateParser.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I591c9f242bfb760aa70098e11cce92273c572f07
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CommonsMetadata
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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...Kartographer[master]: Switch to PSR-4 autoloader

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398607 )

Change subject: Switch to PSR-4 autoloader
..


Switch to PSR-4 autoloader

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

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



diff --git a/extension.json b/extension.json
index 22e5095..1bfae5d 100644
--- a/extension.json
+++ b/extension.json
@@ -22,22 +22,8 @@
"SpecialPages": {
"Map": "Kartographer\\SpecialMap"
},
-   "AutoloadClasses": {
-   "Kartographer\\ApiQueryMapData": "includes/ApiQueryMapData.php",
-   "Kartographer\\ApiSanitizeMapData": 
"includes/ApiSanitizeMapData.php",
-   "Kartographer\\CoordFormatter": "includes/CoordFormatter.php",
-   "Kartographer\\DataModule": "includes/DataModule.php",
-   "Kartographer\\DataModuleLinks": "includes/DataModuleLinks.php",
-   "Kartographer\\Hooks": "includes/Hooks.php",
-   "Kartographer\\SimpleStyleParser": 
"includes/SimpleStyleParser.php",
-   "Kartographer\\SpecialMap": "includes/SpecialMap.php",
-   "Kartographer\\State": "includes/State.php",
-   "Kartographer\\Tag\\MapFrame": "includes/Tag/MapFrame.php",
-   "Kartographer\\Tag\\MapLink": "includes/Tag/MapLink.php",
-   "Kartographer\\Tag\\TagHandler": "includes/Tag/TagHandler.php",
-   "Kartographer\\Projection\\EPSG3857": 
"includes/Projection/EPSG3857.php",
-   "Kartographer\\Projection\\SphericalMercator": 
"includes/Projection/SphericalMercator.php",
-   "Kartographer\\Projection\\Transformation": 
"includes/Projection/Transformation.php"
+   "AutoloadNamespaces": {
+   "Kartographer\\": "includes/"
},
"APIModules": {
"sanitize-mapdata": "Kartographer\\ApiSanitizeMapData"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8981db04ea04bfc4e4e63e51b419e9e28b33d1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MergeHistory: Duplicate watchers on history merge

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393378 )

Change subject: MergeHistory: Duplicate watchers on history merge
..


MergeHistory: Duplicate watchers on history merge

Bug: T132130
Change-Id: Ibb2be4f6f975f8f3c542689530fc120f8a464914
---
M includes/MergeHistory.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php
index 9d63869..b969e03 100644
--- a/includes/MergeHistory.php
+++ b/includes/MergeHistory.php
@@ -24,6 +24,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 use Wikimedia\Timestamp\TimestampException;
 use Wikimedia\Rdbms\IDatabase;
 
@@ -335,6 +336,10 @@
}
$this->dest->invalidateCache(); // update histories
 
+   // Duplicate watchers of the old article to the new article on 
history merge
+   $store = 
MediaWikiServices::getInstance()->getWatchedItemStore();
+   $store->duplicateAllAssociatedEntries( $this->source, 
$this->dest );
+
// Update our logs
$logEntry = new ManualLogEntry( 'merge', 'merge' );
$logEntry->setPerformer( $user );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb2be4f6f975f8f3c542689530fc120f8a464914
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Rename PHP files to match class names

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398438 )

Change subject: Rename PHP files to match class names
..


Rename PHP files to match class names

This avoids the exclusion of the rule
MediaWiki.Files.ClassMatchesFilename.NotMatch in .phpcs.xml.

Change-Id: Ia6fdbe9e9ba726d8a6b4d8168d298820e3efc1d2
---
M .phpcs.xml
R WikiEditorHooks.php
M extension.json
3 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index d3aade5..975fe61 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,6 @@
 


-   



diff --git a/WikiEditor.hooks.php b/WikiEditorHooks.php
similarity index 100%
rename from WikiEditor.hooks.php
rename to WikiEditorHooks.php
diff --git a/extension.json b/extension.json
index 0c8f670..62cf27b 100644
--- a/extension.json
+++ b/extension.json
@@ -434,7 +434,7 @@
}
},
"AutoloadClasses": {
-   "WikiEditorHooks": "WikiEditor.hooks.php"
+   "WikiEditorHooks": "WikiEditorHooks.php"
},
"manifest_version": 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6fdbe9e9ba726d8a6b4d8168d298820e3efc1d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Switch to PSR-4 autoloader

2017-12-15 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398607 )

Change subject: Switch to PSR-4 autoloader
..

Switch to PSR-4 autoloader

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


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

diff --git a/extension.json b/extension.json
index 22e5095..1bfae5d 100644
--- a/extension.json
+++ b/extension.json
@@ -22,22 +22,8 @@
"SpecialPages": {
"Map": "Kartographer\\SpecialMap"
},
-   "AutoloadClasses": {
-   "Kartographer\\ApiQueryMapData": "includes/ApiQueryMapData.php",
-   "Kartographer\\ApiSanitizeMapData": 
"includes/ApiSanitizeMapData.php",
-   "Kartographer\\CoordFormatter": "includes/CoordFormatter.php",
-   "Kartographer\\DataModule": "includes/DataModule.php",
-   "Kartographer\\DataModuleLinks": "includes/DataModuleLinks.php",
-   "Kartographer\\Hooks": "includes/Hooks.php",
-   "Kartographer\\SimpleStyleParser": 
"includes/SimpleStyleParser.php",
-   "Kartographer\\SpecialMap": "includes/SpecialMap.php",
-   "Kartographer\\State": "includes/State.php",
-   "Kartographer\\Tag\\MapFrame": "includes/Tag/MapFrame.php",
-   "Kartographer\\Tag\\MapLink": "includes/Tag/MapLink.php",
-   "Kartographer\\Tag\\TagHandler": "includes/Tag/TagHandler.php",
-   "Kartographer\\Projection\\EPSG3857": 
"includes/Projection/EPSG3857.php",
-   "Kartographer\\Projection\\SphericalMercator": 
"includes/Projection/SphericalMercator.php",
-   "Kartographer\\Projection\\Transformation": 
"includes/Projection/Transformation.php"
+   "AutoloadNamespaces": {
+   "Kartographer\\": "includes/"
},
"APIModules": {
"sanitize-mapdata": "Kartographer\\ApiSanitizeMapData"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8981db04ea04bfc4e4e63e51b419e9e28b33d1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
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] operations/puppet[production]: scap: Set bin_dir globally to /usr/bin

2017-12-15 Thread Chad (Code Review)
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398606 )

Change subject: scap: Set bin_dir globally to /usr/bin
..

scap: Set bin_dir globally to /usr/bin

This setting is a weird relic from back when deployed scap using scap
itself and it lived in /srv/deployment. That's not the case anymore.

We found out today that sometimes the patching when .deb building
doesn't actually update the ancient default to the proper location.
It broke stuff in a very scary way.

Ideally, we want to remove this old configuration entirely but pending
that let's just set this so we can all sleep a little more at ease
over the holiday season.

Bug: T183046
Change-Id: If6c7306f6c22e22febd5a38bb4c1a2c47c23a3d7
---
M modules/scap/templates/scap.cfg.erb
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/398606/1

diff --git a/modules/scap/templates/scap.cfg.erb 
b/modules/scap/templates/scap.cfg.erb
index 4630e2e..f056851 100644
--- a/modules/scap/templates/scap.cfg.erb
+++ b/modules/scap/templates/scap.cfg.erb
@@ -22,6 +22,10 @@
 # deployment git server hostname
 git_server: <%= @deployment_server %>
 
+# Make sure we're always running the deb-installed scap, rather than looking
+# in a possibly erronerous location.
+bin_dir: /usr/bin
+
 statsd_port: 8125
 
 # Deployment realm

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: horizon: Update logos and file naming

2017-12-15 Thread BryanDavis (Code Review)
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398605 )

Change subject: horizon: Update logos and file naming
..

horizon: Update logos and file naming

* Change the brand image used in the Horizon navbar to read "Wikimedia
  Cloud Services" rather than "Wikimedia Labs".
* Rename Puppet source files away from the old "labs" brand.

Bug: T168480
Change-Id: Ib85ce64a830c5ebfdb1da298ece3d4190f8f5930
---
A modules/openstack/files/horizon/125px-Cloud_VPS_dashboard_logo.png
R modules/openstack/files/horizon/180px-Cloud_VPS_dashboard_splash.png
D modules/openstack/files/horizon/216px-Wikimedia_labs_dashboard_logo.png
R modules/openstack/files/horizon/Cloud_VPS.ico
M modules/openstack/manifests/horizon/service.pp
5 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/398605/1

diff --git a/modules/openstack/files/horizon/125px-Cloud_VPS_dashboard_logo.png 
b/modules/openstack/files/horizon/125px-Cloud_VPS_dashboard_logo.png
new file mode 100644
index 000..3cac968
--- /dev/null
+++ b/modules/openstack/files/horizon/125px-Cloud_VPS_dashboard_logo.png
Binary files differ
diff --git 
a/modules/openstack/files/horizon/180px-Wikimedia_labs_dashboard_splash.png 
b/modules/openstack/files/horizon/180px-Cloud_VPS_dashboard_splash.png
similarity index 100%
rename from 
modules/openstack/files/horizon/180px-Wikimedia_labs_dashboard_splash.png
rename to modules/openstack/files/horizon/180px-Cloud_VPS_dashboard_splash.png
Binary files differ
diff --git 
a/modules/openstack/files/horizon/216px-Wikimedia_labs_dashboard_logo.png 
b/modules/openstack/files/horizon/216px-Wikimedia_labs_dashboard_logo.png
deleted file mode 100644
index 8125f16..000
--- a/modules/openstack/files/horizon/216px-Wikimedia_labs_dashboard_logo.png
+++ /dev/null
Binary files differ
diff --git a/modules/openstack/files/horizon/Wikimedia_labs.ico 
b/modules/openstack/files/horizon/Cloud_VPS.ico
similarity index 100%
rename from modules/openstack/files/horizon/Wikimedia_labs.ico
rename to modules/openstack/files/horizon/Cloud_VPS.ico
Binary files differ
diff --git a/modules/openstack/manifests/horizon/service.pp 
b/modules/openstack/manifests/horizon/service.pp
index 91241d9..a85a21d 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -107,7 +107,7 @@
 }
 
 file { 
'/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/img/logo.png':
-source  => 
'puppet:///modules/openstack/horizon/216px-Wikimedia_labs_dashboard_logo.png',
+source  => 
'puppet:///modules/openstack/horizon/125px-Cloud_VPS_dashboard_logo.png',
 owner   => 'horizon',
 group   => 'horizon',
 mode=> '0444',
@@ -115,7 +115,7 @@
 }
 
 file { 
'/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/img/logo-splash.png':
-source  => 
'puppet:///modules/openstack/horizon/180px-Wikimedia_labs_dashboard_splash.png',
+source  => 
'puppet:///modules/openstack/horizon/180px-Cloud_VPS_dashboard_splash.png',
 owner   => 'horizon',
 group   => 'horizon',
 mode=> '0444',
@@ -123,7 +123,7 @@
 }
 
 file { 
'/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/img/favicon.ico':
-source  => 'puppet:///modules/openstack/horizon/Wikimedia_labs.ico',
+source  => 'puppet:///modules/openstack/horizon/Cloud_VPS.ico',
 owner   => 'horizon',
 group   => 'horizon',
 mode=> '0444',

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Rename PHP files to match class names

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398604 )

Change subject: Rename PHP files to match class names
..


Rename PHP files to match class names

This avoids the exclusion of the rule
MediaWiki.Files.ClassMatchesFilename.NotMatch in .phpcs.xml.

Change-Id: Ifd7f5f59097c6dedc19f031baaef538023a6
---
M .phpcs.xml
R TemplateDataHooks.php
M extension.json
3 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index d81f486..b15894e 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,6 @@
 


-   



diff --git a/TemplateData.hooks.php b/TemplateDataHooks.php
similarity index 100%
rename from TemplateData.hooks.php
rename to TemplateDataHooks.php
diff --git a/extension.json b/extension.json
index e8be290..38fb077 100644
--- a/extension.json
+++ b/extension.json
@@ -21,7 +21,7 @@
"templatedata": "ApiTemplateData"
},
"AutoloadClasses": {
-   "TemplateDataHooks": "TemplateData.hooks.php",
+   "TemplateDataHooks": "TemplateDataHooks.php",
"TemplateDataBlob": "TemplateDataBlob.php",
"ApiTemplateData": "api/ApiTemplateData.php"
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd7f5f59097c6dedc19f031baaef538023a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Rename PHP files to match class names

2017-12-15 Thread Fomafix (Code Review)
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398604 )

Change subject: Rename PHP files to match class names
..

Rename PHP files to match class names

This avoids the exclusion of the rule
MediaWiki.Files.ClassMatchesFilename.NotMatch in .phpcs.xml.

Change-Id: Ifd7f5f59097c6dedc19f031baaef538023a6
---
M .phpcs.xml
R TemplateDataHooks.php
M extension.json
3 files changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index d81f486..b15894e 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,6 @@
 


-   



diff --git a/TemplateData.hooks.php b/TemplateDataHooks.php
similarity index 100%
rename from TemplateData.hooks.php
rename to TemplateDataHooks.php
diff --git a/extension.json b/extension.json
index e8be290..38fb077 100644
--- a/extension.json
+++ b/extension.json
@@ -21,7 +21,7 @@
"templatedata": "ApiTemplateData"
},
"AutoloadClasses": {
-   "TemplateDataHooks": "TemplateData.hooks.php",
+   "TemplateDataHooks": "TemplateDataHooks.php",
"TemplateDataBlob": "TemplateDataBlob.php",
"ApiTemplateData": "api/ApiTemplateData.php"
},

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Scap: bump version to 3.7.4-2"

2017-12-15 Thread Thcipriani (Code Review)
Hello Alexandros Kosiaris, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Scap: bump version to 3.7.4-2"
..

Revert "Scap: bump version to 3.7.4-2"

This reverts commit 8b7eae257c945afb65224310aba77d099b62a178.

Change-Id: I8c78acbe85cc102b8b9554e3ba1fadbc703b2ce5
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 313dc7f..fa3aa8f 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-2',
+$version = '3.7.4-1',
 ) {
 package { 'scap':
 ensure => $version,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c78acbe85cc102b8b9554e3ba1fadbc703b2ce5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: WIP: Add support for CodeMirror

2017-12-15 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398602 )

Change subject: WIP: Add support for CodeMirror
..

WIP: Add support for CodeMirror

I know this is a read-only copy of jquery.ime,
I'm trying to get the general concept vetted, after that
I'll submit a commit to the upstream repo.

Mostly concerns CodeMirror's support for non-contenteditable mode
which we use on Firefox.
* Handle input properly
* Proper IME popup positioning

Bug: T171374
Change-Id: I7931387964205dc446986912ebfb876b2c6bec81
---
M lib/jquery.ime/jquery.ime.js
M resources/js/ext.uls.ime.js
2 files changed, 75 insertions(+), 1 deletion(-)


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

diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 11bf253..c0dae1f 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -3,7 +3,7 @@
 * Copyright (c) 2017 Santhosh Thottingal; Licensed GPL, MIT */
 ( function ( $ ) {
'use strict';
-   var TextEntryFactory, TextEntry, FormWidgetEntry, ContentEditableEntry,
+   var TextEntryFactory, TextEntry, FormWidgetEntry, ContentEditableEntry, 
CodeMirrorEntry,
defaultInputMethod;
 
// rangy is defined in the rangy library
@@ -752,6 +752,74 @@
 
TextEntryFactory.static.singleton.register( ContentEditableEntry );
 
+   /**
+* TextEntry class for CodeMirror surfaces that don't use 
contenteditable
+*
+* @class
+* @constructor
+* @param {jQuery} $element The element to wrap
+*/
+   CodeMirrorEntry = function IMECodeMirrorEntry( $element ) {
+   this.$element = $element;
+   this.$textarea = $element.closest( 'textarea' );
+   };
+
+   /* Inheritance */
+
+   inheritClass( CodeMirrorEntry, TextEntry );
+
+   /* Static methods */
+
+   /**
+* @inheritdoc TextEntry
+*/
+   CodeMirrorEntry.static.canWrap = function ( $element ) {
+   return $element.is( '.CodeMirror' ) &&
+   !$element.hasClass( 'noime' );
+   };
+
+   /* Instance methods */
+
+   /**
+* @inheritdoc TextEntry
+*/
+   CodeMirrorEntry.prototype.getTextBeforeSelection = function ( maxLength 
) {
+   var pos = this.getCaretPosition();
+   return this.$element.val().substring(
+   Math.max( 0, pos.start - maxLength ),
+   pos.start
+   );
+   };
+
+   /**
+* @inheritdoc TextEntry
+*/
+   CodeMirrorEntry.prototype.replaceTextAtSelection = function ( 
precedingCharCount, newText ) {
+   var pos = this.getCaretPosition();
+
+   pos.start = Math.max( 0, pos.start - precedingCharCount );
+   this.$textarea.textSelection( 'setContents', {
+   peri: newText,
+   replace: true,
+   selectionStart: pos.start,
+   selectionEnd: pos.end
+   } );
+   };
+
+   /**
+* Get the current selection offsets inside the widget
+*
+* @return {Object} return Offsets in chars (0 means first offset *or* 
no selection in widget)
+* @return {number} return.start Selection start
+* @return {number} return.end Selection end
+*/
+   CodeMirrorEntry.prototype.getCaretPosition = function () {
+   var pos = this.$textarea.textSelection( 'getCaretPosition', { 
startAndEnd: true } );
+   return { start: pos[ 0 ], end: pos[ 1 ] };
+   };
+
+   TextEntryFactory.static.singleton.register( CodeMirrorEntry );
+
/* Exports */
 
/**
diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index 5ebca05..d3499b5 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -277,6 +277,12 @@
mw.ime.addIme = function ( $input ) {
var imeselector;
 
+   // CodeMirror uses a 1px wide textarea to handle input.
+   // Replace it with the underlying surface.
+   if ( $input.is( '.CodeMirror textarea' ) ) {
+   $input = $( '.CodeMirror' );
+   }
+
$input.ime( {
languages: mw.ime.getIMELanguageList(),
languageSelector: function () {

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

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

___

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Remove mw-ui-item from page-selector

2017-12-15 Thread Esanders (Code Review)
Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398601 )

Change subject: Remove mw-ui-item from page-selector
..

Remove mw-ui-item from page-selector

Not required, and causes height issues with float.

Change-Id: I9f317225c13279e380a366f79de9177c9c88436e
---
M modules/source/styles/ext.cx.SourcePageSelector.less
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/modules/source/styles/ext.cx.SourcePageSelector.less 
b/modules/source/styles/ext.cx.SourcePageSelector.less
index e928045..d8a4a4c 100644
--- a/modules/source/styles/ext.cx.SourcePageSelector.less
+++ b/modules/source/styles/ext.cx.SourcePageSelector.less
@@ -2,8 +2,6 @@
 @import 'mediawiki.mixins';
 
 .cx-source-page-selector {
-   .mw-ui-item;
-
background-color: @white;
color: @gray-darker;
position: relative;

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use .then(success, fail) when using .then

2017-12-15 Thread Esanders (Code Review)
Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398600 )

Change subject: Use .then(success,fail) when using .then
..

Use .then(success,fail) when using .then

Change-Id: Ib2e995a71a83ef8902b96b9df77965cd7d8ed270
---
M modules/dashboard/ext.cx.dashboard.js
1 file changed, 14 insertions(+), 11 deletions(-)


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

diff --git a/modules/dashboard/ext.cx.dashboard.js 
b/modules/dashboard/ext.cx.dashboard.js
index da455b3..f42bda0 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -80,20 +80,23 @@
this.render();
 
// Get acceptable source/target language pairs
-   this.siteMapper.getLanguagePairs().then( function ( data ) {
-   // We store valid source and target languages as 
"static" variables of LanguageFilter
-   mw.cx.ui.LanguageFilter.sourceLanguages = 
data.sourceLanguages;
-   mw.cx.ui.LanguageFilter.targetLanguages = 
data.targetLanguages;
+   this.siteMapper.getLanguagePairs().then(
+   function ( data ) {
+   // We store valid source and target languages 
as "static" variables of LanguageFilter
+   mw.cx.ui.LanguageFilter.sourceLanguages = 
data.sourceLanguages;
+   mw.cx.ui.LanguageFilter.targetLanguages = 
data.targetLanguages;
 
-   self.setDefaultLanguages();
+   self.setDefaultLanguages();
 
-   self.initLists();
-   self.listen();
+   self.initLists();
+   self.listen();
 
-   mw.hook( 'mw.cx.dashboard.ready' ).fire();
-   } ).fail( function () {
-   mw.hook( 'mw.cx.error' ).fire( mw.msg( 
'cx-error-server-connection' ) );
-   } );
+   mw.hook( 'mw.cx.dashboard.ready' ).fire();
+   },
+   function () {
+   mw.hook( 'mw.cx.error' ).fire( mw.msg( 
'cx-error-server-connection' ) );
+   }
+   );
};
 
// Find valid source and target language pair and store them in local 
storage

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2e995a71a83ef8902b96b9df77965cd7d8ed270
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
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] wikimedia/textcat[master]: Do not use private repo anymore

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398596 )

Change subject: Do not use private repo anymore
..


Do not use private repo anymore

Change-Id: I5cb26195b94958717acebb5b2e4a2701224cafbe
---
M README.md
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index d7edf9a..b7eafe0 100644
--- a/README.md
+++ b/README.md
@@ -157,4 +157,4 @@
 with `catus.php`.
 
 
-[![Build 
Status](https://travis-ci.org/smalyshev/textcat.svg?branch=master)](https://travis-ci.org/smalyshev/textcat)
+[![Build 
Status](https://travis-ci.org/wikimedia/wikimeda-textcat.svg?branch=master)](https://travis-ci.org/wikimedia/wikimedia-textcat)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5cb26195b94958717acebb5b2e4a2701224cafbe
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/textcat
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Tjones 
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...LoginNotify[wmf/1.31.0-wmf.12]: Use extension registry to check for CheckUser to be installed

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398599 )

Change subject: Use extension registry to check for CheckUser to be installed
..


Use extension registry to check for CheckUser to be installed

Class was renamed in I39c60b2d059d1cb2c1c0d3a4206232d961536697

Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
(cherry picked from commit 313d2e4af1c97afea080e57f200136821591e9d6)
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 956c629..b5e7d12 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -12,6 +12,7 @@
 use CentralAuthUser;
 use Config;
 use EchoEvent;
+use ExtensionRegistry;
 use IBufferingStatsdDataFactory;
 use JobQueueGroup;
 use JobSpecification;
@@ -238,7 +239,7 @@
Assert::parameter( $user->isLoggedIn(), '$user', 'User must be 
logged in' );
 
if ( !$this->config->get( 'LoginNotifyCheckKnownIPs' )
-   || !class_exists( 'CheckUser' )
+   || !$this->isCheckUserInstalled()
) {
// Checkuser checks disabled.
// Note: It's important this be USER_NOT_KNOWN and not 
USER_NO_INFO.
@@ -402,6 +403,14 @@
}
 
/**
+* Whether CheckUser extension is installed
+* @return bool
+*/
+   private function isCheckUserInstalled() {
+   return ExtensionRegistry::getInstance()->isLoaded( 'CheckUser' 
);
+   }
+
+   /**
 * Give the user a cookie saying that they've previously logged in from 
this computer.
 *
 * @note If user already has a cookie, this will refresh it.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.31.0-wmf.12
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.31.0-wmf.12]: Use extension registry to check for CheckUser to be installed

2017-12-15 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398599 )

Change subject: Use extension registry to check for CheckUser to be installed
..

Use extension registry to check for CheckUser to be installed

Class was renamed in I39c60b2d059d1cb2c1c0d3a4206232d961536697

Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
(cherry picked from commit 313d2e4af1c97afea080e57f200136821591e9d6)
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 1 deletion(-)


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

diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 956c629..b5e7d12 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -12,6 +12,7 @@
 use CentralAuthUser;
 use Config;
 use EchoEvent;
+use ExtensionRegistry;
 use IBufferingStatsdDataFactory;
 use JobQueueGroup;
 use JobSpecification;
@@ -238,7 +239,7 @@
Assert::parameter( $user->isLoggedIn(), '$user', 'User must be 
logged in' );
 
if ( !$this->config->get( 'LoginNotifyCheckKnownIPs' )
-   || !class_exists( 'CheckUser' )
+   || !$this->isCheckUserInstalled()
) {
// Checkuser checks disabled.
// Note: It's important this be USER_NOT_KNOWN and not 
USER_NO_INFO.
@@ -402,6 +403,14 @@
}
 
/**
+* Whether CheckUser extension is installed
+* @return bool
+*/
+   private function isCheckUserInstalled() {
+   return ExtensionRegistry::getInstance()->isLoaded( 'CheckUser' 
);
+   }
+
+   /**
 * Give the user a cookie saying that they've previously logged in from 
this computer.
 *
 * @note If user already has a cookie, this will refresh it.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.31.0-wmf.12
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Umherirrender 

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


[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Use extension registry to check for CheckUser to be installed

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398511 )

Change subject: Use extension registry to check for CheckUser to be installed
..


Use extension registry to check for CheckUser to be installed

Class was renamed in I39c60b2d059d1cb2c1c0d3a4206232d961536697

Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 956c629..b5e7d12 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -12,6 +12,7 @@
 use CentralAuthUser;
 use Config;
 use EchoEvent;
+use ExtensionRegistry;
 use IBufferingStatsdDataFactory;
 use JobQueueGroup;
 use JobSpecification;
@@ -238,7 +239,7 @@
Assert::parameter( $user->isLoggedIn(), '$user', 'User must be 
logged in' );
 
if ( !$this->config->get( 'LoginNotifyCheckKnownIPs' )
-   || !class_exists( 'CheckUser' )
+   || !$this->isCheckUserInstalled()
) {
// Checkuser checks disabled.
// Note: It's important this be USER_NOT_KNOWN and not 
USER_NO_INFO.
@@ -402,6 +403,14 @@
}
 
/**
+* Whether CheckUser extension is installed
+* @return bool
+*/
+   private function isCheckUserInstalled() {
+   return ExtensionRegistry::getInstance()->isLoaded( 'CheckUser' 
);
+   }
+
+   /**
 * Give the user a cookie saying that they've previously logged in from 
this computer.
 *
 * @note If user already has a cookie, this will refresh it.

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Normalize path in AutoloadGenerator::setExcludePaths

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398595 )

Change subject: Normalize path in AutoloadGenerator::setExcludePaths
..


Normalize path in AutoloadGenerator::setExcludePaths

Fix is for windows machine

Change-Id: Iadedeb6a04df439c0e940b8eb62fa46757c571c3
---
M includes/utils/AutoloadGenerator.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/utils/AutoloadGenerator.php 
b/includes/utils/AutoloadGenerator.php
index 1c7c9b0..1415ea3 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -74,7 +74,9 @@
 * @param string[] $paths
 */
public function setExcludePaths( array $paths ) {
-   $this->excludePaths = $paths;
+   foreach ( $paths as $path ) {
+   $this->excludePaths[] = self::normalizePathSeparator( 
$path );
+   }
}
 
/**

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

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

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


[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: Change addblocker text

2017-12-15 Thread Nuria (Code Review)
Nuria has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398598 )

Change subject: Change addblocker text
..

Change addblocker text

We should probably fix at a later time the fact that
the addblocker text is on the app

Bug: T182958
Change-Id: Ia23b8a5266a62d4b25fc016c53e588db3cecc993
---
M src/App.vue
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/98/398598/1

diff --git a/src/App.vue b/src/App.vue
index cc0e4d9..bafab07 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -63,7 +63,7 @@
 },
 warnAdBlocker () {
 this.$store.state.centralNotice = {
-message: 'Your ad blocker is preventing Wikistats from 
reaching the server. Disable it to be able to see all metrics correctly.',
+message: 'Your ad blocker is preventing Wikistats\' scripts 
from reaching the server. Disable it to be able to see all metrics correctly. 
As on all Wikimedia services, we will not display ads. :)',
 level: 'error'
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia23b8a5266a62d4b25fc016c53e588db3cecc993
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: master
Gerrit-Owner: Nuria 

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


[MediaWiki-commits] [Gerrit] wikimedia/textcat[master]: Do not use private repo anymore

2017-12-15 Thread Smalyshev (Code Review)
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398596 )

Change subject: Do not use private repo anymore
..

Do not use private repo anymore

Change-Id: I5cb26195b94958717acebb5b2e4a2701224cafbe
---
M README.md
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/textcat 
refs/changes/96/398596/1

diff --git a/README.md b/README.md
index d7edf9a..b7eafe0 100644
--- a/README.md
+++ b/README.md
@@ -157,4 +157,4 @@
 with `catus.php`.
 
 
-[![Build 
Status](https://travis-ci.org/smalyshev/textcat.svg?branch=master)](https://travis-ci.org/smalyshev/textcat)
+[![Build 
Status](https://travis-ci.org/wikimedia/wikimeda-textcat.svg?branch=master)](https://travis-ci.org/wikimedia/wikimedia-textcat)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cb26195b94958717acebb5b2e4a2701224cafbe
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/textcat
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SqlBlobStoreTest: Use utf-8 as name in iconv

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398522 )

Change subject: SqlBlobStoreTest: Use utf-8 as name in iconv
..


SqlBlobStoreTest: Use utf-8 as name in iconv

utf8 is an alias that doesn't work with all PHP installations.

Change-Id: I6ce9c5b4ece1a8c263afb1d4895dacd3c790a51a
---
M tests/phpunit/includes/Storage/SqlBlobStoreTest.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/tests/phpunit/includes/Storage/SqlBlobStoreTest.php 
b/tests/phpunit/includes/Storage/SqlBlobStoreTest.php
index b6af2b4..6d2b09b 100644
--- a/tests/phpunit/includes/Storage/SqlBlobStoreTest.php
+++ b/tests/phpunit/includes/Storage/SqlBlobStoreTest.php
@@ -112,25 +112,25 @@
];
yield '(ISO-8859-1 encoding), string in string out' => [
'ISO-8859-1',
-   iconv( 'utf8', 'ISO-8859-1', "1®Àþ1" ),
+   iconv( 'utf-8', 'ISO-8859-1', "1®Àþ1" ),
[],
'1®Àþ1',
];
yield '(ISO-8859-1 encoding), serialized object in with gzip 
flags returns string' => [
'ISO-8859-1',
-   gzdeflate( iconv( 'utf8', 'ISO-8859-1', "4®Àþ4" ) ),
+   gzdeflate( iconv( 'utf-8', 'ISO-8859-1', "4®Àþ4" ) ),
[ 'gzip' ],
'4®Àþ4',
];
yield '(ISO-8859-1 encoding), serialized object in with object 
flags returns string' => [
'ISO-8859-1',
-   serialize( new TitleValue( 0, iconv( 'utf8', 
'ISO-8859-1', "3®Àþ3" ) ) ),
+   serialize( new TitleValue( 0, iconv( 'utf-8', 
'ISO-8859-1', "3®Àþ3" ) ) ),
[ 'object' ],
'3®Àþ3',
];
yield '(ISO-8859-1 encoding), serialized object in with object 
& gzip flags returns string' => [
'ISO-8859-1',
-   gzdeflate( serialize( new TitleValue( 0, iconv( 'utf8', 
'ISO-8859-1', "2®Àþ2" ) ) ) ),
+   gzdeflate( serialize( new TitleValue( 0, iconv( 
'utf-8', 'ISO-8859-1', "2®Àþ2" ) ) ) ),
[ 'gzip', 'object' ],
'2®Àþ2',
];

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Normalize path in AutoloadGenerator::setExcludePaths

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398595 )

Change subject: Normalize path in AutoloadGenerator::setExcludePaths
..

Normalize path in AutoloadGenerator::setExcludePaths

Fix is for windows machine

Change-Id: Iadedeb6a04df439c0e940b8eb62fa46757c571c3
---
M includes/utils/AutoloadGenerator.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/utils/AutoloadGenerator.php 
b/includes/utils/AutoloadGenerator.php
index 1c7c9b0..1415ea3 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -74,7 +74,9 @@
 * @param string[] $paths
 */
public function setExcludePaths( array $paths ) {
-   $this->excludePaths = $paths;
+   foreach ( $paths as $path ) {
+   $this->excludePaths[] = self::normalizePathSeparator( 
$path );
+   }
}
 
/**

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

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

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


[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Use pool in data.js, don't close pool

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398305 )

Change subject: Use pool in data.js, don't close pool
..


Use pool in data.js, don't close pool

Change-Id: I9bd8a48f257c0c3dc2e75372b20089ef94874c44
---
M persistence.js
M routes/data.js
2 files changed, 21 insertions(+), 31 deletions(-)

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



diff --git a/persistence.js b/persistence.js
index 6398d58..47398e8 100644
--- a/persistence.js
+++ b/persistence.js
@@ -32,10 +32,22 @@
values.push( board.id );
values.push( i );
}
-   return connection.query( insertWidgets + placeholders, values ).then( 
connection.end() );
+   return connection.query( insertWidgets + placeholders, values );
 }
 
 module.exports = {
+   /**
+* Run a query
+*/
+   query: function ( query, params, callback, errorCallback ) {
+   var connection = getConnection();
+
+   connection.query( query, params )
+   .then( callback )
+   /*jslint -W024*/
+   .catch( errorCallback );
+   /*jslint +W024*/
+   },
/**
 * Ensures a user exists in the user table and saves the user's local 
db id
 * in session.  Creates a default board if none exists.
@@ -96,9 +108,7 @@
return;
}
user.defaultBoard = dbResults[ 0 ][ 2 ][ 0 ].id;
-   var result = connection.query( 
insertBigEnglish, [ userId ] )
-   .then( connection.end() );
-   return result;
+   return connection.query( insertBigEnglish, [ 
userId ] );
} );
},
/**
@@ -127,7 +137,6 @@
}
return connection.query( insert, insertParams ).then( function 
( dbResults ) {
instance.id = dbResults[ 0 ].insertId;
-   connection.end();
} );
},
/**
@@ -143,7 +152,6 @@
return connection.query( select, [ instanceId, userId ] )
.then( function ( dbResults ) {
var result = dbResults[ 0 ][ 0 ];
-   connection.end();
if ( result.owner_id ) {
return {
id: instanceId,
@@ -191,7 +199,6 @@
previewPath: rows[ i 
].preview_path
};
}
-   connection.end();
return result;
} );
},
@@ -242,7 +249,7 @@
board.id = dbResults[ 0 ].insertId;
} )
.then( function () {
-   return insertWidgetList( board, connection 
).then( connection.end() );
+   return insertWidgetList( board, connection );
} );
},
/**
@@ -291,7 +298,6 @@
configuration: JSON.parse( 
rows[ i ].configuration )
};
}
-   connection.end();
return board;
} );
},
@@ -321,7 +327,6 @@
isShared: rows[ i ].is_shared 
=== 1
};
}
-   connection.end();
return result;
} );
},
@@ -348,7 +353,6 @@
previewPath: rows[ i 
].preview_path
};
}
-   connection.end();
return result;
} );
}
diff --git a/routes/data.js b/routes/data.js
index 65849c4..47434a0 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -1,6 +1,6 @@
 var widgets = require( '../widgets' ),
odataParser = require( 'odata-parser' ),
-   mysql = require( 'mysql' ),
+   persistence = require( '../persistence.js' ),
config = require( '../config.js' ),
util = require( 'util' ),
cache = require( 'memory-cache' ),
@@ -239,7 +239,6 @@
var widget = widgets[ req.params.widget ],
qs = urlParser.parse( req.url ).query,
parsedQs = 

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Fix select arrow overlapping contents

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398550 )

Change subject: Fix select arrow overlapping contents
..


Fix select arrow overlapping contents

Fix select arrow to not overlap contents e.g. on currency selector
for unsupported currency. Also we don't need special RtL styles,
these are handled by ResourceLoader.

Bug: T181435
Change-Id: I6e7683c6a0b253bf0ba0a755d80efd6cb5055212
---
M gateway_forms/mustache/forms.css
1 file changed, 7 insertions(+), 6 deletions(-)

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



diff --git a/gateway_forms/mustache/forms.css b/gateway_forms/mustache/forms.css
index 9e7e307..6b107ab 100644
--- a/gateway_forms/mustache/forms.css
+++ b/gateway_forms/mustache/forms.css
@@ -191,13 +191,9 @@
   -moz-appearance: none;
   appearance: none;
   background-image: url("data:image/svg+xml,%3Csvg 
xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 
12'%3E%3Cpath d='M11.05 3.996l-.965-1.053-4.035 3.86-3.947-3.86L1.05 3.996l5 5 
5-5'/%3E%3C/svg%3E");
-  background-position: right;
   background-repeat: no-repeat;
-  background-origin: content-box;
-}
-
-body.rtl #payment-table-donor select {
-  background-position: left;
+  background-position: center right 8px;
+  padding-right: 24px;
 }
 
 #payment-table-donor input[type="text"]:hover,
@@ -405,6 +401,11 @@
 -webkit-appearance: none;
 }
 
+td#donate form select {
+background-position: center right 14px;
+padding-right: 28px;
+}
+
 body #mw-content-text #donate #greenBackground {
 background: transparent;
 border: 0;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e7683c6a0b253bf0ba0a755d80efd6cb5055212
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Pcoombe 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
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...CirrusSearch[master]: Fix more_like_api.feature

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398289 )

Change subject: Fix more_like_api.feature
..


Fix more_like_api.feature

switch to -30% instead of 70%, this is basically the same thing but it works.
Spent the afternoon trying to figure out the machine running cindy fails on
this one. There must be something really strange happening there since the exact
same query works well locally.
What is strange is that running the query with mininum_should_match set to 99%
returns pages where only one term that match and setting 100% require all terms.

Change-Id: Iae64d730b48f7c83d6827e68a99b6f075153bec3
---
M tests/integration/features/more_like_api.feature
M tests/integration/features/step_definitions/page_steps.js
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Tjones: Looks good to me, but someone else must approve
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/integration/features/more_like_api.feature 
b/tests/integration/features/more_like_api.feature
index 95ecd8e..8648a6c 100644
--- a/tests/integration/features/more_like_api.feature
+++ b/tests/integration/features/more_like_api.feature
@@ -39,7 +39,7 @@
 And This is Me is not is not part of the api search result
 
   Scenario: Searching for morelike: with the title field and filtering 
with the percent terms to match
-When I set More Like This Options to title field, percent terms to match 
to 70% and I api search for morelike:More Like Me 1
+When I set More Like This Options to title field, percent terms to match 
to -30% and I api search for morelike:More Like Me 1
 Then More Like Me 2 is part of the api search result
 And More Like Me 3 is part of the api search result
 And More Like Me 4 is part of the api search result
diff --git a/tests/integration/features/step_definitions/page_steps.js 
b/tests/integration/features/step_definitions/page_steps.js
index d3dd39f..209bb3c 100644
--- a/tests/integration/features/step_definitions/page_steps.js
+++ b/tests/integration/features/step_definitions/page_steps.js
@@ -406,7 +406,7 @@
return this.stepHelpers.searchFor( search, options );
} );
 
-   When(/^I set More Like This Options to ([^ ]+) field, percent terms to 
match to (\d+%) and I api search for (.+)$/, function( field, percent, search ) 
{
+   When(/^I set More Like This Options to ([^ ]+) field, percent terms to 
match to (-?\d+%) and I api search for (.+)$/, function( field, percent, search 
) {
let options = {
cirrusMtlUseFields: 'yes',
cirrusMltFields: field,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae64d730b48f7c83d6827e68a99b6f075153bec3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Correct bug in mediawiki raw revision table

2017-12-15 Thread Joal (Code Review)
Joal has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398552 )

Change subject: Correct bug in mediawiki raw revision table
..

Correct bug in mediawiki raw revision table

rev_deleted was defined as a boolean while it's actually an integer.

Change-Id: I479cb51a0e32e5705c99f318bb2dbc4ea72555a2
---
M hive/mediawiki/history/create_mediawiki_revision_table.hql
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/52/398552/1

diff --git a/hive/mediawiki/history/create_mediawiki_revision_table.hql 
b/hive/mediawiki/history/create_mediawiki_revision_table.hql
index 772f4c5..bda01aa 100644
--- a/hive/mediawiki/history/create_mediawiki_revision_table.hql
+++ b/hive/mediawiki/history/create_mediawiki_revision_table.hql
@@ -17,7 +17,7 @@
   `rev_user_text`   string  COMMENT 'This field holds the text of the 
editor\'s username, or the IP address of the editor if the revision was done by 
an unregistered user.',
   `rev_timestamp`   string  COMMENT 'Holds the timestamp of the edit.',
   `rev_minor_edit`  boolean COMMENT 'Records whether the user marked 
the \'minor edit\' checkbox. If the value for this field is 1, then the edit 
was declared as \'minor\'\; it is 0 otherwise. Many automated edits are marked 
as minor.',
-  `rev_deleted` boolean COMMENT 'This field is reserved for the 
RevisionDelete system. It\'s a bitfield in which the values are DELETED_TEXT = 
1\; DELETED_COMMENT = 2\; DELETED_USER = 4\; and DELETED_RESTRICTED = 8. So, 
for example, if nothing has been deleted from that revision, then the value is 
0\; if both the comment and user have been deleted, then the value is 6.',
+  `rev_deleted` int COMMENT 'This field is reserved for the 
RevisionDelete system. It\'s a bitfield in which the values are DELETED_TEXT = 
1\; DELETED_COMMENT = 2\; DELETED_USER = 4\; and DELETED_RESTRICTED = 8. So, 
for example, if nothing has been deleted from that revision, then the value is 
0\; if both the comment and user have been deleted, then the value is 6.',
   `rev_len` bigint  COMMENT 'This field contains the length of 
the article after the revision, in bytes. Used in history pages. Corresponds to 
rc_new_len.',
   `rev_parent_id`   bigint  COMMENT 'The rev_id of the previous 
revision to the page. Corresponds to rc_last_oldid.  For edits which are new 
page creations, rev_parent_id = 0.',
   `rev_sha1`string  COMMENT 'This field is used to add the 
SHA-1 text content hash in base-36 (generated by the base-convert library.)',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I479cb51a0e32e5705c99f318bb2dbc4ea72555a2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Joal 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: wiki replicas: point *.labsdb to *.analytics.db.svc.eqiad.wm...

2017-12-15 Thread Andrew Bogott (Code Review)
Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398551 )

Change subject: wiki replicas: point *.labsdb to 
*.analytics.db.svc.eqiad.wmflabs
..


wiki replicas: point *.labsdb to *.analytics.db.svc.eqiad.wmflabs

The legacy `*.labsdb` service names are in wide use for both web and
analytic workloads. Making this legacy set of names default to the
cluster designated for analytics will keep clients who have not switched
from penalizing the explicit web cluster users.

Bug: T142807
Change-Id: I937e8bf9a8a85ea0f6671260c24f9f5aa6c7af9e
---
M modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
1 file changed, 922 insertions(+), 922 deletions(-)

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



diff --git a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone 
b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
index 8b325a0..bd12c1a 100644
--- a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
+++ b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
@@ -7,931 +7,931 @@
 
 tools  1H  IN  CNAME   tools.db.svc.eqiad.wmflabs.
 
-s1 1H  IN  CNAME   s1.web.db.svc.eqiad.wmflabs.
-enwiki 1H  IN  CNAME   s1.web.db.svc.eqiad.wmflabs.
+s1 1H  IN  CNAME   s1.analytics.db.svc.eqiad.wmflabs.
+enwiki 1H  IN  CNAME   s1.analytics.db.svc.eqiad.wmflabs.
 
-s2 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-bgwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-bgwiktionary   1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-cswiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-enwikiquote1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-enwiktionary   1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-eowiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-fiwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-idwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-itwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-nlwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-nowiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-plwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-ptwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-svwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-thwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-trwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-zhwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
+s2 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+bgwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+bgwiktionary   1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+cswiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+enwikiquote1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+enwiktionary   1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+eowiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+fiwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+idwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+itwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+nlwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+nowiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+plwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+ptwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+svwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+thwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+trwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+zhwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
 
-s3 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-aawiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-aawikibooks1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-aawiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-abwiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-abwiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-acewiki1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-advisorywiki   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-adywiki1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwikibooks1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwikiquote1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-akwiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-akwikibooks1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-akwiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-alswiki1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wiki replicas: point *.labsdb to *.analytics.db.svc.eqiad.wm...

2017-12-15 Thread BryanDavis (Code Review)
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398551 )

Change subject: wiki replicas: point *.labsdb to 
*.analytics.db.svc.eqiad.wmflabs
..

wiki replicas: point *.labsdb to *.analytics.db.svc.eqiad.wmflabs

The legacy `*.labsdb` service names are in wide use for both web and
analytic workloads. Making this legacy set of names default to the
cluster designated for analytics will keep clients who have not switched
from penalizing the explicit web cluster users.

Bug: T142807
Change-Id: I937e8bf9a8a85ea0f6671260c24f9f5aa6c7af9e
---
M modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
1 file changed, 922 insertions(+), 922 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/398551/1

diff --git a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone 
b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
index 8b325a0..bd12c1a 100644
--- a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
+++ b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
@@ -7,931 +7,931 @@
 
 tools  1H  IN  CNAME   tools.db.svc.eqiad.wmflabs.
 
-s1 1H  IN  CNAME   s1.web.db.svc.eqiad.wmflabs.
-enwiki 1H  IN  CNAME   s1.web.db.svc.eqiad.wmflabs.
+s1 1H  IN  CNAME   s1.analytics.db.svc.eqiad.wmflabs.
+enwiki 1H  IN  CNAME   s1.analytics.db.svc.eqiad.wmflabs.
 
-s2 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-bgwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-bgwiktionary   1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-cswiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-enwikiquote1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-enwiktionary   1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-eowiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-fiwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-idwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-itwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-nlwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-nowiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-plwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-ptwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-svwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-thwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-trwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
-zhwiki 1H  IN  CNAME   s2.web.db.svc.eqiad.wmflabs.
+s2 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+bgwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+bgwiktionary   1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+cswiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+enwikiquote1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+enwiktionary   1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+eowiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+fiwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+idwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+itwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+nlwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+nowiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+plwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+ptwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+svwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+thwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+trwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
+zhwiki 1H  IN  CNAME   s2.analytics.db.svc.eqiad.wmflabs.
 
-s3 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-aawiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-aawikibooks1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-aawiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-abwiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-abwiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-acewiki1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-advisorywiki   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-adywiki1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwikibooks1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwikiquote1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-afwiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-akwiki 1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-akwikibooks1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-akwiktionary   1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.
-alswiki1H  IN  CNAME   s3.web.db.svc.eqiad.wmflabs.

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Preview dialog title shows incorrect Chinese variant

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398393 )

Change subject: Fix: Preview dialog title shows incorrect Chinese variant
..


Fix: Preview dialog title shows incorrect Chinese variant

 - Add a logic for summary.getDisplayTitle() and  pageTitle.getDisplayText()
 - Update some codes to lambda

Bug: T182928
Change-Id: Ic95610515b010c71d41f4c342dc6ddbd19589340
---
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
1 file changed, 16 insertions(+), 21 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java 
b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index 9a13159..ea60fda 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -123,12 +123,8 @@
 thumbnailGallery = 
rootView.findViewById(R.id.link_preview_thumbnail_gallery);
 
 if (isImageDownloadEnabled()) {
-CallbackTask.execute(new CallbackTask.Task>() {
-@Override public Map execute() throws 
Throwable {
-return client.request(pageTitle.getWikiSite(), pageTitle, 
true);
-
-}
-}, new CallbackTask.Callback>() {
+CallbackTask.execute(() -> client.request(pageTitle.getWikiSite(), 
pageTitle, true),
+new CallbackTask.Callback>() {
 @Override public void success(@Nullable Map 
result) {
 setThumbGallery(result);
 
thumbnailGallery.setGalleryViewListener(galleryViewListener);
@@ -142,14 +138,11 @@
 }
 
 overflowButton = 
rootView.findViewById(R.id.link_preview_overflow_button);
-overflowButton.setOnClickListener(new View.OnClickListener() {
-@Override
-public void onClick(View v) {
-PopupMenu popupMenu = new PopupMenu(getActivity(), 
overflowButton);
-popupMenu.inflate(R.menu.menu_link_preview);
-popupMenu.setOnMenuItemClickListener(menuListener);
-popupMenu.show();
-}
+overflowButton.setOnClickListener((View v) -> {
+PopupMenu popupMenu = new PopupMenu(getActivity(), overflowButton);
+popupMenu.inflate(R.menu.menu_link_preview);
+popupMenu.setOnMenuItemClickListener(menuListener);
+popupMenu.show();
 });
 
 // show the progress bar while we load content...
@@ -284,7 +277,14 @@
 
 PageSummary summary = rsp.body();
 if (summary != null && !summary.hasError()) {
-
titleText.setText(StringUtil.fromHtml(summary.getDisplayTitle()));
+
+// TODO: Remove this logic once Parsoid starts supporting 
language variants.
+if 
(pageTitle.getWikiSite().languageCode().equals(pageTitle.getWikiSite().subdomain()))
 {
+
titleText.setText(StringUtil.fromHtml(summary.getDisplayTitle()));
+} else {
+
titleText.setText(StringUtil.fromHtml(pageTitle.getDisplayText()));
+}
+
 showPreview(new LinkPreviewContents(summary, 
pageTitle.getWikiSite()));
 } else {
 
titleText.setText(StringUtil.fromHtml(pageTitle.getDisplayText()));
@@ -346,12 +346,7 @@
 }
 };
 
-private View.OnClickListener goToPageListener = new View.OnClickListener() 
{
-@Override
-public void onClick(View v) {
-goToLinkedPage();
-}
-};
+private View.OnClickListener goToPageListener = (View v) -> 
goToLinkedPage();
 
 private void goToExternalMapsApp() {
 if (location != null) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic95610515b010c71d41f4c342dc6ddbd19589340
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
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...DonationInterface[master]: Fix select arrow overlapping contents

2017-12-15 Thread Pcoombe (Code Review)
Pcoombe has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398550 )

Change subject: Fix select arrow overlapping contents
..

Fix select arrow overlapping contents

Fix select arrow to not overlap contents e.g. on currency selector
for unsupported currency. Also we don't need special RtL styles,
these are handled by ResourceLoader.

Bug: T181435
Change-Id: I6e7683c6a0b253bf0ba0a755d80efd6cb5055212
---
M gateway_forms/mustache/forms.css
1 file changed, 7 insertions(+), 6 deletions(-)


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

diff --git a/gateway_forms/mustache/forms.css b/gateway_forms/mustache/forms.css
index 9e7e307..6b107ab 100644
--- a/gateway_forms/mustache/forms.css
+++ b/gateway_forms/mustache/forms.css
@@ -191,13 +191,9 @@
   -moz-appearance: none;
   appearance: none;
   background-image: url("data:image/svg+xml,%3Csvg 
xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 
12'%3E%3Cpath d='M11.05 3.996l-.965-1.053-4.035 3.86-3.947-3.86L1.05 3.996l5 5 
5-5'/%3E%3C/svg%3E");
-  background-position: right;
   background-repeat: no-repeat;
-  background-origin: content-box;
-}
-
-body.rtl #payment-table-donor select {
-  background-position: left;
+  background-position: center right 8px;
+  padding-right: 24px;
 }
 
 #payment-table-donor input[type="text"]:hover,
@@ -405,6 +401,11 @@
 -webkit-appearance: none;
 }
 
+td#donate form select {
+background-position: center right 14px;
+padding-right: 28px;
+}
+
 body #mw-content-text #donate #greenBackground {
 background: transparent;
 border: 0;

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use another pageid in WikiPageDbTestBase::testInsertOn_idSpe...

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398545 )

Change subject: Use another pageid in 
WikiPageDbTestBase::testInsertOn_idSpecified
..

Use another pageid in WikiPageDbTestBase::testInsertOn_idSpecified

integer bigger than 2147483648 is bad on 32-bit php

1) WikiPageContentHandlerDbTest::testInsertOn_idSpecified
Failed asserting that -816015107 is identical to 3478952189.

> echo intval( 3478952189 );
-816015107

Change-Id: Ia2ab870dfe53bef873def3905ae93ea52d4ab2ad
---
M tests/phpunit/includes/page/WikiPageDbTestBase.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/398545/1

diff --git a/tests/phpunit/includes/page/WikiPageDbTestBase.php 
b/tests/phpunit/includes/page/WikiPageDbTestBase.php
index b8480dd..2b803ae 100644
--- a/tests/phpunit/includes/page/WikiPageDbTestBase.php
+++ b/tests/phpunit/includes/page/WikiPageDbTestBase.php
@@ -1678,7 +1678,7 @@
public function testInsertOn_idSpecified() {
$title = Title::newFromText( __METHOD__ );
$page = new WikiPage( $title );
-   $id = 3478952189;
+   $id = 1478952189;
 
$result = $page->insertOn( $this->db, $id );
 

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Set wgCommentTableSchemaMigrationStage in RevisionStoreTest

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398543 )

Change subject: Set wgCommentTableSchemaMigrationStage in RevisionStoreTest
..

Set wgCommentTableSchemaMigrationStage in RevisionStoreTest

Change-Id: I2d8bfdee0a30a54f4315c8056b7ac84f47254db2
---
M tests/phpunit/includes/Storage/RevisionStoreTest.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/398543/1

diff --git a/tests/phpunit/includes/Storage/RevisionStoreTest.php 
b/tests/phpunit/includes/Storage/RevisionStoreTest.php
index efad1b1..18dbc250 100644
--- a/tests/phpunit/includes/Storage/RevisionStoreTest.php
+++ b/tests/phpunit/includes/Storage/RevisionStoreTest.php
@@ -213,6 +213,7 @@
public function testGetQueryInfo( $contentHandlerUseDb, $options, 
$expected ) {
$store = $this->getRevisionStore();
$store->setContentHandlerUseDB( $contentHandlerUseDb );
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$this->assertEquals( $expected, $store->getQueryInfo( $options 
) );
}
 
@@ -242,6 +243,7 @@
public function testGetArchiveQueryInfo_contentHandlerDb() {
$store = $this->getRevisionStore();
$store->setContentHandlerUseDB( true );
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$this->assertEquals(
[
'tables' => [
@@ -269,6 +271,7 @@
public function testGetArchiveQueryInfo_noContentHandlerDb() {
$store = $this->getRevisionStore();
$store->setContentHandlerUseDB( false );
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$this->assertEquals(
[
'tables' => [

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update whitelist for a few mobile app schemas.

2017-12-15 Thread Dbrant (Code Review)
Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398542 )

Change subject: Update whitelist for a few mobile app schemas.
..

Update whitelist for a few mobile app schemas.

This adds a few fields to the whitelist from the following eventlogging
schemas used by the Android app:
MobileWikiAppFeedConfigure
MobileWikiAppRandomizer
MobileWikiAppOnThisDay

These are new features that we've developed recently in the app, and we'd
like to quantify the usage/engagement with these features over an
indefinite period.

As with other schemas used by the app, all of these fields are anonymous.

Change-Id: I1a7e6bb5e20843e57dd2dc8c7623f4261adc1d84
---
M 
modules/profile/files/mariadb/misc/eventlogging/eventlogging_purging_whitelist.tsv
1 file changed, 17 insertions(+), 0 deletions(-)


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

diff --git 
a/modules/profile/files/mariadb/misc/eventlogging/eventlogging_purging_whitelist.tsv
 
b/modules/profile/files/mariadb/misc/eventlogging/eventlogging_purging_whitelist.tsv
index 0a00dc9..4690ba6 100644
--- 
a/modules/profile/files/mariadb/misc/eventlogging/eventlogging_purging_whitelist.tsv
+++ 
b/modules/profile/files/mariadb/misc/eventlogging/eventlogging_purging_whitelist.tsv
@@ -948,6 +948,23 @@
 MobileWikiAppWiktionaryPopup   wiki
 MobileWikiAppWiktionaryPopup   event_text
 MobileWikiAppWiktionaryPopup   event_timeSpent
+MobileWikiAppFeedConfigure event_enabledList
+MobileWikiAppFeedConfigure event_orderList
+MobileWikiAppFeedConfigure event_source
+MobileWikiAppFeedConfigure event_timeSpent
+MobileWikiAppFeedConfigure event_appInstallID
+MobileWikiAppRandomizerevent_fingerSwipesForward
+MobileWikiAppRandomizerevent_fingerSwipesBack
+MobileWikiAppRandomizerevent_diceClicks
+MobileWikiAppRandomizerevent_backClicks
+MobileWikiAppRandomizerevent_source
+MobileWikiAppRandomizerevent_timeSpent
+MobileWikiAppRandomizerevent_appInstallID
+MobileWikiAppOnThisDay event_totalEvents
+MobileWikiAppOnThisDay event_scrolledEvents
+MobileWikiAppOnThisDay event_source
+MobileWikiAppOnThisDay event_timeSpent
+MobileWikiAppOnThisDay event_appInstallID
 ReadingDepth   webHost
 ReadingDepth   wiki
 ReadingDepth   event_action

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

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

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


[MediaWiki-commits] [Gerrit] marvin[master]: WIP: add support for page transitions

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398541 )

Change subject: WIP: add support for page transitions
..

WIP: add support for page transitions

Bug: T179489
Change-Id: Ic79100b5f796eedf914e9ad6cc1da5cd820de288
---
M package-lock.json
M package.json
M src/client/index.css
M src/client/index.tsx
M src/client/webpack.config.ts
A src/common/types/preact-css-transition-group.d.ts
6 files changed, 117 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/41/398541/1

diff --git a/package-lock.json b/package-lock.json
index 977e3d5..d018d50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6047,6 +6047,12 @@
   "resolved": "https://registry.npmjs.org/preact/-/preact-8.2.7.tgz;,
   "integrity": 
"sha512-m34Ke8U32HyKRVzUOCAcaiIBLR2ye6syiuRclU5DxyixDPDFqdLbIElhERBrF6gDbPKQR+Vpv5bZ9CCbvN6pdQ=="
 },
+"preact-css-transition-group": {
+  "version": "1.3.0",
+  "resolved": 
"https://registry.npmjs.org/preact-css-transition-group/-/preact-css-transition-group-1.3.0.tgz;,
+  "integrity": "sha1-Bv5Giyb3gC6VuCmnYtsLwZmu85k=",
+  "dev": true
+},
 "preact-render-to-string": {
   "version": "3.7.0",
   "resolved": 
"https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-3.7.0.tgz;,
diff --git a/package.json b/package.json
index bcaec8d..6917feb 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
 "mocha": "4.0.1",
 "nodemon": "1.13.2",
 "npm-run-all": "4.1.2",
+"preact-css-transition-group": "1.3.0",
 "prettier": "1.9.2",
 "sinon": "4.1.3",
 "style-loader": "0.19.1",
@@ -108,11 +109,11 @@
   "bundlesize": [
 {
   "path": "dist/public/index.*.js",
-  "maxSize": "4KB"
+  "maxSize": "4.1KB"
 },
 {
   "path": "dist/public/index.*.css",
-  "maxSize": "4.9KB"
+  "maxSize": "5.0KB"
 },
 {
   "path": "dist/public/runtime.*.js",
@@ -120,7 +121,7 @@
 },
 {
   "path": "dist/public/vendor.*.js",
-  "maxSize": "9.5KB"
+  "maxSize": "11.5KB"
 },
 {
   "path": "dist/public/pages/about.*.js",
diff --git a/src/client/index.css b/src/client/index.css
index fb9779d..be75f5a 100644
--- a/src/client/index.css
+++ b/src/client/index.css
@@ -125,3 +125,33 @@
 p {
   margin: var(--space) 0;
 }
+
+/* Page transitions */
+
+.Client-component-container {
+  /* Stack the components one on top of the other so that pages can transition
+ by fading in and out. */
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.Client-component-container-enter {
+  opacity: 0;
+  transition: opacity var(--transition-duration-medium) ease-in;
+}
+
+.Client-component-container-enter-active {
+  opacity: 1;
+}
+
+.Client-component-container-leave {
+  opacity: 1;
+  transition: opacity var(--transition-duration-medium) ease-out;
+}
+
+.Client-component-container-leave-active {
+  opacity: 0;
+}
diff --git a/src/client/index.tsx b/src/client/index.tsx
index ea10080..c5ce613 100644
--- a/src/client/index.tsx
+++ b/src/client/index.tsx
@@ -3,6 +3,7 @@
 import { Location as HistoricalLocation } from "history";
 import "wikimedia-ui-base/wikimedia-ui-base.css";
 import "./index.css";
+import CSSTransitionGroup from "preact-css-transition-group";
 import { RouteResponse, newRouter } from "../common/router/router";
 import { SSRData } from "../common/models/ssr-data";
 import { WithContext } from "../common/components/with-context";
@@ -24,13 +25,24 @@
   throw new Error('Missing element with "root" ID.');
 })();
 
-function renderPageRoot({ Component, props, title }: RouteResponse) {
+/**
+ * @param {!any} componentKey A low-memory unique identifier for the page. 
e.g.,
+ *the URL.
+ */
+function renderPageRoot(
+  componentKey: any,
+  { Component, props, title }: RouteResponse
+) {
   // Update the window / tab title.
   document.title = formatDocTitle(title ? title(props) : undefined);
 
   render(
 
-  
+  
+
+  
+
+  
 ,
 pageRoot,
 pageRoot.lastElementChild || undefined
@@ -38,7 +50,9 @@
 }
 
 function route(location: Location | HistoricalLocation) {
-  router.route(location.pathname, location.search).then(renderPageRoot);
+  router
+.route(location.pathname, location.search)
+.then(rsp => renderPageRoot(location.pathname, rsp));
 }
 
 // Observe the History
diff --git a/src/client/webpack.config.ts b/src/client/webpack.config.ts
index a9171e0..69e6b20 100644
--- a/src/client/webpack.config.ts
+++ b/src/client/webpack.config.ts
@@ -114,7 +114,7 @@
 
 // Limits the sum of all assets (index, runtime, and vendor) required
 // for an initial load for a specific entry (e.g., index).
-maxEntrypointSize: 64 * 1024
+maxEntrypointSize: 96 * 1024
   },
 
   resolve: { extensions: EXTENSIONS },
diff 

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade Preact, Domino, and Wikimedia UI styles

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398539 )

Change subject: Chore: upgrade Preact, Domino, and Wikimedia UI styles
..

Chore: upgrade Preact, Domino, and Wikimedia UI styles

Upgrade preact v8.2.6 → 8.2.7, domino v1.0.30 → 2.0.0, and
wikimedia-ui-base v0.9.2 → 0.10.0. Preact no longer requires the
preact-debug workaround: https://github.com/developit/preact/issues/924.

https://github.com/developit/preact/releases/tag/8.2.7

https://github.com/fgnass/domino/blob/a7ac728/CHANGELOG.md#domino-xxx-not-yet-released-1

https://github.com/wikimedia/wikimedia-ui-base/blob/3ef6cd2/History.md#v0100-2017-11-08

Change-Id: I072c893d7079d32e453f73f4e3d97e1efc60de27
---
M package-lock.json
M package.json
M src/client/webpack.config.ts
3 files changed, 13 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/39/398539/1

diff --git a/package-lock.json b/package-lock.json
index 8cba56d..3e996fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1853,9 +1853,9 @@
   }
 },
 "domino": {
-  "version": "1.0.30",
-  "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz;,
-  "integrity": 
"sha512-ikq8WiDSkICdkElud317F2Sigc6A3EDpWsxWBwIZqOl95km4p/Vc9Rj98id7qKgsjDmExj0AVM7JOd4bb647Xg=="
+  "version": "2.0.0",
+  "resolved": "https://registry.npmjs.org/domino/-/domino-2.0.0.tgz;,
+  "integrity": 
"sha512-BAJKFY+TeUC7bsKT0BWkJU1ksXYPbMRmmGiE958DXMoTEJRig5BSm5Uo8tK2oBxZwuzYFFRQ9hXZG32zNiY4fQ=="
 },
 "domutils": {
   "version": "1.5.1",
@@ -6009,9 +6009,9 @@
   }
 },
 "preact": {
-  "version": "8.2.6",
-  "resolved": "https://registry.npmjs.org/preact/-/preact-8.2.6.tgz;,
-  "integrity": "sha1-ACi0Ju+Y/Mp0Gjxhf/W4E7mpR8c="
+  "version": "8.2.7",
+  "resolved": "https://registry.npmjs.org/preact/-/preact-8.2.7.tgz;,
+  "integrity": 
"sha512-m34Ke8U32HyKRVzUOCAcaiIBLR2ye6syiuRclU5DxyixDPDFqdLbIElhERBrF6gDbPKQR+Vpv5bZ9CCbvN6pdQ=="
 },
 "preact-render-to-string": {
   "version": "3.7.0",
@@ -8390,9 +8390,9 @@
   }
 },
 "wikimedia-ui-base": {
-  "version": "0.9.2",
-  "resolved": 
"https://registry.npmjs.org/wikimedia-ui-base/-/wikimedia-ui-base-0.9.2.tgz;,
-  "integrity": "sha1-sYElZL0EkNvc2TFn+8zCoYZCkeM=",
+  "version": "0.10.0",
+  "resolved": 
"https://registry.npmjs.org/wikimedia-ui-base/-/wikimedia-ui-base-0.10.0.tgz;,
+  "integrity": 
"sha512-1xwMZiNzQNeneh9OvrHBN5zyfKeUwDFUurYDh7xIwRava03f1AxqxvlrgwUVA7JbLKMGlTiZbj3OsHpFVzgArg==",
   "dev": true
 },
 "window-size": {
diff --git a/package.json b/package.json
index d6a5153..66033b7 100644
--- a/package.json
+++ b/package.json
@@ -48,11 +48,11 @@
   },
   "dependencies": {
 "compression": "1.7.1",
-"domino": "1.0.30",
+"domino": "2.0.0",
 "express": "4.16.2",
 "isomorphic-unfetch": "2.0.0",
 "path-to-regexp": "2.1.0",
-"preact": "8.2.6",
+"preact": "8.2.7",
 "preact-render-to-string": "3.7.0",
 "query-string": "5.0.1"
   },
@@ -103,7 +103,7 @@
 "webpack": "3.10.0",
 "webpack-dev-server": "2.9.7",
 "webpack-node-externals": "1.6.0",
-"wikimedia-ui-base": "0.9.2"
+"wikimedia-ui-base": "0.10.0"
   },
   "bundlesize": [
 {
diff --git a/src/client/webpack.config.ts b/src/client/webpack.config.ts
index 823880c..a9171e0 100644
--- a/src/client/webpack.config.ts
+++ b/src/client/webpack.config.ts
@@ -117,14 +117,7 @@
 maxEntrypointSize: 64 * 1024
   },
 
-  resolve: {
-alias: {
-  // todo: remove. https://github.com/developit/preact/issues/924
-  preact$: "preact/dist/preact.js"
-},
-
-extensions: EXTENSIONS
-  },
+  resolve: { extensions: EXTENSIONS },
 
   module: {
 rules: [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I072c893d7079d32e453f73f4e3d97e1efc60de27
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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


[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade Sinon, nodemon, and npm-run-all

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398540 )

Change subject: Chore: upgrade Sinon, nodemon, and npm-run-all
..

Chore: upgrade Sinon, nodemon, and npm-run-all

Upgrade @types/sinon v4.0.0 → 4.1.2, sinon v4.1.0 → 4.1.3, nodemon
v1.12.1 → 1.13.2, and npm-run-all v4.1.1 → 4.1.2.

https://github.com/sinonjs/sinon/blob/39b0849/docs/changelog.md#401--2017-10-04
https://github.com/sinonjs/sinon/blob/39b0849/docs/changelog.md#402--2017-10-25
https://github.com/sinonjs/sinon/blob/39b0849/docs/changelog.md#410--2017-11-02
https://github.com/sinonjs/sinon/blob/39b0849/docs/changelog.md#411--2017-11-03
https://github.com/sinonjs/sinon/blob/39b0849/docs/changelog.md#412--2017-11-07
https://github.com/sinonjs/sinon/blob/39b0849/docs/changelog.md#413--2017-12-07

https://github.com/remy/nodemon/releases/tag/v1.12.3
https://github.com/remy/nodemon/releases/tag/v1.12.4
https://github.com/remy/nodemon/releases/tag/v1.12.5
https://github.com/remy/nodemon/releases/tag/v1.12.6
https://github.com/remy/nodemon/releases/tag/v1.12.7
https://github.com/remy/nodemon/releases/tag/v1.13.0
https://github.com/remy/nodemon/releases/tag/v1.13.1
https://github.com/remy/nodemon/releases/tag/v1.13.2

https://github.com/mysticatea/npm-run-all/releases/tag/v4.1.2

Change-Id: If5dd48f18898e3ec5d476645796f9d0b5351f320
---
M package-lock.json
M package.json
2 files changed, 125 insertions(+), 113 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/40/398540/1

diff --git a/package-lock.json b/package-lock.json
index 3e996fe..977e3d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,15 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+"@remy/pstree": {
+  "version": "1.0.1",
+  "resolved": "https://registry.npmjs.org/@remy/pstree/-/pstree-1.0.1.tgz;,
+  "integrity": "sha1-Qgq7YTxyzSn4xZW9fWxVaRu5aRA=",
+  "dev": true,
+  "requires": {
+"ps-tree": "1.1.0"
+  }
+},
 "@types/assets-webpack-plugin": {
   "version": "3.5.0",
   "resolved": 
"https://registry.npmjs.org/@types/assets-webpack-plugin/-/assets-webpack-plugin-3.5.0.tgz;,
@@ -136,9 +145,9 @@
   }
 },
 "@types/sinon": {
-  "version": "4.0.0",
-  "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-4.0.0.tgz;,
-  "integrity": 
"sha512-cuK4xM8Lg2wd8cxshcQa8RG4IK/xfyB6TNE6tNVvkrShR4xdrYgsV04q6Dp6v1Lp6biEFdzD8k8zg/ujQeiw+A==",
+  "version": "4.1.2",
+  "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-4.1.2.tgz;,
+  "integrity": 
"sha512-fL6bJHYRzbw/7ofbKiJ65SOAasoe5mZhHNSYKxWsF3sGl/arhRwDPwXJqM1xofKNTQD14HNX9VruicM7pm++mQ==",
   "dev": true
 },
 "@types/source-map": {
@@ -195,9 +204,9 @@
   }
 },
 "abbrev": {
-  "version": "1.1.0",
-  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz;,
-  "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+  "version": "1.1.1",
+  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz;,
+  "integrity": 
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
   "dev": true
 },
 "accepts": {
@@ -643,9 +652,9 @@
   }
 },
 "boxen": {
-  "version": "1.2.2",
-  "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz;,
-  "integrity": "sha1-Px1AMsMP/qnUsCwyLq8up0HcvOU=",
+  "version": "1.3.0",
+  "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz;,
+  "integrity": 
"sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
   "dev": true,
   "requires": {
 "ansi-align": "2.0.0",
@@ -654,7 +663,7 @@
 "cli-boxes": "1.0.0",
 "string-width": "2.1.1",
 "term-size": "1.2.0",
-"widest-line": "1.0.0"
+"widest-line": "2.0.0"
   },
   "dependencies": {
 "ansi-styles": {
@@ -2943,12 +2952,12 @@
   }
 },
 "global-dirs": {
-  "version": "0.1.0",
-  "resolved": 
"https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.0.tgz;,
-  "integrity": "sha1-ENNAOeDfBCcuJizyQiT3IJQ0308=",
+  "version": "0.1.1",
+  "resolved": 
"https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz;,
+  "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
   "dev": true,
   "requires": {
-"ini": "1.3.4"
+"ini": "1.3.5"
   }
 },
 "globals": {
@@ -3443,9 +3452,9 @@
   "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 },
 "ini": {
-  "version": "1.3.4",
-  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz;,
-  "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+  "version": "1.3.5",
+  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz;,
+  "integrity": 

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade TypeScript dependencies

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398538 )

Change subject: Chore: upgrade TypeScript dependencies
..

Chore: upgrade TypeScript dependencies

Upgrade @types/compression v0.0.34 → 0.0.35, @types/history v4.6.1 →
4.6.2, @types/node v8.0.47 → 8.5.1, ts-loader v3.1.1 → 3.2.0, ts-node
v3.3.0 → 4.0.2, typescript v2.6.1 → 2.6.2. TypeScript now supports JSX
fragments. ts-node now defaults to "fast mode" which disables type
checking so explicitly enable it now.

https://github.com/TypeStrong/ts-loader/releases/tag/v3.2.0

https://github.com/TypeStrong/ts-node/releases/tag/v4.0.0
https://github.com/TypeStrong/ts-node/releases/tag/v4.0.1
https://github.com/TypeStrong/ts-node/releases/tag/v4.0.2

https://github.com/Microsoft/TypeScript/releases/tag/v2.6.2

Change-Id: Ia6cd58f82af872ad8b132be000548807e08e6993
---
M package-lock.json
M package.json
2 files changed, 91 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/38/398538/1

diff --git a/package-lock.json b/package-lock.json
index b43f0e1..8cba56d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
   "dev": true,
   "requires": {
 "@types/express": "4.0.39",
-"@types/node": "8.0.47"
+"@types/node": "8.5.1"
   }
 },
 "@types/clean-webpack-plugin": {
@@ -33,9 +33,9 @@
   }
 },
 "@types/compression": {
-  "version": "0.0.34",
-  "resolved": 
"https://registry.npmjs.org/@types/compression/-/compression-0.0.34.tgz;,
-  "integrity": 
"sha512-NUEw+1DmdMFjVXSaSYf0okgyrnydH7q2DpWTA5/M5lgsUzwut0Ir8qgkTKCavM558CXhNrj5TTTqe3WCfUHMAQ==",
+  "version": "0.0.35",
+  "resolved": 
"https://registry.npmjs.org/@types/compression/-/compression-0.0.35.tgz;,
+  "integrity": 
"sha512-SrHPmzvC5AL6cCrq0fDCU2AX9sOK/Azik2mdkbLhGpxOlzS7rTALjtdk/WzvKY3pQqEz3byvz1nnX/AmMk6X0Q==",
   "dev": true,
   "requires": {
 "@types/express": "4.0.39"
@@ -68,7 +68,7 @@
   "integrity": 
"sha512-UpN389YLcQEIn1t4Kxc8TlCrg43r6o8IcF57LvmbCGNhWzz0dEg4AaUsN6IHrrSjPzPmmJ1FLYXGPP/expXOWg==",
   "dev": true,
   "requires": {
-"@types/node": "8.0.47"
+"@types/node": "8.5.1"
   }
 },
 "@types/extract-text-webpack-plugin": {
@@ -81,9 +81,9 @@
   }
 },
 "@types/history": {
-  "version": "4.6.1",
-  "resolved": 
"https://registry.npmjs.org/@types/history/-/history-4.6.1.tgz;,
-  "integrity": 
"sha512-Z8DQIdWtl0ff+tXDKeG3P0IOXd0kCI5wCXqZZjymjwcwe/o46BlEXeDrN09L9qnhzHmo9ObpkrlMCHPfbVvewA==",
+  "version": "4.6.2",
+  "resolved": 
"https://registry.npmjs.org/@types/history/-/history-4.6.2.tgz;,
+  "integrity": 
"sha512-eVAb52MJ4lfPLiO9VvTgv8KaZDEIqCwhv+lXOMLlt4C1YHTShgmMULEg0RrCbnqfYd6QKfHsMp0MiX0vWISpSw==",
   "dev": true
 },
 "@types/mime": {
@@ -105,9 +105,9 @@
   "dev": true
 },
 "@types/node": {
-  "version": "8.0.47",
-  "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.47.tgz;,
-  "integrity": 
"sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ==",
+  "version": "8.5.1",
+  "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.1.tgz;,
+  "integrity": 
"sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw==",
   "dev": true
 },
 "@types/node-fetch": {
@@ -116,7 +116,7 @@
   "integrity": "sha1-UhB46PDGmhWOUCIAWsqS0mIPbVc=",
   "dev": true,
   "requires": {
-"@types/node": "8.0.47"
+"@types/node": "8.5.1"
   }
 },
 "@types/query-string": {
@@ -147,6 +147,18 @@
   "integrity": 
"sha512-/GVAjL1Y8puvZab63n8tsuBiYwZt1bApMdx58/msQ9ID5T05ov+wm/ZV1DvYC/DKKEygpTJViqQvkh5Rhrl4CA==",
   "dev": true
 },
+"@types/strip-bom": {
+  "version": "3.0.0",
+  "resolved": 
"https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz;,
+  "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=",
+  "dev": true
+},
+"@types/strip-json-comments": {
+  "version": "0.0.30",
+  "resolved": 
"https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz;,
+  "integrity": 
"sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
+  "dev": true
+},
 "@types/tapable": {
   "version": "0.2.3",
   "resolved": 
"https://registry.npmjs.org/@types/tapable/-/tapable-0.2.3.tgz;,
@@ -168,7 +180,7 @@
   "integrity": 
"sha512-xXqusBBKbYb8fA1jtE3iO75uRW1ejqGuH93V+6fhbfNY59ndKjfhftJVxcSaYAMDjmFTRBHy82d+513JKuHD5g==",
   "dev": true,
   "requires": {
-"@types/node": "8.0.47",
+"@types/node": "8.5.1",
 "@types/tapable": "0.2.3",
 "@types/uglify-js": "2.6.29"
   }
@@ -3087,6 +3099,15 @@
 "minimalistic-crypto-utils": 

[MediaWiki-commits] [Gerrit] marvin[master]: Fix: horizontally scroll sections as needed

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398535 )

Change subject: Fix: horizontally scroll sections as needed
..

Fix: horizontally scroll sections as needed

When all other CSS adjustments fail, allow horizontal scroll bars to be
shown at the section level instead of the page level.

Change-Id: I871fb9f72bdb7762ffe9eae74b5bd736e77a5841
---
M src/common/components/content-section/content-section.css
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/35/398535/1

diff --git a/src/common/components/content-section/content-section.css 
b/src/common/components/content-section/content-section.css
index 5444bd4..934e727 100644
--- a/src/common/components/content-section/content-section.css
+++ b/src/common/components/content-section/content-section.css
@@ -1,3 +1,9 @@
+.ContentSection {
+  /* When all else fails, add scrollbars at the section level:
+ http://localhost:3000/wiki/File:Belgica1web.jpg. */
+  overflow-x: auto;
+}
+
 .ContentSection-header {
   /* Add a bottom divider under each section header. */
   border-bottom: 1px solid var(--wmui-color-base80);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I871fb9f72bdb7762ffe9eae74b5bd736e77a5841
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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


[MediaWiki-commits] [Gerrit] marvin[master]: Chore: use concise syntax for optional methods

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398536 )

Change subject: Chore: use concise syntax for optional methods
..

Chore: use concise syntax for optional methods

Replace:

  {
foo?: () => string | undefined;
  }

With:

  {
foo?(): string | undefined;
  }

Change-Id: If22cb6d7a8917f9e7a8b1b707a01acb7b784c89a
---
M src/common/marshallers/utils.test.ts
M src/common/router/route.ts
M src/common/router/router.ts
3 files changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/36/398536/1

diff --git a/src/common/marshallers/utils.test.ts 
b/src/common/marshallers/utils.test.ts
index 9b35ebe..0266f80 100644
--- a/src/common/marshallers/utils.test.ts
+++ b/src/common/marshallers/utils.test.ts
@@ -1,10 +1,12 @@
 import * as fetch from "node-fetch";
 import { JSONValue } from "../types/json";
 
-export const reviveFile = (
+export function reviveFile(
   filename: string,
   reviver?: (key: any, value: JSONValue) => any
-) => JSON.parse(JSON.stringify(require(filename)), reviver);
+): any {
+  return JSON.parse(JSON.stringify(require(filename)), reviver);
+}
 
 const ETAG_REVISION = 802006980;
 const ETAG_TIME_ID = "4f754377-a235-11e7-a776-efb84f18649a";
diff --git a/src/common/router/route.ts b/src/common/router/route.ts
index 03394f1..69802bb 100644
--- a/src/common/router/route.ts
+++ b/src/common/router/route.ts
@@ -38,7 +38,7 @@
   Component: Partial>;
 
   /** The document title shown in the browser window's title bar or tab. */
-  title?: (props: Props) => string | undefined;
+  title?(props: Props): string | undefined;
 }
   | {
   getInitialProps?: undefined;
@@ -51,7 +51,7 @@
 
   Component: Partial>;
 
-  title?: () => string | undefined;
+  title?(): string | undefined;
 };
 
 export interface PageModule {
diff --git a/src/common/router/router.ts b/src/common/router/router.ts
index cb3cfd8..a792bad 100644
--- a/src/common/router/router.ts
+++ b/src/common/router/router.ts
@@ -14,7 +14,7 @@
   chunkName?: string;
   status: number;
   Component: AnyComponent;
-  title?: (props: Props) => string | undefined;
+  title?(props: Props): string | undefined;
   props: Props;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If22cb6d7a8917f9e7a8b1b707a01acb7b784c89a
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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


[MediaWiki-commits] [Gerrit] marvin[master]: Chore: add size test for bundled client CSS

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398534 )

Change subject: Chore: add size test for bundled client CSS
..

Chore: add size test for bundled client CSS

The client is Marvin's only entry point and requires that index.css be
loaded. It seems useful to keep track of the size of this CSS bundle.

Change-Id: Iaead6fea4c334bd586e910154f28745d6af17653
---
M package.json
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/34/398534/1

diff --git a/package.json b/package.json
index acb621f..ae41545 100644
--- a/package.json
+++ b/package.json
@@ -109,6 +109,10 @@
   "maxSize": "4KB"
 },
 {
+  "path": "dist/public/index.*.css",
+  "maxSize": "4.9KB"
+},
+{
   "path": "dist/public/runtime.*.js",
   "maxSize": "1KB"
 },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaead6fea4c334bd586e910154f28745d6af17653
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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


[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade lint and style dependencies

2017-12-15 Thread Niedzielski (Code Review)
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398537 )

Change subject: Chore: upgrade lint and style dependencies
..

Chore: upgrade lint and style dependencies

Upgrade eslint v4.10.0 → 4.13.1, eslint-config-node-services v2.2.3 →
2.2.5, eslint-config-prettier v2.7.0 → 2.9.0, eslint-plugin-jsdoc v3.1.3
→ 3.2.0, prettier v1.7.4 → 1.9.2, and typescript-eslint-parser v9.0.0 →
11.0.0. Prettier now supports markdown so the package script was updated
to check them. Although it wasn't explicitly called out in the release
notes, typescript-eslint-parser appears to have fixed one of its known
issues so the ESLint configuration was updated.

https://github.com/eslint/eslint/releases/tag/v4.11.0
https://github.com/eslint/eslint/releases/tag/v4.12.0
https://github.com/eslint/eslint/releases/tag/v4.12.1
https://github.com/eslint/eslint/releases/tag/v4.13.0
https://github.com/eslint/eslint/releases/tag/v4.13.1

https://github.com/wikimedia/eslint-config-node-services/releases/tag/v2.2.4
https://github.com/wikimedia/eslint-config-node-services/releases/tag/v2.2.5

https://github.com/prettier/eslint-config-prettier/blob/984de70/CHANGELOG.md#version-280-2017-11-19
https://github.com/prettier/eslint-config-prettier/blob/984de70/CHANGELOG.md#version-290-2017-11-26

https://github.com/gajus/eslint-plugin-jsdoc/releases/tag/v3.2.0

https://github.com/prettier/prettier/releases/tag/1.8.0
https://github.com/prettier/prettier/releases/tag/1.8.1
https://github.com/prettier/prettier/releases/tag/1.8.2
https://github.com/prettier/prettier/releases/tag/1.9.0
https://github.com/prettier/prettier/releases/tag/1.9.1
https://github.com/prettier/prettier/releases/tag/1.9.2

https://github.com/eslint/typescript-eslint-parser/releases/tag/v9.0.1
https://github.com/eslint/typescript-eslint-parser/releases/tag/v10.0.0
https://github.com/eslint/typescript-eslint-parser/releases/tag/v11.0.0
https://github.com/eslint/typescript-eslint-parser/commit/aec31cb21f1c15b759e91d92a53687edc16e627c#diff-04c6e90faac2675aa89e2176d2eec7d8L23

Bug: T177265
Change-Id: I478c8889529d59c88f1586ae1cf338c5f8222519
---
M .eslintignore
M .eslintrc.json
A .prettierignore
M docs/design.md
M docs/development.md
M package-lock.json
M package.json
M readme.md
M src/client/index.css
M src/client/tsconfig.json
M src/common/components/content-page/content-page.css
M src/common/components/content/styles/content.css
M src/common/components/content/styles/core/gallery.css
M src/common/components/content/styles/core/parsoid.css
M src/common/components/content/styles/extensions/cite.css
M src/common/components/content/styles/extensions/math.css
M src/common/components/content/styles/images.css
M src/common/components/content/styles/tables.css
M src/common/components/hatnotes/hatnotes.css
M src/common/components/page-summary/page-summary.css
M src/common/components/page/page.css
M src/common/components/paper/paper.css
M src/common/components/separator/separator.css
M src/common/components/thumbnail/thumbnail.tsx
M src/common/http/fetch.test.ts
M src/common/marshallers/page-summary/page-summary-expected.test.json
M src/common/marshallers/page-summary/page-summary-restbase.test.json
M src/common/marshallers/page/file-page-lead-expected.test.json
M src/common/marshallers/page/file-page-lead-restbase.test.json
M src/common/marshallers/page/page-body-expected.test.json
M src/common/marshallers/page/page-body-restbase.test.json
M src/common/marshallers/page/page-expected.test.json
M src/common/marshallers/page/page-lead-expected.test.json
M src/common/marshallers/page/page-lead-restbase.test.json
M src/common/marshallers/page/page-restbase.test.json
M src/common/router/route.ts
M src/common/router/router.ts
M src/server/tsconfig.json
M tsconfig.json
39 files changed, 757 insertions(+), 516 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/37/398537/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I478c8889529d59c88f1586ae1cf338c5f8222519
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: maintain-dbusers: Stop managing account creation for labsdb1...

2017-12-15 Thread Madhuvishy (Code Review)
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398533 )

Change subject: maintain-dbusers: Stop managing account creation for labsdb1001 
and 1003
..


maintain-dbusers: Stop managing account creation for labsdb1001 and 1003

Bug: T183029
Change-Id: Id644af5a02cdf3fddaafce5dab62f288b1118da0
---
M modules/role/manifests/labs/db/maintain_dbusers.pp
1 file changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/modules/role/manifests/labs/db/maintain_dbusers.pp 
b/modules/role/manifests/labs/db/maintain_dbusers.pp
index c23fc695..8e50408 100644
--- a/modules/role/manifests/labs/db/maintain_dbusers.pp
+++ b/modules/role/manifests/labs/db/maintain_dbusers.pp
@@ -42,12 +42,6 @@
 },
 'labsdbs' => {
 'hosts' => {
-'labsdb1001.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
-'labsdb1003.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
 'labsdb1005.eqiad.wmnet' => {
 'grant-type' => 'legacy',
 },

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: maintain-dbusers: Stop managing account creation for labsdb1...

2017-12-15 Thread Madhuvishy (Code Review)
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398533 )

Change subject: maintain-dbusers: Stop managing account creation for labsdb1001 
and 1003
..

maintain-dbusers: Stop managing account creation for labsdb1001 and 1003

Bug: T183029
Change-Id: Id644af5a02cdf3fddaafce5dab62f288b1118da0
---
M modules/role/manifests/labs/db/maintain_dbusers.pp
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/398533/1

diff --git a/modules/role/manifests/labs/db/maintain_dbusers.pp 
b/modules/role/manifests/labs/db/maintain_dbusers.pp
index c23fc695..8e50408 100644
--- a/modules/role/manifests/labs/db/maintain_dbusers.pp
+++ b/modules/role/manifests/labs/db/maintain_dbusers.pp
@@ -42,12 +42,6 @@
 },
 'labsdbs' => {
 'hosts' => {
-'labsdb1001.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
-'labsdb1003.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
 'labsdb1005.eqiad.wmnet' => {
 'grant-type' => 'legacy',
 },

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: db eqiad: remove ganglia

2017-12-15 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398531 )

Change subject: db eqiad: remove ganglia
..


db eqiad: remove ganglia

I need a temporary regex just covering db* and can't use
the existing one for all mysql above like in I89bef5743ceb5
because labsdb* need to stay in for the moment.

(postgresql prometheus work in progress).

Bug: T177225
Change-Id: I359c61e5ed2303ade12fc384eeb6d423189d6a35
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index dbbc3ae..93c342e 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -105,6 +105,10 @@
   cluster: mysql
   standard::has_ganglia: false
 
+db_eqiad:
+  __regex: !ruby/regexp /^(db1[01][0-9][0-9])\.eqiad\.wmnet$/
+  standard::has_ganglia: false
+
 dbproxy_eqiad:
   __regex: !ruby/regexp /^(dbproxy10[01][0-9])\.eqiad\.wmnet$/
   standard::has_ganglia: false

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

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

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


[MediaWiki-commits] [Gerrit] integration/config[master]: npm job for chromium-render

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398497 )

Change subject: npm job for chromium-render
..


npm job for chromium-render

It downloads a bundled Chromium which is not ideal, that will be taken
care of via Ibf6b99d8bf6637cbb926cee13b594589c3dedaca

Keep in the experimental pipeline since the test suite deadlocks at some
point.

Bug: T179552
Change-Id: I0565bdf22188c3990d521f996a0f94ce0a958a77
---
M jjb/mediawiki-services.yaml
M zuul/layout.yaml
2 files changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml
index a049c96..80a04d2 100644
--- a/jjb/mediawiki-services.yaml
+++ b/jjb/mediawiki-services.yaml
@@ -8,6 +8,11 @@
  docker_image_var: wmfreleng/npm-test-librdkafka:v2017.12.11.16.37
 
 - project:
+name: chromium-render
+jobs:
+ - '{name}-npm-browser-node-6-docker'
+
+- project:
 name: 'citoid'
 repository:
  - deploy
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0017849..636b34c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6543,6 +6543,10 @@
 experimental:
   - change-propagation-deploy-npm-node-6-jessie
 
+  - name: mediawiki/services/chromium-render
+experimental:
+  - chromium-render-npm-browser-node-6-docker
+
   - name: mediawiki/services/citoid
 template:
   - name: npm-docker

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0565bdf22188c3990d521f996a0f94ce0a958a77
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Another attempt to fix jenkins

2017-12-15 Thread Ladsgroup (Code Review)
Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398532 )

Change subject: Another attempt to fix jenkins
..

Another attempt to fix jenkins

Change-Id: I94b1552a4dec5231bcf287cab68654bf22b7d5c7
---
M client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
M lib/tests/phpunit/Changes/TestChanges.php
2 files changed, 7 insertions(+), 7 deletions(-)


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

diff --git 
a/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php 
b/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
index 1b13ffc..23ba113 100644
--- a/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
@@ -151,28 +151,28 @@
$settings->setSetting( 'sendEchoNotification', true );
$handlers = $this->getHandlers( $settings );
 
-   Title::newFromText( 'Dummy2' )->resetArticleID( 0 );
+   Title::newFromText( 'Duummy2' )->resetArticleID( 0 );
$this->assertFalse(
$handlers->doWikibaseHandleChange( $changeDe ),
"Failed asserting that 'Dummy' does not create an event"
);
 
-   $this->insertPage( 'Dummy2' );
+   $this->insertPage( 'Duummy2' );
$this->assertFalse(
$handlers->doWikibaseHandleChange( $changeDe ),
-   "Failed asserting that 'Dummy2' does not create an 
event"
+   "Failed asserting that 'Duummy2' does not create an 
event"
);
 
-   $this->insertPage( 'Dummy', '#REDIRECT [[Dummy2]]' );
+   $this->insertPage( 'Dummy', '#REDIRECT [[Duummy2]]' );
$this->assertFalse(
$handlers->doWikibaseHandleChange( $changeDe ),
-   "Failed asserting that 'Dummy2' redirected to by 
'Dummy' does not create an event"
+   "Failed asserting that 'Duummy2' redirected to by 
'Dummy' does not create an event"
);
 
$this->insertPage( 'Dummy' );
$this->assertTrue(
$handlers->doWikibaseHandleChange( $changeDe ),
-   "Failed asserting that 'Dummy2' creates an event"
+   "Failed asserting that 'Duummy2' creates an event"
);
}
 
diff --git a/lib/tests/phpunit/Changes/TestChanges.php 
b/lib/tests/phpunit/Changes/TestChanges.php
index ec0024d..7144879 100644
--- a/lib/tests/phpunit/Changes/TestChanges.php
+++ b/lib/tests/phpunit/Changes/TestChanges.php
@@ -92,7 +92,7 @@
$old = $new->copy();
 
// -
-   $new->getSiteLinkList()->setNewSiteLink( 'dewiki', 
'Dummy2' );
+   $new->getSiteLinkList()->setNewSiteLink( 'dewiki', 
'Duummy2' );
$changes['change-dewiki-sitelink'] = 
$changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new );
$old = $new->copy();
 

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix additional usage of incorrect case

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398453 )

Change subject: Fix additional usage of incorrect case
..


Fix additional usage of incorrect case

Courtesy of the PhpStorm inspection Case mismatch in method call or
class usage.

Bug: T166759
Change-Id: I27c53658b99048fa0dd8f9d6ef1398620386e1cc
---
M includes/AutoLoader.php
M includes/changes/ChangesListFilter.php
M includes/parser/ParserOutput.php
M includes/registration/ExtensionRegistry.php
M tests/phpunit/includes/Storage/RevisionStoreRecordTest.php
M tests/phpunit/includes/jobqueue/JobTest.php
M tests/phpunit/structure/ResourcesTest.php
7 files changed, 14 insertions(+), 14 deletions(-)

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



diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 675e347..52410fe 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -133,5 +133,5 @@
}
 }
 
-Autoloader::$psr4Namespaces = AutoLoader::getAutoloadNamespaces();
+AutoLoader::$psr4Namespaces = AutoLoader::getAutoloadNamespaces();
 spl_autoload_register( [ 'AutoLoader', 'autoload' ] );
diff --git a/includes/changes/ChangesListFilter.php 
b/includes/changes/ChangesListFilter.php
index 2546f2b..1c86d44 100644
--- a/includes/changes/ChangesListFilter.php
+++ b/includes/changes/ChangesListFilter.php
@@ -468,7 +468,7 @@
 * @param FormOptions $opts
 * @return bool
 */
-   public function activelyInConflictWithFilter( ChangeslistFilter 
$filter, FormOptions $opts ) {
+   public function activelyInConflictWithFilter( ChangesListFilter 
$filter, FormOptions $opts ) {
if ( $this->isSelected( $opts ) && $filter->isSelected( $opts ) 
) {
/** @var ChangesListFilter $siblingFilter */
foreach ( $this->getSiblings() as $siblingFilter ) {
@@ -484,7 +484,7 @@
return false;
}
 
-   private function hasConflictWithFilter( ChangeslistFilter $filter ) {
+   private function hasConflictWithFilter( ChangesListFilter $filter ) {
return in_array( $filter, $this->getConflictingFilters() );
}
 
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index ff9c28d..153a770 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -596,7 +596,7 @@
 
# Replace unnecessary URL escape codes with the referenced 
character
# This prevents spammers from hiding links from the filters
-   $url = parser::normalizeLinkUrl( $url );
+   $url = Parser::normalizeLinkUrl( $url );
 
$registerExternalLink = true;
if ( !$wgRegisterInternalExternals ) {
diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index 994de97..6308461 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -323,7 +323,7 @@
}
 
if ( isset( $info['autoloaderNS'] ) ) {
-   Autoloader::$psr4Namespaces += $info['autoloaderNS'];
+   AutoLoader::$psr4Namespaces += $info['autoloaderNS'];
}
 
foreach ( $info['defines'] as $name => $val ) {
diff --git a/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php 
b/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php
index db85727..aa59a5b 100644
--- a/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php
+++ b/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php
@@ -300,28 +300,28 @@
 
private function provideAudienceCheckData( $field ) {
yield 'field accessible for oversighter (ALL)' => [
-   Revisionrecord::SUPPRESSED_ALL,
+   RevisionRecord::SUPPRESSED_ALL,
[ 'oversight' ],
true,
false
];
 
yield 'field accessible for oversighter' => [
-   Revisionrecord::DELETED_RESTRICTED | $field,
+   RevisionRecord::DELETED_RESTRICTED | $field,
[ 'oversight' ],
true,
false
];
 
yield 'field not accessible for sysops (ALL)' => [
-   Revisionrecord::SUPPRESSED_ALL,
+   RevisionRecord::SUPPRESSED_ALL,
[ 'sysop' ],
false,
false
];
 
yield 'field not accessible for sysops' => [
-   Revisionrecord::DELETED_RESTRICTED | $field,
+   RevisionRecord::DELETED_RESTRICTED | $field,
[ 'sysop' ],
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: db eqiad: remove ganglia

2017-12-15 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398531 )

Change subject: db eqiad: remove ganglia
..

db eqiad: remove ganglia

I need a temporary regex just covering db* and can't use
the existing one for all mysql above like in I89bef5743ceb5
because labsdb* need to stay in for the moment.

(postgresql prometheus work in progress).

Bug: T177225
Change-Id: I359c61e5ed2303ade12fc384eeb6d423189d6a35
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/398531/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index dbbc3ae..93c342e 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -105,6 +105,10 @@
   cluster: mysql
   standard::has_ganglia: false
 
+db_eqiad:
+  __regex: !ruby/regexp /^(db1[01][0-9][0-9])\.eqiad\.wmnet$/
+  standard::has_ganglia: false
+
 dbproxy_eqiad:
   __regex: !ruby/regexp /^(dbproxy10[01][0-9])\.eqiad\.wmnet$/
   standard::has_ganglia: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I359c61e5ed2303ade12fc384eeb6d423189d6a35
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...MobileFrontend[specialpages]: Show toast messages without 1s delay

2017-12-15 Thread Pmiazga (Code Review)
Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398530 )

Change subject: Show toast messages without 1s delay
..

Show toast messages without 1s delay

Toast message should be visible immediately, not after some delay
Read more: https://phabricator.wikimedia.org/T169807#3841337

Bug: T169807
Change-Id: I505cd8266e87379da9522b1c11208a557af58656
---
M resources/mobile.special.mobileoptions.scripts/mobileoptions.js
1 file changed, 1 insertion(+), 7 deletions(-)


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

diff --git a/resources/mobile.special.mobileoptions.scripts/mobileoptions.js 
b/resources/mobile.special.mobileoptions.scripts/mobileoptions.js
index 9a77ccd..38bef98 100644
--- a/resources/mobile.special.mobileoptions.scripts/mobileoptions.js
+++ b/resources/mobile.special.mobileoptions.scripts/mobileoptions.js
@@ -1,6 +1,5 @@
 ( function ( M, $ ) {
var storage = mw.storage,
-   notification,
toast = M.require( 'mobile.startup/toast' ),
EXPAND_SECTIONS_KEY = 'expandSections',
msg = mw.msg,
@@ -13,15 +12,10 @@
 * @ignore
 */
function notify( isPending ) {
-   if ( notification ) {
-   clearTimeout( notification );
-   }
if ( isPending ) {
toast.showOnPageReload( msg( 
'mobile-frontend-settings-save' ) );
} else {
-   notification = setTimeout( function () {
-   toast.show( msg( 
'mobile-frontend-settings-save' ) );
-   }, 1000 );
+   toast.show( msg( 'mobile-frontend-settings-save' ) );
}
}
/**

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Remove dependencies, use chromium instead

2017-12-15 Thread Hashar (Code Review)
Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398529 )

Change subject: Remove dependencies, use chromium instead
..

Remove dependencies, use chromium instead

3edf62359b introduced service runner dependencies for the chromium
package. They were needed by Puppeteer bundled Chromium.

With Ibf6b99d8bf6637cbb926cee13b594589c3dedaca, Puppeteer no more
install Chromium, so provided it which will also install all the
required dependencies.

Dropped lsb-release and wget, which are not mentionned as a dependency
to the Debian stretch package. Assuming it was for debugging purpose.

Keep fonts-liberation which is Recommended. I guess that will make a
slightly better rendering.

Bug: T179552
Change-Id: If450409c5031c57bf397a73b61b16cdf3f41cb65
---
M package.json
1 file changed, 2 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render 
refs/changes/29/398529/1

diff --git a/package.json b/package.json
index 7e5e6df..897a94e 100644
--- a/package.json
+++ b/package.json
@@ -64,44 +64,8 @@
 "node": "6.11.1",
 "dependencies": {
   "debian": [
-"gconf-service",
-"libasound2",
-"libatk1.0-0",
-"libc6",
-"libcairo2",
-"libcups2",
-"libdbus-1-3",
-"libexpat1",
-"libfontconfig1",
-"libgcc1",
-"libgconf-2-4",
-"libgdk-pixbuf2.0-0",
-"libglib2.0-0",
-"libgtk-3-0",
-"libnspr4",
-"libpango-1.0-0",
-"libpangocairo-1.0-0",
-"libstdc++6",
-"libx11-6",
-"libx11-xcb1",
-"libxcb1",
-"libxcomposite1",
-"libxcursor1",
-"libxdamage1",
-"libxext6",
-"libxfixes3",
-"libxi6",
-"libxrandr2",
-"libxrender1",
-"libxss1",
-"libxtst6",
-"ca-certificates",
-"fonts-liberation",
-"libappindicator1",
-"libnss3",
-"lsb-release",
-"xdg-utils",
-"wget"
+"chromium",
+"fonts-liberation"
   ],
   "_all": []
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If450409c5031c57bf397a73b61b16cdf3f41cb65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: dbproxy eqiad: remove ganglia

2017-12-15 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398528 )

Change subject: dbproxy eqiad: remove ganglia
..


dbproxy eqiad: remove ganglia

Bug: T177225
Change-Id: Id12728f92c65583fa086248eb1857c6cdb23baff
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 2b3dc24..dbbc3ae 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -105,6 +105,10 @@
   cluster: mysql
   standard::has_ganglia: false
 
+dbproxy_eqiad:
+  __regex: !ruby/regexp /^(dbproxy10[01][0-9])\.eqiad\.wmnet$/
+  standard::has_ganglia: false
+
 extstorage_eqiad:
   __regex: !ruby/regexp /^(es101[1-9])\.eqiad\.wmnet$/
   standard::has_ganglia: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id12728f92c65583fa086248eb1857c6cdb23baff
Gerrit-PatchSet: 1
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]: dbproxy eqiad: remove ganglia

2017-12-15 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398528 )

Change subject: dbproxy eqiad: remove ganglia
..

dbproxy eqiad: remove ganglia

Bug: T177225
Change-Id: Id12728f92c65583fa086248eb1857c6cdb23baff
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/398528/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 2b3dc24..dbbc3ae 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -105,6 +105,10 @@
   cluster: mysql
   standard::has_ganglia: false
 
+dbproxy_eqiad:
+  __regex: !ruby/regexp /^(dbproxy10[01][0-9])\.eqiad\.wmnet$/
+  standard::has_ganglia: false
+
 extstorage_eqiad:
   __regex: !ruby/regexp /^(es101[1-9])\.eqiad\.wmnet$/
   standard::has_ganglia: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id12728f92c65583fa086248eb1857c6cdb23baff
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...chromium-render[master]: Prevent puppeteer from downloading Chromium

2017-12-15 Thread Hashar (Code Review)
Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398527 )

Change subject: Prevent puppeteer from downloading Chromium
..

Prevent puppeteer from downloading Chromium

In production we would use the Chromium package has provided by Debian
and hence there is no need to download a bundled chromium. On CI
Chromium is provided as well.

Ask puppeteer to skip download. That can be achieved either by setting
the environment variable PUPPETEER_SKIP_CHROMIUM_DOWNLOAD or via a
.nmprc local to the repository. The later seems more robust.

Result:

  $ npm install puppeteer@^0.13.0

  > puppeteer@0.13.0 install
  mediawiki/services/chromium-render/node_modules/puppeteer
  > node install.js

  **INFO** Skipping Chromium download.
  "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" was set in npm config.

The /deploy repository needs a similar adjustement.

Bug: T179552
Change-Id: Ibf6b99d8bf6637cbb926cee13b594589c3dedaca
---
A .npmrc
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render 
refs/changes/27/398527/1

diff --git a/.npmrc b/.npmrc
new file mode 100644
index 000..0ecb293
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+puppeteer_skip_chromium_download = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf6b99d8bf6637cbb926cee13b594589c3dedaca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: external storage eqiad: remove ganglia

2017-12-15 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398526 )

Change subject: external storage eqiad: remove ganglia
..


external storage eqiad: remove ganglia

Just like I10f7ed6a95f4ad3a08a3e for codfw
but now doing eqiad.

Bug: T177225
Change-Id: Id02588b075354801c82104652dad62e48b124036
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 780a78a..2b3dc24 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -105,6 +105,10 @@
   cluster: mysql
   standard::has_ganglia: false
 
+extstorage_eqiad:
+  __regex: !ruby/regexp /^(es101[1-9])\.eqiad\.wmnet$/
+  standard::has_ganglia: false
+
 labvirt:
   __regex: !ruby/regexp /^labvirt10[0-9][0-9]\.eqiad\.wmnet$/
   cluster: labvirt

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: external storage eqiad: remove ganglia

2017-12-15 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398526 )

Change subject: external storage eqiad: remove ganglia
..

external storage eqiad: remove ganglia

Just like I10f7ed6a95f4ad3a08a3e for codfw
but now doing eqiad.

Bug: T177225
Change-Id: Id02588b075354801c82104652dad62e48b124036
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/398526/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 780a78a..2b3dc24 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -105,6 +105,10 @@
   cluster: mysql
   standard::has_ganglia: false
 
+extstorage_eqiad:
+  __regex: !ruby/regexp /^(es101[1-9])\.eqiad\.wmnet$/
+  standard::has_ganglia: false
+
 labvirt:
   __regex: !ruby/regexp /^labvirt10[0-9][0-9]\.eqiad\.wmnet$/
   cluster: labvirt

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id02588b075354801c82104652dad62e48b124036
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...Athena[master]: Add minus-x to "composer test"

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398521 )

Change subject: Add minus-x to "composer test"
..


Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: I829eba9ddd70ac03a068e15f54e88ca253a73e9a
---
M composer.json
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index aebd773..65dd36a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": "minus-x fix .",
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I829eba9ddd70ac03a068e15f54e88ca253a73e9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Athena
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...Lockdown[master]: Update to extension.json

2017-12-15 Thread MarkAHershberger (Code Review)
MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398525 )

Change subject: Update to extension.json
..

Update to extension.json

* Add conventional GPL header
* Remove block comment that is duplicated in README.
* Use MediaWiki\Extensions… namespace

Change-Id: Ied913791c53da80841e50df670bd6c93184772bd
---
A extension.json
R src/Hook.php
2 files changed, 58 insertions(+), 56 deletions(-)


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

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..6fa24f1
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,36 @@
+{
+   "name": "Lockdown",
+   "author": [
+   "Daniel Kinzler",
+   "Platonides",
+   "Mark A. Hershberger",
+   "..."
+   ],
+   "url": "https://mediawiki.org/wiki/Extension:Lockdown;,
+   "descriptionmsg": "lockdown-desc",
+   "license-name": "GPL-2.0+",
+   "type": "other",
+   "MessagesDirs": {
+   "Lockdown": [
+   "i18n"
+   ]
+   },
+   "Hooks": {
+   "getUserPermissionsErrors": 
"MediaWiki\\Extensions\\Lockdown\\Hook::onGetUserPermissionsErrors",
+   "MediaWikiPerformAction": 
"MediaWiki\\Extensions\\Lockdown\\Hook::onMediawikiPerformAction",
+   "SearchableNamespaces": 
"MediaWiki\\Extensions\\Lockdown\\Hook::onSearchableNamespaces",
+   "SearchGetNearMatchComplete": 
"MediaWiki\\Extensions\\Lockdown\\Hook::onSearchGetNearMatchComplete"
+   },
+   "config": {
+   "NamespacePermissionLockdown": {
+   "value": []
+   },
+   "SpecialPageLockdown": {
+   "value": []
+   },
+   "ActionLockdown": {
+   "value": []
+   }
+   },
+   "manifest_version": 2
+}
diff --git a/Lockdown.php b/src/Hook.php
similarity index 74%
rename from Lockdown.php
rename to src/Hook.php
index 1db1a2a..397f3d3 100644
--- a/Lockdown.php
+++ b/src/Hook.php
@@ -1,72 +1,38 @@
 
  * @license GNU General Public Licence 2.0 or later
  */
+namespace MediaWiki\Extensions\Lockdown;
 
 /**
- * WARNING: you can use this extension to deny read access to some
- * namespaces. Keep in mind that this may be circumvented in several
- * ways. This extension doesn't try to plug such holes. Also note that
- * pages that are not readable will still be shown in listings, such as
- * the search page, categories, etc.
- *
- * Known ways to access "hidden" pages:
- * - transcluding as template. can be avoided using $wgNonincludableNamespaces.
- *
- * - Some search messages may reveal the page existance by producing
- *   links to it (MediaWiki:searchsubtitle, MediaWiki:noexactmatch,
- *   MediaWiki:searchmenu-exists, MediaWiki:searchmenu-new...).
- *
- * - supplying oldid= may work in some
- *   versions of mediawiki. Same with diff, etc.
- *
- * NOTE: you cannot GRANT access to things forbidden by
- * $wgGroupPermissions. You can only DENY access granted there.
+ * Holds the hooks for the Lockdown extension.
  */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo( "This file is an extension to the MediaWiki software and cannot "
- . "be used standalone.\n" );
-   die( 1 );
-}
-
-$wgExtensionCredits['other'][] = [
-   'path' => __FILE__,
-   'name' => 'Lockdown',
-   'author' => [
-   'Daniel Kinzler',
-   'Mark A. Hershberger',
-   'Platonides',
-   '...'
-   ],
-   'url' => 'https://mediawiki.org/wiki/Extension:Lockdown',
-   'descriptionmsg' => 'lockdown-desc',
-   'license-name' => 'GPL-2.0+'
-];
-
-$wgMessagesDirs['Lockdown'] = __DIR__ . '/i18n';
-
-$wgNamespacePermissionLockdown = [];
-$wgSpecialPageLockdown = [];
-$wgActionLockdown = [];
-
-$wgHooks['getUserPermissionsErrors'][] = 
'Lockdown::onGetUserPermissionsErrors';
-$wgHooks['MediaWikiPerformAction'][] = 'Lockdown::onMediawikiPerformAction';
-$wgHooks['SearchableNamespaces'][] = 'Lockdown::onSearchableNamespaces';
-$wgHooks['SearchGetNearMatchComplete'][]
-   = 'Lockdown::onSearchGetNearMatchComplete';
-
-class Lockdown {
+class Hook {
 
/**
 * Fetch an appropriate permission error (or none!)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied913791c53da80841e50df670bd6c93184772bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lockdown
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Jonas Kress move from ldap to shell, add to groups

2017-12-15 Thread RobH (Code Review)
RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398524 )

Change subject: Jonas Kress move from ldap to shell, add to groups
..

Jonas Kress move from ldap to shell, add to groups

Moving the user from ldap only access to shell access, per request for
access to hue/analytics data granted through the
analytics-privatedata-users group.

This request was filed on Thursday, 2017-12-14.  The 3 day wait will be
over (pending no objections on the task) on Tuesday, 2017-12-19.

Bug: T182908
Change-Id: I5bb52a02992c6e8b25c1226bdce66eb8422118c4
---
M modules/admin/data/data.yaml
1 file changed, 11 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/398524/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 7825095..9f7cae6 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -245,7 +245,7 @@
   jdlrobson, chelsyx, ovasileva, mtizzoni, panisson, paolotti, 
ciro,
   flemmerich, mkroetzsch, akrausetud, filippo, pmiazga, faidon,
   piccardi, fdans, eevans, anomie, demon, ladsgroup, musikanimal, 
joewalsh,
-  kaldari, goransm, ema, dsaez, shiladsen, rho, mirrys, slaporte]
+  kaldari, goransm, ema, dsaez, shiladsen, rho, mirrys, slaporte, 
jk]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.
@@ -2644,6 +2644,16 @@
   - ssh-ed25519 
C3NzaC1lZDI1NTE5IDTroA/q8voMNw9A4skHh1DQLIP2Hb3L4bb9dwinwFER 
cormacparle@Cormacs-MacBook-Pro.local
 uid: 17761
 email: cpa...@wikimedia.org
+  jk:
+ensure: present
+gid: 500
+name: jk
+realname: Jonas Kress
+ssh_keys:
+  - ssh-ed25519 
C3NzaC1lZDI1NTE5IG7lA+/vYOVDy1Vbd4/gxs1jCDxvK3M0usqq9FdbbE/Y 
jonas.kr...@wikimedia.de
+uid: 12454
+email: jonas.kr...@wikimedia.de
+
 ldap_only_users:
   abartov:
 ensure: present
@@ -2706,10 +2716,6 @@
 ensure: present
 realname: James Buatti
 email: jbua...@wikimedia.org
-  jk:
-ensure: present
-realname: Jonas Kress
-email: jonas.kr...@wikimedia.de
   jrobell:
 ensure: present
 realname: Jessica Robell

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bb52a02992c6e8b25c1226bdce66eb8422118c4
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] mediawiki...Flow[master]: [EXPERIMENTAL] Running an isomorphic react app

2017-12-15 Thread Sbisson (Code Review)
Sbisson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398523 )

Change subject: [EXPERIMENTAL] Running an isomorphic react app
..

[EXPERIMENTAL] Running an isomorphic react app

Change-Id: Ibf3885e8d0cc9e792227382035b61995eb2a30f7
---
M .gitignore
M extension.json
M includes/UrlGenerator.php
M includes/View.php
4 files changed, 70 insertions(+), 9 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 8fe72ff..2324629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 \#*#
 /composer.lock
 /docs
+modules/fleact-client.js
+modules/fleact-server.js
diff --git a/extension.json b/extension.json
index e238aa4..83d2dc6 100644
--- a/extension.json
+++ b/extension.json
@@ -760,6 +760,16 @@
"desktop",
"mobile"
]
+   },
+   "fleact-server": {
+   "scripts": [
+   "fleact-server.js"
+   ]
+   },
+   "fleact-client": {
+   "scripts": [
+   "fleact-client.js"
+   ]
}
},
"ResourceFileModulePaths": {
diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index 5d176ea..3c0f78b 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -433,10 +433,15 @@
 * @param UUID $workflowId
 * @return Anchor
 */
-   public function workflowLink( Title $title = null, UUID $workflowId ) {
+   public function workflowLink( Title $title = null, UUID $workflowId, 
$version = null ) {
+   $query = [];
+   if ( $version ) {
+   $query[ 'version' ] = $version;
+   }
return new Anchor(
wfMessage( 'flow-workflow' ),
-   $this->resolveTitle( $title, $workflowId )
+   $this->resolveTitle( $title, $workflowId ),
+   [ 'version' => $version ]
);
}
 
diff --git a/includes/View.php b/includes/View.php
index 22d2183..0ea2d64 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -9,11 +9,14 @@
 use Flow\Model\HtmlRenderingInformation;
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
+use FormatJson;
 use Html;
 use Hooks;
 use IContextSource;
 use Message;
 use OutputPage;
+use ResourceLoader;
+use ResourceLoaderContext;
 use Title;
 
 class View extends ContextSource {
@@ -67,15 +70,14 @@
$apiResponse = $this->buildApiResponse( $loader, $blocks, 
$action, $parameters );
 
$output = $this->getOutput();
-   $output->enableOOUI();
-   $this->addModules( $output, $action );
+
// Please note that all blocks can set page title, which may 
cause them
// to override one another's titles
foreach ( $blocks as $block ) {
$block->setPageTitle( $output );
}
 
-   $this->renderApiResponse( $apiResponse );
+   $this->renderApiResponse( $apiResponse, $action );
}
 
protected function addModules( OutputPage $out, $action ) {
@@ -227,6 +229,9 @@
$anchor = $value;
$value = $value->toArray();
 
+   // trying to preserve version of the app in URLs
+   $anchor->query[ 'version' ] = 
$this->getRequest()->getVal( 'version' );
+
// TODO: We're looking into another approach 
for this
// using a parser function, so the URL doesn't 
have to be
// fully qualified.
@@ -243,13 +248,51 @@
return $apiResponse;
}
 
-   protected function renderApiResponse( array $apiResponse ) {
+   protected function renderApiResponse( array $apiResponse, $action ) {
+   if ( $this->getRequest()->getVal( 'version' ) === '2' ) {
+   $this->renderWithReactjs( $apiResponse, $action );
+   } else {
+   $this->renderWithHandlebar( $apiResponse, $action );
+   }
+   }
+
+   private function renderWithReactjs( array $apiResponse, $action ) {
+   $out = $this->getOutput();
+   $result = $this->preRenderWithReactjs( $apiResponse, $action );
+   $state = $result ? $result['state'] : $apiResponse;
+   $markup = $result ? $result['markup'] : '';
+   $out->addHTML( Html::rawElement(
+   'div',
+   [ 'id' => 'fleact-root' ],
+   $markup
+   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SqlBlobStoreTest: Use utf-8 as name in iconv

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398522 )

Change subject: SqlBlobStoreTest: Use utf-8 as name in iconv
..

SqlBlobStoreTest: Use utf-8 as name in iconv

utf8 is an alias that doesn't work with all PHP installations.

Change-Id: I6ce9c5b4ece1a8c263afb1d4895dacd3c790a51a
---
M tests/phpunit/includes/Storage/SqlBlobStoreTest.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/398522/1

diff --git a/tests/phpunit/includes/Storage/SqlBlobStoreTest.php 
b/tests/phpunit/includes/Storage/SqlBlobStoreTest.php
index b6af2b4..6d2b09b 100644
--- a/tests/phpunit/includes/Storage/SqlBlobStoreTest.php
+++ b/tests/phpunit/includes/Storage/SqlBlobStoreTest.php
@@ -112,25 +112,25 @@
];
yield '(ISO-8859-1 encoding), string in string out' => [
'ISO-8859-1',
-   iconv( 'utf8', 'ISO-8859-1', "1®Àþ1" ),
+   iconv( 'utf-8', 'ISO-8859-1', "1®Àþ1" ),
[],
'1®Àþ1',
];
yield '(ISO-8859-1 encoding), serialized object in with gzip 
flags returns string' => [
'ISO-8859-1',
-   gzdeflate( iconv( 'utf8', 'ISO-8859-1', "4®Àþ4" ) ),
+   gzdeflate( iconv( 'utf-8', 'ISO-8859-1', "4®Àþ4" ) ),
[ 'gzip' ],
'4®Àþ4',
];
yield '(ISO-8859-1 encoding), serialized object in with object 
flags returns string' => [
'ISO-8859-1',
-   serialize( new TitleValue( 0, iconv( 'utf8', 
'ISO-8859-1', "3®Àþ3" ) ) ),
+   serialize( new TitleValue( 0, iconv( 'utf-8', 
'ISO-8859-1', "3®Àþ3" ) ) ),
[ 'object' ],
'3®Àþ3',
];
yield '(ISO-8859-1 encoding), serialized object in with object 
& gzip flags returns string' => [
'ISO-8859-1',
-   gzdeflate( serialize( new TitleValue( 0, iconv( 'utf8', 
'ISO-8859-1', "2®Àþ2" ) ) ) ),
+   gzdeflate( serialize( new TitleValue( 0, iconv( 
'utf-8', 'ISO-8859-1', "2®Àþ2" ) ) ) ),
[ 'gzip', 'object' ],
'2®Àþ2',
];

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...Athena[master]: Add minus-x to "composer test"

2017-12-15 Thread Rafidaslam (Code Review)
Rafidaslam has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398521 )

Change subject: Add minus-x to "composer test"
..

Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: I829eba9ddd70ac03a068e15f54e88ca253a73e9a
---
M composer.json
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Athena 
refs/changes/21/398521/1

diff --git a/composer.json b/composer.json
index aebd773..65dd36a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": "minus-x fix .",
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I829eba9ddd70ac03a068e15f54e88ca253a73e9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Athena
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

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


[MediaWiki-commits] [Gerrit] mediawiki...Lockdown[master]: Clean up formatting, bring code up to modernish standards

2017-12-15 Thread MarkAHershberger (Code Review)
MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398520 )

Change subject: Clean up formatting, bring code up to modernish standards
..

Clean up formatting, bring code up to modernish standards

* Take functions out of the global context.
* Newish array notation.
* Documentation for every function.
* Line length.
* Consolidate checking of $wgNamespacePermissionLockdown.

Change-Id: I319a09a2dad1178ea3470949e4928e9a665cc8c6
---
M Lockdown.php
1 file changed, 230 insertions(+), 170 deletions(-)


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

diff --git a/Lockdown.php b/Lockdown.php
index 9ba1af0..1db1a2a 100644
--- a/Lockdown.php
+++ b/Lockdown.php
@@ -1,220 +1,280 @@
  may work in some versions of 
mediawiki. Same with diff, etc.
-*
-* NOTE: you cannot GRANT access to things forbidden by $wgGroupPermissions. 
You can only DENY access
-* granted there.
-*/
+/**
+ * WARNING: you can use this extension to deny read access to some
+ * namespaces. Keep in mind that this may be circumvented in several
+ * ways. This extension doesn't try to plug such holes. Also note that
+ * pages that are not readable will still be shown in listings, such as
+ * the search page, categories, etc.
+ *
+ * Known ways to access "hidden" pages:
+ * - transcluding as template. can be avoided using $wgNonincludableNamespaces.
+ *
+ * - Some search messages may reveal the page existance by producing
+ *   links to it (MediaWiki:searchsubtitle, MediaWiki:noexactmatch,
+ *   MediaWiki:searchmenu-exists, MediaWiki:searchmenu-new...).
+ *
+ * - supplying oldid= may work in some
+ *   versions of mediawiki. Same with diff, etc.
+ *
+ * NOTE: you cannot GRANT access to things forbidden by
+ * $wgGroupPermissions. You can only DENY access granted there.
+ */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
-   echo( "This file is an extension to the MediaWiki software and cannot 
be used standalone.\n" );
+   echo( "This file is an extension to the MediaWiki software and cannot "
+ . "be used standalone.\n" );
die( 1 );
 }
 
-$wgExtensionCredits['other'][] = array(
+$wgExtensionCredits['other'][] = [
'path' => __FILE__,
'name' => 'Lockdown',
-   'author' => array(
+   'author' => [
'Daniel Kinzler',
+   'Mark A. Hershberger',
'Platonides',
'...'
-   ),
+   ],
'url' => 'https://mediawiki.org/wiki/Extension:Lockdown',
'descriptionmsg' => 'lockdown-desc',
'license-name' => 'GPL-2.0+'
-);
+];
 
 $wgMessagesDirs['Lockdown'] = __DIR__ . '/i18n';
 
-$wgNamespacePermissionLockdown = array();
-$wgSpecialPageLockdown = array();
-$wgActionLockdown = array();
+$wgNamespacePermissionLockdown = [];
+$wgSpecialPageLockdown = [];
+$wgActionLockdown = [];
 
-$wgHooks['getUserPermissionsErrors'][] = 'lockdownUserPermissionsErrors';
-$wgHooks['MediaWikiPerformAction'][] = 'lockdownMediawikiPerformAction';
-$wgHooks['SearchableNamespaces'][] = 'lockdownSearchableNamespaces';
-$wgHooks['SearchGetNearMatchComplete'][] = 
'lockdownSearchGetNearMatchComplete';
+$wgHooks['getUserPermissionsErrors'][] = 
'Lockdown::onGetUserPermissionsErrors';
+$wgHooks['MediaWikiPerformAction'][] = 'Lockdown::onMediawikiPerformAction';
+$wgHooks['SearchableNamespaces'][] = 'Lockdown::onSearchableNamespaces';
+$wgHooks['SearchGetNearMatchComplete'][]
+   = 'Lockdown::onSearchGetNearMatchComplete';
 
-/**
- * @param Title $title
- * @param User $user
- * @param string $action
- * @param MessageSpecifier|array|string|bool|null $result
- * @return bool
- */
-function lockdownUserPermissionsErrors(
-   Title $title,
-   User $user,
-   $action,
-   &$result = null
-) {
-   global $wgNamespacePermissionLockdown, $wgSpecialPageLockdown, 
$wgWhitelistRead, $wgLang;
+class Lockdown {
 
-   $result = null;
+   /**
+* Fetch an appropriate permission error (or none!)
+*
+* @param Title $title being checked
+* @param User $user whose access is being checked
+* @param string $action being checked
+* @param MessageSpecifier|array|string|bool|null &$result User
+*   permissions error to add. If none, return true. $result can be
+*   returned as a single error message key (string), or an array of
+*   error message keys when multiple messages are needed
+* @return bool
+* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/getUserPermissionsErrors
+*/
+   public static function onGetUserPermissionsErrors(
+   Title $title, User $user, $action, &$result = null
+   ) {
+   global $wgSpecialPageLockdown, $wgWhitelistRead, $wgLang;
 
-   // don't impose extra restrictions on UI pages
-   if ( $title->isCssJsSubpage() ) {
-   return 

[MediaWiki-commits] [Gerrit] mediawiki...Lockdown[master]: Fix two bugs with lockdownNamespace()

2017-12-15 Thread MarkAHershberger (Code Review)
MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398519 )

Change subject: Fix two bugs with lockdownNamespace()
..

Fix two bugs with lockdownNamespace()

* Changing search's behavior for “go to page” by actually setting
  $title to null.
* Allow the general public to see namespaces without any group restrictions.

Change-Id: Icaf433663311f36f0893a7ec4b660c954fa1b5e6
---
M Lockdown.php
1 file changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Lockdown 
refs/changes/19/398519/1

diff --git a/Lockdown.php b/Lockdown.php
index 9deef15..9ba1af0 100644
--- a/Lockdown.php
+++ b/Lockdown.php
@@ -200,12 +200,7 @@
$groups = @$wgNamespacePermissionLockdown[$ns]['*'];
}
 
-   if ( $groups === null ) {
-   return false;
-   }
-
-   if ( !$groups || !array_intersect($ugroups, $groups) ) {
-   $title = null;
+   if ( $groups && !array_intersect($ugroups, $groups) ) {
return false;
}
 
@@ -218,6 +213,8 @@
 
if ( $title ) {
$ugroups = $wgUser->getEffectiveGroups();
-   return lockdownNamespace( $title->getNamespace(), $ugroups );
+   if ( !lockdownNamespace( $title->getNamespace(), $ugroups ) ) {
+   $title = null;
+   }
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaf433663311f36f0893a7ec4b660c954fa1b5e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lockdown
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Linter: Suppress false positives for multiple-unclosed-forma...

2017-12-15 Thread Subramanya Sastry (Code Review)
Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398518 )

Change subject: Linter: Suppress false positives for 
multiple-unclosed-formatting-tags
..

Linter: Suppress false positives for multiple-unclosed-formatting-tags

* Unclosed tags in tables don't leak out of the table in the HTML5
  tree building algorithm. So, those should be ignored for the purpose
  of detecting multiple unclosed formatting tags.

* There are of course edge cases here that we are going to conveniently
  ignore. For example, if the multiple unclosed tags are in the same
  table cell, that should trigger the check, but not sure it is worth
  the complexity.

  There are probably other edge cases where Tidy and HTML5 parsing
  will do things differently, but I think this is enough for now.
  At this rate, before long, we'll be running Tidy's fixup code in Parsoid.

* New tests added to spec this behavior.

* Verified on enwiki:Papa_Dee

Change-Id: Ie979ce0940a1613d5a4203ff75358dbf91f2535e
---
M lib/wt2html/pp/handlers/linter.js
M tests/mocha/linter.js
2 files changed, 23 insertions(+), 11 deletions(-)


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

diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index a752413..caa1891 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -386,6 +386,7 @@
adjDp.tmp.linted = true;
env.log('lint/misnested-tag', lintObj);
} else if (!endTagOptional(c)) {
+   lintObj.params.inTable = 
DU.hasAncestorOfName(c, 'TABLE');
env.log('lint/missing-end-tag', 
lintObj);
if 
(Consts.HTML.FormattingTags.has(c.nodeName) && matchedOpenTagPairExists(c, dp)) 
{

env.log('lint/multiple-unclosed-formatting-tags', lintObj);
@@ -843,7 +844,8 @@
};
var multiUnclosedTagName = null;
lints.find(function(item) {
-   if (item.type === 'missing-end-tag') {
+   // Unclosed tags in tables don't leak out of the table
+   if (item.type === 'missing-end-tag' && !item.params.inTable) {
if (item.params.name === 'small' || item.params.name 
=== 'big') {
var tagName = item.params.name;
if (!firstUnclosedTag[tagName]) {
diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js
index 4ed63ac..f1679db 100644
--- a/tests/mocha/linter.js
+++ b/tests/mocha/linter.js
@@ -40,6 +40,14 @@
});
};
 
+   var noLintsOfThisType = function(wt, type) {
+   return parseWT(wt).then(function(result) {
+   result.forEach(function(r) {
+   r.should.not.have.a.property("type", type);
+   });
+   });
+   };
+
describe('#Issues', function() {
it('should not lint any issues', function() {
return expectEmptyResults('foo');
@@ -833,6 +841,16 @@
result[4].params.should.have.a.property("name", 
"small");
});
});
+   it('should ignore unclosed small tags in tables', function() {
+   noLintsOfThisType('{|\n|a\n|b\n|}', 
"multiple-unclosed-formatting-tags");
+   });
+   it('should ignore unclosed small tags in tables but detect 
those outside it', function() {
+   return 
parseWT('x\n{|\n|a\n|b\n|}\ny').then(function(result)
 {
+   result.should.have.length(5);
+   result[4].should.have.a.property("type", 
"multiple-unclosed-formatting-tags");
+   result[4].params.should.have.a.property("name", 
"small");
+   });
+   });
it("should detect Tidy's smart auto-fixup of paired unclosed 
formatting tags", function() {
return parseWT('foo\nfoo x 
bar').then(function(result) {
result.should.have.length(6);
@@ -845,18 +863,10 @@
});
});
it("should not flag Tidy's smart auto-fixup of paired unclosed 
formatting tags where Tidy won't do it", function() {
-   return parseWT('foo \nfoo x 
').then(function(result) {
-   result.forEach(function(r) {
-   r.should.not.have.a.property("type", 
"multiple-unclosed-formatting-tags");
-   });
-   });
+ 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Linter: Update comments

2017-12-15 Thread Subramanya Sastry (Code Review)
Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398516 )

Change subject: Linter: Update comments
..

Linter: Update comments

Change-Id: Ia2f411dec0f9a83e75ddc7eafdc50f146b6a36c2
---
M lib/wt2html/pp/handlers/linter.js
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index f06ad79..db43032 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -283,6 +283,14 @@
  * 1. Unclosed end tags
  * 2. Unclosed start tags
  * 3. Stripped tags
+ *
+ * In addition, we have specialized categories for some patterns
+ * where we encounter unclosed end tags.
+ *
+ * 4. misnested-tag
+ * 5. html5-misnesting
+ * 6. multiple-unclosed-formatting-tags
+ * 7. unclosed-quotes-in-heading
  */
 function logTreeBuilderFixup(env, c, dp, tplInfo) {
// This might have been processed as part of

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Linter: Comment out unused linter category

2017-12-15 Thread Subramanya Sastry (Code Review)
Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398517 )

Change subject: Linter: Comment out unused linter category
..

Linter: Comment out unused linter category

Change-Id: I36fa0f62959aa5044e9bcb56a3dd9c747fdffef9
---
M lib/wt2html/pp/handlers/linter.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index db43032..e13d4ac 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -394,6 +394,7 @@
}
}
 
+   /* TODO: not sure if this is useful / valid at all. Suppress 
for now.
if (DU.hasLiteralHTMLMarker(dp) &&
dp.autoInsertedStart === true &&
(tplInfo ||  dsr[3] > 0)) {
@@ -403,6 +404,7 @@
};
env.log('lint/missing-start-tag', lintObj);
}
+   */
}
 }
 

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Minor cleanups to PHPDoc blocks

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398476 )

Change subject: Minor cleanups to PHPDoc blocks
..


Minor cleanups to PHPDoc blocks

Change-Id: I5890144521b6b54c798b1590ab8d102d74ada26a
---
M includes/DiffParser.php
M includes/special/NotificationPager.php
2 files changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/includes/DiffParser.php b/includes/DiffParser.php
index 7b70fae..379945f 100644
--- a/includes/DiffParser.php
+++ b/includes/DiffParser.php
@@ -16,7 +16,6 @@
  */
 
 /**
- *
  * @file
  * @ingroup Extensions
  * @author Erik Bernhardson
diff --git a/includes/special/NotificationPager.php 
b/includes/special/NotificationPager.php
index f174fd8..9aa85cd 100644
--- a/includes/special/NotificationPager.php
+++ b/includes/special/NotificationPager.php
@@ -4,8 +4,6 @@
  * This pager is used by Special:Notifications (NO-JS).
  * The heavy-lifting is done by IndexPager (grand-parent to this class).
  * It paginates on notification_event for a specific user, only for the 
enabled event types.
- *
- * Class NotificationPager
  */
 class NotificationPager extends ReverseChronologicalPager {
public function __construct() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5890144521b6b54c798b1590ab8d102d74ada26a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: bump version to 3.7.4-2

2017-12-15 Thread Alexandros Kosiaris (Code Review)
Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398507 )

Change subject: Scap: bump version to 3.7.4-2
..


Scap: bump version to 3.7.4-2

Bug: T182347
Change-Id: Ifb89158c7f6f53be47daa08845fc3b875a7884d3
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index fa3aa8f..313dc7f 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-1',
+$version = '3.7.4-2',
 ) {
 package { 'scap':
 ensure => $version,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb89158c7f6f53be47daa08845fc3b875a7884d3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Alexandros Kosiaris 
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...apex[master]: Add minus-x to "composer test"

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398514 )

Change subject: Add minus-x to "composer test"
..


Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Ib3aad2cb8c585ab91d2bd977e889897691850df2
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 95bdb5f..9e7543c 100644
--- a/composer.json
+++ b/composer.json
@@ -2,13 +2,18 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/minus-x": "0.2.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
-   "fix": "phpcbf",
+   "fix": [
+   "phpcbf",
+   "minus-x fix ."
+   ],
"test": [
"parallel-lint . --exclude node_modules --exclude 
vendor",
-   "phpcs -p -s"
+   "phpcs -p -s",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3aad2cb8c585ab91d2bd977e889897691850df2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 
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/core[master]: Fix typo in ImportHandleUnknownUser hook documentation

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398512 )

Change subject: Fix typo in ImportHandleUnknownUser hook documentation
..


Fix typo in ImportHandleUnknownUser hook documentation

Change-Id: Ib37facf546e3088cc64373882bb276d2703575b4
---
M docs/hooks.txt
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/docs/hooks.txt b/docs/hooks.txt
index 29883b2..ee38ea9 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1840,7 +1840,7 @@
 Return false to stop further processing of the tag
 $reader: XMLReader object
 
-'ImportHandleUnknownUser': When a user does exist locally, this hook is called
+'ImportHandleUnknownUser': When a user doesn't exist locally, this hook is 
called
 to give extensions an opportunity to auto-create it. If the auto-creation is
 successful, return false.
 $name: User name

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [DNM] Check why jenkins fails

2017-12-15 Thread Ladsgroup (Code Review)
Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398515 )

Change subject: [DNM] Check why jenkins fails
..

[DNM] Check why jenkins fails

Change-Id: Ifab6646cdc1236bf2331db72b4bbf6a2c64dde70
---
M client/includes/Hooks/EchoNotificationsHandlers.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/client/includes/Hooks/EchoNotificationsHandlers.php 
b/client/includes/Hooks/EchoNotificationsHandlers.php
index d39d2e8..80b4f8e 100644
--- a/client/includes/Hooks/EchoNotificationsHandlers.php
+++ b/client/includes/Hooks/EchoNotificationsHandlers.php
@@ -151,6 +151,7 @@
}
 
$siteLinkDiff = $change->getSiteLinkDiff();
+   var_dump( $siteLinkDiff );
if ( $siteLinkDiff->isEmpty() ) {
return false;
}

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: Add minus-x to "composer test"

2017-12-15 Thread Rafidaslam (Code Review)
Rafidaslam has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398514 )

Change subject: Add minus-x to "composer test"
..

Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Ib3aad2cb8c585ab91d2bd977e889897691850df2
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/14/398514/1

diff --git a/composer.json b/composer.json
index 95bdb5f..9e7543c 100644
--- a/composer.json
+++ b/composer.json
@@ -2,13 +2,18 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/minus-x": "0.2.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
-   "fix": "phpcbf",
+   "fix": [
+   "phpcbf",
+   "minus-x fix ."
+   ],
"test": [
"parallel-lint . --exclude node_modules --exclude 
vendor",
-   "phpcs -p -s"
+   "phpcs -p -s",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3aad2cb8c585ab91d2bd977e889897691850df2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use findItem(s)FromData instead of getItem(s)FromData

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398209 )

Change subject: Use findItem(s)FromData instead of getItem(s)FromData
..


Use findItem(s)FromData instead of getItem(s)FromData

Follows-up on Ia2110f71d1642f61451cb8acc7e8a930d0feb31f

Bug: T76630
Change-Id: I1ae2c3da6d1bf1b5c45f8937797661b3c10cd03a
---
M demos/classes/IndexedDialog.js
M src/layouts/BookletLayout.js
M src/layouts/IndexLayout.js
M src/widgets/CapsuleMultiselectWidget.js
M src/widgets/CheckboxMultiselectInputWidget.js
M src/widgets/ComboBoxInputWidget.js
M src/widgets/DropdownInputWidget.js
M src/widgets/MenuTagMultiselectWidget.js
M src/widgets/MultiselectWidget.js
M src/widgets/RadioSelectInputWidget.js
M src/widgets/SelectWidget.js
M src/widgets/TagMultiselectWidget.js
12 files changed, 25 insertions(+), 25 deletions(-)

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



diff --git a/demos/classes/IndexedDialog.js b/demos/classes/IndexedDialog.js
index c2d437f..ac93224 100644
--- a/demos/classes/IndexedDialog.js
+++ b/demos/classes/IndexedDialog.js
@@ -33,7 +33,7 @@
this.indexLayout.addTabPanels( this.tabPanels );
this.$body.append( this.indexLayout.$element );
 
-   this.indexLayout.getTabs().getItemFromData( 'fourth' ).setDisabled( 
true );
+   this.indexLayout.getTabs().findItemFromData( 'fourth' ).setDisabled( 
true );
 };
 Demo.IndexedDialog.prototype.getActionProcess = function ( action ) {
if ( action ) {
diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 4fb4d5b..c53017a 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -323,16 +323,16 @@
prev = pages[ index - 1 ];
// Prefer adjacent pages at the same level
if ( this.outlined ) {
-   level = this.outlineSelectWidget.getItemFromData( 
page.getName() ).getLevel();
+   level = this.outlineSelectWidget.findItemFromData( 
page.getName() ).getLevel();
if (
prev &&
-   level === 
this.outlineSelectWidget.getItemFromData( prev.getName() ).getLevel()
+   level === 
this.outlineSelectWidget.findItemFromData( prev.getName() ).getLevel()
) {
return prev;
}
if (
next &&
-   level === 
this.outlineSelectWidget.getItemFromData( next.getName() ).getLevel()
+   level === 
this.outlineSelectWidget.findItemFromData( next.getName() ).getLevel()
) {
return next;
}
@@ -467,7 +467,7 @@
name = page.getName();
delete this.pages[ name ];
if ( this.outlined ) {
-   items.push( this.outlineSelectWidget.getItemFromData( 
name ) );
+   items.push( this.outlineSelectWidget.findItemFromData( 
name ) );
page.setOutlineItem( null );
}
}
diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js
index 22bcc1a..12fb1b5 100644
--- a/src/layouts/IndexLayout.js
+++ b/src/layouts/IndexLayout.js
@@ -213,16 +213,16 @@
next = tabPanels[ index + 1 ];
prev = tabPanels[ index - 1 ];
// Prefer adjacent tab panels at the same level
-   level = this.tabSelectWidget.getItemFromData( 
tabPanel.getName() ).getLevel();
+   level = this.tabSelectWidget.findItemFromData( 
tabPanel.getName() ).getLevel();
if (
prev &&
-   level === this.tabSelectWidget.getItemFromData( 
prev.getName() ).getLevel()
+   level === this.tabSelectWidget.findItemFromData( 
prev.getName() ).getLevel()
) {
return prev;
}
if (
next &&
-   level === this.tabSelectWidget.getItemFromData( 
next.getName() ).getLevel()
+   level === this.tabSelectWidget.findItemFromData( 
next.getName() ).getLevel()
) {
return next;
}
@@ -340,7 +340,7 @@
tabPanel = tabPanels[ i ];
name = tabPanel.getName();
delete this.tabPanels[ name ];
-   items.push( this.tabSelectWidget.getItemFromData( name ) );
+   items.push( this.tabSelectWidget.findItemFromData( name ) );
tabPanel.setTabItem( null );
}
if ( items.length ) {
diff --git a/src/widgets/CapsuleMultiselectWidget.js 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: icons: Shorten 'accessibility' pack invert hex color

2017-12-15 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398513 )

Change subject: icons: Shorten 'accessibility' pack invert hex color
..

icons: Shorten 'accessibility' pack invert hex color

Shortening leftover instance of `#ff` to `#fff` on invert.

Change-Id: Ic7b3b6e5fa1e012278ee1fd3d71a028215d81bb3
---
M src/themes/apex/icons-accessibility.json
M src/themes/wikimediaui/icons-accessibility.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/src/themes/apex/icons-accessibility.json 
b/src/themes/apex/icons-accessibility.json
index 656e321..8034ed0 100644
--- a/src/themes/apex/icons-accessibility.json
+++ b/src/themes/apex/icons-accessibility.json
@@ -4,7 +4,7 @@
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
-   "color": "#ff",
+   "color": "#fff",
"global": true
}
},
diff --git a/src/themes/wikimediaui/icons-accessibility.json 
b/src/themes/wikimediaui/icons-accessibility.json
index 656e321..8034ed0 100644
--- a/src/themes/wikimediaui/icons-accessibility.json
+++ b/src/themes/wikimediaui/icons-accessibility.json
@@ -4,7 +4,7 @@
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
-   "color": "#ff",
+   "color": "#fff",
"global": true
}
},

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

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

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


[MediaWiki-commits] [Gerrit] operations...docker-pkg[master]: Add .gitreview

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397747 )

Change subject: Add .gitreview
..


Add .gitreview

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

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..261ed44
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/docker-images/docker-pkg.git
+track=1
+defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib42cc4e45e00867c31c89bf35ffe21f50328393d
Gerrit-PatchSet: 3
Gerrit-Project: operations/docker-images/docker-pkg
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix typo in ImportHandleUnknownUser hook documentation

2017-12-15 Thread Anomie (Code Review)
Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398512 )

Change subject: Fix typo in ImportHandleUnknownUser hook documentation
..

Fix typo in ImportHandleUnknownUser hook documentation

Change-Id: Ib37facf546e3088cc64373882bb276d2703575b4
---
M docs/hooks.txt
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 29883b2..ee38ea9 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1840,7 +1840,7 @@
 Return false to stop further processing of the tag
 $reader: XMLReader object
 
-'ImportHandleUnknownUser': When a user does exist locally, this hook is called
+'ImportHandleUnknownUser': When a user doesn't exist locally, this hook is 
called
 to give extensions an opportunity to auto-create it. If the auto-creation is
 successful, return false.
 $name: User name

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

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

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] GroupElement: Rename getItem(s)FromData...

2017-12-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398004 )

Change subject: [DEPRECATING CHANGE] GroupElement: Rename getItem(s)FromData to 
findItem(s)FromData
..


[DEPRECATING CHANGE] GroupElement: Rename getItem(s)FromData to 
findItem(s)FromData

Bug: T76630
Change-Id: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f
---
M src/mixins/GroupElement.js
1 file changed, 30 insertions(+), 6 deletions(-)

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



diff --git a/src/mixins/GroupElement.js b/src/mixins/GroupElement.js
index e84475c..a807c38 100644
--- a/src/mixins/GroupElement.js
+++ b/src/mixins/GroupElement.js
@@ -62,15 +62,15 @@
 };
 
 /**
- * Get an item by its data.
+ * Find an item by its data.
  *
  * Only the first item with matching data will be returned. To return all 
matching items,
- * use the #getItemsFromData method.
+ * use the #findItemsFromData method.
  *
  * @param {Object} data Item data to search for
  * @return {OO.ui.Element|null} Item with equivalent data, `null` if none 
exists
  */
-OO.ui.mixin.GroupElement.prototype.getItemFromData = function ( data ) {
+OO.ui.mixin.GroupElement.prototype.findItemFromData = function ( data ) {
var i, len, item,
hash = OO.getHash( data );
 
@@ -85,14 +85,26 @@
 };
 
 /**
- * Get items by their data.
+ * Get an item by its data.
  *
- * All items with matching data will be returned. To return only the first 
match, use the #getItemFromData method instead.
+ * @deprecated 0.25.1 Use {@link #findItemFromData} instead.
+ * @param {Object} data Item data to search for
+ * @return {OO.ui.Element|null} Item with equivalent data, `null` if none 
exists
+ */
+OO.ui.mixin.GroupElement.prototype.getItemFromData = function ( data ) {
+   OO.ui.warnDeprecation( 'GroupElement#getItemFromData. Deprecated 
function. Use findItemFromData instead. See T76630' );
+   return this.findItemFromData( data );
+};
+
+/**
+ * Find items by their data.
+ *
+ * All items with matching data will be returned. To return only the first 
match, use the #findItemFromData method instead.
  *
  * @param {Object} data Item data to search for
  * @return {OO.ui.Element[]} Items with equivalent data
  */
-OO.ui.mixin.GroupElement.prototype.getItemsFromData = function ( data ) {
+OO.ui.mixin.GroupElement.prototype.findItemsFromData = function ( data ) {
var i, len, item,
hash = OO.getHash( data ),
items = [];
@@ -108,6 +120,18 @@
 };
 
 /**
+ * Find items by their data.
+ *
+ * @deprecated 0.25.1 Use {@link #findItemsFromData} instead.
+ * @param {Object} data Item data to search for
+ * @return {OO.ui.Element[]} Items with equivalent data
+ */
+OO.ui.mixin.GroupElement.prototype.getItemsFromData = function ( data ) {
+   OO.ui.warnDeprecation( 'GroupElement#getItemsFromData. Deprecated 
function. Use findItemsFromData instead. See T76630' );
+   return this.findItemsFromData( data );
+};
+
+/**
  * Add items to the group.
  *
  * Items will be added to the end of the group array unless the optional 
`index` parameter specifies

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
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...LoginNotify[master]: Use extension registry to check for CheckUser to be installed

2017-12-15 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398511 )

Change subject: Use extension registry to check for CheckUser to be installed
..

Use extension registry to check for CheckUser to be installed

Class was renamed in I39c60b2d059d1cb2c1c0d3a4206232d961536697

Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
---
M includes/LoginNotify.php
1 file changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 956c629..a784fa3 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -238,7 +238,7 @@
Assert::parameter( $user->isLoggedIn(), '$user', 'User must be 
logged in' );
 
if ( !$this->config->get( 'LoginNotifyCheckKnownIPs' )
-   || !class_exists( 'CheckUser' )
+   || !$this->isCheckUserInstalled()
) {
// Checkuser checks disabled.
// Note: It's important this be USER_NOT_KNOWN and not 
USER_NO_INFO.
@@ -402,6 +402,14 @@
}
 
/**
+* Whether CheckUser extension is installed
+* @return bool
+*/
+   private function isCheckUserInstalled() {
+   return ExtensionRegistry::getInstance()->isLoaded( 'CheckUser' 
);
+   }
+
+   /**
 * Give the user a cookie saying that they've previously logged in from 
this computer.
 *
 * @note If user already has a cookie, this will refresh it.

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: labnet dnsmasq: use upstream dns servers

2017-12-15 Thread Andrew Bogott (Code Review)
Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398510 )

Change subject: labnet dnsmasq: use upstream dns servers
..

labnet dnsmasq: use upstream dns servers

Dnsmasq only serves DNS for brand new pre-puppetized VMs;
we want those VMs to be able to see the 'puppet' alias
that's registered on our official DNS servers, so this
patch tells dnsmasq about them.

Bug: T181375
Change-Id: I4ca35f3355c4d8fb572865ed1096030c4257cfad
---
M modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/398510/1

diff --git 
a/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb 
b/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
index 1ba03a2..11b58ef 100644
--- a/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
@@ -8,6 +8,10 @@
 alias=<%= v['public_ip'] %>,<%= v['private_ip'] %>
 <% end -%>
 
+# Use official (designate-managed) dns servers
+server=<%= @recursor_ip %>
+server=<%= @recursor_secondary_ip %>
+
 # Special entries for labs baremetal
 <% @labs_metal.sort.map do |k,v| -%>
 dhcp-host=<%= v['MAC'] %>,<%= k %>,<%= v['IPv4'] %>,10m

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ca35f3355c4d8fb572865ed1096030c4257cfad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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


[MediaWiki-commits] [Gerrit] pywikibot/core[master]: diff_checker.py: Fix the logic of calculating error state

2017-12-15 Thread Dalba (Code Review)
Dalba has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398509 )

Change subject: diff_checker.py: Fix the logic of calculating error state
..

diff_checker.py: Fix the logic of calculating error state

Also fix an encoding issue in Python 3.

Change-Id: I7ab6d63c1d213087e23481679c7ef2a8665835d9
---
M scripts/maintenance/diff_checker.py
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/09/398509/1

diff --git a/scripts/maintenance/diff_checker.py 
b/scripts/maintenance/diff_checker.py
index 957c247..740bb4f 100644
--- a/scripts/maintenance/diff_checker.py
+++ b/scripts/maintenance/diff_checker.py
@@ -51,10 +51,8 @@
 """Return the PatchSet for the latest commit."""
 # regex from https://github.com/PyCQA/pylint/blob/master/pylintrc
 output = check_output(
-['git', 'diff', '-U0', '@~..@'], universal_newlines=True)
-if version_info.major == 2:
-return PatchSet.from_string(output, encoding='utf-8')
-return PatchSet.from_string(output)
+['git', 'diff', '-U0', '@~..@'])
+return PatchSet.from_string(output.replace(b'\r', b''), encoding='utf-8')
 
 
 def print_error(path, line_no, col_no, error):
@@ -119,7 +117,7 @@
 )
 error = True
 if added_lines:
-error = check_tokens(path, added_lines) and error
+error = not check_tokens(path, added_lines) or error
 return not error
 
 

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "labsdb: Switchover labsdb1009 to labsdb1010 for main...

2017-12-15 Thread Jcrespo (Code Review)
Hello Marostegui, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "labsdb: Switchover labsdb1009 to labsdb1010 for 
maintenance"
..

Revert "labsdb: Switchover labsdb1009 to labsdb1010 for maintenance"

This reverts commit a004a3c90b35aed3e8f29895957aafa45d535671.

Change-Id: I2875b8e5b0c5e0dc63e7f686d3f485016c008dd7
---
M manifests/site.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/398508/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 21a6eb4..718a2ea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -682,10 +682,10 @@
 node 'dbproxy1010.eqiad.wmnet' {
 class { '::role::mariadb::proxy::master':
 shard  => 'labsdb',
-primary_name   => 'labsdb1010',
-primary_addr   => '10.64.37.23',
-secondary_name => 'labsdb1009',
-secondary_addr => '10.64.4.14',
+primary_name   => 'labsdb1009',
+primary_addr   => '10.64.4.14',
+secondary_name => 'labsdb1010',
+secondary_addr => '10.64.37.23',
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2875b8e5b0c5e0dc63e7f686d3f485016c008dd7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: bump version to 3.7.4-2

2017-12-15 Thread Thcipriani (Code Review)
Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398507 )

Change subject: Scap: bump version to 3.7.4-2
..

Scap: bump version to 3.7.4-2

Bug: T182347
Change-Id: Ifb89158c7f6f53be47daa08845fc3b875a7884d3
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/398507/1

diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index fa3aa8f..313dc7f 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-1',
+$version = '3.7.4-2',
 ) {
 package { 'scap':
 ensure => $version,

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

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

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


  1   2   3   >