[MediaWiki-commits] [Gerrit] mediawiki...Metrolook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: I1f69a67af4ba62c1bfc9a8c8fd001ab7b1fb873e
---
M MetrolookTemplate.php
M composer.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 3939df5..a93ee41 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -683,7 +683,7 @@

echo htmlspecialchars( $link['href'] )

?>" >" >https://gerrit.wikimedia.org/r/372001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f69a67af4ba62c1bfc9a8c8fd001ab7b1fb873e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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...CologneBlue[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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

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



diff --git a/composer.json b/composer.json
index 1c2721a..bb054d0 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"fix": "phpcbf",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8dc39ccc3757c0b67671ac0d33c3bf49edb1dad6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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...MonoBook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372003 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/03/372003/1

diff --git a/composer.json b/composer.json
index 1c2721a..bb054d0 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"fix": "phpcbf",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I077fa6e2c9c1f242ac1fe4a182aa5f776caa0e30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...Modern[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372002 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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


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

diff --git a/composer.json b/composer.json
index 1c2721a..bb054d0 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"fix": "phpcbf",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id319a5599fc4515317ad769b504dd3bfb0120855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...VectorV2[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372007 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: Iff1ce9a08ca43cb6f545dcc06448fff67fe41ae2
---
M VectorV2Template.php
M composer.json
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/VectorV2 
refs/changes/07/372007/1

diff --git a/VectorV2Template.php b/VectorV2Template.php
index 5aeec5f..21e3747 100644
--- a/VectorV2Template.php
+++ b/VectorV2Template.php
@@ -367,7 +367,7 @@

echo htmlspecialchars( $link['href'] )

?>" >" >https://gerrit.wikimedia.org/r/372007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff1ce9a08ca43cb6f545dcc06448fff67fe41ae2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/VectorV2
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...Metrolook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372001 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: I1f69a67af4ba62c1bfc9a8c8fd001ab7b1fb873e
---
M MetrolookTemplate.php
M composer.json
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/01/372001/1

diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 3939df5..a93ee41 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -683,7 +683,7 @@

echo htmlspecialchars( $link['href'] )

?>" >" >https://gerrit.wikimedia.org/r/372001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f69a67af4ba62c1bfc9a8c8fd001ab7b1fb873e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...CologneBlue[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372000 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/CologneBlue 
refs/changes/00/372000/1

diff --git a/composer.json b/composer.json
index 1c2721a..bb054d0 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"fix": "phpcbf",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dc39ccc3757c0b67671ac0d33c3bf49edb1dad6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372006 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/06/372006/1

diff --git a/composer.json b/composer.json
index ed03ccd..0b593d6 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b00201b7f81d88115be496c6bbb9cb317d07324
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...Nostalgia[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372004 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nostalgia 
refs/changes/04/372004/1

diff --git a/composer.json b/composer.json
index 1c2721a..bb054d0 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"fix": "phpcbf",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d13aa66cdfc1957aa71a76b54239a649ca4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372005 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: I776b8855eaf8a61380b785dd4ced6fb5cfec4a6e
---
M TimelessTemplate.php
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/05/372005/1

diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index f22e5d5..ea93470 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -700,7 +700,7 @@
protected function getCategories() {
global $wgContLang;
 
-   $skin =  $this->getSkin();
+   $skin = $this->getSkin();
$title = $skin->getTitle();
$catList = false;
$html = '';
diff --git a/composer.json b/composer.json
index 380d2ae..ffb7ad9 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I776b8855eaf8a61380b785dd4ced6fb5cfec4a6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...SemanticUpdateOnPurge[master]: Archive repository

2017-08-14 Thread Legoktm (Code Review)
Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371999 )

Change subject: Archive repository
..


Archive repository

Bug: T172294
Change-Id: Iceb8ece6c7fea522a4fd9ddffbba93d5276c2c11
---
D CODE_OF_CONDUCT.md
D COPYING
D Gruntfile.js
A OBSOLETE
D README
D RELEASE-NOTES
D SemanticUpdateOnPurge.i18n.php
D SemanticUpdateOnPurge.php
D i18n/ast.json
D i18n/be-tarask.json
D i18n/br.json
D i18n/cs.json
D i18n/de.json
D i18n/dsb.json
D i18n/en.json
D i18n/es.json
D i18n/fa.json
D i18n/fi.json
D i18n/fr.json
D i18n/gl.json
D i18n/he.json
D i18n/hsb.json
D i18n/ia.json
D i18n/it.json
D i18n/ja.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lb.json
D i18n/mk.json
D i18n/ms.json
D i18n/nb.json
D i18n/nl.json
D i18n/pl.json
D i18n/pms.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/sv.json
D i18n/tl.json
D i18n/uk.json
D i18n/zh-hans.json
D i18n/zh-hant.json
D package.json
45 files changed, 1 insertion(+), 547 deletions(-)

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



diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/COPYING b/COPYING
deleted file mode 100644
index fdc831e..000
--- a/COPYING
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2010 - 2011 by Daniel Werner < danwe...@web.de >
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 2db815f..000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*jshint node:true */
-module.exports = function ( grunt ) {
-   grunt.loadNpmTasks( 'grunt-jsonlint' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-   grunt.loadNpmTasks( 'grunt-banana-checker' );
-
-   grunt.initConfig( {
-   banana: {
-   all: 'i18n/'
-   },
-   jshint: {
-   all: [
-   '**/*.js',
-   '!node_modules/**',
-   '!vendor/**'
-   ]
-   },
-   jsonlint: {
-   all: [
-   '**/*.json',
-   '!node_modules/**',
-   '!vendor/**'
-   ]
-   }
-   } );
-
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'jshint' ] );
-   grunt.registerTask( 'default', 'test' );
-};
diff --git a/OBSOLETE b/OBSOLETE
new file mode 100644
index 000..1f555c0
--- /dev/null
+++ b/OBSOLETE
@@ -0,0 +1 @@
+This extension was obsoleted by the Semantic MediaWiki core functionality 
introduced with version 1.9.0.
diff --git a/README b/README
deleted file mode 100644
index bfb0eda..000
--- a/README
+++ /dev/null
@@ -1,30 +0,0 @@
-== About ==
-
-'SemanticUpdateOnPurge' is a 'Semantic MediaWiki' [0] extension by Daniel 
Werner. It updates Semantic MediaWikis
-properties of an article whenever the article is purged.
-SMW standard behavior is to update properties only on page save (as of SMW 1.6)
-
-
-== Installation ==
-
-Once you have downloaded the code, place the 'SemanticUpdateOnPurge' directory 
within your MediaWiki 'extensions'
-directory. Then add the following code to your 
[[Manual:LocalSettings.php|LocalSettings.php]] file:
-
- # SemanticUpdateOnPurge
- require_once( 
"$IP/extensions/SemanticUpdateOnPurge/SemanticUpdateOnPurge.php" );
-
-
-== Compatibility ==
-
-Versions 0.2.1 to 0.4 are tested on SMW 1.6.1 and 1.6.2 (propably working with 
1.6 too) There have been some issues
-with some versions of the SMW 1.5.x branch, where in early versions the 
extension seemed to work, then it didn't.
-
-
-== Contributing ==
-
-If you have bug reports or requests, please add them to the 
'SemanticUpdateOnPurge' Talk page [1].
-You can also send them to Daniel Werner < danwe...@web.de >
-
-
-[0] 'Semantic MediaWiki' is a MediaWiki extension. More information at: 
http://semantic-mediawiki.org
-[1] 

[MediaWiki-commits] [Gerrit] mediawiki...SemanticUpdateOnPurge[master]: Archive repository

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371999 )

Change subject: Archive repository
..

Archive repository

Bug: T172294
Change-Id: Iceb8ece6c7fea522a4fd9ddffbba93d5276c2c11
---
D CODE_OF_CONDUCT.md
D COPYING
D Gruntfile.js
A OBSOLETE
D README
D RELEASE-NOTES
D SemanticUpdateOnPurge.i18n.php
D SemanticUpdateOnPurge.php
D i18n/ast.json
D i18n/be-tarask.json
D i18n/br.json
D i18n/cs.json
D i18n/de.json
D i18n/dsb.json
D i18n/en.json
D i18n/es.json
D i18n/fa.json
D i18n/fi.json
D i18n/fr.json
D i18n/gl.json
D i18n/he.json
D i18n/hsb.json
D i18n/ia.json
D i18n/it.json
D i18n/ja.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lb.json
D i18n/mk.json
D i18n/ms.json
D i18n/nb.json
D i18n/nl.json
D i18n/pl.json
D i18n/pms.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/sv.json
D i18n/tl.json
D i18n/uk.json
D i18n/zh-hans.json
D i18n/zh-hant.json
D package.json
45 files changed, 1 insertion(+), 547 deletions(-)


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

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/COPYING b/COPYING
deleted file mode 100644
index fdc831e..000
--- a/COPYING
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2010 - 2011 by Daniel Werner < danwe...@web.de >
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 2db815f..000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*jshint node:true */
-module.exports = function ( grunt ) {
-   grunt.loadNpmTasks( 'grunt-jsonlint' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-   grunt.loadNpmTasks( 'grunt-banana-checker' );
-
-   grunt.initConfig( {
-   banana: {
-   all: 'i18n/'
-   },
-   jshint: {
-   all: [
-   '**/*.js',
-   '!node_modules/**',
-   '!vendor/**'
-   ]
-   },
-   jsonlint: {
-   all: [
-   '**/*.json',
-   '!node_modules/**',
-   '!vendor/**'
-   ]
-   }
-   } );
-
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'jshint' ] );
-   grunt.registerTask( 'default', 'test' );
-};
diff --git a/OBSOLETE b/OBSOLETE
new file mode 100644
index 000..1f555c0
--- /dev/null
+++ b/OBSOLETE
@@ -0,0 +1 @@
+This extension was obsoleted by the Semantic MediaWiki core functionality 
introduced with version 1.9.0.
diff --git a/README b/README
deleted file mode 100644
index bfb0eda..000
--- a/README
+++ /dev/null
@@ -1,30 +0,0 @@
-== About ==
-
-'SemanticUpdateOnPurge' is a 'Semantic MediaWiki' [0] extension by Daniel 
Werner. It updates Semantic MediaWikis
-properties of an article whenever the article is purged.
-SMW standard behavior is to update properties only on page save (as of SMW 1.6)
-
-
-== Installation ==
-
-Once you have downloaded the code, place the 'SemanticUpdateOnPurge' directory 
within your MediaWiki 'extensions'
-directory. Then add the following code to your 
[[Manual:LocalSettings.php|LocalSettings.php]] file:
-
- # SemanticUpdateOnPurge
- require_once( 
"$IP/extensions/SemanticUpdateOnPurge/SemanticUpdateOnPurge.php" );
-
-
-== Compatibility ==
-
-Versions 0.2.1 to 0.4 are tested on SMW 1.6.1 and 1.6.2 (propably working with 
1.6 too) There have been some issues
-with some versions of the SMW 1.5.x branch, where in early versions the 
extension seemed to work, then it didn't.
-
-
-== Contributing ==
-
-If you have bug reports or requests, please add them to the 
'SemanticUpdateOnPurge' Talk page [1].
-You can also send them to Daniel Werner < danwe...@web.de >
-
-
-[0] 'Semantic MediaWiki' is a MediaWiki extension. More information at: 

[MediaWiki-commits] [Gerrit] mediawiki...MoveToCommonsClient[master]: Archive repository

2017-08-14 Thread Legoktm (Code Review)
Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371998 )

Change subject: Archive repository
..


Archive repository

Change-Id: I23617849bc79fd1af5846e946c9419051e629840
---
D Hooks.php
A OBSOLETE
D README.md
D composer.json
D extension.json
D i18n/de.json
D i18n/en.json
D i18n/es.json
D i18n/fr.json
D i18n/it.json
D i18n/ko.json
D i18n/lb.json
D i18n/mk.json
D i18n/pl.json
D i18n/qqq.json
D i18n/ru.json
D i18n/sv.json
D i18n/zh-hans.json
D phpcs.xml
19 files changed, 1 insertion(+), 238 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
deleted file mode 100644
index 2bfc1e9..000
--- a/Hooks.php
+++ /dev/null
@@ -1,29 +0,0 @@
-getTitle()->getNamespace() !== NS_FILE ) {
-   return;
-   }
-
-   $links['actions']['moveToCommons'] = [
-   'class' => '',
-   'text' => Message::newFromKey( 
'movetocommonsclient-text' )->plain(),
-   'href' => $wgMoveToCommonsClientTarget .
-   '?clientUrl=' .
-   urlencode( 
$sktemplate->getRequest()->getFullRequestURL() ),
-   ];
-   }
-
-}
diff --git a/OBSOLETE b/OBSOLETE
new file mode 100644
index 000..27130d0
--- /dev/null
+++ b/OBSOLETE
@@ -0,0 +1 @@
+Replaced by the "FileExport" extension.
diff --git a/README.md b/README.md
deleted file mode 100644
index 1e12332..000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# MoveToCommonsClient extension
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 0107a29..000
--- a/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.7.2"
-  },
-  "scripts": {
-"test": [
-  "parallel-lint . --exclude vendor",
-  "phpcs -p -s"
-]
-  }
-}
\ No newline at end of file
diff --git a/extension.json b/extension.json
deleted file mode 100644
index 13ad102..000
--- a/extension.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "MoveToCommonsClient",
-  "version": "0.0.1",
-  "author": [
-"Addshore"
-  ],
-  "url": "https://www.mediawiki.org/wiki/Extension:MoveToCommonsClient;,
-  "namemsg": "movetocommonsclient",
-  "descriptionmsg": "movetocommonsclient-desc",
-  "license-name": "GPL-2.0+",
-  "type": "other",
-  "manifest_version": 1,
-  "MessagesDirs": {
-"MoveToCommonsClient": [
-  "i18n"
-]
-  },
-  "config" : {
-"MoveToCommonsClientTarget" : 
"https://commons.wikimedia.org/wiki/Special:MoveToCommons;
-  },
-  "Hooks": {
-"SkinTemplateNavigation": [
-  "MoveToCommonsClient\\MoveToCommonsClientHooks::onSkinTemplateNavigation"
-]
-  },
-  "AutoloadClasses": {
-"MoveToCommonsClient\\MoveToCommonsClientHooks": "Hooks.php"
-  }
-}
\ No newline at end of file
diff --git a/i18n/de.json b/i18n/de.json
deleted file mode 100644
index 73af4f5..000
--- a/i18n/de.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Metalhead64"
-   ]
-   },
-   "movetocommonsclient": "MoveToCommonsClient",
-   "movetocommonsclient-desc": "Einfaches Verschieben von Dateien nach 
Wikimedia Commons",
-   "movetocommonsclient-text": "Nach Wikimedia Commons verschieben"
-}
diff --git a/i18n/en.json b/i18n/en.json
deleted file mode 100644
index 9e75810..000
--- a/i18n/en.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@metadata": {
-"authors": [
-  "WMDE"
-]
-  },
-  "movetocommonsclient": "MoveToCommonsClient",
-  "movetocommonsclient-desc": "Easy moving of files to Wikimedia Commons",
-  "movetocommonsclient-text": "Move to Wikimedia Commons"
-}
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
deleted file mode 100644
index 87560a6..000
--- a/i18n/es.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Macofe"
-   ]
-   },
-   "movetocommonsclient-desc": "Trasladar fácilmente archivos a Wikimedia 
Commons",
-   "movetocommonsclient-text": "Trasladar a Wikimedia Commons"
-}
diff --git a/i18n/fr.json b/i18n/fr.json
deleted file mode 100644
index 5d8e9a9..000
--- a/i18n/fr.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Gomoko"
-   ]
-   },
-   "movetocommonsclient": "MoveToCommonsClient",
-   "movetocommonsclient-desc": "Déplacement facile de fichiers vers 
Wikimédia Communs",
-   "movetocommonsclient-text": "Déplacer vers Wikimédia Communs"
-}
diff --git a/i18n/it.json b/i18n/it.json
deleted file mode 100644
index 9cb184d..000
--- a/i18n/it.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   

[MediaWiki-commits] [Gerrit] mediawiki...MoveToCommonsClient[master]: Archive repositoryy

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371998 )

Change subject: Archive repositoryy
..

Archive repositoryy

Change-Id: I23617849bc79fd1af5846e946c9419051e629840
---
D Hooks.php
A OBSOLETE
D README.md
D composer.json
D extension.json
D i18n/de.json
D i18n/en.json
D i18n/es.json
D i18n/fr.json
D i18n/it.json
D i18n/ko.json
D i18n/lb.json
D i18n/mk.json
D i18n/pl.json
D i18n/qqq.json
D i18n/ru.json
D i18n/sv.json
D i18n/zh-hans.json
D phpcs.xml
19 files changed, 1 insertion(+), 238 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
deleted file mode 100644
index 2bfc1e9..000
--- a/Hooks.php
+++ /dev/null
@@ -1,29 +0,0 @@
-getTitle()->getNamespace() !== NS_FILE ) {
-   return;
-   }
-
-   $links['actions']['moveToCommons'] = [
-   'class' => '',
-   'text' => Message::newFromKey( 
'movetocommonsclient-text' )->plain(),
-   'href' => $wgMoveToCommonsClientTarget .
-   '?clientUrl=' .
-   urlencode( 
$sktemplate->getRequest()->getFullRequestURL() ),
-   ];
-   }
-
-}
diff --git a/OBSOLETE b/OBSOLETE
new file mode 100644
index 000..27130d0
--- /dev/null
+++ b/OBSOLETE
@@ -0,0 +1 @@
+Replaced by the "FileExport" extension.
diff --git a/README.md b/README.md
deleted file mode 100644
index 1e12332..000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# MoveToCommonsClient extension
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 0107a29..000
--- a/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.7.2"
-  },
-  "scripts": {
-"test": [
-  "parallel-lint . --exclude vendor",
-  "phpcs -p -s"
-]
-  }
-}
\ No newline at end of file
diff --git a/extension.json b/extension.json
deleted file mode 100644
index 13ad102..000
--- a/extension.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "MoveToCommonsClient",
-  "version": "0.0.1",
-  "author": [
-"Addshore"
-  ],
-  "url": "https://www.mediawiki.org/wiki/Extension:MoveToCommonsClient;,
-  "namemsg": "movetocommonsclient",
-  "descriptionmsg": "movetocommonsclient-desc",
-  "license-name": "GPL-2.0+",
-  "type": "other",
-  "manifest_version": 1,
-  "MessagesDirs": {
-"MoveToCommonsClient": [
-  "i18n"
-]
-  },
-  "config" : {
-"MoveToCommonsClientTarget" : 
"https://commons.wikimedia.org/wiki/Special:MoveToCommons;
-  },
-  "Hooks": {
-"SkinTemplateNavigation": [
-  "MoveToCommonsClient\\MoveToCommonsClientHooks::onSkinTemplateNavigation"
-]
-  },
-  "AutoloadClasses": {
-"MoveToCommonsClient\\MoveToCommonsClientHooks": "Hooks.php"
-  }
-}
\ No newline at end of file
diff --git a/i18n/de.json b/i18n/de.json
deleted file mode 100644
index 73af4f5..000
--- a/i18n/de.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Metalhead64"
-   ]
-   },
-   "movetocommonsclient": "MoveToCommonsClient",
-   "movetocommonsclient-desc": "Einfaches Verschieben von Dateien nach 
Wikimedia Commons",
-   "movetocommonsclient-text": "Nach Wikimedia Commons verschieben"
-}
diff --git a/i18n/en.json b/i18n/en.json
deleted file mode 100644
index 9e75810..000
--- a/i18n/en.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@metadata": {
-"authors": [
-  "WMDE"
-]
-  },
-  "movetocommonsclient": "MoveToCommonsClient",
-  "movetocommonsclient-desc": "Easy moving of files to Wikimedia Commons",
-  "movetocommonsclient-text": "Move to Wikimedia Commons"
-}
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
deleted file mode 100644
index 87560a6..000
--- a/i18n/es.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Macofe"
-   ]
-   },
-   "movetocommonsclient-desc": "Trasladar fácilmente archivos a Wikimedia 
Commons",
-   "movetocommonsclient-text": "Trasladar a Wikimedia Commons"
-}
diff --git a/i18n/fr.json b/i18n/fr.json
deleted file mode 100644
index 5d8e9a9..000
--- a/i18n/fr.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Gomoko"
-   ]
-   },
-   "movetocommonsclient": "MoveToCommonsClient",
-   "movetocommonsclient-desc": "Déplacement facile de fichiers vers 
Wikimédia Communs",
-   "movetocommonsclient-text": "Déplacer vers Wikimédia Communs"
-}
diff --git a/i18n/it.json b/i18n/it.json
deleted file mode 100644
index 9cb184d..000
--- a/i18n/it.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   

[MediaWiki-commits] [Gerrit] mediawiki...MoveToCommons[master]: Archive repository

2017-08-14 Thread Legoktm (Code Review)
Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371997 )

Change subject: Archive repository
..


Archive repository

Change-Id: I67a8c2334a8d3126e97093c149554bfe2a20d355
---
A OBSOLETE
D README.md
D composer.json
D extension.json
D i18n/be-tarask.json
D i18n/de.json
D i18n/el.json
D i18n/en.json
D i18n/es.json
D i18n/fr.json
D i18n/it.json
D i18n/ko.json
D i18n/lb.json
D i18n/mk.json
D i18n/pl.json
D i18n/qqq.json
D i18n/ru.json
D i18n/sv.json
D i18n/zh-hans.json
D phpcs.xml
D src/MoveToCommonsHooks.php
D src/SpecialMoveToCommons.php
22 files changed, 1 insertion(+), 286 deletions(-)

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



diff --git a/OBSOLETE b/OBSOLETE
new file mode 100644
index 000..7c43cdb
--- /dev/null
+++ b/OBSOLETE
@@ -0,0 +1 @@
+Replaced by the "FileImport" extension.
diff --git a/README.md b/README.md
deleted file mode 100644
index 882ee7e..000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# MoveToCommons extension
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 0107a29..000
--- a/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.7.2"
-  },
-  "scripts": {
-"test": [
-  "parallel-lint . --exclude vendor",
-  "phpcs -p -s"
-]
-  }
-}
\ No newline at end of file
diff --git a/extension.json b/extension.json
deleted file mode 100644
index dfe0965..000
--- a/extension.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "MoveToCommons",
-  "version": "0.0.1",
-  "author": [
-"WMDE"
-  ],
-  "url": "https://www.mediawiki.org/wiki/Extension:MoveToCommons;,
-  "namemsg": "movetocommons",
-  "descriptionmsg": "movetocommons-desc",
-  "license-name": "GPL-2.0+",
-  "type": "other",
-  "manifest_version": 1,
-  "MessagesDirs": {
-"MoveToCommons": [
-  "i18n"
-]
-  },
-  "SpecialPages" : {
-"MoveToCommons": "MoveToCommons\\SpecialMoveToCommons"
-  },
-  "AutoloadClasses": {
-"MoveToCommons\\MoveToCommonsHooks": "src/MoveToCommonsHooks.php",
-"MoveToCommons\\SpecialMoveToCommons": "src/SpecialMoveToCommons.php"
-  }
-}
\ No newline at end of file
diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json
deleted file mode 100644
index f4581e6..000
--- a/i18n/be-tarask.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Red Winged Duck"
-   ]
-   },
-   "movetocommons": "Перанос у Commons",
-   "movetocommons-desc": "Просты перанос файлаў у Вікісховішча",
-   "movetocommons-specialpage": "Перанесьці файл у Вікісховішча"
-}
diff --git a/i18n/de.json b/i18n/de.json
deleted file mode 100644
index 8589933..000
--- a/i18n/de.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Metalhead64"
-   ]
-   },
-   "movetocommons": "MoveToCommons",
-   "movetocommons-desc": "Einfaches Verschieben von Dateien nach Wikimedia 
Commons",
-   "movetocommons-specialpage": "Datei nach Commons verschieben"
-}
diff --git a/i18n/el.json b/i18n/el.json
deleted file mode 100644
index f92a836..000
--- a/i18n/el.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "GR"
-   ]
-   },
-   "movetocommons-specialpage": "Μετακίνηση αρχείου στα Κοινόχρηστα"
-}
diff --git a/i18n/en.json b/i18n/en.json
deleted file mode 100644
index d2ae284..000
--- a/i18n/en.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@metadata": {
-"authors": [
-  "WMDE"
-]
-  },
-  "movetocommons": "MoveToCommons",
-  "movetocommons-desc": "Easy moving of files to Wikimedia Commons",
-  "movetocommons-specialpage": "Move file to Commons"
-}
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
deleted file mode 100644
index edb1aea..000
--- a/i18n/es.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Macofe"
-   ]
-   },
-   "movetocommons-desc": "Trasladar fácilmente archivos a Wikimedia 
Commons"
-}
diff --git a/i18n/fr.json b/i18n/fr.json
deleted file mode 100644
index d98faae..000
--- a/i18n/fr.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Gomoko",
-   "Wladek92"
-   ]
-   },
-   "movetocommons": "MoveToCommons",
-   "movetocommons-desc": "Déplacement facile de fichiers vers Wikimédia 
Communs",
-   "movetocommons-specialpage": "Déplacer le fichier vers Commons"
-}
diff --git a/i18n/it.json b/i18n/it.json
deleted file mode 100644
index 4a20595..000
--- a/i18n/it.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "@metadata": {
-   "authors": 

[MediaWiki-commits] [Gerrit] mediawiki...MoveToCommons[master]: Archive repository

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371997 )

Change subject: Archive repository
..

Archive repository

Change-Id: I67a8c2334a8d3126e97093c149554bfe2a20d355
---
A OBSOLETE
D README.md
D composer.json
D extension.json
D i18n/be-tarask.json
D i18n/de.json
D i18n/el.json
D i18n/en.json
D i18n/es.json
D i18n/fr.json
D i18n/it.json
D i18n/ko.json
D i18n/lb.json
D i18n/mk.json
D i18n/pl.json
D i18n/qqq.json
D i18n/ru.json
D i18n/sv.json
D i18n/zh-hans.json
D phpcs.xml
D src/MoveToCommonsHooks.php
D src/SpecialMoveToCommons.php
22 files changed, 1 insertion(+), 286 deletions(-)


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

diff --git a/OBSOLETE b/OBSOLETE
new file mode 100644
index 000..7c43cdb
--- /dev/null
+++ b/OBSOLETE
@@ -0,0 +1 @@
+Replaced by the "FileImport" extension.
diff --git a/README.md b/README.md
deleted file mode 100644
index 882ee7e..000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# MoveToCommons extension
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 0107a29..000
--- a/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.7.2"
-  },
-  "scripts": {
-"test": [
-  "parallel-lint . --exclude vendor",
-  "phpcs -p -s"
-]
-  }
-}
\ No newline at end of file
diff --git a/extension.json b/extension.json
deleted file mode 100644
index dfe0965..000
--- a/extension.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "MoveToCommons",
-  "version": "0.0.1",
-  "author": [
-"WMDE"
-  ],
-  "url": "https://www.mediawiki.org/wiki/Extension:MoveToCommons;,
-  "namemsg": "movetocommons",
-  "descriptionmsg": "movetocommons-desc",
-  "license-name": "GPL-2.0+",
-  "type": "other",
-  "manifest_version": 1,
-  "MessagesDirs": {
-"MoveToCommons": [
-  "i18n"
-]
-  },
-  "SpecialPages" : {
-"MoveToCommons": "MoveToCommons\\SpecialMoveToCommons"
-  },
-  "AutoloadClasses": {
-"MoveToCommons\\MoveToCommonsHooks": "src/MoveToCommonsHooks.php",
-"MoveToCommons\\SpecialMoveToCommons": "src/SpecialMoveToCommons.php"
-  }
-}
\ No newline at end of file
diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json
deleted file mode 100644
index f4581e6..000
--- a/i18n/be-tarask.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Red Winged Duck"
-   ]
-   },
-   "movetocommons": "Перанос у Commons",
-   "movetocommons-desc": "Просты перанос файлаў у Вікісховішча",
-   "movetocommons-specialpage": "Перанесьці файл у Вікісховішча"
-}
diff --git a/i18n/de.json b/i18n/de.json
deleted file mode 100644
index 8589933..000
--- a/i18n/de.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Metalhead64"
-   ]
-   },
-   "movetocommons": "MoveToCommons",
-   "movetocommons-desc": "Einfaches Verschieben von Dateien nach Wikimedia 
Commons",
-   "movetocommons-specialpage": "Datei nach Commons verschieben"
-}
diff --git a/i18n/el.json b/i18n/el.json
deleted file mode 100644
index f92a836..000
--- a/i18n/el.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "GR"
-   ]
-   },
-   "movetocommons-specialpage": "Μετακίνηση αρχείου στα Κοινόχρηστα"
-}
diff --git a/i18n/en.json b/i18n/en.json
deleted file mode 100644
index d2ae284..000
--- a/i18n/en.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@metadata": {
-"authors": [
-  "WMDE"
-]
-  },
-  "movetocommons": "MoveToCommons",
-  "movetocommons-desc": "Easy moving of files to Wikimedia Commons",
-  "movetocommons-specialpage": "Move file to Commons"
-}
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
deleted file mode 100644
index edb1aea..000
--- a/i18n/es.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Macofe"
-   ]
-   },
-   "movetocommons-desc": "Trasladar fácilmente archivos a Wikimedia 
Commons"
-}
diff --git a/i18n/fr.json b/i18n/fr.json
deleted file mode 100644
index d98faae..000
--- a/i18n/fr.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Gomoko",
-   "Wladek92"
-   ]
-   },
-   "movetocommons": "MoveToCommons",
-   "movetocommons-desc": "Déplacement facile de fichiers vers Wikimédia 
Communs",
-   "movetocommons-specialpage": "Déplacer le fichier vers Commons"
-}
diff --git a/i18n/it.json b/i18n/it.json
deleted file mode 100644
index 4a20595..000
--- a/i18n/it.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   

[MediaWiki-commits] [Gerrit] mediawiki...AJAXPoll[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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

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



diff --git a/composer.json b/composer.json
index 55507be..f80e32e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19f2cf291d39d360186e9740cd7f8bd5de804706
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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...AdminLinks[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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

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



diff --git a/composer.json b/composer.json
index 8cfaa26..d783a33 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecb0a3eae0dbea9c793ef6f534d55c6c0bf2d3ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdminLinks
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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...ConfirmAccount[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371991 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index 3e676f3..f80e32e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia60588d495ed9836c80dcc315c47c5fef8419339
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371990 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

Change-Id: I09ff22848bd5aa90e3574f36e87158a1c70944f2
---
M composer.json
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/composer.json b/composer.json
index b6cd741..de0c600 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,10 @@
 {
-   "name"   : "mediawiki/cirrussearch",
-   "type"   : "mediawiki-extension",
+   "name": "mediawiki/cirrussearch",
+   "type": "mediawiki-extension",
"description": "Elasticsearch-powered search for MediaWiki",
-   "license": "GPL-2.0+",
+   "license": "GPL-2.0+",
"minimum-stability": "dev",
-   "require": {
+   "require": {
"php": ">=5.5.9",
"composer/installers": ">=1.0.1",
"wikimedia/textcat": "1.2.0"
@@ -12,7 +12,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.1"
},
"scripts": {
"fix": "phpcbf",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09ff22848bd5aa90e3574f36e87158a1c70944f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371989 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index fd295f4..5870238 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.1"
},
"scripts": {
"fix": "phpcbf",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54edbb72a9e539813d3c14bb71efb941f6eb412a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...AJAXPoll[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371987 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll 
refs/changes/87/371987/1

diff --git a/composer.json b/composer.json
index 55507be..f80e32e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19f2cf291d39d360186e9740cd7f8bd5de804706
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371996 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index 55507be..f80e32e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I624c173fae70d7c30b92b25e8767b8aab2ddefdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371993 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index 8a2ae1a..363667d 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
"minimum-stability": "dev",
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4374f07493950f3431b1abcd851395ff1a7c8fb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371992 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index 55507be..f80e32e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...FlickrAPI[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371994 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index e966349..f3e8398 100755
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "^0.10",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9637e91b580a1236bcc58e296aaf7848ff471c9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlickrAPI
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...MathSearch[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371995 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index 7a7cc76..27630e7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35871acc52d664a80256d0f44a35bee008aa439d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...AdminLinks[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371988 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.1

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


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

diff --git a/composer.json b/composer.json
index 8cfaa26..d783a33 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1",
+   "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecb0a3eae0dbea9c793ef6f534d55c6c0bf2d3ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdminLinks
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add sniff to ensure floats have a leading `0` if necessary

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371986 )

Change subject: Add sniff to ensure floats have a leading `0` if necessary
..

Add sniff to ensure floats have a leading `0` if necessary

Bug: T170442
Change-Id: I0f8150dbe7155ba99a27a640b44dc347003ce72a
---
A MediaWiki/Sniffs/AlternativeSyntax/LeadingZeroInFloatSniff.php
A MediaWiki/Tests/files/AlternativeSyntax/leading_zero_in_float.php
A MediaWiki/Tests/files/AlternativeSyntax/leading_zero_in_float.php.expect
A MediaWiki/Tests/files/AlternativeSyntax/leading_zero_in_float.php.fixed
4 files changed, 86 insertions(+), 0 deletions(-)


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

diff --git a/MediaWiki/Sniffs/AlternativeSyntax/LeadingZeroInFloatSniff.php 
b/MediaWiki/Sniffs/AlternativeSyntax/LeadingZeroInFloatSniff.php
new file mode 100644
index 000..d2ebf28
--- /dev/null
+++ b/MediaWiki/Sniffs/AlternativeSyntax/LeadingZeroInFloatSniff.php
@@ -0,0 +1,67 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace MediaWiki\Sniffs\AlternativeSyntax;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class LeadingZeroInFloatSniff implements Sniff {
+
+   /**
+* T_DNUMBER is any floating point number
+*
+* @return array
+*/
+   public function register() {
+   return [
+   T_DNUMBER,
+   ];
+   }
+
+   /**
+* If the float starts with a period, it needs
+* a zero in front
+*
+* @param File $phpcsFile File
+* @param int $stackPtr Location
+*/
+   public function process( File $phpcsFile, $stackPtr ) {
+   $tokens = $phpcsFile->getTokens();
+   // var_dump($tokens[$stackPtr]);
+   $content = $tokens[$stackPtr]['content'];
+   if ( $content[0] == '.' ) {
+   // Starts with a ., needs a leading 0.
+   $fix = $phpcsFile->addFixableWarning(
+   'Floats should have a leading 0',
+   $stackPtr,
+   'Found'
+   );
+   if ( $fix ) {
+   $phpcsFile->fixer->replaceToken(
+   $stackPtr,
+   // Put a zero in front of the existing 
content
+   '0' . $content
+   );
+   }
+   }
+   }
+
+}
diff --git a/MediaWiki/Tests/files/AlternativeSyntax/leading_zero_in_float.php 
b/MediaWiki/Tests/files/AlternativeSyntax/leading_zero_in_float.php
new file mode 100644
index 000..5606628
--- /dev/null
+++ b/MediaWiki/Tests/files/AlternativeSyntax/leading_zero_in_float.php
@@ -0,0 +1,7 @@
+https://gerrit.wikimedia.org/r/371986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f8150dbe7155ba99a27a640b44dc347003ce72a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Remove a bunch of entirely unnecessary stuff from composer.json

2017-08-14 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371985 )

Change subject: Remove a bunch of entirely unnecessary stuff from composer.json
..

Remove a bunch of entirely unnecessary stuff from composer.json

This isn't meant to be published as a composer package, so all of that
information is unnecessary and redundant.

Change-Id: I6df06ccd1acb60e9861694f73b90c94f20b15fde
---
M composer.json
1 file changed, 0 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/85/371985/1

diff --git a/composer.json b/composer.json
index 380d2ae..d517daf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,4 @@
 {
-   "name": "mediawiki/timeless-skin",
-   "type": "mediawiki-skin",
-   "description": "A timeless skin designed after the Winter prototype by 
Brandon Harris, and various styles by the Wikimedia Foundation.",
-   "keywords": [
-   "wiki",
-   "MediaWiki",
-   "skin"
-   ],
-   "homepage": "https://www.mediawiki.org/wiki/Skin:Timeless;,
-   "license": "GPL-2.0+",
-   "authors": [
-   {
-   "name": "Isarra"
-   }
-   ],
-   "support": {
-   "wiki": "https://www.mediawiki.org/wiki/Skin:Timeless;,
-   "forum": "https://www.mediawiki.org/wiki/Skin_talk:Timeless;,
-   "source": "https://phabricator.wikimedia.org/diffusion/STIM/;,
-   "irc": "irc://irc.freenode.org/mediawiki"
-   },
-   "require": {
-   "php": ">=5.5.9",
-   "composer/installers": ">1.0.12"
-   },
-   "extra": {
-   "branch-alias": {
-   "dev-master": "1.x-dev"
-   },
-   "installer-name": "Timeless"
-   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.10.1",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6df06ccd1acb60e9861694f73b90c94f20b15fde
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move RawMessage out of Message.php to its own file

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

Change subject: Move RawMessage out of Message.php to its own file
..


Move RawMessage out of Message.php to its own file

Change-Id: Idae9617dafa3c314085eb097f78f1c8d38672f31
---
M autoload.php
M includes/Message.php
A includes/RawMessage.php
3 files changed, 73 insertions(+), 54 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 508e75b..d9e85bd 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1180,7 +1180,7 @@
'RangeChronologicalPager' => __DIR__ . 
'/includes/pager/RangeChronologicalPager.php',
'RangeDifference' => __DIR__ . '/includes/diff/DiffEngine.php',
'RawAction' => __DIR__ . '/includes/actions/RawAction.php',
-   'RawMessage' => __DIR__ . '/includes/Message.php',
+   'RawMessage' => __DIR__ . '/includes/RawMessage.php',
'ReadOnlyError' => __DIR__ . '/includes/exception/ReadOnlyError.php',
'ReadOnlyMode' => __DIR__ . '/includes/ReadOnlyMode.php',
'ReassignEdits' => __DIR__ . '/maintenance/reassignEdits.php',
diff --git a/includes/Message.php b/includes/Message.php
index 8777c6f..0240fa7 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1344,56 +1344,3 @@
return $this->extractParam( new RawMessage( $vars, $params ), 
$format );
}
 }
-
-/**
- * Variant of the Message class.
- *
- * Rather than treating the message key as a lookup
- * value (which is passed to the MessageCache and
- * translated as necessary), a RawMessage key is
- * treated as the actual message.
- *
- * All other functionality (parsing, escaping, etc.)
- * is preserved.
- *
- * @since 1.21
- */
-class RawMessage extends Message {
-
-   /**
-* Call the parent constructor, then store the key as
-* the message.
-*
-* @see Message::__construct
-*
-* @param string $text Message to use.
-* @param array $params Parameters for the message.
-*
-* @throws InvalidArgumentException
-*/
-   public function __construct( $text, $params = [] ) {
-   if ( !is_string( $text ) ) {
-   throw new InvalidArgumentException( '$text must be a 
string' );
-   }
-
-   parent::__construct( $text, $params );
-
-   // The key is the message.
-   $this->message = $text;
-   }
-
-   /**
-* Fetch the message (in this case, the key).
-*
-* @return string
-*/
-   public function fetchMessage() {
-   // Just in case the message is unset somewhere.
-   if ( $this->message === null ) {
-   $this->message = $this->key;
-   }
-
-   return $this->message;
-   }
-
-}
diff --git a/includes/RawMessage.php b/includes/RawMessage.php
new file mode 100644
index 000..9a0d947
--- /dev/null
+++ b/includes/RawMessage.php
@@ -0,0 +1,72 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Variant of the Message class.
+ *
+ * Rather than treating the message key as a lookup
+ * value (which is passed to the MessageCache and
+ * translated as necessary), a RawMessage key is
+ * treated as the actual message.
+ *
+ * All other functionality (parsing, escaping, etc.)
+ * is preserved.
+ *
+ * @since 1.21
+ */
+class RawMessage extends Message {
+
+   /**
+* Call the parent constructor, then store the key as
+* the message.
+*
+* @see Message::__construct
+*
+* @param string $text Message to use.
+* @param array $params Parameters for the message.
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $text, $params = [] ) {
+   if ( !is_string( $text ) ) {
+   throw new InvalidArgumentException( '$text must be a 
string' );
+   }
+
+   parent::__construct( $text, $params );
+
+   // The key is the message.
+   $this->message = $text;
+   }
+
+   /**
+* Fetch the message (in this case, the key).
+*
+* @return string
+*/
+   public function fetchMessage() {
+   // Just in case the message is unset somewhere.
+   if ( $this->message === null ) {
+   $this->message = $this->key;
+   }
+
+   return $this->message;
+   }
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idae9617dafa3c314085eb097f78f1c8d38672f31
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 

[MediaWiki-commits] [Gerrit] mediawiki...InterwikiIntegration[master]: Get rid of deprecated function usage

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

Change subject: Get rid of deprecated function usage
..


Get rid of deprecated function usage

Change-Id: I3bfea33df8100c5551ad67e2c37afb615358e82f
---
M InterwikiIntegrationChangesList.php
1 file changed, 2 insertions(+), 19 deletions(-)

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



diff --git a/InterwikiIntegrationChangesList.php 
b/InterwikiIntegrationChangesList.php
index 48150a0..bfa3c1b 100644
--- a/InterwikiIntegrationChangesList.php
+++ b/InterwikiIntegrationChangesList.php
@@ -507,7 +507,7 @@
 */
public function recentChangesLine( &$rc, $watched = false, $linenumber 
= null ) {
global $wgLang, $wgRCShowChangedSize, $wgUser;
-   wfProfileIn( __METHOD__ );
+
# Should patrol-related stuff be shown?
$unpatrolled = $wgUser->useRCPatrol() && 
!$rc->mAttribs['integration_rc_patrolled'];
 
@@ -581,7 +581,6 @@
 
Hooks::run( 
'OldInterwikiIntegrationChangesListRecentChangesLine', array(&$this, &$s, $rc) 
);
 
-   wfProfileOut( __METHOD__ );
return "$dateheader".$s."\n";
}
 }
@@ -610,8 +609,6 @@
 */
public function recentChangesLine( &$baseRC, $watched = false ) {
global $wgLang, $wgUser;
-
-   wfProfileIn( __METHOD__ );
 
# Create a specialised object
$rc = InterwikiIntegrationRCCacheEntry::newFromParent( $baseRC 
);
@@ -759,8 +756,6 @@
array_push( $this->integration_rc_cache[$secureName], 
$rc );
}
 
-   wfProfileOut( __METHOD__ );
-
return $ret;
}
 
@@ -769,8 +764,6 @@
 */
protected function recentChangesBlockGroup( $block ) {
global $wgLang, $wgContLang, $wgRCShowChangedSize;
-
-   wfProfileIn( __METHOD__ );
 
$r = '';
 
@@ -1015,8 +1008,6 @@
 
$this->rcCacheIndex++;
 
-   wfProfileOut( __METHOD__ );
-
return $r;
}
 
@@ -1060,7 +1051,7 @@
 * @return String: HTML  tag
 */
protected function spacerArrow() {
-   return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // 
non-breaking space
+   return $this->arrow( '', "\xC2\xA0" ); // non-breaking space
}
 
/**
@@ -1077,8 +1068,6 @@
 */
protected function recentChangesBlockLine( $rcObj ) {
global $wgRCShowChangedSize;
-
-   wfProfileIn( __METHOD__ );
 
# Extract fields from DB into the function scope 
(integration_rc_ variables)
// FIXME: Would be good to replace this extract() call with 
something
@@ -1148,8 +1137,6 @@
 
$r .= "\n";
 
-   wfProfileOut( __METHOD__ );
-
return $r;
}
 
@@ -1162,8 +1149,6 @@
return '';
}
 
-   wfProfileIn( __METHOD__ );
-
$blockOut = '';
foreach( $this->integration_rc_cache as $block ) {
if( count( $block ) < 2 ) {
@@ -1172,8 +1157,6 @@
$blockOut .= $this->recentChangesBlockGroup( 
$block );
}
}
-
-   wfProfileOut( __METHOD__ );
 
return ''.$blockOut.'';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3bfea33df8100c5551ad67e2c37afb615358e82f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiIntegration
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...AntiSpoof[master]: Remove unneeded dependency on composer/installers

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

Change subject: Remove unneeded dependency on composer/installers
..


Remove unneeded dependency on composer/installers

Change-Id: I7b50ef3dd2bdfc442d47517eaf7266fb49207c23
---
M composer.json
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index f630f5a..b567927 100644
--- a/composer.json
+++ b/composer.json
@@ -4,9 +4,6 @@
"description": "The  AntiSpoof extension is an extension for preventing 
confusable usernames from being created. It blocks the creation of accounts 
with mixed-script, confusing and similar usernames.",
"homepage": "https://www.mediawiki.org/wiki/Extension:AntiSpoof;,
"license": "GPL-2.0+",
-   "require": {
-   "composer/installers": "*"
-   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b50ef3dd2bdfc442d47517eaf7266fb49207c23
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Dmaza 
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...AntiSpoof[master]: Switch to librarized utfnormal

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

Change subject: Switch to librarized utfnormal
..


Switch to librarized utfnormal

Change-Id: I9d0c646510a8ca774957a2182042b42c2a26e593
---
M AntiSpoof_body.php
M maintenance/generateEquivset.php
2 files changed, 10 insertions(+), 7 deletions(-)

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



diff --git a/AntiSpoof_body.php b/AntiSpoof_body.php
index 84b8d49..d6d424a 100644
--- a/AntiSpoof_body.php
+++ b/AntiSpoof_body.php
@@ -31,6 +31,7 @@
  * USA
  */
 
+use UtfNormal\Utils;
 use UtfNormal\Validator;
 
 class AntiSpoof {
@@ -225,7 +226,7 @@
}
$out = [];
foreach ( $ar[0] as $char ) {
-   $out[] = utf8ToCodepoint( $char );
+   $out[] = Utils::utf8ToCodepoint( $char );
}
return $out;
}
@@ -237,7 +238,7 @@
public static function listToString( $list ) {
$out = '';
foreach ( $list as $cp ) {
-   $out .= codepointToUtf8( $cp );
+   $out .= Utils::codepointToUtf8( $cp );
}
return $out;
}
@@ -282,7 +283,7 @@
 * @return Formatted error message.
 */
private static function badCharErr( $msgId, $point ) {
-   $symbol = codepointToUtf8( $point );
+   $symbol = Utils::codepointToUtf8( $point );
// Combining marks are combined with the previous character. If 
abusing character is a
// combining mark, prepend it with space to show them correctly.
if ( self::getScriptCode( $point ) == "SCRIPT_COMBINING_MARKS" 
) {
diff --git a/maintenance/generateEquivset.php b/maintenance/generateEquivset.php
index 65bcf11..2c946af 100644
--- a/maintenance/generateEquivset.php
+++ b/maintenance/generateEquivset.php
@@ -1,5 +1,7 @@
 output( "Bytes: " . strlen( 
$m['charleft'] ) . "\n" );
$this->output( bin2hex( $line ) . "\n" 
);
@@ -109,9 +111,9 @@
$error = true;
}
if ( !empty( $m['hexright'] )
-   && codepointToUtf8( hexdec( $m['hexright'] ) ) 
!= $m['charright']
+   && Utils::codepointToUtf8( hexdec( 
$m['hexright'] ) ) != $m['charright']
) {
-   $actual = utf8ToCodepoint( $m['charright'] );
+   $actual = Utils::utf8ToCodepoint( 
$m['charright'] );
if ( $actual === false ) {
$hexForm = bin2hex( $m['charright'] );
$this->output( "Invalid UTF-8 character 
\"{$m['charleft']}\" ($hexForm) at " .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d0c646510a8ca774957a2182042b42c2a26e593
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Dmaza 
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...IndexFunction[master]: Replace function call with string literal

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

Change subject: Replace function call with string literal
..


Replace function call with string literal

Change-Id: I2c779324e62832e6632c4e07b8d02edb806d0afd
---
M SpecialIndex.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/SpecialIndex.php b/SpecialIndex.php
index 2d3dbaf..80c7dd8 100644
--- a/SpecialIndex.php
+++ b/SpecialIndex.php
@@ -84,7 +84,7 @@
}
 
protected function spacerArrow() {
-   return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // 
non-breaking space
+   return $this->arrow( '', "\xC2\xA0" ); // non-breaking space
}
 
// Since we're overriding reallyDoQuery, we don't really need this

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c779324e62832e6632c4e07b8d02edb806d0afd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/IndexFunction
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...AntiSpoof[master]: Cleanup SpoofUser

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

Change subject: Cleanup SpoofUser
..


Cleanup SpoofUser

* Explicitly define properties
* Rename them away from Hungarian notation
* Use proper DB class name
* Fix documentation

Change-Id: Ie9cc796aef7d824f7aa69eaaa7a91f2381f01537
---
M SpoofUser.php
1 file changed, 36 insertions(+), 23 deletions(-)

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



diff --git a/SpoofUser.php b/SpoofUser.php
index 630e0b6..8938a23 100644
--- a/SpoofUser.php
+++ b/SpoofUser.php
@@ -1,20 +1,33 @@
 mName = strval( $name );
-   list( $ok, $normalized ) = AntiSpoof::checkUnicodeString( 
$this->mName );
-   $this->mLegal = ( $ok == 'OK' );
-   if ( $this->mLegal ) {
-   $this->mNormalized = $normalized;
-   $this->mError = null;
+   $this->name = strval( $name );
+   list( $ok, $normalized ) = AntiSpoof::checkUnicodeString( 
$this->name );
+   $this->legal = ( $ok == 'OK' );
+   if ( $this->legal ) {
+   $this->normalized = $normalized;
+   $this->error = null;
} else {
-   $this->mNormalized = null;
-   $this->mError = $normalized;
+   $this->normalized = null;
+   $this->error = $normalized;
}
}
 
@@ -23,7 +36,7 @@
 * @return bool
 */
public function isLegal() {
-   return $this->mLegal;
+   return $this->legal;
}
 
/**
@@ -31,7 +44,7 @@
 * @return null|string
 */
public function getError() {
-   return $this->mError;
+   return $this->error;
}
 
/**
@@ -39,7 +52,7 @@
 * @return string|null
 */
public function getNormalized() {
-   return $this->mNormalized;
+   return $this->normalized;
}
 
/**
@@ -70,7 +83,7 @@
[ 'spoofuser', $this->getTableName() ],
[ 'su_name' ], // Same thing due to the join. Saves 
extra variableness
[
-   'su_normalized' => $this->mNormalized,
+   'su_normalized' => $this->normalized,
'su_name = ' . $this->getUserColumn(),
],
__METHOD__,
@@ -99,20 +112,20 @@
 */
private function insertFields() {
return [
-   'su_name'   => $this->mName,
-   'su_normalized' => $this->mNormalized,
-   'su_legal'  => $this->mLegal ? 1 : 0,
-   'su_error'  => $this->mError,
+   'su_name'   => $this->name,
+   'su_normalized' => $this->normalized,
+   'su_legal'  => $this->legal ? 1 : 0,
+   'su_error'  => $this->error,
];
}
 
/**
 * Insert a batch of spoof normalization records into the database.
-* @param $dbw DatabaseBase
-* @param $items array of SpoofUser
+* @param Database $dbw
+* @param SpoofUser[] $items
 * @return bool
 */
-   public static function batchRecord( $dbw, $items ) {
+   public static function batchRecord( Database $dbw, $items ) {
if ( !count( $items ) ) {
return false;
}
@@ -132,7 +145,7 @@
}
 
/**
-* @param $oldName
+* @param string $oldName
 */
public function update( $oldName ) {
$that = $this;
@@ -158,20 +171,20 @@
public function remove() {
$this->getDBMaster()->delete(
'spoofuser',
-   [ 'su_name' => $this->mName ],
+   [ 'su_name' => $this->name ],
__METHOD__
);
}
 
/**
-* @return DatabaseBase
+* @return Database
 */
protected function getDBSlave() {
return wfGetDB( DB_SLAVE );
}
 
/**
-* @return DatabaseBase
+* @return Database
 */
protected function getDBMaster() {
return wfGetDB( DB_MASTER );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9cc796aef7d824f7aa69eaaa7a91f2381f01537
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Dmaza 

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Revert "Temporary don't require the 'database field"

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

Change subject: Revert "Temporary don't require the 'database field"
..


Revert "Temporary don't require the 'database field"

The database field has been added to the JobQueueEventBus class
in commit 5d43d7dd.

This reverts commit 6f61a354bdad5bdf6b69510d4df1d17af4aced83.

Change-Id: Ibec41eafafa1b902041e93f85a1d7bac41ee70c9
---
M jsonschema/mediawiki/job/1.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml
index caba2d5..630df4a 100644
--- a/jsonschema/mediawiki/job/1.yaml
+++ b/jsonschema/mediawiki/job/1.yaml
@@ -91,6 +91,7 @@
 
 required:
   - meta
+  - database
   - type
   - page_namespace
   - page_title
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibec41eafafa1b902041e93f85a1d7bac41ee70c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Hard deprecate UtfNormalUtil

2017-08-14 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371984 )

Change subject: Hard deprecate UtfNormalUtil
..

Hard deprecate UtfNormalUtil

Deprecated in 1.25, last vestiges have been removed.

Inline one last function that's not supposed to be public anyway.

Change-Id: If44c6a9cce7d2d95dc63e6f135b73b8c969f1c07
---
M includes/compat/normal/UtfNormalUtil.php
M maintenance/language/digit2html.php
2 files changed, 23 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/371984/1

diff --git a/includes/compat/normal/UtfNormalUtil.php 
b/includes/compat/normal/UtfNormalUtil.php
index 8791e4c..09443f3 100644
--- a/includes/compat/normal/UtfNormalUtil.php
+++ b/includes/compat/normal/UtfNormalUtil.php
@@ -37,6 +37,7 @@
  * @deprecated since 1.25, use UtfNormal\Utils directly
  */
 function codepointToUtf8( $codepoint ) {
+   wfDeprecated( '1.25' );
return Utils::codepointToUtf8( $codepoint );
 }
 
@@ -52,6 +53,7 @@
  * @deprecated since 1.25, use UtfNormal\Utils directly
  */
 function hexSequenceToUtf8( $sequence ) {
+   wfDeprecated( '1.25' );
return Utils::hexSequenceToUtf8( $sequence );
 }
 
@@ -65,6 +67,7 @@
  * @private
  */
 function utf8ToHexSequence( $str ) {
+   wfDeprecated( '1.25' );
$buf = '';
foreach ( preg_split( '//u', $str, -1, PREG_SPLIT_NO_EMPTY ) as $cp ) {
$buf .= sprintf( '%04x ', UtfNormal\Utils::utf8ToCodepoint( $cp 
) );
@@ -83,6 +86,7 @@
  * @deprecated since 1.25, use UtfNormal\Utils directly
  */
 function utf8ToCodepoint( $char ) {
+   wfDeprecated( '1.25' );
return Utils::utf8ToCodepoint( $char );
 }
 
@@ -95,5 +99,6 @@
  * @deprecated since 1.25, use UtfNormal\Utils directly
  */
 function escapeSingleString( $string ) {
+   wfDeprecated( '1.25' );
return Utils::escapeSingleString( $string );
 }
diff --git a/maintenance/language/digit2html.php 
b/maintenance/language/digit2html.php
index bb1f3d2..fbc7f9b 100644
--- a/maintenance/language/digit2html.php
+++ b/maintenance/language/digit2html.php
@@ -21,6 +21,8 @@
  * @ingroup MaintenanceLanguage
  */
 
+use UtfNormal\Utils;
+
 require_once __DIR__ . '/../Maintenance.php';
 
 /**
@@ -57,12 +59,27 @@
 
$this->output( "OK\n\$digitTransformTable = [\n" );
foreach ( $digitTransformTable as $latin => 
$translation ) {
-   $htmlent = utf8ToHexSequence( $translation );
+   $htmlent = self::utf8ToHexSequence( 
$translation );
$this->output( "'$latin' => '$translation', # 


[MediaWiki-commits] [Gerrit] mediawiki...MathSearch[master]: Fix use of deprecated function

2017-08-14 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371983 )

Change subject: Fix use of deprecated function
..

Fix use of deprecated function

Change-Id: If2d6ffd1363a78cdc4adafd2b52ecacbb26e4056
---
M maintenance/BatchExport.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/maintenance/BatchExport.php b/maintenance/BatchExport.php
index bc7a762..117e5b2 100644
--- a/maintenance/BatchExport.php
+++ b/maintenance/BatchExport.php
@@ -19,6 +19,8 @@
  * @ingroup Maintenance
  */
 
+use UtfNormal\Utils;
+
 require_once __DIR__ . '/../../../maintenance/Maintenance.php';
 
 /**
@@ -57,7 +59,7 @@
foreach ( $res as $row ) {
$user = User::newFromId( $row->userId );
$username = $user->getName();
-   $runName = preg_replace( "#/#", "_", 
escapeSingleString( $row->runName ) );
+   $runName = preg_replace( "#/#", "_", 
Utils::escapeSingleString( $row->runName ) );
$fn = "$dir/$username-$runName-{$row->runId}.csv";
$this->output( "Export to file $fn.\n" );
$fh = fopen( $fn, 'w' );

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...InterwikiIntegration[master]: Get rid of deprecated function usage

2017-08-14 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371982 )

Change subject: Get rid of deprecated function usage
..

Get rid of deprecated function usage

Change-Id: I3bfea33df8100c5551ad67e2c37afb615358e82f
---
M InterwikiIntegrationChangesList.php
1 file changed, 2 insertions(+), 19 deletions(-)


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

diff --git a/InterwikiIntegrationChangesList.php 
b/InterwikiIntegrationChangesList.php
index 48150a0..bfa3c1b 100644
--- a/InterwikiIntegrationChangesList.php
+++ b/InterwikiIntegrationChangesList.php
@@ -507,7 +507,7 @@
 */
public function recentChangesLine( &$rc, $watched = false, $linenumber 
= null ) {
global $wgLang, $wgRCShowChangedSize, $wgUser;
-   wfProfileIn( __METHOD__ );
+
# Should patrol-related stuff be shown?
$unpatrolled = $wgUser->useRCPatrol() && 
!$rc->mAttribs['integration_rc_patrolled'];
 
@@ -581,7 +581,6 @@
 
Hooks::run( 
'OldInterwikiIntegrationChangesListRecentChangesLine', array(&$this, &$s, $rc) 
);
 
-   wfProfileOut( __METHOD__ );
return "$dateheader".$s."\n";
}
 }
@@ -610,8 +609,6 @@
 */
public function recentChangesLine( &$baseRC, $watched = false ) {
global $wgLang, $wgUser;
-
-   wfProfileIn( __METHOD__ );
 
# Create a specialised object
$rc = InterwikiIntegrationRCCacheEntry::newFromParent( $baseRC 
);
@@ -759,8 +756,6 @@
array_push( $this->integration_rc_cache[$secureName], 
$rc );
}
 
-   wfProfileOut( __METHOD__ );
-
return $ret;
}
 
@@ -769,8 +764,6 @@
 */
protected function recentChangesBlockGroup( $block ) {
global $wgLang, $wgContLang, $wgRCShowChangedSize;
-
-   wfProfileIn( __METHOD__ );
 
$r = '';
 
@@ -1015,8 +1008,6 @@
 
$this->rcCacheIndex++;
 
-   wfProfileOut( __METHOD__ );
-
return $r;
}
 
@@ -1060,7 +1051,7 @@
 * @return String: HTML  tag
 */
protected function spacerArrow() {
-   return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // 
non-breaking space
+   return $this->arrow( '', "\xC2\xA0" ); // non-breaking space
}
 
/**
@@ -1077,8 +1068,6 @@
 */
protected function recentChangesBlockLine( $rcObj ) {
global $wgRCShowChangedSize;
-
-   wfProfileIn( __METHOD__ );
 
# Extract fields from DB into the function scope 
(integration_rc_ variables)
// FIXME: Would be good to replace this extract() call with 
something
@@ -1148,8 +1137,6 @@
 
$r .= "\n";
 
-   wfProfileOut( __METHOD__ );
-
return $r;
}
 
@@ -1162,8 +1149,6 @@
return '';
}
 
-   wfProfileIn( __METHOD__ );
-
$blockOut = '';
foreach( $this->integration_rc_cache as $block ) {
if( count( $block ) < 2 ) {
@@ -1172,8 +1157,6 @@
$blockOut .= $this->recentChangesBlockGroup( 
$block );
}
}
-
-   wfProfileOut( __METHOD__ );
 
return ''.$blockOut.'';
}

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...IndexFunction[master]: Replace function call with string literal

2017-08-14 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371981 )

Change subject: Replace function call with string literal
..

Replace function call with string literal

Change-Id: I2c779324e62832e6632c4e07b8d02edb806d0afd
---
M SpecialIndex.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/SpecialIndex.php b/SpecialIndex.php
index 2d3dbaf..80c7dd8 100644
--- a/SpecialIndex.php
+++ b/SpecialIndex.php
@@ -84,7 +84,7 @@
}
 
protected function spacerArrow() {
-   return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // 
non-breaking space
+   return $this->arrow( '', "\xC2\xA0" ); // non-breaking space
}
 
// Since we're overriding reallyDoQuery, we don't really need this

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c779324e62832e6632c4e07b8d02edb806d0afd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/IndexFunction
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] wikimedia...golden[master]: Breakdown search API requests by referer class and use GetSe...

2017-08-14 Thread Chelsyx (Code Review)
Chelsyx has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371980 )

Change subject: Breakdown search API requests by referer class and use 
GetSearchRequestTypeUDF
..

Breakdown search API requests by referer class and use GetSearchRequestTypeUDF

Please do not merge this patch since the new UDF hasn’t been released to 
production.

Bug: T172452
Change-Id: Ia4aa5260fe243abeced91c67de8f44bdc9be859b
---
M modules/metrics/search/search_api_usage
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/80/371980/1

diff --git a/modules/metrics/search/search_api_usage 
b/modules/metrics/search/search_api_usage
index a0b1b7c..f9de476 100755
--- a/modules/metrics/search/search_api_usage
+++ b/modules/metrics/search/search_api_usage
@@ -1,11 +1,12 @@
 #!/bin/bash
 
 hive -S -e "ADD JAR hdfs:///wmf/refinery/current/artifacts/refinery-hive.jar;
-CREATE TEMPORARY FUNCTION search_classify AS 
'org.wikimedia.analytics.refinery.hive.SearchClassifierUDF';
+CREATE TEMPORARY FUNCTION search_classify AS 
'org.wikimedia.analytics.refinery.hive.GetSearchRequestTypeUDF';
 USE wmf;
 SELECT
   '$1' AS date,
   search_classify(uri_path, uri_query) AS api,
+  referer_class,
   COUNT(*) AS calls
 FROM webrequest
 WHERE
@@ -13,6 +14,6 @@
   AND CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1'
   AND CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
   AND http_status = '200'
-  AND search_classify(uri_path, uri_query) IN('language', 'cirrus', 'prefix', 
'geo', 'open')
-GROUP BY '$1', search_classify(uri_path, uri_query);
+  AND search_classify(uri_path, uri_query) IN('language', 'cirrus', 'cirrus 
(more like)', 'prefix', 'geo', 'open')
+GROUP BY '$1', search_classify(uri_path, uri_query), referer_class;
 " 2> /dev/null | grep -v parquet.hadoop | grep -v WARN:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4aa5260fe243abeced91c67de8f44bdc9be859b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 

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


[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Use jQuery for restoring the shuffled question numbers

2017-08-14 Thread Tacsipacsi (Code Review)
Tacsipacsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371979 )

Change subject: Use jQuery for restoring the shuffled question numbers
..

Use jQuery for restoring the shuffled question numbers

Use jQuery instead of JavaScript DOM methods for restoring the question
numbers' shuffled order after shuffling the questions. Use docstring
for documentation instead of a plain comment.

Change-Id: I053ad287293f1627c3a58ad13b126f2bdd42b576
---
M modules/ext.quiz.js
1 file changed, 8 insertions(+), 6 deletions(-)


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

diff --git a/modules/ext.quiz.js b/modules/ext.quiz.js
index bb98f78..b0fa697 100644
--- a/modules/ext.quiz.js
+++ b/modules/ext.quiz.js
@@ -72,13 +72,15 @@
}
}
 
-   // Reassign numbering to shuffled questions
+   /**
+* Reassign numbering to shuffled questions
+*
+* @param {jQuery} $area The shuffled quiz area.
+*/
function shuffleNumbering( $area ) {
-   $area = $area[0];
-   var list = $area.getElementsByClassName( 'questionId' );
-   for( var i =0; i < list.length ; ++i ) {
-   list[i].innerHTML = i+1;
-   }
+   $area.find( '.questionId' ).each( function ( i ) {
+   $( this ).text( i+1 );
+   } );
}
 
/** Prepare the quiz for "javascriptable" browsers

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Remove unneeded dependency on composer/installers

2017-08-14 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371977 )

Change subject: Remove unneeded dependency on composer/installers
..

Remove unneeded dependency on composer/installers

Change-Id: I7b50ef3dd2bdfc442d47517eaf7266fb49207c23
---
M composer.json
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/composer.json b/composer.json
index 86545d6..5e85c8c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,6 @@
"homepage": "https://www.mediawiki.org/wiki/Extension:AntiSpoof;,
"license": "GPL-2.0+",
"require": {
-   "composer/installers": "*",
"wikimedia/utfnormal": "1.1.0"
},
"require-dev": {

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Cleanup SpoofUser

2017-08-14 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371978 )

Change subject: Cleanup SpoofUser
..

Cleanup SpoofUser

* Explicitly define properties
* Rename them away from Hungarian notation
* Use proper DB class name
* Fix documentation

Change-Id: Ie9cc796aef7d824f7aa69eaaa7a91f2381f01537
---
M SpoofUser.php
1 file changed, 36 insertions(+), 23 deletions(-)


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

diff --git a/SpoofUser.php b/SpoofUser.php
index 630e0b6..8938a23 100644
--- a/SpoofUser.php
+++ b/SpoofUser.php
@@ -1,20 +1,33 @@
 mName = strval( $name );
-   list( $ok, $normalized ) = AntiSpoof::checkUnicodeString( 
$this->mName );
-   $this->mLegal = ( $ok == 'OK' );
-   if ( $this->mLegal ) {
-   $this->mNormalized = $normalized;
-   $this->mError = null;
+   $this->name = strval( $name );
+   list( $ok, $normalized ) = AntiSpoof::checkUnicodeString( 
$this->name );
+   $this->legal = ( $ok == 'OK' );
+   if ( $this->legal ) {
+   $this->normalized = $normalized;
+   $this->error = null;
} else {
-   $this->mNormalized = null;
-   $this->mError = $normalized;
+   $this->normalized = null;
+   $this->error = $normalized;
}
}
 
@@ -23,7 +36,7 @@
 * @return bool
 */
public function isLegal() {
-   return $this->mLegal;
+   return $this->legal;
}
 
/**
@@ -31,7 +44,7 @@
 * @return null|string
 */
public function getError() {
-   return $this->mError;
+   return $this->error;
}
 
/**
@@ -39,7 +52,7 @@
 * @return string|null
 */
public function getNormalized() {
-   return $this->mNormalized;
+   return $this->normalized;
}
 
/**
@@ -70,7 +83,7 @@
[ 'spoofuser', $this->getTableName() ],
[ 'su_name' ], // Same thing due to the join. Saves 
extra variableness
[
-   'su_normalized' => $this->mNormalized,
+   'su_normalized' => $this->normalized,
'su_name = ' . $this->getUserColumn(),
],
__METHOD__,
@@ -99,20 +112,20 @@
 */
private function insertFields() {
return [
-   'su_name'   => $this->mName,
-   'su_normalized' => $this->mNormalized,
-   'su_legal'  => $this->mLegal ? 1 : 0,
-   'su_error'  => $this->mError,
+   'su_name'   => $this->name,
+   'su_normalized' => $this->normalized,
+   'su_legal'  => $this->legal ? 1 : 0,
+   'su_error'  => $this->error,
];
}
 
/**
 * Insert a batch of spoof normalization records into the database.
-* @param $dbw DatabaseBase
-* @param $items array of SpoofUser
+* @param Database $dbw
+* @param SpoofUser[] $items
 * @return bool
 */
-   public static function batchRecord( $dbw, $items ) {
+   public static function batchRecord( Database $dbw, $items ) {
if ( !count( $items ) ) {
return false;
}
@@ -132,7 +145,7 @@
}
 
/**
-* @param $oldName
+* @param string $oldName
 */
public function update( $oldName ) {
$that = $this;
@@ -158,20 +171,20 @@
public function remove() {
$this->getDBMaster()->delete(
'spoofuser',
-   [ 'su_name' => $this->mName ],
+   [ 'su_name' => $this->name ],
__METHOD__
);
}
 
/**
-* @return DatabaseBase
+* @return Database
 */
protected function getDBSlave() {
return wfGetDB( DB_SLAVE );
}
 
/**
-* @return DatabaseBase
+* @return Database
 */
protected function getDBMaster() {
return wfGetDB( DB_MASTER );

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

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


[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Switch to librarized utfnormal

2017-08-14 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371976 )

Change subject: Switch to librarized utfnormal
..

Switch to librarized utfnormal

Change-Id: I9d0c646510a8ca774957a2182042b42c2a26e593
---
M AntiSpoof_body.php
M composer.json
2 files changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/AntiSpoof_body.php b/AntiSpoof_body.php
index 84b8d49..d6d424a 100644
--- a/AntiSpoof_body.php
+++ b/AntiSpoof_body.php
@@ -31,6 +31,7 @@
  * USA
  */
 
+use UtfNormal\Utils;
 use UtfNormal\Validator;
 
 class AntiSpoof {
@@ -225,7 +226,7 @@
}
$out = [];
foreach ( $ar[0] as $char ) {
-   $out[] = utf8ToCodepoint( $char );
+   $out[] = Utils::utf8ToCodepoint( $char );
}
return $out;
}
@@ -237,7 +238,7 @@
public static function listToString( $list ) {
$out = '';
foreach ( $list as $cp ) {
-   $out .= codepointToUtf8( $cp );
+   $out .= Utils::codepointToUtf8( $cp );
}
return $out;
}
@@ -282,7 +283,7 @@
 * @return Formatted error message.
 */
private static function badCharErr( $msgId, $point ) {
-   $symbol = codepointToUtf8( $point );
+   $symbol = Utils::codepointToUtf8( $point );
// Combining marks are combined with the previous character. If 
abusing character is a
// combining mark, prepend it with space to show them correctly.
if ( self::getScriptCode( $point ) == "SCRIPT_COMBINING_MARKS" 
) {
diff --git a/composer.json b/composer.json
index f630f5a..86545d6 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,8 @@
"homepage": "https://www.mediawiki.org/wiki/Extension:AntiSpoof;,
"license": "GPL-2.0+",
"require": {
-   "composer/installers": "*"
+   "composer/installers": "*",
+   "wikimedia/utfnormal": "1.1.0"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Remove manual implementation of AntiSpoof::equivString

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

Change subject: Remove manual implementation of AntiSpoof::equivString
..


Remove manual implementation of AntiSpoof::equivString

Cleaned ccnorm method to use AntiSpoof::normalizeString instead going
after AntiSpoof extension files and doing a manual implementation of it.
Also removed composer requirement for AntiSpoof extension.

Bug: T172766
Depends-On: I731733671b650b6bb2f480c41c4f6f2d2f5c62e8
Change-Id: Ib38ba0b06918e81e8af03032eef95e3942773bc1
---
M composer.json
M includes/parser/AbuseFilterParser.php
2 files changed, 10 insertions(+), 28 deletions(-)

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



diff --git a/composer.json b/composer.json
index 485f881..ebfd697 100644
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,7 @@
"license": "GPL-2.0+",
"require": {
"php": ">=5.4",
-   "composer/installers": "1.*,>=1.0.1",
-   "mediawiki/anti-spoof": "dev-master"
+   "composer/installers": "1.*,>=1.0.1"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
diff --git a/includes/parser/AbuseFilterParser.php 
b/includes/parser/AbuseFilterParser.php
index 097e248..f9bd15b 100644
--- a/includes/parser/AbuseFilterParser.php
+++ b/includes/parser/AbuseFilterParser.php
@@ -1106,34 +1106,17 @@
 * @return mixed
 */
protected function ccnorm( $s ) {
-   static $replacementArray = null;
-
-   if ( is_null( $replacementArray ) ) {
-   global $wgExtensionDirectory;
-
-   if ( is_readable( 
"$wgExtensionDirectory/AntiSpoof/equivset.php" ) ) {
-   // Satisfy analyzer.
-   $equivset = null;
-   // Contains a map of characters in $equivset.
-   require 
"$wgExtensionDirectory/AntiSpoof/equivset.php";
-
-   // strtr in ReplacementArray->replace() doesn't 
like this.
-   if ( isset( $equivset[''] ) ) {
-   unset( $equivset[''] );
-   }
-
-   $replacementArray = new ReplacementArray( 
$equivset );
-   } else {
-   // AntiSpoof isn't available, so just create a 
dummy
-   wfDebugLog(
-   'AbuseFilter',
-   "Can't compute normalized string 
(ccnorm) as the AntiSpoof Extension isn't installed."
-   );
-   $replacementArray = new ReplacementArray( [] );
-   }
+   if ( is_callable( 'AntiSpoof::normalizeString' ) ) {
+   $s = AntiSpoof::normalizeString( $s );
+   } else {
+   // AntiSpoof isn't available, so ignore and return same 
string
+   wfDebugLog(
+   'AbuseFilter',
+   "Can't compute normalized string (ccnorm) as 
the AntiSpoof Extension isn't installed."
+   );
}
 
-   return $replacementArray->replace( $s );
+   return $s;
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib38ba0b06918e81e8af03032eef95e3942773bc1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Dmaza 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Remove homemade implementation of strtr

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

Change subject: Remove homemade implementation of strtr
..


Remove homemade implementation of strtr

To make use of AntiSpoof normalization on larger texts the homemade
implementation of strtr was replaced. In order to do this,
generateEquivset needed to be fixed to generate a set with no duplicates
and no empty characters as keys. Also, moved away from serializing the
set (equivset.ser) using codepoints, not needed anymore.

Bug: T172766
Change-Id: I731733671b650b6bb2f480c41c4f6f2d2f5c62e8
---
M AntiSpoof_body.php
M equivset.php
M equivset.ser
M maintenance/generateEquivset.php
M tests/phpunit/AntiSpoofTest.php
5 files changed, 39 insertions(+), 3,897 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I731733671b650b6bb2f480c41c4f6f2d2f5c62e8
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Dmaza 
Gerrit-Reviewer: Dmaza 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Revert "Temporary don't require the 'database field"

2017-08-14 Thread Dereckson (Code Review)
Dereckson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371975 )

Change subject: Revert "Temporary don't require the 'database field"
..

Revert "Temporary don't require the 'database field"

The database field has been added to the JobQueueEventBus class
in commit 5d43d7dd.

This reverts commit 6f61a354bdad5bdf6b69510d4df1d17af4aced83.

Change-Id: Ibec41eafafa1b902041e93f85a1d7bac41ee70c9
---
M jsonschema/mediawiki/job/1.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/event-schemas 
refs/changes/75/371975/1

diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml
index caba2d5..630df4a 100644
--- a/jsonschema/mediawiki/job/1.yaml
+++ b/jsonschema/mediawiki/job/1.yaml
@@ -91,6 +91,7 @@
 
 required:
   - meta
+  - database
   - type
   - page_namespace
   - page_title
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibec41eafafa1b902041e93f85a1d7bac41ee70c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Dereckson 

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Remove obsolete flags from icons

2017-08-14 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371974 )

Change subject: WikimediaUI theme: Remove obsolete flags from icons
..

WikimediaUI theme: Remove obsolete flags from icons

Removing obsolete icon flags, where applicable and
'constructive' flag globally.

Bug: T173350
Change-Id: I5fd8b9f673e6c0f416ac4396050f281da173a336
---
M src/themes/wikimediaui/icons-alerts.json
M src/themes/wikimediaui/icons-content.json
M src/themes/wikimediaui/icons-editing-advanced.json
M src/themes/wikimediaui/icons-editing-core.json
M src/themes/wikimediaui/icons-editing-list.json
M src/themes/wikimediaui/icons-editing-styling.json
M src/themes/wikimediaui/icons-interactions.json
M src/themes/wikimediaui/icons-layout.json
M src/themes/wikimediaui/icons-location.json
M src/themes/wikimediaui/icons-media.json
M src/themes/wikimediaui/icons-moderation.json
M src/themes/wikimediaui/icons-movement.json
M src/themes/wikimediaui/icons-user.json
13 files changed, 6 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/74/371974/1

diff --git a/src/themes/wikimediaui/icons-alerts.json 
b/src/themes/wikimediaui/icons-alerts.json
index c169b56..991fddd 100644
--- a/src/themes/wikimediaui/icons-alerts.json
+++ b/src/themes/wikimediaui/icons-alerts.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
-   "constructive": {
-   "color": "#36c"
-   },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-content.json 
b/src/themes/wikimediaui/icons-content.json
index e952108..d37070a 100644
--- a/src/themes/wikimediaui/icons-content.json
+++ b/src/themes/wikimediaui/icons-content.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
-   "constructive": {
-   "color": "#36c"
-   },
"destructive": {
"color": "#d33"
},
@@ -72,7 +69,7 @@
"ltr": "images/icons/newspaper-ltr.svg",
"rtl": "images/icons/newspaper-rtl.svg"
} },
-   "tag": { "file": "images/icons/tag.svg", "variants": [ 
"destructive", "warning", "constructive" ] },
+   "tag": { "file": "images/icons/tag.svg", "variants": [ 
"destructive", "warning" ] },
"upload": { "file": {
"ltr": "images/icons/upload-ltr.svg",
"rtl": "images/icons/upload-rtl.svg"
diff --git a/src/themes/wikimediaui/icons-editing-advanced.json 
b/src/themes/wikimediaui/icons-editing-advanced.json
index b384422..d510ee2 100644
--- a/src/themes/wikimediaui/icons-editing-advanced.json
+++ b/src/themes/wikimediaui/icons-editing-advanced.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
-   "constructive": {
-   "color": "#36c"
-   },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-editing-core.json 
b/src/themes/wikimediaui/icons-editing-core.json
index 4515405..9a9293c 100644
--- a/src/themes/wikimediaui/icons-editing-core.json
+++ b/src/themes/wikimediaui/icons-editing-core.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
-   "constructive": {
-   "color": "#36c"
-   },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-editing-list.json 
b/src/themes/wikimediaui/icons-editing-list.json
index 3edb545..8ebef98 100644
--- a/src/themes/wikimediaui/icons-editing-list.json
+++ b/src/themes/wikimediaui/icons-editing-list.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
-   "constructive": {
-   "color": "#36c"
-   },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-editing-styling.json 
b/src/themes/wikimediaui/icons-editing-styling.json
index 85e47ee..7b1a0ac 100644
--- a/src/themes/wikimediaui/icons-editing-styling.json
+++ b/src/themes/wikimediaui/icons-editing-styling.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
-   "constructive": {
-   "color": "#36c"
-   },
"destructive": {
"color": "#d33"
},
diff 

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[wmf/1.30.0-wmf.11]: JobQueueEventBus: not set properties are accessed

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

Change subject: JobQueueEventBus: not set properties are accessed
..


JobQueueEventBus: not set properties are accessed

Change-Id: I0f021d716a6ed5ae42e6ae811347007c2f667c20
(cherry picked from commit da7696eddec1807d65edfe59e5d7ddc26f1beec8)
---
M JobQueueEventBus.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index ee7980e..b1da61f 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -96,10 +96,10 @@
foreach ( $jobs as $job ) {
$item = JobQueueEventBus::createJobEvent( $job );
// hash identifier => de-duplicate
-   if ( strlen( $item['sha1'] ) ) {
+   if ( isset( $item['sha1'] ) ) {
$events[$item['sha1']] = $item;
} else {
-   $events[$item['meta']['uuid']] = $item;
+   $events[$item['meta']['id']] = $item;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f021d716a6ed5ae42e6ae811347007c2f667c20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...EventBus[wmf/1.30.0-wmf.11]: JobQueueEventBus: Populate the database field.

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

Change subject: JobQueueEventBus: Populate the database field.
..


JobQueueEventBus: Populate the database field.

We require that all mediawiki-related events have a 'database'
field, so populate it for job events as well.

Once this is deployed, we need to revert 368246

Change-Id: I6e6b5cd088859413f32c30103f734f4dc405dc15
(cherry picked from commit 5d43d7dde0dc942a33609081e2bf11f3a933d3e7)
---
M JobQueueEventBus.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index 3bdba26..ee7980e 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -4,7 +4,10 @@
 class JobQueueEventBus extends JobQueue {
 
private static function createJobEvent( IJobSpecification $job ) {
+   global $wgDBname;
+
$attrs = [
+   'database' => $wgDBname,
'type' => $job->getType(),
'page_namespace' => $job->getTitle()->getNamespace(),
'page_title' => $job->getTitle()->getPrefixedDBkey()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e6b5cd088859413f32c30103f734f4dc405dc15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Separate out CodeMirror config data and add to VE mode

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

Change subject: Separate out CodeMirror config data and add to VE mode
..


Separate out CodeMirror config data and add to VE mode

Bug: T172958
Change-Id: I2d7969782ee9f02347f7aa0c7f0eebb2d592904d
---
M extension.json
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 70033f3..2fd2286 100644
--- a/extension.json
+++ b/extension.json
@@ -23,8 +23,8 @@
},
"ResourceModules": {
"ext.CodeMirror": {
-   "class": "ResourceLoaderCodeMirrorModule",
"dependencies": [
+   "ext.CodeMirror.data",
"ext.CodeMirror.lib",
"ext.CodeMirror.mode.mediawiki",
"jquery.textSelection",
@@ -49,6 +49,9 @@
"codemirror-popup-btn-yes",
"codemirror-popup-btn-no"
]
+   },
+   "ext.CodeMirror.data": {
+   "class": "ResourceLoaderCodeMirrorModule"
},
"ext.CodeMirror.lib": {
"scripts": [
@@ -122,6 +125,7 @@
},
"ext.CodeMirror.visualEditor": {
"dependencies": [
+   "ext.CodeMirror.data",
"ext.visualEditor.mwcore",
"ext.CodeMirror.lib",
"ext.CodeMirror.mode.mediawiki",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d7969782ee9f02347f7aa0c7f0eebb2d592904d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Look for dablinks when extracting hatnotes

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

Change subject: Look for dablinks when extracting hatnotes
..


Look for dablinks when extracting hatnotes

Certain wiki pages use older wiki templates and disambiguation links
are marked with .dablink

e.g.
https://en.wikivoyage.org/wiki/Mumbai

Change-Id: Ieac31f6492e9d8ca3c15f787d0e5a2925777af45
---
M lib/transformations/extractHatnotes.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/transformations/extractHatnotes.js 
b/lib/transformations/extractHatnotes.js
index e4bbd48..219dc5e 100644
--- a/lib/transformations/extractHatnotes.js
+++ b/lib/transformations/extractHatnotes.js
@@ -7,7 +7,7 @@
  */
 function extractHatnotes(lead, removeNodes) {
 const hatnotes = [];
-const hatnoteNodes = lead.querySelectorAll('.hatnote');
+const hatnoteNodes = lead.querySelectorAll('.hatnote,.dablink');
 Array.prototype.forEach.call(hatnoteNodes, (hatnoteNode, i) => {
 hatnotes.push(hatnoteNode.innerHTML);
 if (removeNodes) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieac31f6492e9d8ca3c15f787d0e5a2925777af45
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix broken tests

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

Change subject: Fix broken tests
..


Fix broken tests

1) Reflect template change:
   Link has changed from Help:IPA for English to Help:IPA/English
   https://en.m.wikipedia.org/wiki/Special:MobileDiff/794002013

2) The action API doesn't return a Wikidata description for Main Pages.
   See T172829

Bug: T172829
Change-Id: I91a840fa0d6e6fe5a57a235285dc4bbdf5297929
---
M spec.yaml
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section3-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section3-text.html
M test/features/mobile-sections/pagecontent.js
6 files changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/spec.yaml b/spec.yaml
index 6bb3913..164553d 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -630,7 +630,6 @@
 displaytitle: /.+/
 normalizedtitle: /.+/
 wikibase_item: Q5296
-description: /[Mm]ain [Pp]age/
 protection: /.+/
 editable: /.+/
 mainpage: true
diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index d80bea7..b9d2c8d 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -36,7 +36,7 @@
   },
   {
 "id": 3,
-"text": "\nKonjac (English:  
/ˈkoʊnjæk/
 KOHN-yak)\n\n",
+"text": "\nKonjac (English:  
/ˈkoʊnjæk/
 KOHN-yak)\n\n",
 "toclevel": 1,
 "line": "Pronunciation aids",
 "anchor": "Pronunciation_aids"
diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
index a6db74f..bb4dfad 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
@@ -1,5 +1,5 @@
 
-  Konjac (English:  /ˈkoʊnjæk/
+  Konjac (English:  /ˈkoʊnjæk/
   
   
KOHN-yak)
diff --git 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 7676792..244222d 100644
--- 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -190,7 +190,7 @@
   },
   {
 "id": 3,
-"text": "\nKonjac (English:  /ˈkoʊnjæk/
 KOHN-yak)\n\n",
+"text": "\nKonjac (English:  /ˈkoʊnjæk/
 KOHN-yak)\n\n",
 "toclevel": 1,
 "line": "Pronunciation aids",
 "anchor": "Pronunciation_aids"
diff --git 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
index 684cf49..8887298 100644
--- 
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
+++ 
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section3-text.html"
@@ -1,5 +1,5 @@
 
-  Konjac (English:  /ˈkoʊnjæk/
+  Konjac (English:  /ˈkoʊnjæk/
   
   
KOHN-yak)
diff --git a/test/features/mobile-sections/pagecontent.js 
b/test/features/mobile-sections/pagecontent.js
index 01f9c07..dc072f4 100644
--- a/test/features/mobile-sections/pagecontent.js
+++ b/test/features/mobile-sections/pagecontent.js
@@ -67,7 +67,6 @@
 assert.equal(lead.displaytitle, 'Main Page');
 assert.equal(lead.normalizedtitle, 'Main Page');
 assert.equal(lead.wikibase_item, 'Q5296');
-assert.ok(/main page/i.test(lead.description));
 assert.deepEqual(lead.protection, {
 "edit": [
 "sysop"

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix, i18n, PEP8] Make reflinks.py work smoothly

2017-08-14 Thread Dvorapa (Code Review)
Dvorapa has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371973 )

Change subject: [bugfix, i18n, PEP8] Make reflinks.py work smoothly
..

[bugfix, i18n, PEP8] Make reflinks.py work smoothly

- Allow running without localized stop page
- Allow running without localized dead link template (en fallback)
- Remove references to DumZiBoT as it is retired
- Remove broken localization messages
- Fix error with requests implementation (T155509)
- Fix Python 3.x and PEP8 errors

Bug: T123789
Bug: T155509
Change-Id: Iae0d25523fd68ac95b351f2ac9e3cc8484277df4
---
M scripts/reflinks.py
1 file changed, 20 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/73/371973/1

diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index c178b0c..272393e 100755
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -12,15 +12,12 @@
 The bot checks every 20 edits a special stop page. If the page has been edited,
 it stops.
 
-DumZiBoT is running that script on en: & fr: at every new dump, running it on
-de: is not allowed anymore.
+Warning: Running this script on German Wikipedia is not allowed anymore.
 
 As it uses it, you need to configure noreferences.py for your wiki, or it will
 not work.
 
 pdfinfo is needed for parsing pdf titles.
-
-See [[:en:User:DumZiBoT/refLinks]] for more information on the bot.
 
 
 
@@ -84,7 +81,7 @@
 # should be moved to MediaWiki Pywikibot manual
 
 
-stopPage = {
+stop_page = {
 'fr': u'Utilisateur:DumZiBoT/EditezCettePagePourMeStopper',
 'da': u'Bruger:DumZiBoT/EditThisPageToStopMe',
 'de': u'Benutzer:DumZiBoT/EditThisPageToStopMe',
@@ -102,9 +99,7 @@
 deadLinkTag = {
 'fr': u'[%s] {{lien mort}}',
 'da': u'[%s] {{dødt link}}',
-'de': u'',
 'fa': u'[%s] {{پیوند مرده}}',
-'he': u'{{קישור שבור}}',
 'hu': u'[%s] {{halott link}}',
 'ko': u'[%s] {{죽은 바깥 고리}}',
 'es': u'{{enlace roto2|%s}}',
@@ -215,7 +210,7 @@
 
 def refDead(self):
 """Dead link, tag it with a {{dead link}}."""
-tag = i18n.translate(self.site, deadLinkTag) % self.link
+tag = i18n.translate(self.site, deadLinkTag, fallback=['en']) % 
self.link
 return '%s' % (self.refname, tag)
 
 def transform(self, ispdf=False):
@@ -408,8 +403,6 @@
 self.msg = i18n.twtranslate(self.site, 'reflinks-msg', locals())
 else:
 self.msg = self.getOption('summary')
-self.stopPage = pywikibot.Page(self.site,
-   i18n.translate(self.site, stopPage))
 
 local = i18n.translate(self.site, badtitles)
 if local:
@@ -419,12 +412,17 @@
 self.titleBlackList = re.compile(bad, re.I | re.S | re.X)
 self.norefbot = noreferences.NoReferencesBot(None, verbose=False)
 self.deduplicator = DuplicateReferences()
-try:
-self.stopPageRevId = self.stopPage.latest_revision_id
-except pywikibot.NoPage:
-pywikibot.output(u'The stop page %s does not exist'
- % self.stopPage.title(asLink=True))
-raise
+
+if i18n.translate(self.site, stop_page):
+self.stop_page = pywikibot.Page(
+self.site,
+i18n.translate(self.site, stop_page)
+)
+if self.stop_page.latest_revision_id:
+self.stop_page_rev_id = self.stop_page.latest_revision_id
+else:
+pywikibot.output('Warning: The stop page %s does not exist'
+ % self.stop_page.title(asLink=True))
 
 # Regex to grasp content-type meta HTML tag in HTML source
 self.META_CONTENT = re.compile(br'(?i)]*content\-type[^>]*>')
@@ -454,7 +452,7 @@
 """
 pywikibot.output(u'PDF file.')
 fd, infile = tempfile.mkstemp()
-urlobj = os.fdopen(fd, 'r+w')
+urlobj = os.fdopen(fd, 'w+')
 urlobj.write(f.content)
 
 try:
@@ -473,7 +471,7 @@
 pywikibot.output(u'pdfinfo value error.')
 except OSError:
 pywikibot.output(u'pdfinfo OS error.')
-except:  # Ignore errors
+except BaseException:  # Ignore errors
 pywikibot.output(u'PDF processing error.')
 pass
 finally:
@@ -583,7 +581,7 @@
 new_text = new_text.replace(match.group(), repl)
 continue
 
-linkedpagetext = f.content
+linkedpagetext = f.raw
 except UnicodeError:
 # example : 
http://www.adminet.com/jo/20010615¦/ECOC0100037D.html
 # in [[fr:Cyanure]]
@@ -726,11 +724,11 @@
 if editedpages % 20 == 0:
 pywikibot.output(color_format(
 '{lightgreen}Checking stop page...{default}'))
-

[MediaWiki-commits] [Gerrit] analytics/reportupdater[master]: Fix graphite tests

2017-08-14 Thread Mforns (Code Review)
Mforns has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371972 )

Change subject: Fix graphite tests
..


Fix graphite tests

Bug: T173345
Change-Id: I48eb59faf41498b2c38b0b1dd266f15955a4e6b0
---
M test/graphite_test.py
1 file changed, 19 insertions(+), 30 deletions(-)

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



diff --git a/test/graphite_test.py b/test/graphite_test.py
index 237cdef..a5ad53b 100644
--- a/test/graphite_test.py
+++ b/test/graphite_test.py
@@ -10,10 +10,10 @@
 from unittest import TestCase
 from datetime import datetime
 from mock import call, MagicMock
+import time
 
 
 class GraphiteTest(TestCase):
-
 
 def setUp(self):
 self.config = load_config('test/fixtures/config/graphite_test1.yaml')
@@ -30,22 +30,6 @@
 executor = Executor(selector, self.config)
 self.writer = Writer(executor, self.config, self.graphite)
 
-self.report = Report()
-self.report.key = 'graphite_test1'
-self.report.sql_template = 'SOME sql TEMPLATE;'
-self.report.results = {
-'header': ['date', 'value'],
-'data': {
-datetime(2015, 1, 1): [datetime(2015, 1, 1), '1']
-}
-}
-self.report_config = self.config['reports'][self.report.key]
-self.report.graphite = self.report_config['graphite']
-self.report.explode_by = {
-'wiki': 'enwiki',
-'editor': 'wikitext',
-}
-
 
 def tearDown(self):
 self.graphite.record = self.graphite_record_stash
@@ -53,26 +37,31 @@
 
 
 def test_send_new_dates_to_graphite(self):
-old_date = datetime(2015, 1, 1)
-new_date_1 = datetime(2015, 1, 2)
-new_date_2 = datetime(2015, 1, 3)
-new_row_1 = [new_date_1, 1, 2, 3]
-new_row_2 = [new_date_2, 1, 2, 3]
+self.report = Report()
+self.report.key = 'graphite_test1'
 self.report.granularity = 'days'
-self.report.start = old_date
+self.report.graphite = 
self.config['reports'][self.report.key]['graphite']
+self.report.explode_by = {
+'wiki': 'enwiki',
+'editor': 'wikitext',
+}
+self.report.start = datetime(2015, 1, 1)
 self.report.results = {
 'header': ['date', 'val1', 'val2', 'val3'],
 'data': {
-new_date_1: new_row_1,
-new_date_2: new_row_2,
+datetime(2015, 1, 2): [datetime(2015, 1, 2), 1, 2, 3],
+datetime(2015, 1, 3): [datetime(2015, 1, 3), 1, 2, 3],
 }
 }
-header, updated_data, new_dates = 
self.writer.update_results(self.report)
 
+header, updated_data, new_dates = 
self.writer.update_results(self.report)
 self.writer.record_to_graphite(self.report, new_dates)
+
+expected_date1 = time.mktime(datetime(2015, 1, 2).timetuple())
+expected_date2 = time.mktime(datetime(2015, 1, 3).timetuple())
 self.graphite.record.assert_has_calls([
-call('metric_name_one.en.wiki.wikitext', 1, 1420174800.0),
-call('metric_name_two.en.wiki.wikitext', 3, 1420174800.0),
-call('metric_name_one.en.wiki.wikitext', 1, 1420261200.0),
-call('metric_name_two.en.wiki.wikitext', 3, 1420261200.0),
+call('metric_name_one.en.wiki.wikitext', 1, expected_date1),
+call('metric_name_two.en.wiki.wikitext', 3, expected_date1),
+call('metric_name_one.en.wiki.wikitext', 1, expected_date2),
+call('metric_name_two.en.wiki.wikitext', 3, expected_date2),
 ], any_order=True)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48eb59faf41498b2c38b0b1dd266f15955a4e6b0
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater
Gerrit-Branch: master
Gerrit-Owner: Mforns 
Gerrit-Reviewer: Mforns 
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/reportupdater[master]: Fix graphite tests

2017-08-14 Thread Mforns (Code Review)
Mforns has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371972 )

Change subject: Fix graphite tests
..

Fix graphite tests

Bug: T173345
Change-Id: I48eb59faf41498b2c38b0b1dd266f15955a4e6b0
---
M test/graphite_test.py
1 file changed, 19 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater 
refs/changes/72/371972/1

diff --git a/test/graphite_test.py b/test/graphite_test.py
index 237cdef..a5ad53b 100644
--- a/test/graphite_test.py
+++ b/test/graphite_test.py
@@ -10,10 +10,10 @@
 from unittest import TestCase
 from datetime import datetime
 from mock import call, MagicMock
+import time
 
 
 class GraphiteTest(TestCase):
-
 
 def setUp(self):
 self.config = load_config('test/fixtures/config/graphite_test1.yaml')
@@ -30,22 +30,6 @@
 executor = Executor(selector, self.config)
 self.writer = Writer(executor, self.config, self.graphite)
 
-self.report = Report()
-self.report.key = 'graphite_test1'
-self.report.sql_template = 'SOME sql TEMPLATE;'
-self.report.results = {
-'header': ['date', 'value'],
-'data': {
-datetime(2015, 1, 1): [datetime(2015, 1, 1), '1']
-}
-}
-self.report_config = self.config['reports'][self.report.key]
-self.report.graphite = self.report_config['graphite']
-self.report.explode_by = {
-'wiki': 'enwiki',
-'editor': 'wikitext',
-}
-
 
 def tearDown(self):
 self.graphite.record = self.graphite_record_stash
@@ -53,26 +37,31 @@
 
 
 def test_send_new_dates_to_graphite(self):
-old_date = datetime(2015, 1, 1)
-new_date_1 = datetime(2015, 1, 2)
-new_date_2 = datetime(2015, 1, 3)
-new_row_1 = [new_date_1, 1, 2, 3]
-new_row_2 = [new_date_2, 1, 2, 3]
+self.report = Report()
+self.report.key = 'graphite_test1'
 self.report.granularity = 'days'
-self.report.start = old_date
+self.report.graphite = 
self.config['reports'][self.report.key]['graphite']
+self.report.explode_by = {
+'wiki': 'enwiki',
+'editor': 'wikitext',
+}
+self.report.start = datetime(2015, 1, 1)
 self.report.results = {
 'header': ['date', 'val1', 'val2', 'val3'],
 'data': {
-new_date_1: new_row_1,
-new_date_2: new_row_2,
+datetime(2015, 1, 2): [datetime(2015, 1, 2), 1, 2, 3],
+datetime(2015, 1, 3): [datetime(2015, 1, 3), 1, 2, 3],
 }
 }
-header, updated_data, new_dates = 
self.writer.update_results(self.report)
 
+header, updated_data, new_dates = 
self.writer.update_results(self.report)
 self.writer.record_to_graphite(self.report, new_dates)
+
+expected_date1 = time.mktime(datetime(2015, 1, 2).timetuple())
+expected_date2 = time.mktime(datetime(2015, 1, 3).timetuple())
 self.graphite.record.assert_has_calls([
-call('metric_name_one.en.wiki.wikitext', 1, 1420174800.0),
-call('metric_name_two.en.wiki.wikitext', 3, 1420174800.0),
-call('metric_name_one.en.wiki.wikitext', 1, 1420261200.0),
-call('metric_name_two.en.wiki.wikitext', 3, 1420261200.0),
+call('metric_name_one.en.wiki.wikitext', 1, expected_date1),
+call('metric_name_two.en.wiki.wikitext', 3, expected_date1),
+call('metric_name_one.en.wiki.wikitext', 1, expected_date2),
+call('metric_name_two.en.wiki.wikitext', 3, expected_date2),
 ], any_order=True)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48eb59faf41498b2c38b0b1dd266f15955a4e6b0
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater
Gerrit-Branch: master
Gerrit-Owner: Mforns 

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


[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Show error message in a scrollable view in landscape mode

2017-08-14 Thread Jcasariego (Code Review)
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371970 )

Change subject: Show error message in a scrollable view in landscape mode
..

Show error message in a scrollable view in landscape mode

To solve the problem of the error view that can not be seen completely when the 
device is offline is added a NestedScrollView.

Bug: T172701
Change-Id: I0f2e53de4179a8d33dfd52abe66290bbe706ddae
---
M app/src/main/res/layout/view_wiki_error.xml
1 file changed, 67 insertions(+), 55 deletions(-)


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

diff --git a/app/src/main/res/layout/view_wiki_error.xml 
b/app/src/main/res/layout/view_wiki_error.xml
index cb514f0..e890a3d 100644
--- a/app/src/main/res/layout/view_wiki_error.xml
+++ b/app/src/main/res/layout/view_wiki_error.xml
@@ -2,71 +2,83 @@
 http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
 xmlns:tools="http://schemas.android.com/tools;
-tools:parentTag="LinearLayout"
-tools:orientation="vertical"
+tools:layout_height="wrap_content"
 tools:layout_width="wrap_content"
-tools:layout_height="wrap_content">
+tools:orientation="vertical"
+tools:parentTag="LinearLayout">
 
-
+android:layout_height="match_parent"
+android:fillViewport="true">
 
-
+android:orientation="vertical">
 
-
+
 
-
+
 
-
-
+
 
-
+
 
-
+
+
 
-
-
+
+
+
+
+
+
+
+
 

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 71baac4

2017-08-14 Thread Mobrovac (Code Review)
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371969 )

Change subject: Update restbase to 71baac4
..


Update restbase to 71baac4

List of changes:
71baac4 Parsoid: Bug fix: Get all of the components from the old tables

Change-Id: I63929acee66ec54eca8271c04268cb9e301b9475
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/restbase b/restbase
index 410c04d..71baac4 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 410c04dfa913fd086f044213f23633641e8769c0
+Subproject commit 71baac4b17422dfa2f27a03e54a17c8f670ee2b6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63929acee66ec54eca8271c04268cb9e301b9475
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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


[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 71baac4

2017-08-14 Thread Mobrovac (Code Review)
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371969 )

Change subject: Update restbase to 71baac4
..

Update restbase to 71baac4

List of changes:
71baac4 Parsoid: Bug fix: Get all of the components from the old tables

Change-Id: I63929acee66ec54eca8271c04268cb9e301b9475
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/69/371969/1

diff --git a/restbase b/restbase
index 410c04d..71baac4 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 410c04dfa913fd086f044213f23633641e8769c0
+Subproject commit 71baac4b17422dfa2f27a03e54a17c8f670ee2b6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63929acee66ec54eca8271c04268cb9e301b9475
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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


[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix the order of conditions when choosing the correct method

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

Change subject: Fix the order of conditions when choosing the correct method
..


Fix the order of conditions when choosing the correct method

It seems that move actions have rc_this_oldid set. rc_log_type
should have higher priority.

Bug: T170586
Change-Id: I9bb4ea599f12ef01fad823ac3232330966b0d281
---
M includes/AbuseFilter.class.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 224a982..779a6d2 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -2076,13 +2076,13 @@
 * @return AbuseFilterVariableHolder|null
 */
public static function getVarsFromRCRow( $row ) {
-   if ( $row->rc_this_oldid ) {
-   // It's an edit.
-   $vars = self::getEditVarsFromRCRow( $row );
-   } elseif ( $row->rc_log_type == 'move' ) {
+   if ( $row->rc_log_type == 'move' ) {
$vars = self::getMoveVarsFromRCRow( $row );
} elseif ( $row->rc_log_type == 'newusers' ) {
$vars = self::getCreateVarsFromRCRow( $row );
+   } elseif ( $row->rc_this_oldid ) {
+   // It's an edit.
+   $vars = self::getEditVarsFromRCRow( $row );
} else {
return null;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bb4ea599f12ef01fad823ac3232330966b0d281
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: NoRandom 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Allow to regenerate computed dblists

2017-08-14 Thread Dereckson (Code Review)
Dereckson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371968 )

Change subject: Allow to regenerate computed dblists
..

Allow to regenerate computed dblists

The .dblist files are repeated in the Makefile, so we're sure
it's compatible both with BSD Make and GNU Make.

Bug: T173342
Change-Id: I90942e2642c4573b222ec76ef2516a9cb94a8b8a
---
A dblists/Makefile
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/dblists/Makefile b/dblists/Makefile
new file mode 100644
index 000..d350169
--- /dev/null
+++ b/dblists/Makefile
@@ -0,0 +1,15 @@
+EXPANDDBLIST=../multiversion/bin/expanddblist
+
+all: flow.dblist nowikidatadescriptiontaglines.dblist wikipedia-english.dblist
+
+clean:
+   rm -f flow.dblist nowikidatadescriptiontaglines.dblist 
wikipedia-english.dblist
+
+flow.dblist:
+   ${EXPANDDBLIST} flow-computed.dblist > flow.dblist
+
+nowikidatadescriptiontaglines.dblist:
+   ${EXPANDDBLIST} nowikidatadescriptiontaglines-computed.dblist > 
nowikidatadescriptiontaglines.dblist
+
+wikipedia-english.dblist:
+   ${EXPANDDBLIST} wikipedia-english-computed.dblist > 
wikipedia-english.dblist

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

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

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix notice when no argument is given

2017-08-14 Thread Dereckson (Code Review)
Dereckson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371967 )

Change subject: Fix notice when no argument is given
..

Fix notice when no argument is given

Bug: T173342
Change-Id: I99ca485982ba5ce57c98e0cbebd413920c0095b9
---
M multiversion/bin/expanddblist
1 file changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/multiversion/bin/expanddblist b/multiversion/bin/expanddblist
index 58b703e..10e877b 100755
--- a/multiversion/bin/expanddblist
+++ b/multiversion/bin/expanddblist
@@ -1,11 +1,14 @@
 #!/usr/bin/env php
 ,  or ]";
+
+if ( $argc < 2 ) {
+   print "Usage: expanddblist [,  or ]\nb";
exit( 1 );
 }
+
+$param = trim( $argv[1] );
+
 foreach ( MWWikiversions::evalDbListExpression( $param ) as $wiki ) {
echo "$wiki\n";
 }

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

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

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix expanddblist shebang

2017-08-14 Thread Dereckson (Code Review)
Dereckson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371966 )

Change subject: Fix expanddblist shebang
..

Fix expanddblist shebang

Change-Id: I625062b2a399b75037feb8851ef0286fa13c8894
---
M multiversion/bin/expanddblist
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/multiversion/bin/expanddblist b/multiversion/bin/expanddblist
index 1bfa251..58b703e 100755
--- a/multiversion/bin/expanddblist
+++ b/multiversion/bin/expanddblist
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 https://gerrit.wikimedia.org/r/371966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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


[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove ext-datavalues

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

Change subject: Remove ext-datavalues
..


Remove ext-datavalues

Change-Id: I6931a3846423b1a656473409a5d623509fea1965
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index dc65f2d..79c92b2 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -33,11 +33,6 @@
   - ext-contributiontracking # wikimediafoundation.org
   - ext-creditssource # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
   - ext-dashiki
-  - ext-datavalues # Needed for Wikibase
-  - ext-datavalues-datatypes # Needed for Wikibase
-  - ext-datavalues-valueformatters # Needed for Wikibase
-  - ext-datavalues-valueparsers # Needed for Wikibase
-  - ext-datavalues-valuevalidators # Needed for Wikibase
   - ext-di-gc
   - ext-di-pfpg # wikimediafoundation.org
   - ext-diff

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6931a3846423b1a656473409a5d623509fea1965
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: update.php: Check for outdated composer deps of extensions

2017-08-14 Thread TheDJ (Code Review)
TheDJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371965 )

Change subject: update.php: Check for outdated composer deps of extensions
..

update.php: Check for outdated composer deps of extensions

Bug: T119711
Change-Id: I6d4f427eb255b6638ac51ae5537d62d2fe54d37d
---
M maintenance/checkComposerLockUpToDate.php
1 file changed, 46 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/371965/1

diff --git a/maintenance/checkComposerLockUpToDate.php 
b/maintenance/checkComposerLockUpToDate.php
index b504bde..afbcc15 100644
--- a/maintenance/checkComposerLockUpToDate.php
+++ b/maintenance/checkComposerLockUpToDate.php
@@ -10,24 +10,51 @@
  * the composer.json file to see if dependencies are up to date.
  */
 class CheckComposerLockUpToDate extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->addDescription(
'Checks whether your composer.lock file is up to date 
with the current composer.json' );
+   $this->addOption( 'without-extensions', 'Also recurse the 
extensions folder' );
}
 
public function execute() {
global $IP;
-   $lockLocation = "$IP/composer.lock";
-   $jsonLocation = "$IP/composer.json";
+
+   $this->updateComposerDirectory( "$IP", true );
+
+   if ( $this->hasOption( 'without-extensions' ) ) {
+   return;
+   }
+
+   $installedExtensions = 
ExtensionRegistry::getInstance()->getAllThings();
+
+   foreach ( $installedExtensions as $extensionName => 
$extensionInfo ) {
+   $directory = dirname( $extensionInfo[ 'path' ] );
+   if ( !$this->isSuitablePath( $directory ) ) {
+   continue;
+   }
+   $this->output( "Checking composer dependencies for: 
$extensionName\n" );
+   $this->updateComposerDirectory( dirname( 
$extensionInfo[ 'path' ] ) );
+   }
+   }
+
+   public function updateComposerDirectory( $directory, $root = false ) {
+   global $IP;
+   $lockLocation = "$directory/composer.lock";
+   $jsonLocation = "$directory/composer.json";
+   $workingDir = $root ? '' : " -d \"{$directory}\"";
+
if ( !file_exists( $lockLocation ) ) {
// Maybe they're using mediawiki/vendor?
$lockLocation = "$IP/vendor/composer.lock";
if ( !file_exists( $lockLocation ) ) {
$this->error(
-   'Could not find composer.lock file. 
Have you run "composer install"?',
-   1
+   "Could not find composer.lock file.\n" .
+   "Have you run 'composer 
install{$workingDir}' ?\n",
+   $root ? true : false
);
+   return;
}
}
 
@@ -53,7 +80,7 @@
if ( $found ) {
$this->error(
'Error: your composer.lock file is not up to 
date. ' .
-   'Run "composer update" to install newer 
dependencies',
+   "Run 'composer update{$workingDir}' to 
install newer dependencies",
1
);
} else {
@@ -61,6 +88,20 @@
$this->output( "Your composer.lock file is up to date 
with current dependencies!\n" );
}
}
+
+   /**
+* Returns true if $directory is of a type we can check
+* @param string $directory
+* @return bool
+*/
+   private function isSuitablePath( $directory ) {
+   $directory = str_replace( '\\', '/', $directory );
+   if ( file_exists( "$directory/composer.json" ) ) {
+   return true;
+   }
+
+   return false;
+   }
 }
 
 $maintClass = 'CheckComposerLockUpToDate';

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

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

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


[MediaWiki-commits] [Gerrit] analytics/reportupdater[master]: README.md: update link

2017-08-14 Thread Bearloga (Code Review)
Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371964 )

Change subject: README.md: update link
..

README.md: update link

This patch is to update the link to Reportupdater's wiki page
and to double-check that there's no issue with the CI.

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


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater 
refs/changes/64/371964/1

diff --git a/README.md b/README.md
index bd0f39c..fc49e83 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 reportupdater
 =
-For documentation see: 
https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater
+For documentation see: 
[Analytics/Systems/Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Systems/Reportupdater)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I033d9dc135f54c7352b27f23b61971bb923ff119
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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


[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Remove duplicated clicks on the same position for each query...

2017-08-14 Thread Bearloga (Code Review)
Bearloga has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370977 )

Change subject: Remove duplicated clicks on the same position for each query 
when computing paulscore
..


Remove duplicated clicks on the same position for each query when computing 
paulscore

Bug: T172960
Change-Id: I972500c6150408a119f2c80dad9fe8a49f00845e
---
M modules/metrics/search/paulscore_approximations.R
1 file changed, 21 insertions(+), 9 deletions(-)

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



diff --git a/modules/metrics/search/paulscore_approximations.R 
b/modules/metrics/search/paulscore_approximations.R
index 1f7fe9f..4c640ff 100644
--- a/modules/metrics/search/paulscore_approximations.R
+++ b/modules/metrics/search/paulscore_approximations.R
@@ -2,7 +2,10 @@
 
 source("config.R")
 .libPaths(r_library)
-suppressPackageStartupMessages(library("optparse"))
+suppressPackageStartupMessages({
+  library("optparse")
+  library("glue")
+})
 
 option_list <- list(
   make_option(c("-d", "--date"), default = NA, action = "store", type = 
"character"),
@@ -19,10 +22,15 @@
 }
 
 # Build query:
-date_clause <- as.character(as.Date(opt$date), format = "LEFT(timestamp, 8) = 
'%Y%m%d'")
+mmdd <- format(as.Date(opt$date), "%Y%m%d")
+revision <- dplyr::case_when(
+  as.Date(opt$date) < "2017-02-10" ~ "15922352",
+  as.Date(opt$date) < "2017-06-29" ~ "16270835",
+  TRUE ~ "16909631"
+)
 
-query <-paste0("SELECT
-  DATE('", opt$date, "') AS date,
+query <- glue("SELECT
+  DATE('{opt$date}') AS date,
   event_searchSessionId,
   event_source,
   wiki,
@@ -35,11 +43,15 @@
   SUM(IF(event_action = 'click', POW(0.7, event_position), 0)) / 
SUM(IF(event_action = 'searchResultPage', 1, 0)) AS pow_7,
   SUM(IF(event_action = 'click', POW(0.8, event_position), 0)) / 
SUM(IF(event_action = 'searchResultPage', 1, 0)) AS pow_8,
   SUM(IF(event_action = 'click', POW(0.9, event_position), 0)) / 
SUM(IF(event_action = 'searchResultPage', 1, 0)) AS pow_9
-FROM TestSearchSatisfaction2_", dplyr::if_else(as.Date(opt$date) < 
"2017-02-10", "15922352", dplyr::if_else(as.Date(opt$date) < "2017-06-29", 
"16270835", "16909631")), "
-WHERE ", date_clause, "
-  AND event_action IN ('searchResultPage', 'click')
-  AND IF(event_source = 'autocomplete', event_inputLocation = 'header', TRUE)
-  AND IF(event_source = 'autocomplete' AND event_action = 'click', 
event_position >= 0, TRUE)
+FROM (
+  SELECT DISTINCT
+event_searchSessionId, event_source, wiki, event_action, event_position, 
event_pageViewId, event_query
+  FROM TestSearchSatisfaction2_{revision}
+  WHERE LEFT(timestamp, 8) = {mmdd}
+AND event_action IN ('searchResultPage', 'click')
+AND IF(event_source = 'autocomplete', event_inputLocation = 'header', TRUE)
+AND IF(event_source = 'autocomplete' AND event_action = 'click', 
event_position >= 0, TRUE)
+) AS deduplicate
 GROUP BY date, event_searchSessionId, event_source, wiki;")
 
 # Fetch data from MySQL database:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I972500c6150408a119f2c80dad9fe8a49f00845e
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 
Gerrit-Reviewer: Bearloga 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Set elasticsearch servers to use 128kB readahead

2017-08-14 Thread EBernhardson (Code Review)
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371963 )

Change subject: Set elasticsearch servers to use 128kB readahead
..

Set elasticsearch servers to use 128kB readahead

128kB is the default readahead that is used in most circumstances
by the linux kernel. For some reason though the raid0 arrays on
elastic1017-1031 decided to use a readahead of 2048kB. This leads
to them bringing in signifcant amounts of unnecessary data and
reduces the ability of the page cache to buffer the data elasticsearch
needs.

Bug: T169498
Change-Id: Idbf8d88aadbaaae64b595d2f0d08f596e15f1457
---
M modules/profile/manifests/elasticsearch.pp
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/371963/1

diff --git a/modules/profile/manifests/elasticsearch.pp 
b/modules/profile/manifests/elasticsearch.pp
index 24115fd..c6aa3f0 100644
--- a/modules/profile/manifests/elasticsearch.pp
+++ b/modules/profile/manifests/elasticsearch.pp
@@ -63,6 +63,20 @@
 require => Package['elasticsearch/plugins'],
 }
 
+file { '/etc/udev/rules.d/elasticsearch-md2.rules':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => 'SUBSYSTEM=="block", KERNEL=="md2", ACTION=="add|change", 
ATTR{bdi/read_ahead_kb}="128"',
+notify  => Exec['elasticsearch_udev_reload'],
+}
+
+exec { 'elasticsearch_udev_reload':
+command => '/sbin/udevadm control --reload && /sbin/udevadm 
trigger',
+refreshonly => true,
+}
+
 # Install
 class { '::elasticsearch':
 require=> [

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Switch elastic1017-1031 to niofs"

2017-08-14 Thread EBernhardson (Code Review)
Hello jenkins-bot, Gehel,

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

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

to review the following change.


Change subject: Revert "Switch elastic1017-1031 to niofs"
..

Revert "Switch elastic1017-1031 to niofs"

While niofs did provide some level of bandaid, the source of
the issue has been traced down to readahead on the raid
array. There is an open question of how niofs avoided the
readahead, perhaps linux's adaptive readahead only works with
standard file access and is skipped for mmap. Either way this
is no longer necessary and we will continue using the default
mmap storage implementation.

This reverts commit 288336361dbe0eac62da589cdd2a86610b0a3185.

Bug: T169498
Change-Id: Ib0b510eb4a6b564f041431b711830e5c13ab8068
---
M hieradata/regex.yaml
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/templates/elasticsearch_5.yml.erb
M modules/profile/manifests/elasticsearch.pp
4 files changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/371962/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index bb995c2..dbaa90d 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -38,10 +38,6 @@
   profile::elasticsearch::rack: D5
   profile::elasticsearch::row:  D
 
-es_eqiad_niofs:
-__regex: !ruby/regexp /^elastic10(1\d|2\d|30|31)\.eqiad\.wmnet$/
-profile::elasticsearch::index_store: niofs
-
 es_eqiad_rack_a3:
   __regex: !ruby/regexp 
/^(elastic10(30|31|32|33|34|35)|relforge1001)\.eqiad\.wmnet$/
   profile::elasticsearch::rack: A3
diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 4f82e84..fef01ae 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -80,10 +80,6 @@
 #and port are used. Defaults to undef, which means no remote reindex 
can occur.
 # - $script_max_compilations_per_minute: integer, max number of script
 #compilations per minute, defaults to undef (see T171579).
-# - $index_store: Sets the storage implementation elasticsearch will use to
-#access index data. Defaults to fs which lets elasticsearch decide.
-#This should almost always be fs unless there is a specific issue to
-#be solved.
 #
 # == Sample usage:
 #
@@ -124,7 +120,6 @@
 $curator_uses_unicast_hosts = true,
 $reindex_remote_whitelist = undef,
 $script_max_compilations_per_minute = undef,
-$index_store = 'fs',
 ) {
 
 # Check arguments
diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb 
b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
index b4a2d59..196931d 100644
--- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
@@ -135,7 +135,6 @@
 # Use the Index Status API () to inspect
 # the index status.
 
-index.store.type: <%= @index_store %>
 
  Paths 
 
diff --git a/modules/profile/manifests/elasticsearch.pp 
b/modules/profile/manifests/elasticsearch.pp
index 24115fd..b84f3f9 100644
--- a/modules/profile/manifests/elasticsearch.pp
+++ b/modules/profile/manifests/elasticsearch.pp
@@ -29,7 +29,6 @@
 $recover_after_nodes = 
hiera('profile::elasticsearch::recover_after_nodes', 1),
 $search_shard_count_limit = 
hiera('profile::elasticsearch::search_shard_count_limit'),
 $reindex_remote_whitelist = 
hiera('profile::elasticsearch::reindex_remote_whitelist'),
-$index_store = hiera('profile::elasticsearch::index_store', 'fs'),
 ) {
 $master_eligible = $::fqdn in $unicast_hosts
 
@@ -101,7 +100,6 @@
 search_shard_count_limit   => $search_shard_count_limit,
 reindex_remote_whitelist   => $reindex_remote_whitelist,
 script_max_compilations_per_minute => 1,
-index_store=> $index_store,
 }
 
 class { '::elasticsearch::https':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0b510eb4a6b564f041431b711830e5c13ab8068
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Gehel 
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...EventBus[wmf/1.30.0-wmf.11]: JobQueueEventBus: not set properties are accessed

2017-08-14 Thread Ppchelko (Code Review)
Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371961 )

Change subject: JobQueueEventBus: not set properties are accessed
..

JobQueueEventBus: not set properties are accessed

Change-Id: I0f021d716a6ed5ae42e6ae811347007c2f667c20
(cherry picked from commit da7696eddec1807d65edfe59e5d7ddc26f1beec8)
---
M JobQueueEventBus.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus 
refs/changes/61/371961/1

diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index ee7980e..b1da61f 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -96,10 +96,10 @@
foreach ( $jobs as $job ) {
$item = JobQueueEventBus::createJobEvent( $job );
// hash identifier => de-duplicate
-   if ( strlen( $item['sha1'] ) ) {
+   if ( isset( $item['sha1'] ) ) {
$events[$item['sha1']] = $item;
} else {
-   $events[$item['meta']['uuid']] = $item;
+   $events[$item['meta']['id']] = $item;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f021d716a6ed5ae42e6ae811347007c2f667c20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Ppchelko 

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


[MediaWiki-commits] [Gerrit] mediawiki...EventBus[wmf/1.30.0-wmf.11]: JobQueueEventBus: Populate the database field.

2017-08-14 Thread Ppchelko (Code Review)
Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371960 )

Change subject: JobQueueEventBus: Populate the database field.
..

JobQueueEventBus: Populate the database field.

We require that all mediawiki-related events have a 'database'
field, so populate it for job events as well.

Once this is deployed, we need to revert 368246

Change-Id: I6e6b5cd088859413f32c30103f734f4dc405dc15
(cherry picked from commit 5d43d7dde0dc942a33609081e2bf11f3a933d3e7)
---
M JobQueueEventBus.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus 
refs/changes/60/371960/1

diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index 3bdba26..ee7980e 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -4,7 +4,10 @@
 class JobQueueEventBus extends JobQueue {
 
private static function createJobEvent( IJobSpecification $job ) {
+   global $wgDBname;
+
$attrs = [
+   'database' => $wgDBname,
'type' => $job->getType(),
'page_namespace' => $job->getTitle()->getNamespace(),
'page_title' => $job->getTitle()->getPrefixedDBkey()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e6b5cd088859413f32c30103f734f4dc405dc15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Ppchelko 

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make Special:NewPages show "originally created as" correctly

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

Change subject: Make Special:NewPages show "originally created as" correctly
..


Make Special:NewPages show "originally created as" correctly

$ret should not be generated until after $oldTitleText is generated. Then 
"originally created as" will be correctly shown, as expected.

Bug: T171138
Change-Id: Ibcf9f36a46cfc4beb0aaa424e35a334ed73a1c98
---
M includes/specials/SpecialNewpages.php
1 file changed, 7 insertions(+), 6 deletions(-)

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



diff --git a/includes/specials/SpecialNewpages.php 
b/includes/specials/SpecialNewpages.php
index 83482f6..f644189 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -382,12 +382,6 @@
# Display the old title if the namespace/title has been changed
$oldTitleText = '';
$oldTitle = Title::makeTitle( $result->rc_namespace, 
$result->rc_title );
-   $ret = "{$time} {$dm}{$plink} {$hist} {$dm}{$length} 
{$dm}{$ulink} {$comment} "
-   . "{$tagDisplay} {$oldTitleText}";
-
-   // Let extensions add data
-   Hooks::run( 'NewPagesLineEnding', [ $this, &$ret, $result, 
&$classes, &$attribs ] );
-   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isReservedDataAttribute' ] );
 
if ( count( $classes ) ) {
$attribs['class'] = implode( ' ', $classes );
@@ -402,6 +396,13 @@
);
}
 
+   $ret = "{$time} {$dm}{$plink} {$hist} {$dm}{$length} 
{$dm}{$ulink} {$comment} "
+   . "{$tagDisplay} {$oldTitleText}";
+
+   // Let extensions add data
+   Hooks::run( 'NewPagesLineEnding', [ $this, &$ret, $result, 
&$classes, &$attribs ] );
+   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isReservedDataAttribute' ] );
+
return Html::rawElement( 'li', $attribs, $ret ) . "\n";
}
 

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 410c04d

2017-08-14 Thread Mobrovac (Code Review)
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371959 )

Change subject: Update restbase to 410c04d
..


Update restbase to 410c04d

List of changes:
410c04d Assign proper TID when copying over the data to fallback buckets

Change-Id: Ife3291758fd1a55a021ea6857cbf06d0176276dc
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/restbase b/restbase
index 43aad0a..410c04d 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 43aad0a4cf6c0db9c5f8b83961b2051055176a53
+Subproject commit 410c04dfa913fd086f044213f23633641e8769c0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife3291758fd1a55a021ea6857cbf06d0176276dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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


[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 410c04d

2017-08-14 Thread Mobrovac (Code Review)
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371959 )

Change subject: Update restbase to 410c04d
..

Update restbase to 410c04d

List of changes:
410c04d Assign proper TID when copying over the data to fallback buckets

Change-Id: Ife3291758fd1a55a021ea6857cbf06d0176276dc
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/59/371959/1

diff --git a/restbase b/restbase
index 43aad0a..410c04d 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 43aad0a4cf6c0db9c5f8b83961b2051055176a53
+Subproject commit 410c04dfa913fd086f044213f23633641e8769c0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife3291758fd1a55a021ea6857cbf06d0176276dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add 5 second "greet pause" delay to lists.wikimedia.org SMTP

2017-08-14 Thread Herron (Code Review)
Herron has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371958 )

Change subject: Add 5 second "greet pause" delay to lists.wikimedia.org SMTP
..

Add 5 second "greet pause" delay to lists.wikimedia.org SMTP

Insert a 5 second delay before sending SMTP banner.  If (poorly
written/spammy) client speaks before the banner the connection is
closed and synchronization error logged.

Bug: T173143
Change-Id: I3b0369899b3c919331f35de2f8b9401388e9d8ad
---
M modules/profile/templates/exim/exim4.conf.mailman.erb
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/371958/1

diff --git a/modules/profile/templates/exim/exim4.conf.mailman.erb 
b/modules/profile/templates/exim/exim4.conf.mailman.erb
index e5b52da..a6d5981 100644
--- a/modules/profile/templates/exim/exim4.conf.mailman.erb
+++ b/modules/profile/templates/exim/exim4.conf.mailman.erb
@@ -128,7 +128,11 @@
accept
 
 acl_check_connect:
+# Insert a 5 second delay before sending SMTP banner.  If (poorly
+# written/spammy) client speaks before the banner the connection is
+# closed and synchronization error logged.
accept
+delay = 5s
 
 acl_check_data:
# Let's trust local senders to not send out spam

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Minor fixes for sister search sidebar

2017-08-14 Thread Jdrewniak (Code Review)
Jdrewniak has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371957 )

Change subject: Minor fixes for sister search sidebar
..

Minor fixes for sister search sidebar

- Making the project link color blue
- Changing phrasing from "Results from Sister projects" to
"Results from other Wikimedia projects"

Bug: T171804
Change-Id: Ia7d28b53886c977b15c77c8fb4a6658bcb0aa912
---
M languages/i18n/en.json
M 
resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/371957/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index d7a3aeb..903520f 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -977,7 +977,7 @@
"search-file-match": "(matches file content)",
"search-suggest": "Did you mean: $1",
"search-rewritten": "Showing results for $1. Search instead for $2.",
-   "search-interwiki-caption": "Results from sister projects",
+   "search-interwiki-caption": "Results from other Wikimedia projects",
"search-interwiki-default": "Results from $1:",
"search-interwiki-custom": "",
"search-interwiki-more": "(more)",
diff --git 
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
 
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
index 59464bd..8ec2735 100644
--- 
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
+++ 
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
@@ -47,7 +47,6 @@
}
.iw-result__footer a {
vertical-align: middle;
-   color: @colorGray7;
font-style: italic;
}
 

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

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

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


[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: fix leaking threads in integration tests

2017-08-14 Thread Gehel (Code Review)
Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371956 )

Change subject: fix leaking threads in integration tests
..

fix leaking threads in integration tests

The RdfRepository in AbstractRdfRepositoryIntegrationTestBase wasn't closed
properly on each test, which make randomized testing leaked thread detector
unhappy. This should help make tests more reliable.

Change-Id: Ie3496814a320f77641142b01e1c99da416b2e2ba
---
M 
tools/src/test/java/org/wikidata/query/rdf/tool/AbstractRdfRepositoryIntegrationTestBase.java
1 file changed, 26 insertions(+), 1 deletion(-)


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

diff --git 
a/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractRdfRepositoryIntegrationTestBase.java
 
b/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractRdfRepositoryIntegrationTestBase.java
index fa39003..e9e9148 100644
--- 
a/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractRdfRepositoryIntegrationTestBase.java
+++ 
b/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractRdfRepositoryIntegrationTestBase.java
@@ -33,7 +33,7 @@
 /**
  * Repository to test with.
  */
-private final RdfRepositoryForTesting rdfRepository;
+private RdfRepositoryForTesting rdfRepository;
 
 /**
  * Build the test against prod wikidata.
@@ -44,10 +44,35 @@
 
 public AbstractRdfRepositoryIntegrationTestBase(WikibaseUris uris) {
 this.uris = uris;
+}
+
+/**
+ * Initializes the {@link RdfRepository} before each test.
+ *
+ * Since randomized testing ThreadLeakControl checks for leaked thread, not
+ * closing properly the RdfRepository after each test causes random false
+ * negative in the test results. Initializing the RdfRepository for each
+ * test might be slightly less performant, but at least it ensures
+ * reproducible tests.
+ */
+@Before
+public void initRdfRepository() {
 rdfRepository = new RdfRepositoryForTesting("wdq");
 }
 
 /**
+ * Closes the {@link RdfRepository} after each test.
+ *
+ * @throws Exception if error when closing the RdfRepository
+ */
+@After
+public void shutdownRdfRepository() throws Exception {
+if (rdfRepository != null) {
+rdfRepository.close();
+}
+}
+
+/**
  * Uris to test with.
  */
 public WikibaseUris uris() {

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

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

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


[MediaWiki-commits] [Gerrit] marvin[master]: Chore: limit build output

2017-08-14 Thread Jhernandez (Code Review)
Jhernandez has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371943 )

Change subject: Chore: limit build output
..


Chore: limit build output

- Use Webpack configuration file for display settings.

- For all `run-p` / `run-s`, `npm run`, and `npm test` commands, add
  `-s` to silence NPM's verbose output.

- For all `run-p` commands, don't print the task name. These commands
  are parallelized and may produce interleaved output.

- Trim `server:build` and `server:run` scripts to specify a directory
  and use filename conventions therein.

Change-Id: I6d1e40d3a07efa1fb471760d5dbc5aefa5cf46e1
---
M package.json
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/package.json b/package.json
index b290864..4f14227 100644
--- a/package.json
+++ b/package.json
@@ -4,22 +4,22 @@
   "description": "An API driven skin for MediaWiki",
   "scripts": {
 "--- PRIMARY ---": "# Frequent user scripts.",
-"start": "run-p -sn 'client:build -- -w' 'server:build -- -w' 
server:watch",
+"start": "run-p -s 'client:build -- -w' 'server:build -- -w' server:watch",
 "build": "NODE_ENV=production npm-run-all --silent clean --parallel 
server:build 'client:build -- -p'",
 "format": "npm run -s lint -- --fix",
 "lint": "eslint --cache --max-warnings 0 --ext ts,tsx,js,json .",
-"test": "run-p -sn lint build mocha",
-"test:watch": "nodemon -e js,json,ts,tsx -q -x 'npm test'",
+"test": "run-p -s lint build mocha",
+"test:watch": "nodemon -e js,json,ts,tsx -q -x 'npm test -s'",
 "--- SECONDARY ---": "# Useful but rarely used scripts.",
 "mocha": "mocha '{src,test}/**/*.test.{ts,js}'",
 "clean": "rm -rf dist/",
 "--- HOOKS ---": "# Triggered scripts.",
 "precommit": "npm test -s",
 "--- INTERNAL ---": "# Private scripts.",
-"server:watch": "nodemon -e js,json,ts,tsx -q -x 'npm run server:run'",
-"server:build": "tsc -p src/server/tsconfig.json",
-"server:run": "node dist/server/index.js",
-"client:build": "webpack --display minimal"
+"server:watch": "nodemon -e js,json,ts,tsx -q -x 'npm run -s server:run'",
+"server:build": "tsc -p src/server",
+"server:run": "node dist/server",
+"client:build": "webpack"
   },
   "repository": {
 "type": "git",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d1e40d3a07efa1fb471760d5dbc5aefa5cf46e1
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Sniedzielski 

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


[MediaWiki-commits] [Gerrit] analytics/reportupdater[master]: Give group write permission to output files

2017-08-14 Thread Bearloga (Code Review)
Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371955 )

Change subject: Give group write permission to output files
..

Give group write permission to output files

Bug: T17
Change-Id: I2f5c0138f0df7b19ff0658322b9e7c989e58a7ac
---
M reportupdater/writer.py
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater 
refs/changes/55/371955/1

diff --git a/reportupdater/writer.py b/reportupdater/writer.py
index c681cd0..bd41ba6 100644
--- a/reportupdater/writer.py
+++ b/reportupdater/writer.py
@@ -141,6 +141,7 @@
 # Make sure the output directory exists
 if not os.path.exists(output_folder):
 os.makedirs(output_folder)
+os.chmod(output_folder 0o664)
 
 try:
 # wb mode needed to avoid unicode conflict between io and csv
@@ -153,6 +154,7 @@
 row[0] = row[0].strftime(DATE_FORMAT)
 tsv_writer.writerow(row)
 temp_output_file.close()
+os.chmod(temp_output_path, 0o664)
 try:
 os.rename(temp_output_path, output_path)
 except Exception, e:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f5c0138f0df7b19ff0658322b9e7c989e58a7ac
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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


[MediaWiki-commits] [Gerrit] marvin[master]: Chore: move package headers to keys

2017-08-14 Thread Jhernandez (Code Review)
Jhernandez has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371941 )

Change subject: Chore: move package headers to keys
..


Chore: move package headers to keys

- Move package headers to keys to make unique constraints work for
  instead of against formatting.

- Set commands to commented out descriptions to clarify divisional
  differences.

- Move "tools" to "secondary" to avoid confusion where a primary script
  is also a tool. Since these scripts appear to be public and useful to
  the user, although infrequently used, move them above hooks and
  internal tooling which are protected and private-ish, respectively.

- Rename "main scripts" to "primary" for consistency with "secondary".

- Rename "helpers" to "internal" to indicate that the client is not
  expected to find these commands useful or invoke them. They exist only
  for internal usage.

Change-Id: I5da2a8e1f03a68a3679717990b5584379195751e
---
M package.json
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/package.json b/package.json
index 6a38aac..b290864 100644
--- a/package.json
+++ b/package.json
@@ -3,23 +3,23 @@
   "version": "0.0.0",
   "description": "An API driven skin for MediaWiki",
   "scripts": {
-"//": "MAIN SCRIPTS",
+"--- PRIMARY ---": "# Frequent user scripts.",
 "start": "run-p -sn 'client:build -- -w' 'server:build -- -w' 
server:watch",
 "build": "NODE_ENV=production npm-run-all --silent clean --parallel 
server:build 'client:build -- -p'",
 "format": "npm run -s lint -- --fix",
 "lint": "eslint --cache --max-warnings 0 --ext ts,tsx,js,json .",
 "test": "run-p -sn lint build mocha",
 "test:watch": "nodemon -e js,json,ts,tsx -q -x 'npm test'",
-"//-": "HOOKS",
+"--- SECONDARY ---": "# Useful but rarely used scripts.",
+"mocha": "mocha '{src,test}/**/*.test.{ts,js}'",
+"clean": "rm -rf dist/",
+"--- HOOKS ---": "# Triggered scripts.",
 "precommit": "npm test -s",
-"//--": "HELPERS",
+"--- INTERNAL ---": "# Private scripts.",
 "server:watch": "nodemon -e js,json,ts,tsx -q -x 'npm run server:run'",
 "server:build": "tsc -p src/server/tsconfig.json",
 "server:run": "node dist/server/index.js",
-"client:build": "webpack --display minimal",
-"//---": "TOOLS",
-"mocha": "mocha '{src,test}/**/*.test.{ts,js}'",
-"clean": "rm -rf dist/"
+"client:build": "webpack --display minimal"
   },
   "repository": {
 "type": "git",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5da2a8e1f03a68a3679717990b5584379195751e
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Sniedzielski 

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


[MediaWiki-commits] [Gerrit] mediawiki...CategoryWatch[master]: Add the ability to notify watchers of parent categories

2017-08-14 Thread Seanchenldap (Code Review)
Seanchenldap has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370774 )

Change subject: Add the ability to notify watchers of parent categories
..


Add the ability to notify watchers of parent categories

Needs to be tested.

Change-Id: Ic7d32294a573fcb95b96e8c00f6792c39abdb5d8
---
M CategoryWatch.php
M README.md
2 files changed, 100 insertions(+), 4 deletions(-)

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



diff --git a/CategoryWatch.php b/CategoryWatch.php
index cfd3fca..aca8f23 100644
--- a/CategoryWatch.php
+++ b/CategoryWatch.php
@@ -223,6 +223,97 @@
}
}
}
+
+   global $wgCategoryWatchNotifyParentWatchers;
+   if ( $wgCategoryWatchNotifyParentWatchers ) {
+   self::notifyParentWatchers();
+   }
+   }
+
+   /**
+* Notify the watchers of parent categories
+*/
+   protected static function notifyParentWatchers() {
+   self::$watcher->allparents = [];
+   self::$watcher->i = 0;
+   self::$watcher->findCategoryParents( self::$watcher->after );
+   ## For each active parent category, send the mail
+   if ( self::$watcher->allparents ) {
+   $page = $article->getTitle();
+   $pageurl  = $page->getFullUrl();
+   foreach ( self::$watcher->allparents as $cat ) {
+   $title   = Title::newFromText( $cat, 
NS_CATEGORY );
+   $message = wfMessage(
+   'categorywatch-catchange', $page,
+   self::$watcher->friendlyCat( $cat )
+   );
+   self::$watcher->notifyWatchers(
+   $title, $user, $message, $summary, 
$medit, $pageurl
+   );
+   }
+   }
+   }
+
+   /**
+* Recursively find all parents of the given categories
+*
+* @param array $catarray the categories
+*/
+   protected function findCategoryParents( array $catarray ) {
+   $this->i++;
+   if ( $this->i == 200 ) {
+   return;
+   }
+
+   if ( $catarray ) {
+   foreach ( $catarray as $catname ) {
+   self::$watcher->allparents[] = $catname;
+   $id = self::$watcher->getCategoryArticleId( 
$catname );
+   if ( is_numeric( $id ) ) {
+   $parentCat = 
self::$watcher->getParentCategories( $id );
+   if ( $parentCat ) {
+   self::$watcher->allparents[] = 
$parentCat;
+   
self::$watcher->findCategoryParents( [ $parentCat ] );
+   }
+   }
+   }
+   self::$watcher->allparents = array_unique( 
self::$watcher->allparents );
+   }
+   }
+
+   /**
+* Return the parent categories
+* @param int $id Category Article id
+* @return parents
+*/
+   protected function getParentCategories( $id ) {
+   $dbr  = wfGetDB( DB_SLAVE );
+   $cl   = $dbr->tableName( 'categorylinks' );
+   $res  = $dbr->select(
+   $cl, 'cl_to', "cl_from = $id", __METHOD__,
+   [ 'ORDER BY' => 'cl_sortkey' ]
+   );
+   $row = $dbr->fetchRow( $res );
+   $dbr->freeResult( $res );
+   if ( empty( $row[0] ) ) {
+   return false;
+   }
+   return $row[0];
+   }
+
+   /**
+* Load page ID of one category
+*
+* @param string $catname name of category
+* @return int
+*/
+   protected function getCategoryArticleId( $catname ) {
+   $dbr = wfGetDB( DB_SLAVE );
+   $cl  = $dbr->tableName( 'page' );
+   $res = $dbr->select( $cl, 'page_id', "page_title = '$catname'", 
__METHOD__ );
+   $row = $dbr->fetchRow( $res );
+   $dbr->freeResult( $res );
+   return $row[0];
}
 
/**
diff --git a/README.md b/README.md
index 1fb356e..6433bdf 100644
--- a/README.md
+++ b/README.md
@@ -18,14 +18,19 @@
 $wgCategoryWatchNotifyEditor = true;
 ```
 
-Set this to give every user a unique category that they're automatically 
watching. The format of the category name is defined on the 
"categorywatch-autocat" localisation message 

[MediaWiki-commits] [Gerrit] mediawiki...CategoryWatch[master]: Fix up

2017-08-14 Thread Seanchenldap (Code Review)
Seanchenldap has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370773 )

Change subject: Fix up
..


Fix up

* Trim long lines.
* Add copyright notice.
* Fix up config variable prefix in extension.json.
* Use a protected class variable instead of a global variable for
  storing instance.
* Move comments providing documentation for globals to README.
* Fix up doc comments to comply with coding conventions.

Change-Id: I33ae7ce52c371c54d002862ae984863283193e9a
---
M CategoryWatch.php
M README.md
M extension.json
3 files changed, 242 insertions(+), 133 deletions(-)

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



diff --git a/CategoryWatch.php b/CategoryWatch.php
index e576d63..cfd3fca 100644
--- a/CategoryWatch.php
+++ b/CategoryWatch.php
@@ -1,11 +1,32 @@
 https://www.mediawiki.org/Extension:CategoryWatch for installation and 
usage details
- * See http://www.organicdesign.co.nz/Extension_talk:CategoryWatch for 
development notes and disucssion
+ * Copyright (C) 2008  Aran Dunkley
+ * Copyright (C) 2017  Sean Chen
+ * Copyright (C) 2017  Mark A. Hershberger
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * See https://www.mediawiki.org/Extension:CategoryWatch
+ * for installation and usage details
+ * See http://www.organicdesign.co.nz/Extension_talk:CategoryWatch
+ * for development notes and disucssion
  *
  * @file
  * @ingroup Extensions
@@ -14,125 +35,138 @@
  * @licence GNU General Public Licence 2.0 or later
  */
 
-# Whether or not to also send notificaton to the person 
-# who made the change
-# The default value is set in file extension.json
-//$wgCategoryWatchNotifyEditor = true;
-
-# Set this to give every user a unique category that 
-# they're automatically watching
-# - the format of the category name is defined on the 
-# "categorywatch-autocat" localisation message
-# The default value is set in file extension.json
-//$wgCategoryWatchUseAutoCat = false;
-
-# Set this to make the categorisation work by realname 
-# instead of username
-# The default value is set in file extension.json
-//$wgCategoryWatchUseAutoCatRealName = false;
-
 class CategoryWatch {
+   // Instance
+   protected static $watcher;
 
/**
 * The extension function.
 * It has to be the static function in a class now.
 */
-   public static function wfSetupCategoryWatch() {
-   wfDebugLog('CategoryWatch', 'loading extension...');
-   global $wgCategoryWatch;
+   public static function setupCategoryWatch() {
+   wfDebugLog( 'CategoryWatch', 'loading extension...' );
 
-   # Instantiate the CategoryWatch singleton now 
-# that the environment is prepared
-   $wgCategoryWatch = new CategoryWatch();
-   }
-
-   function __construct() {
-   # the constructor will do nothing now.
-   # New extension register process will use the file
-   # extension.json to set hooks.
+   # Instantiate the CategoryWatch singleton now
+   # that the environment is prepared
+   self::$watcher = new CategoryWatch();
}
 
/**
-* Get a list of categories before article updated
-* Since MediaWiki version 1.25.x, we have to use static function
-* for hooks.
-* the hook has different signatures.
+* Get a list of categories before article updated Since MediaWiki
+* version 1.25.x, we have to use static function for hooks.  the
+* hook has different signatures.
+* @param WikiPage $wikiPage the page
+* @param User $user who is modifying
+* @param Content $content the new article content
+* @param string $summary the article summary (comment)
+* @param bool $isMinor minor flag
+* @param bool $isWatch watch flag (not used, aka always null)
+* @param int $section section number (not used, aka always null)
+* @param int $flags see WikiPage::doEditContent documentation for 
flags' definition
+* @param Status $status Status (object)
 */
-   public static function onPageContentSave( &$wikiPage, 

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: combine linters

2017-08-14 Thread Jhernandez (Code Review)
Jhernandez has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371766 )

Change subject: Chore: combine linters
..


Chore: combine linters

- Combine ESLint and Prettier linting and formatting.

- Upgrade ESLint to v4.4.1 to support glob based configurations. There
  are many new rules, updates, and breaking changes. I've reviewed the
  notes with attention to breaking changes and believe all is well.
  Deprecation warnings in eslint-config-node-services should be resolved
  next release.

  https://github.com/eslint/eslint/releases/tag/v4.0.0-alpha.0
  https://github.com/eslint/eslint/releases/tag/v4.0.0-alpha.1
  https://github.com/eslint/eslint/releases/tag/v4.0.0-alpha.2
  https://github.com/eslint/eslint/releases/tag/v4.0.0-beta.0
  https://github.com/eslint/eslint/releases/tag/v4.0.0-rc.0
  https://github.com/eslint/eslint/releases/tag/v4.0.0
  https://github.com/eslint/eslint/releases/tag/v4.1.0
  https://github.com/eslint/eslint/releases/tag/v4.1.1
  https://github.com/eslint/eslint/releases/tag/v4.2.0
  https://github.com/eslint/eslint/releases/tag/v4.3.0
  https://github.com/eslint/eslint/releases/tag/v4.4.0
  https://github.com/eslint/eslint/releases/tag/v4.4.1
  https://github.com/wikimedia/eslint-config-node-services/pull/23

Change-Id: I931473048eafae15d28d534282e51f2e819fb057
---
M .eslintrc.json
M package-lock.json
M package.json
M src/server/index.ts
M src/server/templates/page.ts
5 files changed, 211 insertions(+), 1,101 deletions(-)

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



diff --git a/.eslintrc.json b/.eslintrc.json
index 086e06c..5488218 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -9,6 +9,7 @@
   "rules": {
 "prettier/prettier": "error"
   },
+  "parser": "typescript-eslint-parser",
   "parserOptions": {
 "ecmaVersion": 2016,
 "sourceType": "module",
@@ -20,5 +21,18 @@
   "env": {
 "es6": true,
 "node": false
-  }
+  },
+  "overrides": [
+{
+  "files": [ "*.ts", "*.tsx" ],
+  "rules": {
+// Disable rules with known issues.
+// https://github.com/eslint/typescript-eslint-parser#known-issues
+"no-undef": 0,
+"no-unused-vars": 0,
+"no-useless-constructor": 0,
+"space-infix-ops": 0
+  }
+}
+  ]
 }
diff --git a/package-lock.json b/package-lock.json
index 363b7c8..ec29495 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -136,9 +136,9 @@
   }
 },
 "ansi-escapes": {
-  "version": "1.4.0",
-  "resolved": 
"https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz;,
-  "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+  "version": "2.0.0",
+  "resolved": 
"https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz;,
+  "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=",
   "dev": true
 },
 "ansi-regex": {
@@ -509,7 +509,6 @@
   "requires": {
 "anymatch": "1.3.2",
 "async-each": "1.0.1",
-"fsevents": "1.1.2",
 "glob-parent": "2.0.0",
 "inherits": "2.0.3",
 "is-binary-path": "1.0.1",
@@ -544,10 +543,7 @@
   "version": "0.1.16",
   "resolved": 
"https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.16.tgz;,
   "integrity": "sha1-QiqOFQvz1av9PRS/rLBw6A+y4j8=",
-  "dev": true,
-  "requires": {
-"rimraf": "2.5.4"
-  }
+  "dev": true
 },
 "cli": {
   "version": "1.0.1",
@@ -560,12 +556,12 @@
   }
 },
 "cli-cursor": {
-  "version": "1.0.2",
-  "resolved": 
"https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz;,
-  "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+  "version": "2.1.0",
+  "resolved": 
"https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz;,
+  "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
   "dev": true,
   "requires": {
-"restore-cursor": "1.0.1"
+"restore-cursor": "2.0.0"
   }
 },
 "cli-width": {
@@ -823,7 +819,7 @@
 "object-assign": "4.1.1",
 "pify": "2.3.0",
 "pinkie-promise": "2.0.1",
-"rimraf": "2.5.4"
+"rimraf": "2.6.1"
   }
 },
 "depd": {
@@ -1152,57 +1148,56 @@
   }
 },
 "eslint": {
-  "version": "3.19.0",
-  "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz;,
-  "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
+  "version": "4.4.1",
+  "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz;,
+  "integrity": "sha1-mc1+r8/8ov+Zpcj18qR01jZLS9M=",
   "dev": true,
   "requires": {
+"ajv": "5.2.2",
 "babel-code-frame": "6.22.0",
 "chalk": "1.1.3",
 "concat-stream": "1.6.0",
-"debug": "2.6.7",
+"cross-spawn": "5.1.0",
+"debug": "2.6.8",
 "doctrine": "2.0.0",
-"escope": "3.6.0",
-"espree": 

[MediaWiki-commits] [Gerrit] mediawiki...CategoryWatch[master]: Emacs settings

2017-08-14 Thread Seanchenldap (Code Review)
Seanchenldap has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370767 )

Change subject: Emacs settings
..


Emacs settings

Change-Id: I6f00a10eede26256974008afba9344d3fbb29892
---
A .dir-locals.el
M .gitignore
2 files changed, 102 insertions(+), 0 deletions(-)

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



diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 000..75ce2ef
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,89 @@
+((nil . ((mode . flycheck)
+(mode . company)
+(mode . edep)
+(mode . subword)
+(tab-width . 4)
+(c-basic-offset . 4)
+(indent-tabs-mode . t)
+(lice:default-license . "gpl-3.0")
+(eval . (progn (when (fboundp 'delete-trailing-whitespace)
+ (delete-trailing-whitespace))
+ (tabify (point-min) 
(point-max
+(c-hanging-braces-alist
+ (defun-open after)
+ (block-open after)
+ (defun-close))
+(c-offsets-alist . (
+(access-label . -)
+(annotation-top-cont . 
0)
+(annotation-var-cont . 
+)
+(arglist-close . 
php-lineup-arglist-close)
+(arglist-cont-nonempty 
first
+   
php-lineup-cascaded-calls
+   
c-lineup-arglist)
+(arglist-intro . 
php-lineup-arglist-intro)
+(block-close . 0)
+(block-open . 0)
+(brace-entry-open . 0)
+(brace-list-close . 0)
+(brace-list-entry . 0)
+(brace-list-intro . +)
+(brace-list-open . 0)
+(c . 
c-lineup-C-comments)
+(case-label . 0)
+(catch-clause . 0)
+(class-close . 0)
+(comment-intro . 0)
+(composition-close . 0)
+(composition-open . 0)
+(cpp-define-intro 
c-lineup-cpp-define +)
+(cpp-macro . [0])
+(cpp-macro-cont . +)
+(defun-block-intro . +)
+(defun-close . 0)
+(defun-open . 0)
+(do-while-closure . 0)
+(else-clause . 0)
+(extern-lang-close . 0)
+(extern-lang-open . 0)
+(friend . 0)
+(func-decl-cont . +)
+(inclass . +)
+(incomposition . +)
+(inexpr-class . +)
+(inexpr-statement . +)
+(inextern-lang . +)
+(inher-cont . 
c-lineup-multi-inher)
+(inher-intro . +)
+(inlambda . 0)
+(inline-close . 0)
+(inline-open . 0)
+(inmodule . +)
+

[MediaWiki-commits] [Gerrit] marvin[master]: Hygiene: Tidy up script comment keys

2017-08-14 Thread Jhernandez (Code Review)
Jhernandez has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371954 )

Change subject: Hygiene: Tidy up script comment keys
..

Hygiene: Tidy up script comment keys

Keys need be unique so it makes sense to put the comment on the key
instead of in the value

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


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/54/371954/1

diff --git a/package.json b/package.json
index a9b4758..9d28ac0 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "description": "An API driven skin for MediaWiki",
   "scripts": {
-"//": "MAIN SCRIPTS",
+"// MAIN SCRIPTS": "--",
 "start": "run-p -sn 'client:build -- -w' 'server:build -- -w' 
server:watch",
 "build": "NODE_ENV=production npm-run-all --silent clean --parallel 
server:build 'client:build -- -p'",
 "format": "run-p -s 'eslint -- --fix .' 'prettier -- --write'",
@@ -11,16 +11,16 @@
 "test": "run-p -sn lint build mocha",
 "test:watch": "nodemon -e js,json,ts,tsx -q -x 'npm test'",
 
-"//-": "HOOKS",
+"// HOOKS": "--",
 "precommit": "npm test -s",
 
-"//--": "HELPERS",
+"// HELPERS": "--",
 "server:watch": "nodemon -e js,json,ts,tsx -q -x 'npm run server:run'",
 "server:build": "tsc -p src/server/tsconfig.json",
 "server:run": "node dist/server/index.js",
 "client:build": "webpack --display minimal",
 
-"//---": "TOOLS",
+"// TOOLS": "--",
 "prettier": "prettier --parser typescript '{src,test}/**/*.{ts,tsx}'",
 "eslint": "eslint --cache --max-warnings 0 --ext js,json",
 "mocha": "mocha '{src,test}/**/*.test.{ts,js}'",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic15e85c550785bb74863cf68e0cddd3d227045fb
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Perform a permission check on the title when changing the pa...

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

Change subject: Perform a permission check on the title when changing the page 
language
..


Perform a permission check on the title when changing the page language

Performing this check will prevent users without the edituserjs/css to change 
the page language for protected user js/css subpages, similar to 
Special:Editcontentmodel.

Bug: T160783
Bug: T74965
Change-Id: I2b106861ea0a488308cda92baf7ebf697844ffd7
---
M includes/specials/SpecialPageLanguage.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/includes/specials/SpecialPageLanguage.php 
b/includes/specials/SpecialPageLanguage.php
index db05ebe..ef034fb 100644
--- a/includes/specials/SpecialPageLanguage.php
+++ b/includes/specials/SpecialPageLanguage.php
@@ -135,6 +135,16 @@
return Status::newFatal( $ex->getMessageObject() );
}
 
+   // Check permissions and make sure the user has permission to 
edit the page
+   $errors = $title->getUserPermissionsErrors( 'edit', 
$this->getUser() );
+
+   if ( $errors ) {
+   $out = $this->getOutput();
+   $wikitext = $out->formatPermissionsErrorMessage( 
$errors );
+   // Hack to get our wikitext parsed
+   return Status::newFatal( new RawMessage( '$1', [ 
$wikitext ] ) );
+   }
+
// Url to redirect to after the operation
$this->goToUrl = $title->getFullURL(
$title->isRedirect() ? [ 'redirect' => 'no' ] : []

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b106861ea0a488308cda92baf7ebf697844ffd7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Kunalgrover05 
Gerrit-Reviewer: Mainframe98 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Don't float article actions on tablets

2017-08-14 Thread Bmansurov (Code Review)
Bmansurov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371953 )

Change subject: Don't float article actions on tablets
..

Don't float article actions on tablets

Bug: T171608
Change-Id: Ie9ba7df0a0f052948d46b6a9b14a3bbcef2b99fe
---
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.tablet.styles/common.less
2 files changed, 0 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/53/371953/1

diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index f1c304b..4b9ba1f 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -129,17 +129,3 @@
}
}
 }
-
-@media all and ( min-width: @deviceWidthTablet ) {
-   #page-actions {
-   position: initial;
-   float: right;
-   width: auto;
-   border: 0;
-   margin: 0 0 @iconGutterWidth @iconGutterWidth;
-
-   .language-selector {
-   float: inherit;
-   }
-   }
-}
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 8274c19..2f9f5d5 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -54,29 +54,6 @@
clear: none;
}
 
-   .heading-holder {
-   padding: 20px 0;
-   position: relative;
-
-   #section_0 {
-   border-bottom: 0;
-   padding: 0 0 7px 0;
-   font-size: @firstHeadingFontSize;
-   }
-   }
-
-   #page-actions {
-   padding: 18px 0 0 0;
-
-   li {
-   display: inline-block;
-   }
-
-   li:first-child {
-   margin-top: 0;
-   }
-   }
-
// FIXME: Have a class that identifies all of these selectors
.pre-content,
.content,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9ba7df0a0f052948d46b6a9b14a3bbcef2b99fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make BaseTemplate::getFooter use 'footer' as default id, and...

2017-08-14 Thread Isarra (Code Review)
Isarra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371952 )

Change subject: Make BaseTemplate::getFooter use 'footer' as default id, and 
make id adjustible (was 'footer-bottom' because I wasn't paying attention)
..

Make BaseTemplate::getFooter use 'footer' as default id, and
make id adjustible (was 'footer-bottom' because I wasn't
paying attention)

'footer' being what pretty much every skin uses in general,
so that'll make it a lot easier to migrate.

No idea what to do about vector, which adds extra wrappers
for all the chunks in the footer.

Change-Id: I336b89b8a04c2f26260a594500d7ed019a5444ef
---
M includes/skins/BaseTemplate.php
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/371952/1

diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index 8d5ce10..27fbc89 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -655,11 +655,12 @@
 *
 * @param string $iconStyle $option for getFooterIcons: "icononly", 
"nocopyright"
 * @param string $linkStyle $option for getFooterLinks: "flat"
+* @param string $id id for footer block; defaults to 'footer'
 *
 * @return string html
 * @since 1.29
 */
-   protected function getFooter( $iconStyle = 'icononly', $linkStyle = 
'flat' ) {
+   protected function getFooter( $iconStyle = 'icononly', $linkStyle = 
'flat', $id = 'footer' ) {
$validFooterIcons = $this->getFooterIcons( $iconStyle );
$validFooterLinks = $this->getFooterLinks( $linkStyle );
 
@@ -667,7 +668,7 @@
 
if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 
0 ) {
$html .= Html::openElement( 'div', [
-   'id' => 'footer-bottom',
+   'id' => $id,
'role' => 'contentinfo',
'lang' => $this->get( 'userlang' ),
'dir' => $this->get( 'dir' )
@@ -763,7 +764,3 @@
$html = MWDebug::getDebugHTML( $this->getSkin()->getContext() );
$html .= $this->get( 'bottomscripts' );
$html .= $this->get( 'reporttime' );
-
-   return $html;
-   }
-}

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:Newpages feed now shows first revision instead of la...

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

Change subject: Special:Newpages feed now shows first revision instead of 
latest revision
..


Special:Newpages feed now shows first revision instead of latest revision

Bug: T69026
Change-Id: I1f794f314319127848a4e9981c7d4f549fb4fd0f
---
M includes/specials/SpecialNewpages.php
1 file changed, 17 insertions(+), 9 deletions(-)

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



diff --git a/includes/specials/SpecialNewpages.php 
b/includes/specials/SpecialNewpages.php
index be8ad8f..2c39331 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -294,6 +294,19 @@
}
 
/**
+* @param stdClass $row Result row from recent changes
+* @return Revision|bool
+*/
+   protected function revisionFromRcResult( stdClass $result ) {
+   return new Revision( [
+   'comment' => $result->rc_comment,
+   'deleted' => $result->rc_deleted,
+   'user_text' => $result->rc_user_text,
+   'user' => $result->rc_user,
+   ] );
+   }
+
+   /**
 * Format a row, providing the timestamp, links to the page/history,
 * size, user links, and a comment
 *
@@ -303,14 +316,9 @@
public function formatRow( $result ) {
$title = Title::newFromRow( $result );
 
-   # Revision deletion works on revisions, so we should cast one
-   $row = [
-   'comment' => $result->rc_comment,
-   'deleted' => $result->rc_deleted,
-   'user_text' => $result->rc_user_text,
-   'user' => $result->rc_user,
-   ];
-   $rev = new Revision( $row );
+   // Revision deletion works on revisions,
+   // so cast our recent change row to a revision row.
+   $rev = $this->revisionFromRcResult( $result );
$rev->setTitle( $title );
 
$classes = [];
@@ -477,7 +485,7 @@
}
 
protected function feedItemDesc( $row ) {
-   $revision = Revision::newFromId( $row->rev_id );
+   $revision = $this->revisionFromRcResult( $row );
if ( $revision ) {
// XXX: include content model/type in feed item?
return '' . htmlspecialchars( 
$revision->getUserText() ) .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f794f314319127848a4e9981c7d4f549fb4fd0f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Rohan013 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: SPQRobin 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move RawMessage out of Message.php to its own file

2017-08-14 Thread Florianschmidtwelzow (Code Review)
Florianschmidtwelzow has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371951 )

Change subject: Move RawMessage out of Message.php to its own file
..

Move RawMessage out of Message.php to its own file

Change-Id: Idae9617dafa3c314085eb097f78f1c8d38672f31
---
M autoload.php
M includes/Message.php
A includes/RawMessage.php
3 files changed, 73 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/371951/1

diff --git a/autoload.php b/autoload.php
index 508e75b..d9e85bd 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1180,7 +1180,7 @@
'RangeChronologicalPager' => __DIR__ . 
'/includes/pager/RangeChronologicalPager.php',
'RangeDifference' => __DIR__ . '/includes/diff/DiffEngine.php',
'RawAction' => __DIR__ . '/includes/actions/RawAction.php',
-   'RawMessage' => __DIR__ . '/includes/Message.php',
+   'RawMessage' => __DIR__ . '/includes/RawMessage.php',
'ReadOnlyError' => __DIR__ . '/includes/exception/ReadOnlyError.php',
'ReadOnlyMode' => __DIR__ . '/includes/ReadOnlyMode.php',
'ReassignEdits' => __DIR__ . '/maintenance/reassignEdits.php',
diff --git a/includes/Message.php b/includes/Message.php
index 8777c6f..0240fa7 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1344,56 +1344,3 @@
return $this->extractParam( new RawMessage( $vars, $params ), 
$format );
}
 }
-
-/**
- * Variant of the Message class.
- *
- * Rather than treating the message key as a lookup
- * value (which is passed to the MessageCache and
- * translated as necessary), a RawMessage key is
- * treated as the actual message.
- *
- * All other functionality (parsing, escaping, etc.)
- * is preserved.
- *
- * @since 1.21
- */
-class RawMessage extends Message {
-
-   /**
-* Call the parent constructor, then store the key as
-* the message.
-*
-* @see Message::__construct
-*
-* @param string $text Message to use.
-* @param array $params Parameters for the message.
-*
-* @throws InvalidArgumentException
-*/
-   public function __construct( $text, $params = [] ) {
-   if ( !is_string( $text ) ) {
-   throw new InvalidArgumentException( '$text must be a 
string' );
-   }
-
-   parent::__construct( $text, $params );
-
-   // The key is the message.
-   $this->message = $text;
-   }
-
-   /**
-* Fetch the message (in this case, the key).
-*
-* @return string
-*/
-   public function fetchMessage() {
-   // Just in case the message is unset somewhere.
-   if ( $this->message === null ) {
-   $this->message = $this->key;
-   }
-
-   return $this->message;
-   }
-
-}
diff --git a/includes/RawMessage.php b/includes/RawMessage.php
new file mode 100644
index 000..cd62e52
--- /dev/null
+++ b/includes/RawMessage.php
@@ -0,0 +1,72 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Variant of the Message class.
+ *
+ * Rather than treating the message key as a lookup
+ * value (which is passed to the MessageCache and
+ * translated as necessary), a RawMessage key is
+ * treated as the actual message.
+ *
+ * All other functionality (parsing, escaping, etc.)
+ * is preserved.
+ *
+ * @since 1.21
+ */
+class RawMessage extends Message {
+
+   /**
+* Call the parent constructor, then store the key as
+* the message.
+*
+* @see Message::__construct
+*
+* @param string $text Message to use.
+* @param array $params Parameters for the message.
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $text, $params = [] ) {
+   if ( !is_string( $text ) ) {
+   throw new InvalidArgumentException( '$text must be a 
string' );
+   }
+
+   parent::__construct( $text, $params );
+
+   // The key is the message.
+   $this->message = $text;
+   }
+
+   /**
+* Fetch the message (in this case, the key).
+*
+* @return string
+*/
+   public function fetchMessage() {
+   // Just in case the message is unset somewhere.
+   if ( $this->message === null ) {
+   $this->message = $this->key;
+   }
+
+   return $this->message;
+   }
+
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idae9617dafa3c314085eb097f78f1c8d38672f31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Change WikiImporter to now requires the second parameter to ...

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

Change subject: Change WikiImporter to now requires the second parameter to be 
an instance of the Config class.
..


Change WikiImporter to now requires the second parameter to be an instance of 
the Config class.

Prior to this change, the second parameter to WikiImporter was optional.  If 
the parameter didn't exist, it would get filled in with a 
MediaWikiServices::getInstance()->getMainConfig().  It would also emit a hard 
deprecation warning. This behavior has existed since 1.25.

Bug: T61113
Change-Id: Ic15cc103c7d2b7fb499f1632c0001b8a3dbdf778
---
M RELEASE-NOTES-1.30
M includes/import/WikiImporter.php
2 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 90d6cd9..9474f21 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -165,6 +165,9 @@
 * mw.util.escapeId() was deprecated, use escapeIdForAttribute() or
   escapeIdForLink().
 * MagicWord::replaceMultiple() (deprecated in 1.25) was removed.
+* WikiImporter now requires the second parameter to be an instance of the 
Config,
+  class. Prior to that, the Config parameter was optional (a behavior 
deprecated in
+  1.25).
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php
index 7c89b23..2099709 100644
--- a/includes/import/WikiImporter.php
+++ b/includes/import/WikiImporter.php
@@ -55,16 +55,12 @@
 * @param Config $config
 * @throws Exception
 */
-   function __construct( ImportSource $source, Config $config = null ) {
+   function __construct( ImportSource $source, Config $config ) {
if ( !class_exists( 'XMLReader' ) ) {
throw new Exception( 'Import requires PHP to have been 
compiled with libxml support' );
}
 
$this->reader = new XMLReader();
-   if ( !$config ) {
-   wfDeprecated( __METHOD__ . ' without a Config 
instance', '1.25' );
-   $config = 
MediaWikiServices::getInstance()->getMainConfig();
-   }
$this->config = $config;
 
if ( !in_array( 'uploadsource', stream_get_wrappers() ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic15cc103c7d2b7fb499f1632c0001b8a3dbdf778
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthewrbowker 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: [WIP] Send logs to logstash

2017-08-14 Thread Gehel (Code Review)
Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371950 )

Change subject: [WIP] Send logs to logstash
..

[WIP] Send logs to logstash

Adds the logstash-logback-encoder as a dependency and configure it to send
logs to logstash.

The LogstashTcpSocketAppender is used as it seems to be a good way to ensure
large stacktraces can be sent without issue. It works asynchronously to
ensure that the logging thread isn't blocked. It uses an LMAX Disruptor for
queuing, which should provide more than enoug performance and robustness.
In case of overflow, log messages are dropped to prioritize performances.

Note that minimal testing on wdqs-beta show that messages are sent, but not
parsed by logstash. More investigation needed before merging.

Bug: T172710
Change-Id: Ie9075dfbc34055748976648fa3d06a91fd2d9563
---
M dist/src/script/runBlazegraph.sh
M dist/src/script/runUpdate.sh
M pom.xml
M tools/pom.xml
M tools/src/main/resources/logback.xml
M war/pom.xml
M war/src/main/resources/logback.xml
7 files changed, 43 insertions(+), 0 deletions(-)


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

diff --git a/dist/src/script/runBlazegraph.sh b/dist/src/script/runBlazegraph.sh
index 4be9c04..e7cb21e 100755
--- a/dist/src/script/runBlazegraph.sh
+++ b/dist/src/script/runBlazegraph.sh
@@ -9,6 +9,8 @@
 PORT=${PORT:-""}
 DIR=${DIR:-`dirname $0`}
 HEAP_SIZE=${HEAP_SIZE:-"16g"}
+LOGSTASH_SERVER=${LOGSTASH_SERVER:-"localhost"}
+LOGSTASH_PORT=${LOGSTASH_PORT:-"11514"}
 MEMORY=${MEMORY:-"-Xms${HEAP_SIZE} -Xmx${HEAP_SIZE}"}
 GC_LOGS=${GC_LOGS:-"-Xloggc:/var/log/wdqs/wdqs-blazegraph_jvm_gc.%p.log \
  -XX:+PrintGCDetails \
@@ -66,6 +68,8 @@
  
-Dorg.wikidata.query.rdf.blazegraph.mwapi.MWApiServiceFactory.config=$DIR/mwservices.json
 \
  
-Dcom.bigdata.rdf.sail.webapp.client.HttpClientConfigurator=org.wikidata.query.rdf.blazegraph.ProxiedHttpConnectionFactory
 \
  -Dhttp.userAgent="${USER_AGENT}" \
+ -Dlogstash.host="${LOGSTASH_SERVER}" \
+ -Dlogstash.port="${LOGSTASH_PORT}" \
  ${BLAZEGRAPH_OPTS} \
  -jar jetty-runner*.jar \
  --host $HOST \
diff --git a/dist/src/script/runUpdate.sh b/dist/src/script/runUpdate.sh
index e56a96f..ea4bfbb 100755
--- a/dist/src/script/runUpdate.sh
+++ b/dist/src/script/runUpdate.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+if [ -r /etc/default/wdqs-updater ]; then
+  . /etc/default/wdqs-updater
+fi
+
 HOST=http://localhost:
 CONTEXT=bigdata
 MEMORY="-Xms2g -Xmx2g"
@@ -13,6 +17,8 @@
  -XX:+UseGCLogFileRotation \
  -XX:NumberOfGCLogFiles=10 \
  -XX:GCLogFileSize=20M"
+LOGSTASH_SERVER=${LOGSTASH_SERVER:-"localhost"}
+LOGSTASH_PORT=${LOGSTASH_PORT:-"11514"}
 NAMESPACE=wdq
 UPDATER_OPTS=${UPDATER_OPTS:-""}
 
@@ -61,6 +67,7 @@
 if [ -f updater-logs.xml ]; then
 LOG="-Dlogback.configurationFile=updater-logs.xml"
 fi
+LOG="${LOG} -Dlogstash.host=${LOGSTASH_SERVER} 
-Dlogstash.port=${LOGSTASH_PORT}"
 
 CP=lib/wikidata-query-tools-*-jar-with-dependencies.jar
 MAIN=org.wikidata.query.rdf.tool.Update
diff --git a/pom.xml b/pom.xml
index 866e8a8..4a75363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,6 +555,12 @@
 1.4.01
   
   
+net.logstash.logback
+logstash-logback-encoder
+4.11
+runtime
+  
+  
 org.jhades
 jhades
 1.0.4
diff --git a/tools/pom.xml b/tools/pom.xml
index faeca64..28d668c 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -115,6 +115,11 @@
   common
 
 
+  net.logstash.logback
+  logstash-logback-encoder
+  runtime
+
+
   org.slf4j
   jcl-over-slf4j
   runtime
diff --git a/tools/src/main/resources/logback.xml 
b/tools/src/main/resources/logback.xml
index 206a188..da0d47b 100644
--- a/tools/src/main/resources/logback.xml
+++ b/tools/src/main/resources/logback.xml
@@ -7,9 +7,17 @@
 
 
 
+
+
${logstash.host:-localhost}:${logstash.port:-11514}
+
+{"type":"wdqs-updater"}
+
+
+
 
 
 
 
+
 
 
diff --git a/war/pom.xml b/war/pom.xml
index a7a7b64..638a048 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -40,6 +40,11 @@
   runtime
 
 
+  net.logstash.logback
+  logstash-logback-encoder
+  runtime
+
+
   org.jhades
   jhades
   runtime
diff --git a/war/src/main/resources/logback.xml 
b/war/src/main/resources/logback.xml
index e13e8a9..2ceb3fb 100644
--- a/war/src/main/resources/logback.xml
+++ b/war/src/main/resources/logback.xml
@@ -7,9 +7,17 @@
 
 
 
+
+
${logstash.host:-localhost}:${logstash.port:-11514}
+
+{"type":"wdqs-blazegraph"}
+
+
+
 
 
 
 
+
 
 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Define management networks and allow them to send syslog to ...

2017-08-14 Thread Ayounsi (Code Review)
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371949 )

Change subject: Define management networks and allow them to send syslog to 
logstash
..

Define management networks and allow them to send syslog to logstash

Needed to have switches in logstash

Change-Id: Ia0d4ab58835bf38a0e0976e5943d9962deebbd1e
---
M modules/base/templates/firewall/defs.erb
M modules/network/data/data.yaml
M modules/network/manifests/constants.pp
M modules/role/manifests/logstash/collector.pp
4 files changed, 14 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/371949/1

diff --git a/modules/base/templates/firewall/defs.erb 
b/modules/base/templates/firewall/defs.erb
index 4e68ff9..3322333 100644
--- a/modules/base/templates/firewall/defs.erb
+++ b/modules/base/templates/firewall/defs.erb
@@ -9,6 +9,8 @@
 analytics_networks = scope.lookupvar('network::constants::analytics_networks')
 mw_appserver_networks = 
scope.lookupvar('network::constants::mw_appserver_networks')
 network_infra = scope.lookupvar('network::constants::network_infra')
+mgmt_networks = scope.lookupvar('network::constants::mgmt_networks')
+
 -%>
 
 @def $INTERNAL = (10.0.0.0/8 2620:0:860:100::/56 2620:0:861:100::/56 
2620:0:862:100::/56 2620:0:863:100::/56);
@@ -27,6 +29,8 @@
 @def $MW_APPSERVER_NETWORKS = (<%- mw_appserver_networks.each do |net| -%><%= 
net %> <% end -%>);
 
 @def $NETWORK_INFRA = (<%- network_infra.each do |net| -%><%= net %> <% end 
-%>);
+@def $MGMT_NETWORKS = (<%- mgmt_networks.each do |net| -%><%= net %> <% end 
-%>);
+
 
 <%- special_hosts.sort.map do |realm, services | -%>
<%- if @realm != realm then next end -%>
diff --git a/modules/network/data/data.yaml b/modules/network/data/data.yaml
index 0a539de..f98fd27 100644
--- a/modules/network/data/data.yaml
+++ b/modules/network/data/data.yaml
@@ -16,6 +16,12 @@
   - 208.80.154.192/27 # eqiad
   - 2620:0:861:fe00::/55 # eqiad
 
+network::management:
+  - 10.65.0.0/16 # eqiad
+  - 10.128.128.0/17 # ulsfo
+  - 10.193.0.0/16 # codfw
+  - 10.21.0.0/24 # esams
+
 network::subnets:
   production:
 eqiad:
diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index c6d2fd7..c95e9f7 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -7,6 +7,8 @@
 $all_network_subnets = $network_data['network::subnets']
 $external_networks = $network_data['network::external']
 $network_infra = $network_data['network::infrastructure']
+$mgmt_networks = $network_data['network::management']
+
 
 # are you really sure you want to use this? maybe what you really
 # the trusted/production networks. See $production_networks for this.
diff --git a/modules/role/manifests/logstash/collector.pp 
b/modules/role/manifests/logstash/collector.pp
index 1cd090c..7113d5a 100644
--- a/modules/role/manifests/logstash/collector.pp
+++ b/modules/role/manifests/logstash/collector.pp
@@ -41,14 +41,14 @@
 proto   => 'udp',
 port=> '10514',
 notrack => true,
-srange  => '($DOMAIN_NETWORKS $NETWORK_INFRA)',
+srange  => '($DOMAIN_NETWORKS $NETWORK_INFRA $MGMT_NETWORKS)',
 }
 
 ferm::service { 'logstash_syslog_tcp':
 proto   => 'tcp',
 port=> '10514',
 notrack => true,
-srange  => '($DOMAIN_NETWORKS $NETWORK_INFRA)',
+srange  => '($DOMAIN_NETWORKS $NETWORK_INFRA $MGMT_NETWORKS)',
 }
 
 ferm::service { 'grafana_dashboard_definition_storage':

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...WikiForum[master]: Use CaptchaTriggers attribute to declare wikiforum Captcha t...

2017-08-14 Thread Florianschmidtwelzow (Code Review)
Florianschmidtwelzow has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371948 )

Change subject: Use CaptchaTriggers attribute to declare wikiforum Captcha 
trigger
..

Use CaptchaTriggers attribute to declare wikiforum Captcha trigger

Instead of overwriting the existing configuration, depending on the
load order of WikiForum and ConfirmEdit.

Bug: T152929
Change-Id: I53f75190d49fbab0c6f947c04e7d5f19594b9e5f
Depends-on: I4c5eaf87657f5dc07787480a2f1a56a1db8c714f
---
M extension.json
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/extension.json b/extension.json
index 7b7bb6c..b7c0e1a 100644
--- a/extension.json
+++ b/extension.json
@@ -76,13 +76,13 @@
"ParserFirstCallInit": "WikiForumHooks::registerParserHooks",
"LoadExtensionSchemaUpdates": "WikiForumHooks::addTables"
},
+   "CaptchaTriggers": {
+   "wikiforum": true
+   },
"config": {
"WikiForumAllowAnonymous": true,
"WikiForumSmilies": [],
-   "WikiForumLogInRC": true,
-   "CaptchaTriggers": {
-   "wikiforum": true
-   }
+   "WikiForumLogInRC": true
},
"manifest_version": 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53f75190d49fbab0c6f947c04e7d5f19594b9e5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 

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


[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Allow other extensions to setup triggers using attributes

2017-08-14 Thread Florianschmidtwelzow (Code Review)
Florianschmidtwelzow has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371947 )

Change subject: Allow other extensions to setup triggers using attributes
..

Allow other extensions to setup triggers using attributes

Instead of misusing the config section of extension.json to declare
captcha triggers in the ConfirmEdits CaptchaTriggers config variable,
other extensions can now use the CaptchaTriggers attribute for the
exact same thing. E.g., to declare a new trigger, the following
addition to the own extension.json will register the trigger in
ConfirmEdit:

  "CaptchaTriggers": {
"wikiforum": true
  }

Bug: T152929
Change-Id: I4c5eaf87657f5dc07787480a2f1a56a1db8c714f
---
M includes/ConfirmEditHooks.php
1 file changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/includes/ConfirmEditHooks.php b/includes/ConfirmEditHooks.php
index fc8a540..066eebf 100644
--- a/includes/ConfirmEditHooks.php
+++ b/includes/ConfirmEditHooks.php
@@ -83,15 +83,17 @@
self::getInstance()->onAuthChangeFormFields( $requests, 
$fieldInfo, $formDescriptor, $action );
}
 
-   /**
-* Set up $wgWhitelistRead
-*/
public static function confirmEditSetup() {
// @codingStandardsIgnoreStart 
MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
global $wgCaptchaTriggers, $wgAllowConfirmedEmail,
$wgWikimediaJenkinsCI, $ceAllowConfirmedEmail;
// @codingStandardsIgnoreEnd
 
+   $attributeCaptchaTriggers = ExtensionRegistry::getInstance()
+   ->getAttribute( 'CaptchaTriggers' );
+   if ( is_array( $attributeCaptchaTriggers ) ) {
+   $wgCaptchaTriggers += $attributeCaptchaTriggers;
+   }
// There is no need to run (core) tests with enabled 
ConfirmEdit - bug T44145
if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI 
=== true ) {
$wgCaptchaTriggers = array_fill_keys( array_keys( 
$wgCaptchaTriggers ), false );

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use gzip -9 for compressing the Wikidata entity dumps

2017-08-14 Thread Hoo man (Code Review)
Hoo man has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371946 )

Change subject: Use gzip -9 for compressing the Wikidata entity dumps
..

Use gzip -9 for compressing the Wikidata entity dumps

This will save us about 10% in output file size.

Given the dump output is streamed into this over several
hours, this shouldn't really clog the snapshot CPU much.

In the future we might also want to do T151876, but that
is so much slower that we need to investigate that more
carefully.

Change-Id: I51368a530be90b8aefc8331bc3fce7bbfd963c33
---
M modules/snapshot/files/cron/dumpwikidatajson.sh
M modules/snapshot/files/cron/dumpwikidatardf.sh
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/snapshot/files/cron/dumpwikidatajson.sh 
b/modules/snapshot/files/cron/dumpwikidatajson.sh
index 7827d3a..80dd30b 100644
--- a/modules/snapshot/files/cron/dumpwikidatajson.sh
+++ b/modules/snapshot/files/cron/dumpwikidatajson.sh
@@ -29,7 +29,7 @@
(
set -o pipefail

errorLog=/var/log/wikidatadump/dumpwikidatajson-$filename-$i.log
-   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpJson.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --snippet 2>> $errorLog | 
gzip > $tempDir/wikidataJson.$i.gz
+   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpJson.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --snippet 2>> $errorLog | 
gzip -9 > $tempDir/wikidataJson.$i.gz
exitCode=$?
if [ $exitCode -gt 0 ]; then
echo -e "\n\n(`date --iso-8601=minutes`) 
Process for shard $i failed with exit code $exitCode" >> $errorLog
diff --git a/modules/snapshot/files/cron/dumpwikidatardf.sh 
b/modules/snapshot/files/cron/dumpwikidatardf.sh
index b7709ff..036eec9 100755
--- a/modules/snapshot/files/cron/dumpwikidatardf.sh
+++ b/modules/snapshot/files/cron/dumpwikidatardf.sh
@@ -56,7 +56,7 @@
(
set -o pipefail

errorLog=/var/log/wikidatadump/dumpwikidata$dumpFormat-$filename-$i.log
-   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpRdf.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --format $dumpFormat --flavor 
$dumpFlavor 2>> $errorLog | gzip > $tempDir/wikidata$dumpFormat-$dumpName.$i.gz
+   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpRdf.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --format $dumpFormat --flavor 
$dumpFlavor 2>> $errorLog | gzip -9 > 
$tempDir/wikidata$dumpFormat-$dumpName.$i.gz
exitCode=$?
if [ $exitCode -gt 0 ]; then
echo -e "\n\n(`date --iso-8601=minutes`) 
Process for shard $i failed with exit code $exitCode" >> $errorLog

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51368a530be90b8aefc8331bc3fce7bbfd963c33
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man 

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


[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Convert Special:AbuseLog to OOjs

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

Change subject: Convert Special:AbuseLog to OOjs
..


Convert Special:AbuseLog to OOjs

Bug: T132284
Change-Id: Ifad07bac45eadc4ed377967aa4ab3e3b9e14aa8b
---
M includes/special/SpecialAbuseLog.php
1 file changed, 2 insertions(+), 7 deletions(-)

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



diff --git a/includes/special/SpecialAbuseLog.php 
b/includes/special/SpecialAbuseLog.php
index 61b60c5..bac89fe 100644
--- a/includes/special/SpecialAbuseLog.php
+++ b/includes/special/SpecialAbuseLog.php
@@ -109,13 +109,11 @@
'label-message' => 
'abusefilter-log-search-user',
'type' => 'user',
'default' => $this->mSearchUser,
-   'size' => 45,
],
'SearchTitle' => [
'label-message' => 
'abusefilter-log-search-title',
'type' => 'title',
'default' => $this->mSearchTitle,
-   'size' => 45,
]
];
if ( self::canSeeDetails() ) {
@@ -123,7 +121,6 @@
'label-message' => 
'abusefilter-log-search-filter',
'type' => 'text',
'default' => $this->mSearchFilter,
-   'size' => 45,
];
}
if ( $wgAbuseFilterIsCentral ) {
@@ -133,7 +130,6 @@
'label-message' => 
'abusefilter-log-search-wiki',
'type' => 'text',
'default' => $this->mSearchWiki,
-   'size' => 45,
];
}
if ( self::canSeeHidden() ) {
@@ -148,9 +144,8 @@
];
}
 
-   $htmlForm = HTMLForm::factory( 'table', $formDescriptor, 
$this->getContext() );
-   $htmlForm->setWrapperLegendMsg( 'abusefilter-log-search' )
-   ->setSubmitTextMsg( 'abusefilter-log-search-submit' )
+   $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, 
$this->getContext() )
+   ->setWrapperLegendMsg( 'abusefilter-log-search' )
->setMethod( 'get' )
->prepareForm()
->displayForm( false );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifad07bac45eadc4ed377967aa4ab3e3b9e14aa8b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Rendann 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Huji 
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] pywikibot/core[master]: wikibase_tests.py: Ignore the case of mainpage aliases

2017-08-14 Thread Dalba (Code Review)
Dalba has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371945 )

Change subject: wikibase_tests.py: Ignore the case of mainpage aliases
..

wikibase_tests.py: Ignore the case of mainpage aliases

Bug: T173318
Change-Id: I30eff420aefc95cc699ea256500343acda73d58f
---
M tests/wikibase_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/45/371945/1

diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py
index 86b1f2d..259b5d0 100644
--- a/tests/wikibase_tests.py
+++ b/tests/wikibase_tests.py
@@ -130,7 +130,7 @@
 self.assertIn('en', item.labels)
 self.assertTrue(item.labels['en'].lower().endswith('main page'))
 self.assertIn('en', item.aliases)
-self.assertIn('Home page', item.aliases['en'])
+self.assertIn('home page', [a.lower() for a in item.aliases['en']])
 self.assertEqual(item.namespace(), 0)
 item2 = ItemPage(repo, 'q5296')
 self.assertEqual(item2.getID(), 'Q5296')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30eff420aefc95cc699ea256500343acda73d58f
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


  1   2   >