date:20180119

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update wikimedia dependancies

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

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

Change subject: Update wikimedia dependancies
..


Update wikimedia dependancies

Updated:
* wikimedia/ip-set 1.1.0 -> 1.2.0
* wikimedia/relpath 2.0.0 -> 2.1.1
* wikimedia/running-stat 1.1.0 -> 1.2.1
* wikimedia/wrappedstring 2.2.0 -> 2.3.0

https://github.com/wikimedia/IPSet/compare/1.1.0...1.2.0
https://github.com/wikimedia/relpath/compare/2.0.0...2.1.1
https://github.com/wikimedia/runningstat/compare/v1.1.0...v1.2.1
https://github.com/wikimedia/WrappedString/compare/v2.2.0...v2.3.0

Bug: T182273
Change-Id: Ib2402f41262549207c8386d74855240ca0d4a54b
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
A wikimedia/ip-set/.phpcs.xml
M wikimedia/ip-set/README.md
A wikimedia/ip-set/src/IPSet/IPSet.php
R wikimedia/ip-set/src/Wikimedia/IPSet.php
A wikimedia/relpath/.phpcs.xml
M wikimedia/relpath/README.md
D wikimedia/relpath/src/RelPath.php
A wikimedia/relpath/src/RelPath/RelPath.php
A wikimedia/relpath/src/Wikimedia/RelPath.php
A wikimedia/running-stat/.phpcs.xml
M wikimedia/running-stat/COPYING
M wikimedia/running-stat/README.md
A wikimedia/running-stat/src/RunningStat/PSquare.php
A wikimedia/running-stat/src/RunningStat/RunningStat.php
R wikimedia/running-stat/src/Wikimedia/PSquare.php
R wikimedia/running-stat/src/Wikimedia/RunningStat.php
A wikimedia/wrappedstring/.phpcs.xml
M wikimedia/wrappedstring/README.md
R wikimedia/wrappedstring/src/Wikimedia/WrappedString.php
R wikimedia/wrappedstring/src/Wikimedia/WrappedStringList.php
A wikimedia/wrappedstring/src/WrappedString/WrappedString.php
A wikimedia/wrappedstring/src/WrappedString/WrappedStringList.php
29 files changed, 544 insertions(+), 377 deletions(-)

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



diff --git a/composer.json b/composer.json
index 23c9403..285e003 100644
--- a/composer.json
+++ b/composer.json
@@ -116,20 +116,20 @@
"wikimedia/css-sanitizer": "1.0.2",
"wikimedia/equivset": "1.2.0",
"wikimedia/html-formatter": "1.0.1",
-   "wikimedia/ip-set": "1.1.0",
+   "wikimedia/ip-set": "1.2.0",
"wikimedia/lucene-explain-parser": "1.0.0",
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
-   "wikimedia/relpath": "2.0.0",
+   "wikimedia/relpath": "2.1.1",
"wikimedia/remex-html": "1.0.2",
-   "wikimedia/running-stat": "1.1.0",
+   "wikimedia/running-stat": "1.2.1",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/testing-access-wrapper": "1.0.0",
"wikimedia/textcat": "1.2.0",
"wikimedia/timestamp": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
"wikimedia/wait-condition-loop": "1.0.1",
-   "wikimedia/wrappedstring": "2.2.0",
+   "wikimedia/wrappedstring": "2.3.0",
"zordius/lightncandy": "0.23"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index 79b8e27..58c9371 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "837c313a820d305f7d8972f339ad3f58",
+"content-hash": "55ccb0d45b1afbfc53e1263ca3a357d8",
 "packages": [
 {
 "name": "composer/semver",
@@ -2972,25 +2972,25 @@
 },
 {
 "name": "wikimedia/ip-set",
-"version": "1.1.0",
+"version": "1.2.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/IPSet.git;,
-"reference": "b71a3834b42e2bcb2d9fa037abbb654e82117a01"
+"reference": "cabb679f440c87fd4053e4ea5e0120e769c9447f"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/IPSet/zipball/b71a3834b42e2bcb2d9fa037abbb654e82117a01;,
-"reference": "b71a3834b42e2bcb2d9fa037abbb654e82117a01",
+"url": 
"https://api.github.com/repos/wikimedia/IPSet/zipball/cabb679f440c87fd4053e4ea5e0120e769c9447f;,
+"reference": "cabb679f440c87fd4053e4ea5e0120e769c9447f",
 "shasum": ""
 },
 "require": {
-"php": ">=5.3.3"
+"php": ">=5.5.9"
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
-

[MediaWiki-commits] [Gerrit] mediawiki...phpunit-patch-coverage[master]: Add script as a composer binary

2018-01-19 Thread Legoktm (Code Review)

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

Change subject: Add script as a composer binary
..


Add script as a composer binary

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

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



diff --git a/composer.json b/composer.json
index 720c921..7cc96d9 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,9 @@
   "MediaWiki\\Tool\\PatchCoverage\\": "src"
 }
   },
+  "bin": [
+"bin/phpunit-patch-coverage"
+  ],
   "require": {
 "php": ">=5.5.9",
 "legoktm/clover-diff": "^1.0.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd3e2029939f576a4af3f608b1f56f63327a20c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/phpunit-patch-coverage
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...phpunit-patch-coverage[master]: Add script as a composer binary

2018-01-19 Thread Legoktm (Code Review)

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

Change subject: Add script as a composer binary
..

Add script as a composer binary

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/tools/phpunit-patch-coverage 
refs/changes/02/405402/1

diff --git a/composer.json b/composer.json
index 720c921..7cc96d9 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,9 @@
   "MediaWiki\\Tool\\PatchCoverage\\": "src"
 }
   },
+  "bin": [
+"bin/phpunit-patch-coverage"
+  ],
   "require": {
 "php": ">=5.5.9",
 "legoktm/clover-diff": "^1.0.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd3e2029939f576a4af3f608b1f56f63327a20c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/phpunit-patch-coverage
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]: Update wikimedia dependencies

2018-01-19 Thread MaxSem (Code Review)

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

Change subject: Update wikimedia dependencies
..


Update wikimedia dependencies

Updated:
* wikimedia/ip-set 1.1.0 -> 1.2.0
* wikimedia/relpath 2.0.0 -> 2.1.1
* wikimedia/running-stat 1.1.0 -> 1.2.1
* wikimedia/wrappedstring 2.2.0 -> 2.3.0

https://github.com/wikimedia/IPSet/compare/1.1.0...1.2.0
https://github.com/wikimedia/relpath/compare/2.0.0...2.1.1
https://github.com/wikimedia/runningstat/compare/v1.1.0...v1.2.1
https://github.com/wikimedia/WrappedString/compare/v2.2.0...v2.3.0

Bug: T182273
Change-Id: I23a734e7a5b9a7ff4d46901a9c5b3b51402687d5
Depends-On: Ib2402f41262549207c8386d74855240ca0d4a54b
---
M RELEASE-NOTES-1.31
M composer.json
2 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index a50159c..2189482 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -48,6 +48,10 @@
   1.2.0 (development dependency).
 * Updated nikic/php-parser from 2.1.0 to 3.1.3
   (development dependency).
+* Updated wikimedia/ip-set from 1.1.0 to 1.2.0.
+* Updated wikimedia/relpath from 2.0.0 to 2.1.1.
+* Updated wikimedia/running-stat from 1.1.0 to 1.2.0.
+* Updated wikimedia/wrappedstring from 2.2.0 to 2.3.0.
 * …
 
  New external libraries 
diff --git a/composer.json b/composer.json
index 4ae1f00..4596c4c 100644
--- a/composer.json
+++ b/composer.json
@@ -35,17 +35,17 @@
"wikimedia/cldr-plural-rule-parser": "1.0.0",
"wikimedia/composer-merge-plugin": "1.4.1",
"wikimedia/html-formatter": "1.0.1",
-   "wikimedia/ip-set": "1.1.0",
+   "wikimedia/ip-set": "1.2.0",
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
-   "wikimedia/relpath": "2.0.0",
+   "wikimedia/relpath": "2.1.1",
"wikimedia/remex-html": "1.0.2",
-   "wikimedia/running-stat": "1.1.0",
+   "wikimedia/running-stat": "1.2.1",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
"wikimedia/timestamp": "1.0.0",
"wikimedia/wait-condition-loop": "1.0.1",
-   "wikimedia/wrappedstring": "2.2.0",
+   "wikimedia/wrappedstring": "2.3.0",
"zordius/lightncandy": "0.23"
},
"require-dev": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23a734e7a5b9a7ff4d46901a9c5b3b51402687d5
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Tabs[master]: Convert Tabs to use extension registration

2018-01-19 Thread Jayprakash12345 (Code Review)

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

Change subject: Convert Tabs to use extension registration
..

Convert Tabs to use extension registration

Bug: T185371
Change-Id: I4041813e6e7df0fcde317fbdbb0df913e9c1a575
---
M Tabs.php
A extension.json
2 files changed, 55 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Tabs 
refs/changes/01/405401/2

diff --git a/Tabs.php b/Tabs.php
index c69f10f..cf18a2c 100644
--- a/Tabs.php
+++ b/Tabs.php
@@ -24,32 +24,16 @@
  * @file
  */
 
-$wgExtensionCredits['parserhook'][] = array(
-   'path'   => __FILE__,
-   'name'   => 'Tabs',
-   'author' => 'Joeytje50',
-   'url'=> 'https://www.mediawiki.org/wiki/Extension:Tabs',
-   'descriptionmsg' => 'tabs-desc',
-   'version'=> '1.3.2',
-   'license-name'   => 'GPL-2.0+'
-);
-
-$dir = __DIR__ . '/';
-$wgMessagesDirs['Tabs'] = __DIR__ . '/i18n';
-$wgAutoloadClasses['Tabs'] = $dir . 'Tabs.body.php';
-$wgExtensionMessagesFiles['TabsMagic'] =  $dir . 'Tabs.i18n.magic.php';
-$wgHooks['ParserFirstCallInit'][] = 'Tabs::init';
-$wgResourceModules['ext.tabs'] = array(
-   'scripts' => 'ext.tabs.js',
-   'styles' => 'ext.tabs.css',
-   'messages' => array(
-   'tabs-tab-label',
-   'tabs-toggle-open',
-   'tabs-toggle-close',
-   'tabs-dropdown-label',
-   'tabs-dropdown-bgcolor',
-   ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'Tabs',
-   'position' => 'top',
-);
+ if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'Tabs' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['Tabs'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for the Tabs extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the Tabs extension requires MediaWiki 1.29+' );
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..3932040
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,42 @@
+{
+   "name": "Tabs",
+   "version": "1.3.2",
+   "author": "Joeytje50",
+   "url": "https://www.mediawiki.org/wiki/Extension:Tabs;,
+   "descriptionmsg": "tabs-desc",
+   "license-name": "GPL-2.0+",
+   "type": "parserhook",
+   "MessagesDirs": {
+   "Tabs": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "TabsMagic": "Tabs.i18n.magic.php"
+   },
+   "AutoloadClasses": {
+   "Tabs": "Tabs.body.php"
+   },
+   "ResourceModules": {
+   "ext.tabs": {
+   "scripts": "ext.tabs.js",
+   "styles": "ext.tabs.css",
+   "messages": [
+   "tabs-tab-label",
+   "tabs-toggle-open",
+   "tabs-toggle-close",
+   "tabs-dropdown-label",
+   "tabs-dropdown-bgcolor"
+   ],
+   "position": "top"
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "",
+   "remoteExtPath": "Tabs"
+   },
+   "Hooks": {
+   "ParserFirstCallInit": "Tabs::init"
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4041813e6e7df0fcde317fbdbb0df913e9c1a575
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Tabs
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Arrays[master]: Convert Arrays to use extension registration

2018-01-19 Thread Jayprakash (Code Review)

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

Change subject: Convert Arrays to use extension registration
..

Convert Arrays to use extension registration

Bug: T185253
Change-Id: I63118c3e2f038f97f28420b7047dad5879e4a162
---
D Arrays.settings.php
1 file changed, 0 insertions(+), 46 deletions(-)


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

diff --git a/Arrays.settings.php b/Arrays.settings.php
deleted file mode 100644
index 029f7a0..000
--- a/Arrays.settings.php
+++ /dev/null
@@ -1,46 +0,0 @@
-http://www.mediawiki.org/wiki/Extension:Arrays#Configuration
- *
- * NOTICE:
- * ===
- * Changing one of these settings can be done by copying and placing
- * it in LocalSettings.php, AFTER the inclusion of 'Arrays'.
- *
- * @file
- * @ingroup Arrays
- * @since 2.0
- *
- * @author Daniel Werner
- */
-
-/**
- * Set to false by default since version 2.0.
- *
- * @since 2.0 (as '$egArrayExtensionCompatbilityMode' in 1.4 alpha)
- *
- * @var boolean
- */
-$egArraysCompatibilityMode = false;
-
-/**
- * Contains a key-value pair list of characters that should be replaced by a 
template or parser function
- * call within array values included into an '#arrayprint'. By replacing these 
special characters before
- * including the values into the string which is being expanded afterwards, 
array values can't distract
- * the surrounding MW code. Otherwise the array values themselves would be 
parsed as well.
- *
- * This has no effect in case $egArraysCompatibilityMode is set to false! If 
set to null, Arrays will
- * jump to compatibility mode behavior on this, independently from 
$egArraysCompatibilityMode.
- *
- * @since 2.0
- *
- * @var array|null
- */
-$egArraysExpansionEscapeTemplates = array(
-   '='  => '{{=}}',
-   '|'  => '{{!}}',
-   '{{' => '{{((}}',
-   '}}' => '{{))}}'
-);

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...phpunit-patch-coverage[master]: Initial commit

2018-01-19 Thread Legoktm (Code Review)

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

Change subject: Initial commit
..


Initial commit

Change-Id: Iee3af2fc500fac61a5f85a498f1c8830c872d90f
---
A .gitignore
A COPYING
A README.md
A bin/phpunit-patch-coverage
A composer.json
A phpcs.xml
A phpunit.xml
A src/CheckCommand.php
A src/ClassFinder.php
A src/CommandProcess.php
A src/Git.php
A src/GitChanged.php
A src/Parser/ClassTrackerVisitor.php
A src/TestFinder.php
A tests/ClassFinderTest.php
A tests/GitTest.php
A tests/TestFinderTest.php
A tests/data/Dummy1.php
A tests/data/Dummy1Test.php
A tests/data/Dummy2.php
A tests/data/Dummy2Test.php
A tests/data/Dummy3Test.php
A tests/data/Dummy3bTest.php
A tests/data/Dummy4Test.php
A tests/data/Dummy5Test.php
A tests/data/Dummy6Test6.php
26 files changed, 1,719 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..ff72e2d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/composer.lock
+/vendor
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..f288702
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+

[MediaWiki-commits] [Gerrit] mediawiki...phpunit-patch-coverage[master]: Initial commit

2018-01-19 Thread Legoktm (Code Review)

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

Change subject: Initial commit
..

Initial commit

Change-Id: Iee3af2fc500fac61a5f85a498f1c8830c872d90f
---
A .gitignore
A COPYING
A README.md
A bin/phpunit-patch-coverage
A composer.json
A phpcs.xml
A phpunit.xml
A src/CheckCommand.php
A src/ClassFinder.php
A src/CommandProcess.php
A src/Git.php
A src/GitChanged.php
A src/Parser/ClassTrackerVisitor.php
A src/TestFinder.php
A tests/ClassFinderTest.php
A tests/GitTest.php
A tests/TestFinderTest.php
A tests/data/Dummy1.php
A tests/data/Dummy1Test.php
A tests/data/Dummy2.php
A tests/data/Dummy2Test.php
A tests/data/Dummy3Test.php
A tests/data/Dummy3bTest.php
A tests/data/Dummy4Test.php
A tests/data/Dummy5Test.php
A tests/data/Dummy6Test6.php
26 files changed, 1,719 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/tools/phpunit-patch-coverage 
refs/changes/99/405399/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..ff72e2d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/composer.lock
+/vendor
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..f288702
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+

[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: [WIP] Simplyfing HTML for WikiSelector menu options

2018-01-19 Thread Nuria (Code Review)

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

Change subject: [WIP] Simplyfing HTML for WikiSelector menu options
..

[WIP] Simplyfing HTML for WikiSelector menu options

The menu options can be as high as 500,
with that many it seems that Vue has trouble with property access
but also a DOM insertion of so many nodes is costly. We simplyfy HTML
and remove some of vuew accessors

Also, small caching is added so clearing of search text in selector
doesn't repeat computations

Bug: T185334
Change-Id: Ia81a7445c3715064518026ccc1f149ff230770f0
---
M src/components/WikiSelector.vue
M src/components/widgets/SearchResults.vue
2 files changed, 49 insertions(+), 28 deletions(-)


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

diff --git a/src/components/WikiSelector.vue b/src/components/WikiSelector.vue
index dffc351..4353af1 100644
--- a/src/components/WikiSelector.vue
+++ b/src/components/WikiSelector.vue
@@ -53,6 +53,10 @@
 subtitle: 'name'
 };
 
+
+let  sitematrixData = null;
+
+
 export default {
 name: 'wiki-selector',
 
@@ -71,6 +75,7 @@
 },
 
 mounted () {
+
 this.initWithCurrentWiki();
 this.initTextWidthMeasurer();
 },
@@ -231,26 +236,41 @@
 },
 
 getAllSearchData () {
-return Promise.all([
-sitematrix.getWikiGroups(searchDataFormat),
-sitematrix.getProjectFamilies(null, searchDataFormat),
-sitematrix.getLanguages(null, searchDataFormat),
-sitematrix.getSpecialWikis({
-type: true,
-code: 'hostname',
-title: 'name',
-subtitle: 'hostname'
-}),
-sitematrix.getRegularWikis({
-type: true,
-code: 'hostname',
-title: 'hostname',
-subtitle: 'dbname'
-})
-]).then(values => {
-const [groups, projectFamilies, languages, specials, wikis] = 
values;
-return _.concat(groups, projectFamilies, languages, specials, 
wikis);
-});
+// no need to go through all the promise parsing code more than 
once
+// this saves about ~10 ms of execution time (profiled with 
console.time)
+// we probably we can benefit
+// from this pattern of locally caching data rather that 
re-resolve the chain
+// of promises elsewhere
+
+if (sitematrixData){
+return Promise.resolve(sitematrixData);
+}  else {
+
+return Promise.all([
+sitematrix.getWikiGroups(searchDataFormat),
+sitematrix.getProjectFamilies(null, searchDataFormat),
+sitematrix.getLanguages(null, searchDataFormat),
+sitematrix.getSpecialWikis({
+type: true,
+code: 'hostname',
+title: 'name',
+subtitle: 'hostname'
+}),
+sitematrix.getRegularWikis({
+type: true,
+code: 'hostname',
+title: 'hostname',
+subtitle: 'dbname'
+})
+
+]).then(values => {
+const [groups, projectFamilies, languages, specials, 
wikis] = values;
+
+sitematrixData = _.concat(groups, projectFamilies, 
languages, specials, wikis)
+return sitematrixData;
+});
+
+}
 },
 
 navigateSearchResults (offset) {
diff --git a/src/components/widgets/SearchResults.vue 
b/src/components/widgets/SearchResults.vue
index fcb81f5..2919b54 100644
--- a/src/components/widgets/SearchResults.vue
+++ b/src/components/widgets/SearchResults.vue
@@ -7,11 +7,8 @@
 @mouseenter="highlightResult(r)"
 @click="select(r)"
 :class="{ highlighted: highlightedResult === r }">
+{{r[title || 'title']}}
 
-{{r[title || 'title']}}
-
-{{r[subtitle]}}
-
 
 
 
@@ -140,6 +137,7 @@
 
 computed: {
 results: function () {
+console.time('start-computed')
 const {
 search,
 data = [],
@@ -149,12 +147,12 @@
 
 } = this.$props;
 
-if (!search) { return _.take(data, maxResults); }
+if (!search || search == 'All wikis') { return _.take(data, 
maxResults); }
 const s = makeRegex(search);
 
 // For some reason, lodash's _.chain() method would throw errors 
when
 // trying to chain filter operations to it. Super-ugly, but...
-

[MediaWiki-commits] [Gerrit] mediawiki...phpunit-patch-coverage[master]: Add .gitreview

2018-01-19 Thread Legoktm (Code Review)

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

Change subject: Add .gitreview
..


Add .gitreview

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

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..5432224
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/tools/phpunit-patch-coverage.git
+track=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic861d624c2171e3359b6f2aa639c34b1aeaa3c47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/phpunit-patch-coverage
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...phpunit-patch-coverage[master]: Add .gitreview

2018-01-19 Thread Legoktm (Code Review)

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

Change subject: Add .gitreview
..

Add .gitreview

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/tools/phpunit-patch-coverage 
refs/changes/97/405397/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..5432224
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/tools/phpunit-patch-coverage.git
+track=1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic861d624c2171e3359b6f2aa639c34b1aeaa3c47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/phpunit-patch-coverage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: requirements.txt: Add setuptools_scm to Python 2.6 requirements

2018-01-19 Thread Dalba (Code Review)

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

Change subject: requirements.txt: Add setuptools_scm to Python 2.6 requirements
..

requirements.txt: Add setuptools_scm to Python 2.6 requirements

Bug: T185369

Change-Id: Ia3dff97a9b6739f910592a7776f58dfea6472eb4
---
M dev-requirements.txt
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/96/405396/1

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 4e1640d..5084cdf 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -35,3 +35,5 @@
 # are not useful on the Appveyor Win32 builds since the relevant UI tests
 # also require accessing the menu of the console window, which doesnt exist
 # in the Appveyor environment.
+
+setuptools_scm ; python_version == '2.6'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...NoTitle[master]: Convert NoTitle to use extension registration

2018-01-19 Thread Jayprakash12345 (Code Review)

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

Change subject: Convert NoTitle to use extension registration
..

Convert NoTitle to use extension registration

Change-Id: I54f9d0c2369d10ec057f278dfc3e6f63d18802e3
---
M NoTitle.php
A extension.json
2 files changed, 41 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NoTitle 
refs/changes/95/405395/2

diff --git a/NoTitle.php b/NoTitle.php
index fb1840e..d929850 100644
--- a/NoTitle.php
+++ b/NoTitle.php
@@ -18,32 +18,16 @@
  * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public 
License 3.0 or later
  */
 
-// Ensure that the script cannot be executed outside of MediaWiki.
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( 'This file is an extension to MediaWiki and cannot be used 
standalone.' );
-}
-
-// Display extension properties on MediaWiki.
-$wgExtensionCredits['parserhook'][] = array(
-   'path' => __FILE__,
-   'name' => 'NoTitle',
-   'version' => '0.3.0',
-   'author' => array(
-   'Carlo Cabanilla',
-   'Tony Boyles',
-   '...'
-   ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:NoTitle',
-   'descriptionmsg' => 'notitle-desc',
-   'license-name' => 'GPL-3.0+'
-);
-
-// Load extension classes.
-$wgAutoloadClasses['NoTitle'] = __DIR__ . '/NoTitle.body.php';
-
-// Register extension messages and other localisation.
-$wgMessagesDirs['NoTitle'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['NoTitleMagic'] = __DIR__ . 
'/NoTitle.i18n.magic.php';
-
-// Register extension hooks.
-$wgHooks['ParserBeforeTidy'][] = 'NoTitle::killTitle';
+ if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'NoTitle' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['NoTitle'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for the NoTitle extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the NoTitle extension requires MediaWiki 1.29+' );
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..9ec4cc2
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,28 @@
+{
+   "name": "NoTitle",
+   "version": "0.3.0",
+   "author": [
+   "Carlo Cabanilla",
+   "Tony Boyles",
+   "..."
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:NoTitle;,
+   "descriptionmsg": "notitle-desc",
+   "license-name": "GPL-3.0+",
+   "type": "parserhook",
+   "MessagesDirs": {
+   "NoTitle": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "NoTitleMagic": "NoTitle.i18n.magic.php"
+   },
+   "AutoloadClasses": {
+   "NoTitle": "NoTitle.body.php"
+   },
+   "Hooks": {
+   "ParserBeforeTidy": "NoTitle::killTitle"
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54f9d0c2369d10ec057f278dfc3e6f63d18802e3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/NoTitle
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Use 'unwrap' post-cache transform instead of setWrapOutputCl...

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

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

Change subject: Use 'unwrap' post-cache transform instead of 
setWrapOutputClass( false ), when available
..


Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ), when 
available

To reduce parser cache fragmentation, core is deprecating
$parserOptions->setWrapOutputClass( false ) in favor of
$parserOutput->getText( [ 'unwrap' => true ] );

Change-Id: Ibc013a41f4a463f4014fbbce7ce27f8690161728
---
M includes/ApiQueryExtracts.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, but someone else must approve
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ApiQueryExtracts.php b/includes/ApiQueryExtracts.php
index 9b0e845..f4470e6 100644
--- a/includes/ApiQueryExtracts.php
+++ b/includes/ApiQueryExtracts.php
@@ -219,7 +219,9 @@
$apiException = null;
if ( !$this->parserOptions ) {
$this->parserOptions = new ParserOptions( new User( 
'127.0.0.1' ) );
-   if ( is_callable( [ $this->parserOptions, 
'setWrapOutputClass' ] ) ) {
+   if ( is_callable( [ $this->parserOptions, 
'setWrapOutputClass' ] ) &&
+   !defined( 
'ParserOutput::SUPPORTS_UNWRAP_TRANSFORM' )
+   ) {
$this->parserOptions->setWrapOutputClass( false 
);
}
}
@@ -227,7 +229,7 @@
if ( $page->shouldCheckParserCache( $this->parserOptions, 0 ) ) 
{
$pout = 
MediaWikiServices::getInstance()->getParserCache()->get( $page, 
$this->parserOptions );
if ( $pout ) {
-   $text = $pout->getText();
+   $text = $pout->getText( [ 'unwrap' => true ] );
if ( $this->params['intro'] ) {
$text = $this->getFirstSection( $text, 
false );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc013a41f4a463f4014fbbce7ce27f8690161728
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.Uri: Don't double-escape fragments

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

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

Change subject: mediawiki.Uri: Don't double-escape fragments
..


mediawiki.Uri: Don't double-escape fragments

Fragments were ingested already-escaped, then escaped again
when serializing. To prevent double-escaping, decode fragments
when ingesting them.

Bug: T183710
Change-Id: I19fc889bb7bde446476203bf6d6352dce8298256
---
M resources/src/mediawiki/mediawiki.Uri.js
M tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
2 files changed, 10 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.Uri.js 
b/resources/src/mediawiki/mediawiki.Uri.js
index 450b415..7f12835 100644
--- a/resources/src/mediawiki/mediawiki.Uri.js
+++ b/resources/src/mediawiki/mediawiki.Uri.js
@@ -324,6 +324,11 @@
} );
}
uri.query = q;
+
+   // Decode uri.fragment, otherwise it gets 
double-encoded when serializing
+   if ( uri.fragment !== undefined ) {
+   uri.fragment = Uri.decode( uri.fragment 
);
+   }
},
 
/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
index 84b8f06..918c923 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
@@ -206,6 +206,8 @@
uri = uriBase.clone();
uri.fragment = 'frag';
assert.equal( uri.toString(), 
'http://en.wiki.local/w/api.php#frag', 'add a fragment' );
+   uri.fragment = 'café';
+   assert.equal( uri.toString(), 
'http://en.wiki.local/w/api.php#caf%C3%A9', 'fragment is url-encoded' );
 
uri = uriBase.clone();
uri.host = 'fr.wiki.local';
@@ -391,7 +393,7 @@
QUnit.test( 'Advanced URL', function ( assert ) {
var uri, queryString, relativePath;
 
-   uri = new mw.Uri( 
'http://a...@www.example.com:81/dir/dir.2/index.htm?q1=0&=value+%28escaped%29#top'
 );
+   uri = new mw.Uri( 
'http://a...@www.example.com:81/dir/dir.2/index.htm?q1=0&=value+%28escaped%29#caf%C3%A9'
 );
 
assert.deepEqual(
{
@@ -412,7 +414,7 @@
port: '81',
path: '/dir/dir.2/index.htm',
query: { q1: '0', test1: null, test2: 'value 
(escaped)' },
-   fragment: 'top'
+   fragment: 'café'
},
'basic object properties'
);
@@ -432,7 +434,7 @@
relativePath = uri.getRelativePath();
assert.ok( relativePath.indexOf( uri.path ) >= 0, 'path in 
relative path' );
assert.ok( relativePath.indexOf( uri.getQueryString() ) >= 0, 
'query string in relative path' );
-   assert.ok( relativePath.indexOf( uri.fragment ) >= 0, 'fragment 
in relative path' );
+   assert.ok( relativePath.indexOf( mw.Uri.encode( uri.fragment ) 
) >= 0, 'escaped fragment in relative path' );
} );
 
QUnit.test( 'Parse a uri with an @ symbol in the path and query', 
function ( assert ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19fc889bb7bde446476203bf6d6352dce8298256
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Localize namespaces to inh

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

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

Change subject: Localize namespaces to inh
..


Localize namespaces to inh

Bug: T184511
Change-Id: Ia5f6add2ae4342f4916cb611c711f031c8f40575
---
M languages/messages/MessagesInh.php
1 file changed, 27 insertions(+), 7 deletions(-)

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



diff --git a/languages/messages/MessagesInh.php 
b/languages/messages/MessagesInh.php
index dc33b65..a40241c 100644
--- a/languages/messages/MessagesInh.php
+++ b/languages/messages/MessagesInh.php
@@ -1,11 +1,31 @@
 https://translatewiki.net
- *
- * @ingroup Language
- * @file
- *
- */
+*
+* To improve a translation please visit https://translatewiki.net
+*
+* @ingroup Language
+* @file
+*
+*/
 
 $fallback = 'ru';
+
+$namespaceNames = [
+   NS_MEDIA=> 'Медиа',
+   NS_SPECIAL  => 'Гӏулакха',
+   NS_MAIN => '',
+   NS_TALK => 'Ювцар',
+   NS_USER => 'Доакъашхо',
+   NS_USER_TALK=> 'Доакъашхочун_дувцар',
+   NS_PROJECT_TALK => '$1_ювцар',
+   NS_FILE => 'Файл',
+   NS_FILE_TALK=> 'Файл_ювцар',
+   NS_MEDIAWIKI=> 'MediaWiki',
+   NS_MEDIAWIKI_TALK   => 'MediaWiki_ювцар',
+   NS_TEMPLATE => 'Ло',
+   NS_TEMPLATE_TALK=> 'Ло_бувцар',
+   NS_HELP => 'Новкъостал',
+   NS_HELP_TALK=> 'Новкъостал_дувцар',
+   NS_CATEGORY => 'ОагӀат',
+   NS_CATEGORY_TALK=> 'ОагӀат_ювцар',
+];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5f6add2ae4342f4916cb611c711f031c8f40575
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Fix Special:AllComments, add optional button label, formatting

2018-01-19 Thread Cicalese (Code Review)

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

Change subject: Fix Special:AllComments, add optional button label, formatting
..

Fix Special:AllComments, add optional button label, formatting

Bug:T184731
Bug:T175855
Change-Id: Ie4b4965a4a1df77d3135c8b4b897243617cafa40
---
A .phpcs.xml
M composer.json
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/ApiCSBase.php
M includes/ApiCSDeleteComment.php
M includes/ApiCSPostComment.php
M includes/Comment.php
M includes/CommentStreams.php
M includes/CommentStreamsAllComments.php
M includes/CommentStreamsHooks.php
M includes/EchoCSPresentationModel.php
M resources/CommentStreams.css
M resources/CommentStreams.js
15 files changed, 106 insertions(+), 69 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
new file mode 100644
index 000..b0464c3
--- /dev/null
+++ b/.phpcs.xml
@@ -0,0 +1,8 @@
+
+
+   
+   
+   .
+   
+   
+
diff --git a/composer.json b/composer.json
index 7d306d5..182cb75 100644
--- a/composer.json
+++ b/composer.json
@@ -2,14 +2,17 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/mediawiki-codesniffer": "^15.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor --exclude 
node_modules",
+   "phpcs -p -s",
"minus-x check ."
],
"fix": [
+   "phpcbf",
"minus-x fix ."
]
}
diff --git a/extension.json b/extension.json
index 23f6d2b..024b33f 100644
--- a/extension.json
+++ b/extension.json
@@ -67,6 +67,8 @@
"commentstreams-api-error-unwatch",

"commentstreams-validation-error-nocommenttitle",
"commentstreams-validation-error-nocommenttext",
+   "commentstreams-buttontext-add",
+   "commentstreams-buttontext-reply",
"commentstreams-buttontooltip-add",
"commentstreams-buttontooltip-reply",
"commentstreams-buttontooltip-edit",
@@ -154,6 +156,7 @@
"CommentStreamsEnableTalk": false,
"CommentStreamsNewestStreamsOnTop": true,
"CommentStreamsModeratorFastDelete": false,
+   "CommentStreamsShowLabels": true,
"CommentStreamsEnableVoting": false,
"CommentStreamsInitiallyCollapsedNamespaces" : [],
"CommentStreamsUserRealNamePropertyName" : null,
diff --git a/i18n/en.json b/i18n/en.json
index 501fac6..22c2842 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -80,6 +80,8 @@
"commentstreams-api-error-unwatch": "Error unwatching comment.",
"commentstreams-validation-error-nocommenttitle": "You must enter a 
comment title.",
"commentstreams-validation-error-nocommenttext": "You must enter 
comment text.",
+   "commentstreams-buttontext-add": "ADD A COMMENT",
+   "commentstreams-buttontext-reply": "REPLY",
"commentstreams-buttontooltip-add": "add a comment",
"commentstreams-buttontooltip-reply": "reply",
"commentstreams-buttontooltip-edit": "edit",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 113c5bc..bfaf1d4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -82,6 +82,8 @@
"commentstreams-api-error-unwatch": "Error message.",
"commentstreams-validation-error-nocommenttitle": "Error message.",
"commentstreams-validation-error-nocommenttext": "Error message.",
+   "commentstreams-buttontext-add": "User interface button label. Upper 
case for stylistic reasons.",
+   "commentstreams-buttontext-reply": "User interface button label. Upper 
case for stylistic reasons.",
"commentstreams-buttontooltip-add": "User interface button tooltip.",
"commentstreams-buttontooltip-reply": "User interface button 
tooltip.\n{{Identical|Reply}}",
"commentstreams-buttontooltip-edit": "User interface button 
tooltip.\n{{Identical|Edit}}",
diff --git a/includes/ApiCSBase.php b/includes/ApiCSBase.php
index 78ac2e2..e524e97 100644
--- a/includes/ApiCSBase.php
+++ b/includes/ApiCSBase.php
@@ -29,7 +29,7 @@
/**
 * @param ApiMain $main main module
 * @param string $action name of this module
-* @param boolean $edit whether this API module will be editing the 
database
+* @param bool $edit whether this API module will be editing the 
database
 */
public function

[MediaWiki-commits] [Gerrit] integration/config[master]: Only run that extension's tests in coverage job

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

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

Change subject: Only run that extension's tests in coverage job
..


Only run that extension's tests in coverage job

Running all extension tests can be really slow, and it's totally useless
since we're going to discard all of those results anyways because they
don't match the coverage filter.

Change-Id: I404138b3b19efc428b7dbc80f2faeaf1bd56fc8e
---
M jjb/mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e58bc2f..ce3db35 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -512,6 +512,7 @@
 --testsuite extensions \
 --coverage-clover log/clover.xml \
 --coverage-html "$WORKSPACE/cover" \
+"$MW_INSTALL_PATH/extensions/$DOC_BASENAME/tests/phpunit" \
 || :
 # Above: Use "|| :" to ignore any non-zero exist status
 # We want to publish code coverage even in case one of there

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Only run that extension's tests in coverage job

2018-01-19 Thread Legoktm (Code Review)

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

Change subject: Only run that extension's tests in coverage job
..

Only run that extension's tests in coverage job

Running all extension tests can be really slow, and it's totally useless
since we're going to discard all of those results anyways because they
don't match the coverage filter.

Change-Id: I404138b3b19efc428b7dbc80f2faeaf1bd56fc8e
---
M jjb/mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/93/405393/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 7f8e025..18394a9 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -499,6 +499,7 @@
 --testsuite extensions \
 --coverage-clover log/clover.xml \
 --coverage-html "$WORKSPACE/cover" \
+"$MW_INSTALL_PATH/extensions/$DOC_BASENAME/tests/phpunit" \
 || :
 # Above: Use "|| :" to ignore any non-zero exist status
 # We want to publish code coverage even in case one of there

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I404138b3b19efc428b7dbc80f2faeaf1bd56fc8e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix or suppress some of the expected warnings during dry tests

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

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

Change subject: Fix or suppress some of the expected warnings during dry tests
..


Fix or suppress some of the expected warnings during dry tests

api_tests.py:
- TestDryPageGenerator.setUp: The `titles` parameter is handled through
  Request.clean_kwargs which issues a DeprecationWarning about using
  parameters isntead. Do it to avoid the warning.
- test_mixed_mode: Suppress parameters related warnings.

pywikibot.diff.html_comparator:
- Explicitly use html.parser to avoid "bs4/__init__.py:181: UserWarning:
  No parser was explicitly specified"

+ Similar suppressions in other dry test modules.

Bug: T185296
Change-Id: Ib108e513b66112956c19ce62746510e34c594a93
---
M pywikibot/diff.py
M tests/api_tests.py
M tests/bot_tests.py
M tests/dry_api_tests.py
M tests/http_tests.py
M tests/i18n_tests.py
M tests/textlib_tests.py
7 files changed, 49 insertions(+), 26 deletions(-)

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



diff --git a/pywikibot/diff.py b/pywikibot/diff.py
index e7f029d..636be64 100644
--- a/pywikibot/diff.py
+++ b/pywikibot/diff.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Diff module."""
 #
-# (C) Pywikibot team, 2014-2015
+# (C) Pywikibot team, 2014-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -607,7 +607,7 @@
 from bs4 import BeautifulSoup
 
 comparands = {'deleted-context': [], 'added-context': []}
-soup = BeautifulSoup(compare_string)
+soup = BeautifulSoup(compare_string, 'html.parser')
 for change_type, css_class in (('deleted-context', 'diff-deletedline'),
('added-context', 'diff-addedline')):
 crutons = soup.find_all('td', class_=css_class)
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 7906847..c185ff5 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """API test module."""
 #
-# (C) Pywikibot team, 2007-2016
+# (C) Pywikibot team, 2007-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -18,6 +18,7 @@
 
 from pywikibot.throttle import Throttle
 from pywikibot.tools import (
+suppress_warnings,
 MediaWikiVersion,
 PY2,
 UnicodeType,
@@ -143,6 +144,9 @@
 for item in req.items():
 self.assertEqual(len(item), 2, item)
 
+@suppress_warnings(
+'Instead of using kwargs |Both kwargs and parameters are set',
+DeprecationWarning)
 def test_mixed_mode(self):
 """Test if parameters is used with kwargs."""
 req1 = api.Request(site=self.site, action='test', parameters='foo')
@@ -570,7 +574,7 @@
 mysite = self.get_site()
 self.gen = api.PageGenerator(site=mysite,
  generator="links",
- titles="User:R'n'B")
+ parameters={'titles': "User:R'n'B"})
 # following test data is copied from an actual api.php response,
 # but that query no longer matches this dataset.
 # 
http://en.wikipedia.org/w/api.php?action=query=links=User:R%27n%27B
diff --git a/tests/bot_tests.py b/tests/bot_tests.py
index 47c3618..5cfade3 100644
--- a/tests/bot_tests.py
+++ b/tests/bot_tests.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Bot tests."""
 #
-# (C) Pywikibot team, 2015
+# (C) Pywikibot team, 2015-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -13,7 +13,7 @@
 import pywikibot.bot
 
 from pywikibot import i18n
-from pywikibot.tools import PY2
+from pywikibot.tools import PY2, suppress_warnings
 
 from tests.aspects import (
 unittest, DefaultSiteTestCase, SiteAttributeTestCase, TestCase,
@@ -222,6 +222,7 @@
 self.bot.run()
 self.assertEqual(self.bot.site, self._treat_site)
 
+@suppress_warnings('pywikibot.bot.MultipleSitesBot.site is deprecated')
 def test_MultipleSitesBot(self):
 """Test MultipleSitesBot class."""
 # Assert no specific site
diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py
index ed405af..8cef292 100644
--- a/tests/dry_api_tests.py
+++ b/tests/dry_api_tests.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """API tests which do not interact with a site."""
 #
-# (C) Pywikibot team, 2012-2014
+# (C) Pywikibot team, 2012-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -17,8 +17,9 @@
 QueryGenerator,
 )
 from pywikibot.family import Family
+from pywikibot.tools import suppress_warnings
 
-from tests import join_images_path
+from tests import join_images_path, patch
 from tests.utils import DummySiteinfo
 from tests.aspects import (
 unittest, TestCase, DefaultDrySiteTestCase, SiteAttributeTestCase,
@@ -58,10 +59,11 @@
 expiry=1, site=self.altsite,
 parameters={'action': 'query', 'meta': 'userinfo'})

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: Add further `alt` attributes and texts

2018-01-19 Thread VolkerE (Code Review)

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

Change subject: Add further `alt` attributes and texts
..

Add further `alt` attributes and texts

Also clarify via `lang` and code comments which language is used.

Bug: T185288
Change-Id: Ifdd5922370bebae7e90c888f2080c046099f8715
---
M 2017/donors.html
M 2017/images/thanks_2.svg
M 2017/images/thanks_3.svg
M 2017/images/thanks_4.svg
M 2017/images/thanks_7.svg
M 2017/stories.html
6 files changed, 10 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/annualreport 
refs/changes/92/405392/1

diff --git a/2017/donors.html b/2017/donors.html
index b8538c4..c0b9f85 100644
--- a/2017/donors.html
+++ b/2017/donors.html
@@ -96,7 +96,7 @@
 
   
 Donors
-
+
 In every language, we wish to say 
thank you. This year, we received donations from millions of 
supporters. Those donations make our work possible. Thank you for sustaining 
Wikimedia and benefiting readers around the world.
 We are proud to list donors here who 
gave 1,000 USD and more between July 1, 2016 and June 30, 2017. Thank you again 
for supporting free knowledge in the world. We are honored to have you with 
us.
   
diff --git a/2017/images/thanks_2.svg b/2017/images/thanks_2.svg
index d6f2a16..7894ed4 100644
--- a/2017/images/thanks_2.svg
+++ b/2017/images/thanks_2.svg
@@ -6,7 +6,8 @@
   }
 
   
-  Chinese
+  
+  谢谢。
   
 
 
diff --git a/2017/images/thanks_3.svg b/2017/images/thanks_3.svg
index 6b1c5b3..3bddcc1 100644
--- a/2017/images/thanks_3.svg
+++ b/2017/images/thanks_3.svg
@@ -6,7 +6,7 @@
   }
 
   
-  Gracias
+  Gracias.
   
 
 
diff --git a/2017/images/thanks_4.svg b/2017/images/thanks_4.svg
index 6326b1a..cb72257 100644
--- a/2017/images/thanks_4.svg
+++ b/2017/images/thanks_4.svg
@@ -6,7 +6,7 @@
   }
 
   
-  Merci
+  Merci.
   
 
 
diff --git a/2017/images/thanks_7.svg b/2017/images/thanks_7.svg
index 421e819..e2a8aea 100644
--- a/2017/images/thanks_7.svg
+++ b/2017/images/thanks_7.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" viewBox="0 0 188 64" 
style="enable-background:new 0 0 188 64;" xml:space="preserve">.st0{fill:#221F20;}.st1{fill:#1C1A1A;}Arabic
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" viewBox="0 0 188 64" 
style="enable-background:new 0 0 188 64;" xml:space="preserve">.st0{fill:#221F20;}.st1{fill:#1C1A1A;}شكر.
diff --git a/2017/stories.html b/2017/stories.html
index 64b8bb8..210cf32 100644
--- a/2017/stories.html
+++ b/2017/stories.html
@@ -184,7 +184,7 @@
   The people behind free 
knowledge
   
 
-  
+  
 
   https://commons.wikimedia.org/wiki/File:Felix_Nartey_at_Wikimedia_Conference_2017.jpg;
 rel="noopener" target="_blank">Jason Krüger - CC BY-SA 4.0
 
@@ -232,7 +232,7 @@
   Creating healthy 
communities
   
 
-  
+  
 
   https://commons.wikimedia.org/wiki/File:ArtAndFeminism_2017_Livrustkammaren_06.jpg;
 rel="noopener" target="_blank">Jens Mohr - CC BY-SA 3.0
 
@@ -279,7 +279,7 @@
   Improving access to 
knowledge
   
 
-  
+  
 
   https://commons.wikimedia.org/wiki/File:Haeckel_Trochilidae.jpg; 
rel="noopener" target="_blank">Ernst Haeckel - Public domain
 
@@ -328,7 +328,7 @@
   Finding the missing 
knowledge
   
 
-  
+  
 
   https://commons.wikimedia.org/wiki/Category:Lake_Titicaca#/media/File:Artesan%C3%ADas_Islas_Flotantes_Uros.JPG;
 rel="noopener" target="_blank">Yoli Marcela Hernandez - CC BY 4.0
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdd5922370bebae7e90c888f2080c046099f8715
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/annualreport
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Set default fragment mode to [ 'legacy', 'html5' ]

2018-01-19 Thread MaxSem (Code Review)

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

Change subject: Set default fragment mode to [ 'legacy', 'html5' ]
..

Set default fragment mode to [ 'legacy', 'html5' ]

This is step one in migration, 1.35 LTS should make it
[ 'html5', 'legacy' ].

Also issue deprecation warnings for $wgExperimentalHtmlIds.

Bug: T152540
Bug: T139744
Change-Id: I8780bb589002a4f836ba90bd18093a56cddc3ddf
---
M RELEASE-NOTES-1.31
M includes/DefaultSettings.php
M includes/Setup.php
3 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/405391/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index dd00228..1008b05 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -21,6 +21,9 @@
   were removed (deprecated since 1.27).
 * (T180921) $wgReferrerPolicy now supports having fallbacks for browsers that 
are not
   using the latest version of the Referrer Policy specification.
+* $wgFragmentMode is now set to [ 'legacy', 'html5' ] by default. This is a 
first step of
+  migration to human-readable section IDs that will later result in 'html5' 
being the
+  default mode.
 
 === New features in 1.31 ===
 * Wikimedia\Rdbms\IDatabase->select() and similar methods now support
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9208dec..8f4c346 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3411,7 +3411,7 @@
  *
  * @since 1.30
  */
-$wgFragmentMode = [ 'legacy' ];
+$wgFragmentMode = [ 'legacy', 'html5' ];
 
 /**
  * Which ID escaping mode should be used for external interwiki links? See 
documentation
diff --git a/includes/Setup.php b/includes/Setup.php
index d1f225b..3e37c9c 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -360,6 +360,7 @@
 
 // Convert this deprecated setting to modern system
 if ( $wgExperimentalHtmlIds ) {
+   wfDeprecated( '$wgExperimentalHtmlIds', '1.30' );
$wgFragmentMode = [ 'html5-legacy', 'html5' ];
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...InputBox[wmf/1.31.0-wmf.17]: Follow-up dd0a0035e: make useve work together with prefix

2018-01-19 Thread Catrope (Code Review)

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

Change subject: Follow-up dd0a0035e: make useve work together with prefix
..

Follow-up dd0a0035e: make useve work together with prefix

If you set useve=true, the prefix was ignored. This was because
the prefixing code only looked for action=edit, not for veaction=edit.

Bug: T185367
Change-Id: I7b14f76571aab302cf76a3383066f030881c1454
(cherry picked from commit 64364df4455065a3d12ae9905f0c45d39566d72e)
---
M InputBox.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/InputBox.hooks.php b/InputBox.hooks.php
index 25aa98d..d94c422 100644
--- a/InputBox.hooks.php
+++ b/InputBox.hooks.php
@@ -84,7 +84,7 @@
$request,
$wiki
) {
-   if ( $wiki->getAction( $request ) !== 'edit' ) {
+   if ( $wiki->getAction( $request ) !== 'edit' && 
$request->getText( 'veaction' ) !== 'edit' ) {
// not our problem
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b14f76571aab302cf76a3383066f030881c1454
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InputBox
Gerrit-Branch: wmf/1.31.0-wmf.17
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...InputBox[master]: Follow-up dd0a0035e: make useve work together with prefix

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

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

Change subject: Follow-up dd0a0035e: make useve work together with prefix
..


Follow-up dd0a0035e: make useve work together with prefix

If you set useve=true, the prefix was ignored. This was because
the prefixing code only looked for action=edit, not for veaction=edit.

Bug: T185367
Change-Id: I7b14f76571aab302cf76a3383066f030881c1454
---
M InputBox.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/InputBox.hooks.php b/InputBox.hooks.php
index 25aa98d..d94c422 100644
--- a/InputBox.hooks.php
+++ b/InputBox.hooks.php
@@ -84,7 +84,7 @@
$request,
$wiki
) {
-   if ( $wiki->getAction( $request ) !== 'edit' ) {
+   if ( $wiki->getAction( $request ) !== 'edit' && 
$request->getText( 'veaction' ) !== 'edit' ) {
// not our problem
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b14f76571aab302cf76a3383066f030881c1454
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InputBox
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: VolkerE 
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...InputBox[master]: Follow-up dd0a0035e: make useve work together with prefix

2018-01-19 Thread Catrope (Code Review)

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

Change subject: Follow-up dd0a0035e: make useve work together with prefix
..

Follow-up dd0a0035e: make useve work together with prefix

If you set useve=true, the prefix was ignored. This was because
the prefixing code only looked for action=edit, not for veaction=edit.

Bug: T185367
Change-Id: I7b14f76571aab302cf76a3383066f030881c1454
---
M InputBox.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/InputBox.hooks.php b/InputBox.hooks.php
index 25aa98d..d94c422 100644
--- a/InputBox.hooks.php
+++ b/InputBox.hooks.php
@@ -84,7 +84,7 @@
$request,
$wiki
) {
-   if ( $wiki->getAction( $request ) !== 'edit' ) {
+   if ( $wiki->getAction( $request ) !== 'edit' && 
$request->getText( 'veaction' ) !== 'edit' ) {
// not our problem
return true;
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: make os_version spec more extensive

2018-01-19 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405387 )

Change subject: wmflib: make os_version spec more extensive
..


wmflib: make os_version spec more extensive

Cover cases such as:
- no operator ('Debian jessie')
- compound expressions ('Debian jessie || Ubuntu trusty')
- testing against another operating system ('debian jessie' on a trusty)
- case sensitivity ('debian jessie')

Bug: T185345
Change-Id: I7aa053dea60614b36f5743cc26abd3e155390a0f
---
M modules/wmflib/spec/functions/os_version_spec.rb
1 file changed, 75 insertions(+), 3 deletions(-)

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



diff --git a/modules/wmflib/spec/functions/os_version_spec.rb 
b/modules/wmflib/spec/functions/os_version_spec.rb
index f422356..4381f44 100644
--- a/modules/wmflib/spec/functions/os_version_spec.rb
+++ b/modules/wmflib/spec/functions/os_version_spec.rb
@@ -11,7 +11,7 @@
 end
   end
 
-  context 'when running on Ubuntu Trusty 14.04' do
+  context 'when running on Ubuntu Trusty Tahr (14.04)' do
 let(:facts) do
   {
 :lsbdistrelease => '14.04',
@@ -19,16 +19,56 @@
   }
 end
 
-it 'matches properly' do
+it 'matches comparing current release' do
+  expect(subject).to run.with_params('Ubuntu trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu == trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu >= trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu <= trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu > trusty').and_return(false)
   expect(subject).to run.with_params('Ubuntu < trusty').and_return(false)
 end
+
+it 'matches comparing with next release' do
+  expect(subject).to run.with_params('Ubuntu utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu == utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu >= utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu <= utopic').and_return(true)
+  expect(subject).to run.with_params('Ubuntu > utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu < utopic').and_return(true)
+end
+
+it 'does not match with another operating system' do
+  expect(subject).to run.with_params('Debian jessie').and_return(false)
+  expect(subject).to run.with_params('Debian == jessie').and_return(false)
+  expect(subject).to run.with_params('Debian >= jessie').and_return(false)
+  expect(subject).to run.with_params('Debian <= jessie').and_return(false)
+  expect(subject).to run.with_params('Debian > jessie').and_return(false)
+  expect(subject).to run.with_params('Debian < jessie').and_return(false)
+end
+
+it 'works with compound expressions' do
+  expect(subject).to run.with_params('Ubuntu trusty || Debian 
jessie').and_return(true)
+  expect(subject).to run.with_params('Debian jessie || Ubuntu 
trusty').and_return(true)
+  expect(subject).to run.with_params('Ubuntu trusty || Ubuntu 
utopic').and_return(true)
+  expect(subject).to run.with_params('Ubuntu utopic || Ubuntu 
trusty').and_return(true)
+
+  expect(subject).to run.with_params('Ubuntu trusty || Ubuntu utopic || 
Debian jessie').and_return(true)
+  expect(subject).to run.with_params('Ubuntu utopic || Ubuntu xenial || 
Debian stretch').and_return(false)
+
+  expect(subject).to run.with_params('Ubuntu utopic || Debian 
jessie').and_return(false)
+  expect(subject).to run.with_params('Debian jessie || Ubuntu 
utopic').and_return(false)
+
+  expect(subject).to run.with_params('Debian jessie || Debian 
stretch').and_return(false)
+  expect(subject).to run.with_params('Debian stretch || Debian 
buster').and_return(false)
+end
+
+it 'is case insensitive' do
+  expect(subject).to run.with_params('ubuntu trusty').and_return(true)
+  expect(subject).to run.with_params('debian jessie').and_return(false)
+end
   end
 
-  context 'when running on Debian Jessie 8' do
+  context 'when running on Debian 8 "jessie"' do
 let(:facts) do
   {
 :lsbdistrelease => '8.7',
@@ -37,6 +77,7 @@
 end
 
 it 'matches comparing current release' do
+  expect(subject).to run.with_params('Debian jessie').and_return(true)
   expect(subject).to run.with_params('Debian == jessie').and_return(true)
   expect(subject).to run.with_params('Debian >= jessie').and_return(true)
   expect(subject).to run.with_params('Debian <= jessie').and_return(true)
@@ -45,11 +86,42 @@
 end
 
 it 'matches comparing with next release' do
+  expect(subject).to run.with_params('Debian stretch').and_return(false)
   expect(subject).to run.with_params('Debian == stretch').and_return(false)
   expect(subject).to run.with_params('Debian >=

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmAccount[master]: Improve some parameter docs

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

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: I964cfc2d2563e617a195d6b2b6f0acab4dea4efc
---
M .phpcs.xml
M ConfirmAccount.setup.php
M backend/ConfirmAccount.class.php
M backend/UserAccountRequest.php
M business/AccountConfirmSubmission.php
M business/AccountRequestSubmission.php
M frontend/ConfirmAccountUI.hooks.php
M frontend/ConfirmAccountUI.setup.php
M frontend/specialpages/actions/ConfirmAccount_body.php
M frontend/specialpages/actions/ConfirmAccountsPager.php
M frontend/specialpages/actions/RequestAccount_body.php
M frontend/specialpages/actions/UserCredentials_body.php
12 files changed, 51 insertions(+), 58 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 31951f0..bcfe27a 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,9 +4,6 @@



-   
-   
-   



diff --git a/ConfirmAccount.setup.php b/ConfirmAccount.setup.php
index 31497e0..4c6023f 100644
--- a/ConfirmAccount.setup.php
+++ b/ConfirmAccount.setup.php
@@ -7,10 +7,9 @@
 * Register source code paths.
 * This function must NOT depend on any config vars.
 *
-* @param $classes Array $classes
-* @param $messagesDirs Array $messagesDirs
-* @param $messagesFiles Array $messagesFiles
-* @return void
+* @param array &$classes
+* @param array &$messagesDirs
+* @param array &$messagesFiles
 */
public static function defineSourcePaths(
array &$classes, array &$messagesDirs, array &$messagesFiles
diff --git a/backend/ConfirmAccount.class.php b/backend/ConfirmAccount.class.php
index 39c635d..c9aa4a3 100644
--- a/backend/ConfirmAccount.class.php
+++ b/backend/ConfirmAccount.class.php
@@ -82,7 +82,7 @@
 * Generate, store, and return a new email confirmation code.
 * A hash (unsalted since it's used as a key) is stored.
 * @param User $user
-* @param string $expiration
+* @param string &$expiration
 * @return string
 */
public static function getConfirmationToken( $user, &$expiration ) {
@@ -125,7 +125,7 @@
/**
 * Get a request name from an email confirmation token
 *
-* @param $code string
+* @param string $code
 * @return string|false
 */
public static function requestNameFromEmailToken( $code ) {
@@ -141,8 +141,8 @@
 
/**
 * Get the number of account requests for a request type
-* @param $type int
-* @return Array Assosiative array with 'open', 'held', 'type' keys 
mapping to integers
+* @param int $type
+* @return array Assosiative array with 'open', 'held', 'type' keys 
mapping to integers
 */
public static function getOpenRequestCount( $type ) {
$dbr = wfGetDB( DB_REPLICA );
@@ -163,7 +163,7 @@
 
/**
 * Get the number of open email-confirmed account requests for a 
request type
-* @param $type int|string A request type or '*' for all
+* @param int|string $type A request type or '*' for all
 * @return int
 */
public static function getOpenEmailConfirmedCount( $type = '*' ) {
diff --git a/backend/UserAccountRequest.php b/backend/UserAccountRequest.php
index e24da51..2481648 100644
--- a/backend/UserAccountRequest.php
+++ b/backend/UserAccountRequest.php
@@ -32,7 +32,7 @@
}
 
/**
-* @param $row
+* @param stdClass $row
 * @return UserAccountRequest
 */
public static function newFromRow( $row ) {
@@ -68,7 +68,7 @@
}
 
/**
-* @param $fields array
+* @param array $fields
 * @return UserAccountRequest
 */
public static function newFromArray( array $fields ) {
@@ -121,8 +121,8 @@
}
 
/**
-* @param $id int
-* @param $from string|null 'dbmaster' to use DB master
+* @param int $id
+* @param string|null $from 'dbmaster' to use DB master
 * @return UserAccountRequest|null
 */
public static function newFromId( $id, $from = null ) {
@@ -137,8 +137,8 @@
}
 
/**
-* @param $name string
-* @param $from string|null 'dbmaster' to use DB master
+* @param string $name
+* @param string|null $from 'dbmaster' to use DB master
 * @return UserAccountRequest|null
 */
public static function newFromName( $name, $from = null ) {
@@ -209,7 +209,7 @@
}
 
/**
-* @param $flat string Use 'flat' to get a raw blob back
+*

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: make os_version spec more extensive

2018-01-19 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405387 )

Change subject: wmflib: make os_version spec more extensive
..

wmflib: make os_version spec more extensive

Cover cases such as:
- no operator ('Debian jessie')
- compound expressions ('Debian jessie || Ubuntu trusty')
- testing against another operating system ('debian jessie' on a trusty)
- case sensitivity ('debian jessie')

Bug: T185345
Change-Id: I7aa053dea60614b36f5743cc26abd3e155390a0f
---
M modules/wmflib/spec/functions/os_version_spec.rb
1 file changed, 75 insertions(+), 3 deletions(-)


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

diff --git a/modules/wmflib/spec/functions/os_version_spec.rb 
b/modules/wmflib/spec/functions/os_version_spec.rb
index f422356..4381f44 100644
--- a/modules/wmflib/spec/functions/os_version_spec.rb
+++ b/modules/wmflib/spec/functions/os_version_spec.rb
@@ -11,7 +11,7 @@
 end
   end
 
-  context 'when running on Ubuntu Trusty 14.04' do
+  context 'when running on Ubuntu Trusty Tahr (14.04)' do
 let(:facts) do
   {
 :lsbdistrelease => '14.04',
@@ -19,16 +19,56 @@
   }
 end
 
-it 'matches properly' do
+it 'matches comparing current release' do
+  expect(subject).to run.with_params('Ubuntu trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu == trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu >= trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu <= trusty').and_return(true)
   expect(subject).to run.with_params('Ubuntu > trusty').and_return(false)
   expect(subject).to run.with_params('Ubuntu < trusty').and_return(false)
 end
+
+it 'matches comparing with next release' do
+  expect(subject).to run.with_params('Ubuntu utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu == utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu >= utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu <= utopic').and_return(true)
+  expect(subject).to run.with_params('Ubuntu > utopic').and_return(false)
+  expect(subject).to run.with_params('Ubuntu < utopic').and_return(true)
+end
+
+it 'does not match with another operating system' do
+  expect(subject).to run.with_params('Debian jessie').and_return(false)
+  expect(subject).to run.with_params('Debian == jessie').and_return(false)
+  expect(subject).to run.with_params('Debian >= jessie').and_return(false)
+  expect(subject).to run.with_params('Debian <= jessie').and_return(false)
+  expect(subject).to run.with_params('Debian > jessie').and_return(false)
+  expect(subject).to run.with_params('Debian < jessie').and_return(false)
+end
+
+it 'works with compound expressions' do
+  expect(subject).to run.with_params('Ubuntu trusty || Debian 
jessie').and_return(true)
+  expect(subject).to run.with_params('Debian jessie || Ubuntu 
trusty').and_return(true)
+  expect(subject).to run.with_params('Ubuntu trusty || Ubuntu 
utopic').and_return(true)
+  expect(subject).to run.with_params('Ubuntu utopic || Ubuntu 
trusty').and_return(true)
+
+  expect(subject).to run.with_params('Ubuntu trusty || Ubuntu utopic || 
Debian jessie').and_return(true)
+  expect(subject).to run.with_params('Ubuntu utopic || Ubuntu xenial || 
Debian stretch').and_return(false)
+
+  expect(subject).to run.with_params('Ubuntu utopic || Debian 
jessie').and_return(false)
+  expect(subject).to run.with_params('Debian jessie || Ubuntu 
utopic').and_return(false)
+
+  expect(subject).to run.with_params('Debian jessie || Debian 
stretch').and_return(false)
+  expect(subject).to run.with_params('Debian stretch || Debian 
buster').and_return(false)
+end
+
+it 'is case insensitive' do
+  expect(subject).to run.with_params('ubuntu trusty').and_return(true)
+  expect(subject).to run.with_params('debian jessie').and_return(false)
+end
   end
 
-  context 'when running on Debian Jessie 8' do
+  context 'when running on Debian 8 "jessie"' do
 let(:facts) do
   {
 :lsbdistrelease => '8.7',
@@ -37,6 +77,7 @@
 end
 
 it 'matches comparing current release' do
+  expect(subject).to run.with_params('Debian jessie').and_return(true)
   expect(subject).to run.with_params('Debian == jessie').and_return(true)
   expect(subject).to run.with_params('Debian >= jessie').and_return(true)
   expect(subject).to run.with_params('Debian <= jessie').and_return(true)
@@ -45,11 +86,42 @@
 end
 
 it 'matches comparing with next release' do
+  expect(subject).to run.with_params('Debian stretch').and_return(false)
   expect(subject).to run.with_params('Debian == stretch').and_return(false)
   expect(subject).to run.with_params('Debian >=

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix variable name to match code

2018-01-19 Thread MaxSem (Code Review)

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

Change subject: Fix variable name to match code
..

Fix variable name to match code

Change-Id: Idb97c9c5379d2ba4f0874ceaffcf48870bdd682e
---
M includes/parser/BlockLevelPass.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/parser/BlockLevelPass.php 
b/includes/parser/BlockLevelPass.php
index 761d5be..8cf8f85 100644
--- a/includes/parser/BlockLevelPass.php
+++ b/includes/parser/BlockLevelPass.php
@@ -26,7 +26,7 @@
private $DTopen = false;
private $inPre = false;
private $lastSection = '';
-   private $linestart;
+   private $lineStart;
private $text;
 
# State constants for the definition list colon extraction

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove 2 unused private fields from ApiFormatBase

2018-01-19 Thread MaxSem (Code Review)

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

Change subject: Remove 2 unused private fields from ApiFormatBase
..

Remove 2 unused private fields from ApiFormatBase

Change-Id: I20018c7c5a2bff451db44fdb605120942500c5e1
---
M includes/api/ApiFormatBase.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/405383/1

diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
index 4348fc8..5e14e30 100644
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -30,7 +30,7 @@
  * @ingroup API
  */
 abstract class ApiFormatBase extends ApiBase {
-   private $mIsHtml, $mFormat, $mUnescapeAmps, $mHelp;
+   private $mIsHtml, $mFormat;
private $mBuffer, $mDisabled = false;
private $mIsWrappedHtml = false;
private $mHttpStatus = false;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix called function case in a bunch of places

2018-01-19 Thread MaxSem (Code Review)

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

Change subject: Fix called function case in a bunch of places
..

Fix called function case in a bunch of places

Change-Id: If1e392290a5bab3bce389f7da692e53a748b8aff
---
M includes/EditPage.php
M includes/Feed.php
M includes/Storage/RevisionStore.php
M includes/Title.php
M includes/api/ApiComparePages.php
M includes/api/ApiOptions.php
M includes/libs/jsminplus.php
M includes/libs/mime/XmlTypeCheck.php
8 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/405386/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 72c3c14..5dc0720 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3727,7 +3727,7 @@
 
return new OOUI\ButtonWidget( [
'id' => 'mw-editform-cancel',
-   'href' => $this->getContextTitle()->getLinkUrl( 
$cancelParams ),
+   'href' => $this->getContextTitle()->getLinkURL( 
$cancelParams ),
'label' => new OOUI\HtmlSnippet( $this->context->msg( 
'cancel' )->parse() ),
'framed' => false,
'infusable' => true,
diff --git a/includes/Feed.php b/includes/Feed.php
index 92eec08..86e9bee 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -88,7 +88,7 @@
 * @return string
 */
public function getUniqueID() {
-   $id = $this->getUniqueIDUnescaped();
+   $id = $this->getUniqueIdUnescaped();
if ( $id ) {
return $this->xmlEncode( $id );
}
@@ -383,7 +383,7 @@
"title" => $item->getTitle(),
"url" => $this->xmlEncode( wfExpandUrl( 
$item->getUrlUnescaped(), PROTO_CURRENT ) ),
"permalink" => $item->rssIsPermalink,
-   "uniqueID" => $item->getUniqueId(),
+   "uniqueID" => $item->getUniqueID(),
"description" => $item->getDescription(),
"date" => $this->xmlEncode( $this->formatTime( 
$item->getDate() ) ),
"author" => $item->getAuthor()
@@ -433,7 +433,7 @@
// uses htmlentities, which does not work with XML
$templateParams = [
'language' => $this->xmlEncode( $this->getLanguage() ),
-   'feedID' => $this->getFeedID(),
+   'feedID' => $this->getFeedId(),
'title' => $this->getTitle(),
'url' => $this->xmlEncode( wfExpandUrl( 
$this->getUrlUnescaped(), PROTO_CURRENT ) ),
'selfUrl' => $this->getSelfUrl(),
@@ -474,7 +474,7 @@
// Manually escaping rather than letting Mustache do it because 
Mustache
// uses htmlentities, which does not work with XML
$templateParams = [
-   "uniqueID" => $item->getUniqueId(),
+   "uniqueID" => $item->getUniqueID(),
"title" => $item->getTitle(),
"mimeType" => $this->xmlEncode( $wgMimeType ),
"url" => $this->xmlEncode( wfExpandUrl( 
$item->getUrlUnescaped(), PROTO_CURRENT ) ),
diff --git a/includes/Storage/RevisionStore.php 
b/includes/Storage/RevisionStore.php
index f8481fe..79ecec6 100644
--- a/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@ -190,7 +190,7 @@
 
// rev_id is defined as NOT NULL, but this revision may not yet 
have been inserted.
if ( !$title && $revId !== null && $revId > 0 ) {
-   $dbr = $this->getDbConnectionRef( $dbMode );
+   $dbr = $this->getDBConnectionRef( $dbMode );
// @todo: Title::getSelectFields(), or 
Title::getQueryInfo(), or something like that
$row = $dbr->selectRow(
[ 'revision', 'page' ],
diff --git a/includes/Title.php b/includes/Title.php
index 9aad401..c4cf434 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1812,10 +1812,10 @@
if ( $this->isExternal() ) {
$target = SpecialPage::getTitleFor(
'GoToInterwiki',
-   $this->getPrefixedDBKey()
+   $this->getPrefixedDBkey()
);
}
-   return $target->getFullUrl( $query, false, $proto );
+   return $target->getFullURL( $query, false, $proto );
}
 
/**
diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index 375fc18..93c35d3 100644
--- a/includes/api/ApiComparePages.php
+++

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove unused SpecialPasswordReset::$passwords

2018-01-19 Thread MaxSem (Code Review)

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

Change subject: Remove unused SpecialPasswordReset::$passwords
..

Remove unused SpecialPasswordReset::$passwords

Change-Id: I4c03bd9b7f01bacba453a263c3676b4f47aec933
---
M includes/specials/SpecialPasswordReset.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/85/405385/1

diff --git a/includes/specials/SpecialPasswordReset.php 
b/includes/specials/SpecialPasswordReset.php
index a4f16bd..84292f3 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -37,11 +37,6 @@
private $passwordReset = null;
 
/**
-* @var string[] Temporary storage for the passwords which have been 
sent out, keyed by username.
-*/
-   private $passwords = [];
-
-   /**
 * @var Status
 */
private $result;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove User::$mGroups

2018-01-19 Thread MaxSem (Code Review)

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

Change subject: Remove User::$mGroups
..

Remove User::$mGroups

Deprecated and unused. Private so nothing can possibly use it.

Change-Id: I70a20d35222cb0571e8b401c8b4e031d0be25d6b
---
M includes/user/User.php
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/includes/user/User.php b/includes/user/User.php
index 7684d2e..709bac7 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -228,11 +228,6 @@
protected $mRegistration;
/** @var int */
protected $mEditCount;
-   /**
-* @var array No longer used since 1.29; use User::getGroups() instead
-* @deprecated since 1.29
-*/
-   private $mGroups;
/** @var UserGroupMembership[] Associative array of (group name => 
UserGroupMembership object) */
protected $mGroupMemberships;
/** @var array */

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: revthank: Embed gender of thanks recipients in the page

2018-01-19 Thread Catrope (Code Review)

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

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

revthank: Embed gender of thanks recipients in the page

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

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


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

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

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

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

___
MediaWiki-commits mailing list

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

2018-01-19 Thread Catrope (Code Review)

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

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

revthank: Clarify confirmation message and change yes/no messages

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


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

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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces

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

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

Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
..


Require MediaWiki 1.31 in extension.json for AutoloadNamespaces

AutoloadNamespaces is a new feature in 1.31

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

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



diff --git a/extension.json b/extension.json
index ced4d65..3394073 100644
--- a/extension.json
+++ b/extension.json
@@ -8,6 +8,9 @@
"url": "https://www.mediawiki.org/wiki/Extension:GlobalPreferences;,
"descriptionmsg": "globalprefs-desc",
"type": "specialpage",
+   "requires": {
+   "MediaWiki": ">= 1.31.0"
+   },
"config": {
"GlobalPreferencesDB": null
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id67f1fe3afc4e11e0883b262f7993c206be4517d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Default to HTTPS on basically all links

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

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

Change subject: Default to HTTPS on basically all links
..


Default to HTTPS on basically all links

WMF supports them, as does CC. No need for protocol-relative messiness

Change-Id: I0a68029bade6bc047eed85e7cb7f6b259c248b96
---
M i18n/cclicensetexts/en.json
M i18n/wikimedia/en.json
M i18n/wikimediaoverrides/en.json
3 files changed, 203 insertions(+), 203 deletions(-)

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



diff --git a/i18n/cclicensetexts/en.json b/i18n/cclicensetexts/en.json
index 895a7f8..03f4ccd 100644
--- a/i18n/cclicensetexts/en.json
+++ b/i18n/cclicensetexts/en.json
@@ -4,202 +4,202 @@
},
"wm-license-cc-wiki-link": "w:en:Creative Commons",
"wm-license-cc-attribution": "Attribution",
-   "wm-license-cc-by-1.0-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/deed.en Attribution 1.0 Generic] 
license.",
-   "wm-license-cc-by-1.0-fi-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/fi/deed.en Attribution 1.0 Finland] 
license.",
-   "wm-license-cc-by-1.0-il-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/il/deed.en Attribution 1.0 Israel] 
license.",
-   "wm-license-cc-by-1.0-nl-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/nl/deed.en Attribution 1.0 Netherlands] 
license.",
-   "wm-license-cc-by-2.0-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/deed.en Attribution 2.0 Generic] 
license.",
-   "wm-license-cc-by-2.0-at-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/at/deed.en Attribution 2.0 Austria] 
license.",
-   "wm-license-cc-by-2.0-au-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/au/deed.en Attribution 2.0 Australia] 
license.",
-   "wm-license-cc-by-2.0-be-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/be/deed.en Attribution 2.0 Belgium] 
license.",
-   "wm-license-cc-by-2.0-br-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/br/deed.en Attribution 2.0 Brazil] 
license.",
-   "wm-license-cc-by-2.0-ca-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/ca/deed.en Attribution 2.0 Canada] 
license.",
-   "wm-license-cc-by-2.0-cl-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/cl/deed.en Attribution 2.0 Chile] 
license.",
-   "wm-license-cc-by-2.0-de-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/de/deed.en Attribution 2.0 Germany] 
license.",
-   "wm-license-cc-by-2.0-es-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/es/deed.en Attribution 2.0 Spain] 
license.",
-   "wm-license-cc-by-2.0-fr-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/fr/deed.en Attribution 2.0 France] 
license.",
-   "wm-license-cc-by-2.0-hr-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/hr/deed.en Attribution 2.0 Croatia] 
license.",
-   "wm-license-cc-by-2.0-it-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/it/deed.en Attribution 2.0 Italy] 
license.",
-   "wm-license-cc-by-2.0-jp-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/jp/deed.en Attribution 2.0 Japan] 
license.",
-   "wm-license-cc-by-2.0-kr-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/kr/deed.en Attribution 2.0 Korea] 
license.",
-   "wm-license-cc-by-2.0-nl-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/nl/deed.en Attribution 2.0 Netherlands]

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Default to HTTPS on basically all links

2018-01-19 Thread Chad (Code Review)

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

Change subject: Default to HTTPS on basically all links
..

Default to HTTPS on basically all links

WMF supports them, as does CC. No need for protocol-relative messiness

Change-Id: I0a68029bade6bc047eed85e7cb7f6b259c248b96
---
M i18n/cclicensetexts/en.json
M i18n/wikimedia/en.json
M i18n/wikimediaoverrides/en.json
3 files changed, 203 insertions(+), 203 deletions(-)


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

diff --git a/i18n/cclicensetexts/en.json b/i18n/cclicensetexts/en.json
index 895a7f8..03f4ccd 100644
--- a/i18n/cclicensetexts/en.json
+++ b/i18n/cclicensetexts/en.json
@@ -4,202 +4,202 @@
},
"wm-license-cc-wiki-link": "w:en:Creative Commons",
"wm-license-cc-attribution": "Attribution",
-   "wm-license-cc-by-1.0-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/deed.en Attribution 1.0 Generic] 
license.",
-   "wm-license-cc-by-1.0-fi-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/fi/deed.en Attribution 1.0 Finland] 
license.",
-   "wm-license-cc-by-1.0-il-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/il/deed.en Attribution 1.0 Israel] 
license.",
-   "wm-license-cc-by-1.0-nl-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/1.0/nl/deed.en Attribution 1.0 Netherlands] 
license.",
-   "wm-license-cc-by-2.0-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/deed.en Attribution 2.0 Generic] 
license.",
-   "wm-license-cc-by-2.0-at-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/at/deed.en Attribution 2.0 Austria] 
license.",
-   "wm-license-cc-by-2.0-au-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/au/deed.en Attribution 2.0 Australia] 
license.",
-   "wm-license-cc-by-2.0-be-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/be/deed.en Attribution 2.0 Belgium] 
license.",
-   "wm-license-cc-by-2.0-br-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/br/deed.en Attribution 2.0 Brazil] 
license.",
-   "wm-license-cc-by-2.0-ca-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/ca/deed.en Attribution 2.0 Canada] 
license.",
-   "wm-license-cc-by-2.0-cl-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/cl/deed.en Attribution 2.0 Chile] 
license.",
-   "wm-license-cc-by-2.0-de-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/de/deed.en Attribution 2.0 Germany] 
license.",
-   "wm-license-cc-by-2.0-es-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/es/deed.en Attribution 2.0 Spain] 
license.",
-   "wm-license-cc-by-2.0-fr-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/fr/deed.en Attribution 2.0 France] 
license.",
-   "wm-license-cc-by-2.0-hr-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/hr/deed.en Attribution 2.0 Croatia] 
license.",
-   "wm-license-cc-by-2.0-it-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/it/deed.en Attribution 2.0 Italy] 
license.",
-   "wm-license-cc-by-2.0-jp-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/jp/deed.en Attribution 2.0 Japan] 
license.",
-   "wm-license-cc-by-2.0-kr-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/kr/deed.en Attribution 2.0 Korea] 
license.",
-   "wm-license-cc-by-2.0-nl-text": "This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/2.0/nl/deed.en Attribution 2.0

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Fix "Error code 0" issue

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

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

Change subject: Fix "Error code 0" issue
..


Fix "Error code 0" issue

In some cases the returned code is integer "0". Adding the message to the
errors-array then collieds with this index.

Change-Id: I42ba94963208c749c8e82c68c121bbc3271b44ac
---
M includes/api/BSApiTasksBase.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/api/BSApiTasksBase.php b/includes/api/BSApiTasksBase.php
index 4cfd37a..93e8be5 100644
--- a/includes/api/BSApiTasksBase.php
+++ b/includes/api/BSApiTasksBase.php
@@ -158,6 +158,9 @@
if( $e instanceof DBError ) {
$mCode = 'dberror'; 
//TODO: error code for subtypes like DBQueryError or DBReadOnlyError?
}
+   if ( $mCode === 0 ) {
+   $mCode = 'error-0';
+   }
$oResult->errors[$mCode] = 
$e->getMessage();
$oResult->errors[0]['code'] = 
'unknown error';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42ba94963208c749c8e82c68c121bbc3271b44ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: Piwik: Complement protocol-relative URL with `https://`

2018-01-19 Thread Catrope (Code Review)

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

Change subject: Piwik: Complement protocol-relative URL with `https://`
..


Piwik: Complement protocol-relative URL with `https://`

Also remove unnecessary `type` attribute as it's default
in HTML5.

Bug: T185357
Change-Id: Ib4747d0ca5a921ff79bf80e8cc1a02ebb7c167fe
---
M 2017/community.html
M 2017/donors.html
M 2017/financials.html
M 2017/index.html
M 2017/leadership.html
M 2017/stories.html
6 files changed, 24 insertions(+), 36 deletions(-)

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



diff --git a/2017/community.html b/2017/community.html
index 350329b..cb8cad2 100644
--- a/2017/community.html
+++ b/2017/community.html
@@ -21,24 +21,22 @@
 
 
 
-
 
-
+