[MediaWiki-commits] [Gerrit] Fix broken and incomplete PHPDoc comments - change (mediawiki...CirrusSearch)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix broken and incomplete PHPDoc comments
..

Fix broken and incomplete PHPDoc comments

Change-Id: I4f85b2dee1208932fa1e6d7a420ae6c91de5258a
---
M includes/BuildDocument/SuggestBuilder.php
M includes/BuildDocument/SuggestScoring.php
M includes/NearMatchPicker.php
M includes/Search/RescoreBuilders.php
M includes/Search/Result.php
M includes/Search/ResultsType.php
M includes/Search/SearchContext.php
M includes/SearchConfig.php
M includes/Searcher.php
M tests/jenkins/Jenkins.php
10 files changed, 14 insertions(+), 13 deletions(-)


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

diff --git a/includes/BuildDocument/SuggestBuilder.php 
b/includes/BuildDocument/SuggestBuilder.php
index 45824f9..0ec199c 100644
--- a/includes/BuildDocument/SuggestBuilder.php
+++ b/includes/BuildDocument/SuggestBuilder.php
@@ -144,7 +144,7 @@
 * to make this decision at index time.
 *
 * @param int $id the page id
-* @param array of string $redirects the redirects
+* @param string[] $redirects
 * @param array $location the geo coordinates or null if unavailable
 * @param int $score the weight of the suggestion
 * @return array the suggestion document
diff --git a/includes/BuildDocument/SuggestScoring.php 
b/includes/BuildDocument/SuggestScoring.php
index 6d9477b..7cd1abc 100644
--- a/includes/BuildDocument/SuggestScoring.php
+++ b/includes/BuildDocument/SuggestScoring.php
@@ -123,7 +123,7 @@
 
/**
 * @param integer $maxDocs the number of docs in the index
-* @param array of key values, key is the template name, value the 
boost factor.
+* @param float[]|null $boostTemplates Array of key values, key is the 
template name, value the boost factor.
 *Defaults to Util::getDefaultBoostTemplates()
 */
public function __construct( $maxDocs, $boostTemplates = null ) {
diff --git a/includes/NearMatchPicker.php b/includes/NearMatchPicker.php
index 556ced8..ba0d88e 100644
--- a/includes/NearMatchPicker.php
+++ b/includes/NearMatchPicker.php
@@ -31,7 +31,7 @@
 */
private $term;
/**
-* @var array(Title) potential near matches
+* @var array[] Potential near matches
 */
private $titles;
 
@@ -40,7 +40,7 @@
 *
 * @param Language $language to use during normalization process
 * @param string $term the search term
-* @param array with optional keys:
+* @param array[] $titles Array of arrays, each with optional keys:
 *   titleMatch => a title if the title matched
 *   redirectMatches => an array of redirect matches, one per matched 
redirect
 */
diff --git a/includes/Search/RescoreBuilders.php 
b/includes/Search/RescoreBuilders.php
index 211be93..08a0c3a 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -254,7 +254,7 @@
 
 abstract class FunctionScoreBuilder {
/**
-* @param SearchContext the search context
+* @param SearchContext $context
 */
protected $context;
public function __construct( SearchContext $context ) {
@@ -277,7 +277,7 @@
private $boostTemplates;
 
/**
-* @param SearchContext the search context
+* @param SearchContext $context
 */
public function __construct( SearchContext $context ) {
parent::__construct( $context );
@@ -321,7 +321,7 @@
 
 
/**
-* @param SearchContext the search context
+* @param SearchContext $context
 */
public function __construct( SearchContext $context ) {
parent::__construct( $context );
diff --git a/includes/Search/Result.php b/includes/Search/Result.php
index 2cb6fd1..99be681 100644
--- a/includes/Search/Result.php
+++ b/includes/Search/Result.php
@@ -169,7 +169,7 @@
 
/**
 * Build the redirect title from the highlighted redirect snippet.
-* @param string highlighted redirect snippet
+* @param string $snippet Highlighted redirect snippet
 * @param array $redirects Array of redirects stored as arrays with 
'title' and 'namespace' keys
 * @return Title object representing the redirect
 */
diff --git a/includes/Search/ResultsType.php b/includes/Search/ResultsType.php
index beb85f9..2f96694 100644
--- a/includes/Search/ResultsType.php
+++ b/includes/Search/ResultsType.php
@@ -135,7 +135,7 @@
 
/**
 * Convert the results to titles.
-* @return array with optional keys:
+* @return array[] Array of arrays, each with optional keys:
 *   titleMatch => a title if the title matched
 *   redirectMatches => an array of redirect 

[MediaWiki-commits] [Gerrit] Remove unused uses - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Remove unused uses
..

Remove unused uses

While you are here, could you also merge the following patch please?
https://github.com/DataValues/Common/pull/39

Change-Id: I8cb23b25e61bbcb66888df7b568dd2cf633ec220
---
M repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php 
b/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
index ea2d637..6cb6c85 100644
--- a/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Test;
 
-use ContentHandler;
 use Title;
 use Wikibase\DataModel\Entity\Entity;
 use Wikibase\DataModel\Entity\EntityRedirect;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cb23b25e61bbcb66888df7b568dd2cf633ec220
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Switch Central/South Asia to esams (1) - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: Switch Central/South Asia to esams (1)
..


Switch Central/South Asia to esams (1)

Switch Kazakhstan, Kyrgyzstan, Tajikistan, Turkmenistan and Uzbekistan
to esams.

Change-Id: Ie570423a17e6eb93572e352aaeb977fae79afd43
---
M config-geo
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/config-geo b/config-geo
index c1ce4ea..c986f78 100644
--- a/config-geo
+++ b/config-geo
@@ -30,12 +30,12 @@
 IR => [esams, eqiad, codfw], # Iran (Islamic Republic of)
 JO => [esams, eqiad, codfw], # Jordan
 JP => [ulsfo, codfw, eqiad], # Japan
-KG => [   eqiad, codfw], # Kyrgyzstan
+KG => [esams, eqiad, codfw], # Kyrgyzstan
 KH => [ulsfo, codfw, eqiad], # Cambodia
 KP => [ulsfo, codfw, eqiad], # Korea, Democratic People's 
Republic of
 KR => [ulsfo, codfw, eqiad], # Korea, Republic of
 KW => [esams, eqiad, codfw], # Kuwait
-KZ => [   eqiad, codfw], # Kazakhstan
+KZ => [esams, eqiad, codfw], # Kazakhstan
 LA => [ulsfo, codfw, eqiad], # Lao People's Democratic 
Republic
 LB => [esams, eqiad, codfw], # Lebanon
 LK => [   eqiad, codfw], # Sri Lanka
@@ -54,11 +54,11 @@
 SG => [ulsfo, codfw, eqiad], # Singapore
 SY => [esams, eqiad, codfw], # Syrian Arab Republic
 TH => [ulsfo, codfw, eqiad], # Thailand
-TJ => [   eqiad, codfw], # Tajikistan
+TJ => [esams, eqiad, codfw], # Tajikistan
 TL => [ulsfo, codfw, eqiad], # Timor-Leste
-TM => [   eqiad, codfw], # Turkmenistan
+TM => [esams, eqiad, codfw], # Turkmenistan
 TW => [ulsfo, codfw, eqiad], # Taiwan, Province of China
-UZ => [   eqiad, codfw], # Uzbekistan
+UZ => [esams, eqiad, codfw], # Uzbekistan
 VN => [ulsfo, codfw, eqiad], # Viet Nam
 YE => [esams, eqiad, codfw], # Yemen
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie570423a17e6eb93572e352aaeb977fae79afd43
Gerrit-PatchSet: 5
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Switch Central/South Asia to esams (2) - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: Switch Central/South Asia to esams (2)
..

Switch Central/South Asia to esams (2)

Switch Afghanistan and Sri Lanka to esams.

Change-Id: Ice639845f640e097ccbdcf9dc5a9e96348e17303
---
M config-geo
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/41/257841/1

diff --git a/config-geo b/config-geo
index c986f78..b580381 100644
--- a/config-geo
+++ b/config-geo
@@ -8,7 +8,7 @@
 AF => [esams, eqiad, codfw],
 AS => {
 AE => [esams, eqiad, codfw], # United Arab Emirates
-AF => [   eqiad, codfw], # Afghanistan
+AF => [esams, eqiad, codfw], # Afghanistan
 AM => [esams, eqiad, codfw], # Armenia
 AP => [ulsfo, codfw, eqiad], # Asia-Pacific region (misc)
 AZ => [esams, eqiad, codfw], # Azerbaijan
@@ -38,7 +38,7 @@
 KZ => [esams, eqiad, codfw], # Kazakhstan
 LA => [ulsfo, codfw, eqiad], # Lao People's Democratic 
Republic
 LB => [esams, eqiad, codfw], # Lebanon
-LK => [   eqiad, codfw], # Sri Lanka
+LK => [esams, eqiad, codfw], # Sri Lanka
 MM => [ulsfo, codfw, eqiad], # Myanmar
 MN => [ulsfo, codfw, eqiad], # Mongolia
 MO => [ulsfo, codfw, eqiad], # Macao

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice639845f640e097ccbdcf9dc5a9e96348e17303
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Switch Pakistan to esams (3) - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: Switch Pakistan to esams (3)
..

Switch Pakistan to esams (3)

Change-Id: I6a3b451b7248e2414a72b1a8ecc4ba99bf0aea87
---
M config-geo
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/42/257842/1

diff --git a/config-geo b/config-geo
index b580381..a77f71f 100644
--- a/config-geo
+++ b/config-geo
@@ -47,7 +47,7 @@
 NP => [ulsfo, codfw, eqiad], # Nepal
 OM => [esams, eqiad, codfw], # Oman
 PH => [ulsfo, codfw, eqiad], # Philippines
-PK => [   eqiad, codfw], # Pakistan
+PK => [esams, eqiad, codfw], # Pakistan
 PS => [esams, eqiad, codfw], # Palestine, State of
 QA => [esams, eqiad, codfw], # Qatar
 SA => [esams, eqiad, codfw], # Saudi Arabia

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a3b451b7248e2414a72b1a8ecc4ba99bf0aea87
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Switch India & BIOT to esams (4) - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: Switch India & BIOT to esams (4)
..

Switch India & BIOT to esams (4)

Change-Id: I925526bf57f20ac847358dde240ef57b534ca3b6
---
M config-geo
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/43/257843/1

diff --git a/config-geo b/config-geo
index a77f71f..6a7bce9 100644
--- a/config-geo
+++ b/config-geo
@@ -24,8 +24,8 @@
 HK => [ulsfo, codfw, eqiad], # Hong Kong
 ID => [ulsfo, codfw, eqiad], # Indonesia
 IL => [esams, eqiad, codfw], # Israel
-IN => [   eqiad, codfw], # India
-IO => [   eqiad, codfw], # British Indian Ocean 
Territory
+IN => [esams, eqiad, codfw], # India
+IO => [esams, eqiad, codfw], # British Indian Ocean 
Territory
 IQ => [esams, eqiad, codfw], # Iraq
 IR => [esams, eqiad, codfw], # Iran (Islamic Republic of)
 JO => [esams, eqiad, codfw], # Jordan

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I925526bf57f20ac847358dde240ef57b534ca3b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Switch Afghanistan and Sri Lanka to esams (2) - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: Switch Afghanistan and Sri Lanka to esams (2)
..


Switch Afghanistan and Sri Lanka to esams (2)

Change-Id: Ice639845f640e097ccbdcf9dc5a9e96348e17303
---
M config-geo
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/config-geo b/config-geo
index c986f78..b580381 100644
--- a/config-geo
+++ b/config-geo
@@ -8,7 +8,7 @@
 AF => [esams, eqiad, codfw],
 AS => {
 AE => [esams, eqiad, codfw], # United Arab Emirates
-AF => [   eqiad, codfw], # Afghanistan
+AF => [esams, eqiad, codfw], # Afghanistan
 AM => [esams, eqiad, codfw], # Armenia
 AP => [ulsfo, codfw, eqiad], # Asia-Pacific region (misc)
 AZ => [esams, eqiad, codfw], # Azerbaijan
@@ -38,7 +38,7 @@
 KZ => [esams, eqiad, codfw], # Kazakhstan
 LA => [ulsfo, codfw, eqiad], # Lao People's Democratic 
Republic
 LB => [esams, eqiad, codfw], # Lebanon
-LK => [   eqiad, codfw], # Sri Lanka
+LK => [esams, eqiad, codfw], # Sri Lanka
 MM => [ulsfo, codfw, eqiad], # Myanmar
 MN => [ulsfo, codfw, eqiad], # Mongolia
 MO => [ulsfo, codfw, eqiad], # Macao

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice639845f640e097ccbdcf9dc5a9e96348e17303
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove an extra passwords::ldap::corp - change (labs/private)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Remove an extra passwords::ldap::corp
..

Remove an extra passwords::ldap::corp

It was declared twice

Change-Id: I9eb06c988cdfd0403d058c5f4a7c66f1db6e6637
---
M modules/passwords/manifests/init.pp
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/46/257846/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index fdc5faa..dfbadb0 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -86,10 +86,6 @@
 $ldap_user_pass = ''
 }
 
-class passwords::openldap::corp {
-$sync_pass = 'syncsyncsync'
-}
-
 class passwords::labs::rabbitmq {
 $rabbit_userid = 'auser'
 $rabbit_password  = 'apassword'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9eb06c988cdfd0403d058c5f4a7c66f1db6e6637
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Fix limit argument parser - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Fix limit argument parser
..

Fix limit argument parser

'-limit' was parsed as including a value instead of prompting for
a value, causing a ValueError.

Change-Id: Iea57e1bb8cc5823cc01420636d04752a5fb2f3f7
---
M scripts/checkimages.py
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/48/257848/1

diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 762f6d6..92fba62 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -1532,6 +1532,7 @@
 # Here begins the check block.
 if brackets and license_found:
 # It works also without this... but i want only to be sure ^^
+brackets = False
 return True
 elif delete:
 pywikibot.output(u"%s is not a file!" % self.imageName)
@@ -1541,6 +1542,7 @@
 notification = din % self.imageName
 head = dih
 self.report(canctext, self.imageName, notification, head)
+delete = False
 return True
 elif self.imageCheckText in nothing:
 pywikibot.output(
@@ -1595,7 +1597,7 @@
 # Here below there are the parameters.
 for arg in pywikibot.handle_args(args):
 if arg.startswith('-limit'):
-if len(arg) == 7:
+if len(arg) == 6:
 limit = int(pywikibot.input(
 u'How many files do you want to check?'))
 else:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea57e1bb8cc5823cc01420636d04752a5fb2f3f7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Switch from the "reverted" to "damaging" model - change (mediawiki...ORES)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Switch from the "reverted" to "damaging" model
..

Switch from the "reverted" to "damaging" model

Bug: T112856
Change-Id: I8b5ea18ea6618aefd45c53bd8cb52c0005100f50
---
M i18n/en.json
M i18n/qqq.json
M includes/Hooks.php
3 files changed, 13 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/51/257851/1

diff --git a/i18n/en.json b/i18n/en.json
index c8fa9a4..796ff07 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,8 +3,8 @@
"authors": []
},
"ores-desc": "Expose automated revision scores in the interface",
-   "ores-reverted-filter": "$1 good edits",
-   "ores-reverted-letter": "R",
-   "ores-reverted-title": "This edit needs review",
-   "ores-reverted-legend": "ORES predicts that this change may be damaging 
and should be reviewed"
+   "ores-damaging-filter": "$1 good edits",
+   "ores-damaging-letter": "D",
+   "ores-damaging-title": "This edit needs review",
+   "ores-damaging-legend": "ORES predicts that this change may be damaging 
and should be reviewed"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1e1a06f..418221e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,8 +1,8 @@
 {
"@metadata": [],
"ores-desc": "Extension summary.",
-   "ores-reverted-filter": "Label to toggle filtering on ORES data. 
Parameters:\n* $1 - Action to be performed by toggling.",
-   "ores-reverted-letter": "Single letter for tagging recent changes at 
risk of revert.",
-   "ores-reverted-title": "Tooltip for revert risk icon.",
-   "ores-reverted-legend": "Legend for revert risk icon."
+   "ores-damaging-filter": "Label to toggle filtering on ORES data. 
Parameters:\n* $1 - Action to be performed by toggling.",
+   "ores-damaging-letter": "Single letter for tagging possibly damaging 
recent changes.",
+   "ores-damaging-title": "Tooltip for damaging risk icon.",
+   "ores-damaging-legend": "Legend for damaging risk icon."
 }
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 9239194..d6be9c5 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -50,8 +50,8 @@
 * @param $filters
 */
public static function onChangesListSpecialPageFilters( 
ChangesListSpecialPage $clsp, &$filters ) {
-   $filters['hidenonreverted'] = array(
-   'msg' => 'ores-reverted-filter',
+   $filters['hidenondamaging'] = array(
+   'msg' => 'ores-damaging-filter',
'default' => false,
);
 
@@ -78,10 +78,10 @@
$tables[] = 'ores_classification';
$fields[] = 'ores_probability';
$join_conds['ores_classification'] = array( 'LEFT JOIN',
-   'rc_this_oldid = ores_rev AND ores_model = \'reverted\' 
' .
+   'rc_this_oldid = ores_rev AND ores_model = \'damaging\' 
' .
'AND ores_is_predicted = 1 AND ores_class = \'true\'' );
 
-   if ( $opts->getValue( 'hidenonreverted' ) ) {
+   if ( $opts->getValue( 'hidenondamaging' ) ) {
// Filter out non-damaging edits.
$conds[] = 'ores_is_predicted = 1';
$conds[] = 'ores_probability > '
@@ -131,7 +131,7 @@
$type = Scoring::getRevertThreshold( $score );
 
if ( $type ) {
-   $data['recentChangesFlags']['revertedRisk'] = 
true;
+   $data['recentChangesFlags']['damaging'] = true;
// TODO: Stash the details in HTML so they can 
be retrieved by JS?
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b5ea18ea6618aefd45c53bd8cb52c0005100f50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Bug:T87963 Perfected Code. - change (mediawiki...Quiz)

[Ananay (Code Review)]

Ananay has uploaded a new change for review.

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

Change subject: Bug:T87963 Perfected Code.
..

Bug:T87963 Perfected Code.

Change-Id: I041814e2788f238c8840f60132784e2bda6a04bc
---
A .DS_Store
A Quiz.hooks.php
M Quiz.php
A extension.json
4 files changed, 68 insertions(+), 28 deletions(-)


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

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000..f2c6039
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/Quiz.hooks.php b/Quiz.hooks.php
new file mode 100644
index 000..0fe4f12
--- /dev/null
+++ b/Quiz.hooks.php
@@ -0,0 +1,27 @@
+
+* @param $parser Parser the wikitext parser
+* @return Boolean true to continue hook processing
+   */
+   public static function onParserFirstCallInit( &$parser ) {
+   $parser->setHook( 'quiz', 'QuizHooks::renderQuiz' );
+   return true;
+   }
+   /**
+* Call the quiz parser on an input text.
+*
+* @param $input String text between  and  tags, in quiz 
syntax.
+* @param $argv Array an array containing any arguments passed to the 
extension
+* @param $parser Parser the wikitext parser.
+*
+* @return string An HTML quiz.
+   */
+   public static function renderQuiz( $input, $argv, $parser ) {
+   $parser->disableCache();
+   $quiz = new Quiz( $argv, $parser );
+   return $quiz->parseQuiz( $input );
+   }
+}
diff --git a/Quiz.php b/Quiz.php
index b92e37f..1ddcc05 100644
--- a/Quiz.php
+++ b/Quiz.php
@@ -55,10 +55,11 @@
 $dir = __DIR__ . '/';
 $wgAutoloadClasses['Quiz'] = $dir . 'Quiz.class.php';
 $wgAutoloadClasses['Question'] = $dir . 'Quiz.class.php';
+$wgAutoloadClasses['QuizHooks'] = $dir . 'Quiz.hooks.php';
 $wgMessagesDirs['QuizExtension'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['QuizExtension'] = $dir . 'Quiz.i18n.php';
 
-$wgHooks['ParserFirstCallInit'][] = 'wfQuizExtension';
+$wgHooks['ParserFirstCallInit'][] = 'QuizHooks::wfQuizExtension';
 $wgHooks['ParserClearState'][] = 'Quiz::resetQuizID';
 
 $commonModuleInfo = array(
@@ -72,30 +73,3 @@
'styles' => 'ext.quiz.css',
'position' => 'top',
 ) + $commonModuleInfo;
-
-/**
- * Register the extension with the WikiText parser.
- * The tag used is 
- *
- * @param $parser Parser the wikitext parser
- * @return Boolean true to continue hook processing
- */
-function wfQuizExtension( &$parser ) {
-   $parser->setHook( 'quiz', 'renderQuiz' );
-   return true;
-}
-
-/**
- * Call the quiz parser on an input text.
- *
- * @param $input String text between  and  tags, in quiz syntax.
- * @param $argv Array an array containing any arguments passed to the extension
- * @param $parser Parser the wikitext parser.
- *
- * @return string An HTML quiz.
- */
-function renderQuiz( $input, $argv, $parser ) {
-   $parser->disableCache();
-   $quiz = new Quiz( $argv, $parser );
-   return $quiz->parseQuiz( $input );
-}
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..e530ae2
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,39 @@
+{
+   "name": "Quiz",
+   "version": "1.2.0",
+   "author": "Louis-Rémi Babe",
+   "url": "https://www.mediawiki.org/wiki/Extension:Quiz;,
+   "descriptionmsg": "quiz_desc",
+   "license-name": "GPL-2.0+",
+   "type": "parserhook",
+   "MessagesDirs": {
+   "QuizExtension": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "Quiz": "Quiz.class.php",
+   "Question": "Quiz.class.php",
+   "QuizHooks": "Quiz.hooks.php"
+   },
+   "ResourceModules": {
+   "ext.quiz": {
+   "scripts": "ext.quiz.js",
+   "styles": "ext.quiz.css",
+   "position": "top"
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "modules",
+   "remoteExtPath": "Quiz/modules"
+   },
+   "Hooks": {
+   "ParserFirstCallInit": [
+   "QuizHooks::onParserFirstCallInit"
+   ],
+   "ParserClearState": [
+   "Quiz::resetQuizID"
+   ]
+   },
+   "manifest_version": 1
+}

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

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

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

[MediaWiki-commits] [Gerrit] adds dataTables - change (wikidata...rdf)

[Christopher Johnson (WMDE) (Code Review)]

Christopher Johnson (WMDE) has uploaded a new change for review.

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

Change subject: adds dataTables
..

adds dataTables

Change-Id: Id3f8498bd97df4cd33e9d61e74b2e813052fe6eb
---
M gui/index.html
A gui/vendor/datatables/dataTables.css
A gui/vendor/datatables/jquery.dataTables.js
A gui/vendor/datatables/rsrc/sort_asc.png
A gui/vendor/datatables/rsrc/sort_both.png
A gui/vendor/datatables/rsrc/sort_desc.png
M gui/wikibase/queryService/api/Sparql.js
M gui/wikibase/queryService/ui/App.js
8 files changed, 15,490 insertions(+), 2 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3f8498bd97df4cd33e9d61e74b2e813052fe6eb
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) 

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

[MediaWiki-commits] [Gerrit] Fix broken PHPDoc comment in ApiListStudents - change (mediawiki...EducationProgram)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix broken PHPDoc comment in ApiListStudents
..

Fix broken PHPDoc comment in ApiListStudents

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


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

diff --git a/includes/api/ApiListStudents.php b/includes/api/ApiListStudents.php
index 608c957..eb642a5 100644
--- a/includes/api/ApiListStudents.php
+++ b/includes/api/ApiListStudents.php
@@ -224,7 +224,7 @@
 *
 * @param array $studentsList
 * @param string $propName
-* @param ApiResult @results
+* @param ApiResult $results
 * @param int[]|int $courseIds A list of one or more course IDs
 * @param int $courseIndex
 * @param $articleStore articleStore object

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe975665bde6e40297d61300b218a058eb9605d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Fix broken PHPDoc comment in ApiListStudents - change (mediawiki...EducationProgram)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix broken PHPDoc comment in ApiListStudents
..


Fix broken PHPDoc comment in ApiListStudents

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

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



diff --git a/includes/api/ApiListStudents.php b/includes/api/ApiListStudents.php
index 608c957..eb642a5 100644
--- a/includes/api/ApiListStudents.php
+++ b/includes/api/ApiListStudents.php
@@ -224,7 +224,7 @@
 *
 * @param array $studentsList
 * @param string $propName
-* @param ApiResult @results
+* @param ApiResult $results
 * @param int[]|int $courseIds A list of one or more course IDs
 * @param int $courseIndex
 * @param $articleStore articleStore object

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe975665bde6e40297d61300b218a058eb9605d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] No longer shows execution times of 0 seconds - change (pywikibot/core)

[Georggi199 (Code Review)]

Georggi199 has uploaded a new change for review.

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

Change subject: No longer shows execution times of 0 seconds
..

No longer shows execution times of 0 seconds

Should no longer show execution time of 0 seconds

Bug T70613

Change-Id: I2a17f2f4f05a8b134237ccd5037ba02e42c6e1bc
---
M scripts/checkimages.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/50/257850/1

diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 762f6d6..4495d28 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -1770,4 +1770,5 @@
 else:
 final = time.time()
 delta = int(final - start)
-pywikibot.output("Execution time: %s seconds\n" % delta)
+   if delta != 0:
+   pywikibot.output("Execution time: %s seconds\n" % delta)

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

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

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

[MediaWiki-commits] [Gerrit] apt: add a trailing slash to backports' uri - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: apt: add a trailing slash to backports' uri
..


apt: add a trailing slash to backports' uri

Follow-up to cdd58af -- helps with comment_old taking effect.

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

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 9072a75..4fd161c 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -103,7 +103,7 @@
 # enable backports for Debian systems
 if $::operatingsystem == 'Debian' {
 apt::repository { 'debian-backports':
-uri => 'http://mirrors.wikimedia.org/debian',
+uri => 'http://mirrors.wikimedia.org/debian/',
 dist=> "${::lsbdistcodename}-backports",
 components  => 'main contrib non-free',
 comment_old => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae453fe068beaec9625ba4ac29d2bea0f7ea1e48
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Revert "CharacterBeforePHPOpeningTagSniff: Support T_HASHBAN... - change (mediawiki...codesniffer)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Revert "CharacterBeforePHPOpeningTagSniff: Support T_HASHBANG 
for HHVM >=3.5,<3.7"
..

Revert "CharacterBeforePHPOpeningTagSniff: Support T_HASHBANG for HHVM 
>=3.5,<3.7"

My upstream patch to address this is included in 2.4.0:
.

This reverts commit 7cf13be7ba88e9a1e24551bdd949899ae61bfef5.

Change-Id: I7f6806d252e04753e39197d5fad18c52d6000d1f
---
M MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git 
a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php 
b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
index e8a419d..a27df2b 100644
--- a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
+++ b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
@@ -31,8 +31,7 @@
// so the first token is on the first line
 
// check if it is valid shebang
-   // T_HASHBANG is a token used in HHVM >=3.5, 
<3.7 (T103119)
-   if ( in_array( $tokens[0]['type'], array( 
'T_INLINE_HTML', 'T_HASHBANG' ) )
+   if ( $tokens[0]['type'] == 'T_INLINE_HTML'
&& substr( $tokens[0]['content'], 0, 2 
) == '#!' ) {
$validShebang = true;
}

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

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

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

[MediaWiki-commits] [Gerrit] Remove deprecated or unnecessary API code - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove deprecated or unnecessary API code
..


Remove deprecated or unnecessary API code

Change-Id: I2e705869285ccd7e6a25db0072789a3423d09078
---
M api/ApiContentTranslationDelete.php
M api/ApiContentTranslationPublish.php
2 files changed, 0 insertions(+), 22 deletions(-)

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



diff --git a/api/ApiContentTranslationDelete.php 
b/api/ApiContentTranslationDelete.php
index 75ffdbe..337f9d5 100644
--- a/api/ApiContentTranslationDelete.php
+++ b/api/ApiContentTranslationDelete.php
@@ -40,9 +40,6 @@
 
public function getAllowedParams() {
return array(
-   'token' => array(
-   ApiBase::PARAM_REQUIRED => true,
-   ),
'from' => array(
ApiBase::PARAM_REQUIRED => true,
),
@@ -57,14 +54,6 @@
 
public function needsToken() {
return 'csrf';
-   }
-
-   public function getTokenSalt() {
-   return '';
-   }
-
-   public function mustBePosted() {
-   return true;
}
 
public function isWriteMode() {
diff --git a/api/ApiContentTranslationPublish.php 
b/api/ApiContentTranslationPublish.php
index cda0071..99414e4 100755
--- a/api/ApiContentTranslationPublish.php
+++ b/api/ApiContentTranslationPublish.php
@@ -381,9 +381,6 @@
'title' => array(
ApiBase::PARAM_REQUIRED => true,
),
-   'token' => array(
-   ApiBase::PARAM_REQUIRED => true,
-   ),
'html' => array(
ApiBase::PARAM_REQUIRED => true,
),
@@ -415,14 +412,6 @@
 
public function needsToken() {
return 'csrf';
-   }
-
-   public function getTokenSalt() {
-   return '';
-   }
-
-   public function mustBePosted() {
-   return true;
}
 
public function isWriteMode() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e705869285ccd7e6a25db0072789a3423d09078
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] PHPUnit testing - change (mediawiki/core)

[Cenarium (Code Review)]

Cenarium has uploaded a new change for review.

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

Change subject: PHPUnit testing
..

PHPUnit testing

Change-Id: I7b5e271b4b983e3ec4ba5de346a155c737547266
---
A tests/phpunit/includes/changetags/ChangeTagTest.php
1 file changed, 153 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/257844/1

diff --git a/tests/phpunit/includes/changetags/ChangeTagTest.php 
b/tests/phpunit/includes/changetags/ChangeTagTest.php
new file mode 100644
index 000..35d3bca
--- /dev/null
+++ b/tests/phpunit/includes/changetags/ChangeTagTest.php
@@ -0,0 +1,153 @@
+context = $this->getMockBuilder( 'ChangeTagsContext' 
)->setMethods(
+   array( 'getStats', 'getStored', 'getRegistered' ) 
)->getMock();
+   $this->stats = array(
+   'UndefinedTag' => 65,
+   'StoredTagWithHits' => 30,
+   );
+   $this->registered = array(
+   'ActiveRegisteredTag' => array(
+   'active' => true, 'extName' => 'myext',
+   ),
+   'InactiveRegisteredTag' => array(),
+   );
+   $this->stored = array(
+   'StoredTagNoHits' => array( 'active' => true ),
+   'StoredTagWithHits' => array( 'active' => true ),
+   );
+   }
+
+   /**
+* @covers ChangeTag::getHitcount
+*/
+   public function testGetHitcount() {
+   $this->context->expects( $this->once() )->method( 'getStats' )
+   ->will( $this->returnValue( $this->stats ) );
+   $changeTag = new ChangeTag( 'UndefinedTag', $this->context );
+   $this->assertEquals( 65, $changeTag->getHitcount() );
+   }
+
+   /**
+* @covers ChangeTag::getExtensionName
+*/
+   public function testGetExtensionName() {
+   $this->context->expects( $this->once() )->method( 
'getRegistered' )
+   ->will( $this->returnValue( $this->registered ) );
+   $changeTag = new ChangeTag( 'ActiveRegisteredTag', 
$this->context );
+   $this->assertEquals( 'myext', $changeTag->getExtensionName() );
+   }
+
+   /**
+* @dataProvider provideCanCreate
+* @covers ChangeTag::canCreate
+*/
+   public function testCanCreate( $name, $expected ) {
+   $this->context->expects( $this->any() )->method( 'getStats' )
+   ->will( $this->returnValue( $this->stats ) );
+   $this->context->expects( $this->any() )->method( 'getStored' )
+   ->will( $this->returnValue( $this->stored ) );
+   $this->context->expects( $this->any() )->method( 
'getRegistered' )
+   ->will( $this->returnValue( $this->registered ) );
+   $changeTag = new ChangeTag( $name, $this->context );
+   $this->assertEquals( $expected, 
$changeTag->canCreate()->isGood() );
+   }
+
+   public function provideCanCreate() {
+   return array(
+   array( 'NewTag', true ),
+   array( '8', false ),
+   array( 'BadTagName,WithComa', false ),
+   array( 'UndefinedTag', false ),
+   array( 'StoredTagNoHits', false ),
+   array( 'ActiveRegisteredTag', false ),
+   array( 'InactiveRegisteredTag', false ),
+   );
+   }
+
+   /**
+* @dataProvider provideCanDelete
+* @covers ChangeTag::canDelete
+*/
+   public function testCanDelete( $name, $expected ) {
+   $this->context->expects( $this->any() )->method( 'getStats' )
+   ->will( $this->returnValue( $this->stats ) );
+   $this->context->expects( $this->any() )->method( 'getStored' )
+   ->will( $this->returnValue( $this->stored ) );
+   $this->context->expects( $this->any() )->method( 
'getRegistered' )
+   ->will( $this->returnValue( $this->registered ) );
+   $changeTag = new ChangeTag( $name, $this->context );
+   $this->assertEquals( $expected, 
$changeTag->canDelete()->isGood() );
+   }
+
+   public function provideCanDelete() {
+   return array(
+   array( 'UndefinedTag', true ),
+   array( 'StoredTagNoHits', true ),
+   array( 'StoredTagWithHits', true ),
+   array( 'NonexistingTag', false ),
+   array( 'ActiveRegisteredTag', false ),
+   array( 'InactiveRegisteredTag', false ),
+   );
+   }
+
+   /**
+* @dataProvider 

[MediaWiki-commits] [Gerrit] PHPUnit testing - change (mediawiki/core)

[Cenarium (Code Review)]

Cenarium has uploaded a new change for review.

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

Change subject: PHPUnit testing
..

PHPUnit testing

Change-Id: I8a9ea095952b9de7208e6fb8ce69dd94ec17450a
---
A tests/phpunit/includes/changetags/ChangeTagsCoreTest.php
1 file changed, 65 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/includes/changetags/ChangeTagsCoreTest.php 
b/tests/phpunit/includes/changetags/ChangeTagsCoreTest.php
new file mode 100644
index 000..d8be7f7
--- /dev/null
+++ b/tests/phpunit/includes/changetags/ChangeTagsCoreTest.php
@@ -0,0 +1,65 @@
+setMwGlobals( array(
+   'wgUseAutoTagging' => true,
+   ) );
+   }
+
+   /**
+* @dataProvider provideGetAutotagsForEditUpdate
+* @covers ChangeTagsCore::getAutotagsForEditUpdate
+*/
+   public function testGetAutotagsForEditUpdate( $oldText, $newText, 
$pageTitle, $expected ) {
+   $title = Title::makeTitle( NS_MAIN, $pageTitle );
+   $oldContent =  ContentHandler::makeContent( $oldText, null, 
CONTENT_MODEL_WIKITEXT );
+   $newContent =  ContentHandler::makeContent( $newText, null, 
CONTENT_MODEL_WIKITEXT );
+   $actual = ChangeTagsCore::getAutotagsForEditUpdate( 
$oldContent, $newContent, $title );
+
+   sort( $expected );
+   sort( $actual );
+   $this->assertEquals( $expected, $actual );
+   }
+
+   public function provideGetAutotagsForEditUpdate() {
+   return array(
+   array( 'Hi', '#REDIRECT [[Main Page]]', 'Main Page',
+   array( 'core-redirect-self', 
'core-redirect-new' ) ),
+   array( '#REDIRECT [[Main Page]]', 'nothing', 'Some 
Page',
+   array( 'core-redirect-removed' ) ),
+   array( 'Lorem ipsum', '', 'Some Page',
+   array( 'core-edit-blank' ) ),
+   array( 'Lorem ipsum', 'Lorem ipsum dolor sit amet', 
'Some Page',
+   array() ),
+   );
+   }
+
+   /**
+* @dataProvider provideGetAutotagsForMove
+* @covers ChangeTagsCore::getAutotagsForMove
+*/
+   public function testGetAutotagsForMove(
+   $oldNs, $oldPage, $newNs, $newPage, $userName, $expected
+   ) {
+   $oldTitle = Title::makeTitle( $oldNs, $oldPage );
+   $newTitle = Title::makeTitle( $newNs, $newPage );
+   $user = User::newFromName( $userName );
+   $actual = ChangeTagsCore::getAutotagsForMove( $oldTitle, 
$newTitle, $user );
+
+   sort( $expected );
+   sort( $actual );
+   $this->assertEquals( $expected, $actual );
+   }
+
+   public function provideGetAutotagsForMove() {
+   return array(
+   array( NS_USER, 'John', NS_USER, 'James', 'John',
+   array( 'core-move-rename' ) ),
+   array( NS_MAIN, 'Foo', NS_PROJECT, 'Foo', 'Caesar',
+   array( 'core-move-crossnamespace' ) ),
+   );
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] Update phpunit to 4.8.18 - change (mediawiki...codesniffer)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update phpunit to 4.8.18
..


Update phpunit to 4.8.18

Changelogs

4.8:
* https://github.com/sebastianbergmann/phpunit/blob/4.8.18/ChangeLog-4.8.md

4.7:
* https://github.com/sebastianbergmann/phpunit/blob/4.8.18/ChangeLog-4.7.md

4.6:
* https://github.com/sebastianbergmann/phpunit/blob/4.8.18/ChangeLog-4.6.md

4.5:
* https://github.com/sebastianbergmann/phpunit/blob/4.8.18/ChangeLog-4.5.md

4.4:
* https://github.com/sebastianbergmann/phpunit/blob/4.8.18/ChangeLog-4.4.md

4.3:
* https://github.com/sebastianbergmann/phpunit/blob/4.8.18/ChangeLog-4.3.md

4.2:
* https://github.com/sebastianbergmann/phpunit/blob/4.8.18/ChangeLog-4.2.md

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

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



diff --git a/composer.json b/composer.json
index 8f4c142..0fe8af5 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.*",
-   "phpunit/phpunit": "~4.1.0"
+   "phpunit/phpunit": "~4.8.18"
},
"scripts": {
"test": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd6046bb272b054751b01edad808b4cbb02f0810
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Polybuildr 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] snapshot: fix logrotate.d syntax - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: snapshot: fix logrotate.d syntax
..

snapshot: fix logrotate.d syntax

Change-Id: I40cae016387902a12f35c36e8a6ea15c102acfe9
---
M modules/snapshot/files/logrotate.cirrusdump
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/257832/1

diff --git a/modules/snapshot/files/logrotate.cirrusdump 
b/modules/snapshot/files/logrotate.cirrusdump
index b86c054..c3565f1 100644
--- a/modules/snapshot/files/logrotate.cirrusdump
+++ b/modules/snapshot/files/logrotate.cirrusdump
@@ -1,6 +1,6 @@
 # This file is managed by puppet
 
-/var/log/cirrusdump/*.log {{
+/var/log/cirrusdump/*.log {
 daily
 notifempty
 dateext

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40cae016387902a12f35c36e8a6ea15c102acfe9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] apt: swap backport repository's components - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: apt: swap backport repository's components
..

apt: swap backport repository's components

Use "main contrib non-free" instead of "main non-free contrib" as this
is how d-i uses this and hence how some it is provisioned on some
systems' sources.list (those installed with early versions of jessie's
d-i).

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


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

diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 6b0c252..9072a75 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -105,7 +105,7 @@
 apt::repository { 'debian-backports':
 uri => 'http://mirrors.wikimedia.org/debian',
 dist=> "${::lsbdistcodename}-backports",
-components  => 'main non-free contrib',
+components  => 'main contrib non-free',
 comment_old => true,
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0880db6796cb846d3e22483e02faf344d4d3e48e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Add connections.yaml to .gitignore - change (labs...grrrit)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Add connections.yaml to .gitignore
..


Add connections.yaml to .gitignore

Change-Id: I9edd2397fd2885a9b15d4dc2ea1cffac30eb2e97
---
M .gitignore
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 1754ecd..1edb718 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 
 # Logs
 .npm-debug.log*
+
+/connections.yaml

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9edd2397fd2885a9b15d4dc2ea1cffac30eb2e97
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Polybuildr 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add .npm-debug.log* to .gitignore - change (labs...grrrit)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Add .npm-debug.log* to .gitignore
..


Add .npm-debug.log* to .gitignore

Change-Id: I22b1031a7b41715a7c470d721b9783521168f96c
---
M .gitignore
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 8ab36b8..1754ecd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 # Dependency directory
 node_modules
+
+# Logs
+.npm-debug.log*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22b1031a7b41715a7c470d721b9783521168f96c
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Polybuildr 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apt: swap backport repository's components - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: apt: swap backport repository's components
..


apt: swap backport repository's components

Use "main contrib non-free" instead of "main non-free contrib" as this
is how d-i uses this and hence how some it is provisioned on some
systems' sources.list (those installed with early versions of jessie's
d-i).

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

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 6b0c252..9072a75 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -105,7 +105,7 @@
 apt::repository { 'debian-backports':
 uri => 'http://mirrors.wikimedia.org/debian',
 dist=> "${::lsbdistcodename}-backports",
-components  => 'main non-free contrib',
+components  => 'main contrib non-free',
 comment_old => true,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0880db6796cb846d3e22483e02faf344d4d3e48e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Remove unused i18n shim - change (mediawiki...Quiz)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Remove unused i18n shim
..

Remove unused i18n shim

Change-Id: Iec679d77b3291616631a1c0258c073297dfd2f9e
---
D Quiz.i18n.php
1 file changed, 0 insertions(+), 35 deletions(-)


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

diff --git a/Quiz.i18n.php b/Quiz.i18n.php
deleted file mode 100644
index df963ee..000
--- a/Quiz.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim15aada0cdeb34f22' ) ) {
-   function wfJsonI18nShim15aada0cdeb34f22( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim15aada0cdeb34f22';
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec679d77b3291616631a1c0258c073297dfd2f9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
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] Convert Quiz to use extension registration - change (mediawiki...Quiz)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Convert Quiz to use extension registration
..


Convert Quiz to use extension registration

Bug: T87963
Change-Id: I041814e2788f238c8840f60132784e2bda6a04bc
---
A Quiz.hooks.php
M Quiz.php
A extension.json
3 files changed, 79 insertions(+), 63 deletions(-)

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



diff --git a/Quiz.hooks.php b/Quiz.hooks.php
new file mode 100644
index 000..84806fb
--- /dev/null
+++ b/Quiz.hooks.php
@@ -0,0 +1,30 @@
+
+* @param $parser Parser the wikitext parser
+* @return Boolean true to continue hook processing
+   */
+   public static function onParserFirstCallInit( &$parser ) {
+   $parser->setHook( 'quiz', 'QuizHooks::renderQuiz' );
+   return true;
+   }
+
+   /**
+* Call the quiz parser on an input text.
+*
+* @param $input String text between  and  tags, in quiz 
syntax.
+* @param $argv Array an array containing any arguments passed to the 
extension
+* @param $parser Parser the wikitext parser.
+*
+* @return string An HTML quiz.
+   */
+   public static function renderQuiz( $input, $argv, $parser ) {
+   $parser->disableCache();
+   $quiz = new Quiz( $argv, $parser );
+   return $quiz->parseQuiz( $input );
+   }
+}
diff --git a/Quiz.php b/Quiz.php
index b92e37f..0bd73c0 100644
--- a/Quiz.php
+++ b/Quiz.php
@@ -35,67 +35,14 @@
 if ( !defined( 'MEDIAWIKI' ) ) {
die( 'This is not a valid entry point to MediaWiki.' );
 }
-
-/**
- * Extension credits that will show up on Special:Version
- */
-$wgExtensionCredits['parserhook'][] = array(
-   'path'   => __FILE__,
-   'name'   => 'Quiz',
-   'version'=> '1.2.0',
-   'author' => 'Louis-Rémi Babe',
-   'url'=> 'https://www.mediawiki.org/wiki/Extension:Quiz',
-   'descriptionmsg' => 'quiz_desc',
-   'license-name'   => 'GPL-2.0+'
-);
-
-/**
- * Add this extension to MediaWiki's extensions list.
- */
-$dir = __DIR__ . '/';
-$wgAutoloadClasses['Quiz'] = $dir . 'Quiz.class.php';
-$wgAutoloadClasses['Question'] = $dir . 'Quiz.class.php';
-$wgMessagesDirs['QuizExtension'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['QuizExtension'] = $dir . 'Quiz.i18n.php';
-
-$wgHooks['ParserFirstCallInit'][] = 'wfQuizExtension';
-$wgHooks['ParserClearState'][] = 'Quiz::resetQuizID';
-
-$commonModuleInfo = array(
-   'localBasePath' => dirname( __FILE__ ) . '/modules',
-   'remoteExtPath' => 'Quiz/modules',
-);
-
-// Styles and any code common to all Special:Code subviews:
-$wgResourceModules['ext.quiz'] = array(
-   'scripts' => 'ext.quiz.js',
-   'styles' => 'ext.quiz.css',
-   'position' => 'top',
-) + $commonModuleInfo;
-
-/**
- * Register the extension with the WikiText parser.
- * The tag used is 
- *
- * @param $parser Parser the wikitext parser
- * @return Boolean true to continue hook processing
- */
-function wfQuizExtension( &$parser ) {
-   $parser->setHook( 'quiz', 'renderQuiz' );
-   return true;
-}
-
-/**
- * Call the quiz parser on an input text.
- *
- * @param $input String text between  and  tags, in quiz syntax.
- * @param $argv Array an array containing any arguments passed to the extension
- * @param $parser Parser the wikitext parser.
- *
- * @return string An HTML quiz.
- */
-function renderQuiz( $input, $argv, $parser ) {
-   $parser->disableCache();
-   $quiz = new Quiz( $argv, $parser );
-   return $quiz->parseQuiz( $input );
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'Quiz' );
+   $wgMessagesDirs['QuizExtension'] = __DIR__ . '/i18n';
+   /* wfWarn(
+   'Deprecated PHP entry point used for Quiz extension. Please use 
wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the Quiz extension requires MediaWiki 1.25+' );
 }
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..e530ae2
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,39 @@
+{
+   "name": "Quiz",
+   "version": "1.2.0",
+   "author": "Louis-Rémi Babe",
+   "url": "https://www.mediawiki.org/wiki/Extension:Quiz;,
+   "descriptionmsg": "quiz_desc",
+   "license-name": "GPL-2.0+",
+   "type": "parserhook",
+   "MessagesDirs": {
+   "QuizExtension": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "Quiz": "Quiz.class.php",
+   "Question": "Quiz.class.php",
+   "QuizHooks": "Quiz.hooks.php"
+   },
+   "ResourceModules": {
+   "ext.quiz": {
+   

[MediaWiki-commits] [Gerrit] diamond: fix StreamHandler module path - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: diamond: fix StreamHandler module path
..

diamond: fix StreamHandler module path

differently than others StreamHandler, FileHandler and NullHandler are in
logging, not logging.handlers

Change-Id: I47b291651de70186956331c9e0643da4e6732e63
---
M modules/diamond/templates/diamond.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/257853/1

diff --git a/modules/diamond/templates/diamond.conf.erb 
b/modules/diamond/templates/diamond.conf.erb
index 69a93fa..b49c469 100644
--- a/modules/diamond/templates/diamond.conf.erb
+++ b/modules/diamond/templates/diamond.conf.erb
@@ -36,7 +36,7 @@
 propagate = 1
 
 [handler_stdout]
-class = logging.handlers.StreamHandler
+class = logging.StreamHandler
 args = (None, )
 
 [handler_rotated_file]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47b291651de70186956331c9e0643da4e6732e63
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Use is_readable and require_once for consistency - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Use is_readable and require_once for consistency
..

Use is_readable and require_once for consistency

For consistency across our code base.

Change-Id: Ide95d9295fb694fd529d33cabff476da7dec4e1f
---
M lib/WikibaseLib.php
M purtle/Purtle.php
M view/WikibaseView.php
3 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 2809f32..b748967 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -48,8 +48,8 @@
 
 // This is the path to the autoloader generated by composer in case of a 
composer install.
 if ( ( !defined( 'WIKIBASE_DATAMODEL_VERSION' ) || !defined( 'Diff_VERSION' ) 
|| !defined( 'DATAVALUES_VERSION' ) )
-   && file_exists( __DIR__ . '/../vendor/autoload.php' ) ) {
-   include_once __DIR__ . '/../vendor/autoload.php';
+   && is_readable( __DIR__ . '/../vendor/autoload.php' ) ) {
+   require_once __DIR__ . '/../vendor/autoload.php';
 }
 
 call_user_func( function() {
diff --git a/purtle/Purtle.php b/purtle/Purtle.php
index ee2262c..660aa87 100644
--- a/purtle/Purtle.php
+++ b/purtle/Purtle.php
@@ -9,7 +9,7 @@
 
 // Include the composer autoloader if it is present.
 if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-   include_once __DIR__ . '/vendor/autoload.php';
+   require_once __DIR__ . '/vendor/autoload.php';
 }
 
 if ( defined( 'MEDIAWIKI' ) ) {
diff --git a/view/WikibaseView.php b/view/WikibaseView.php
index 7d94340..6177dac 100644
--- a/view/WikibaseView.php
+++ b/view/WikibaseView.php
@@ -9,7 +9,7 @@
 
 // Include the composer autoloader if it is present.
 if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-   include_once __DIR__ . '/vendor/autoload.php';
+   require_once __DIR__ . '/vendor/autoload.php';
 }
 
 if ( defined( 'MEDIAWIKI' ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide95d9295fb694fd529d33cabff476da7dec4e1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Revert "CharacterBeforePHPOpeningTagSniff: Support T_HASHBAN... - change (mediawiki...codesniffer)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Revert "CharacterBeforePHPOpeningTagSniff: Support T_HASHBANG 
for HHVM >=3.5,<3.7"
..


Revert "CharacterBeforePHPOpeningTagSniff: Support T_HASHBANG for HHVM 
>=3.5,<3.7"

My upstream patch to address this is included in 2.4.0:
.

This reverts commit 7cf13be7ba88e9a1e24551bdd949899ae61bfef5.

Change-Id: I7f6806d252e04753e39197d5fad18c52d6000d1f
---
M MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git 
a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php 
b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
index e8a419d..a27df2b 100644
--- a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
+++ b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
@@ -31,8 +31,7 @@
// so the first token is on the first line
 
// check if it is valid shebang
-   // T_HASHBANG is a token used in HHVM >=3.5, 
<3.7 (T103119)
-   if ( in_array( $tokens[0]['type'], array( 
'T_INLINE_HTML', 'T_HASHBANG' ) )
+   if ( $tokens[0]['type'] == 'T_INLINE_HTML'
&& substr( $tokens[0]['content'], 0, 2 
) == '#!' ) {
$validShebang = true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f6806d252e04753e39197d5fad18c52d6000d1f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Polybuildr 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Switch Pakistan to esams (3) - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: Switch Pakistan to esams (3)
..


Switch Pakistan to esams (3)

Change-Id: I6a3b451b7248e2414a72b1a8ecc4ba99bf0aea87
---
M config-geo
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/config-geo b/config-geo
index b580381..a77f71f 100644
--- a/config-geo
+++ b/config-geo
@@ -47,7 +47,7 @@
 NP => [ulsfo, codfw, eqiad], # Nepal
 OM => [esams, eqiad, codfw], # Oman
 PH => [ulsfo, codfw, eqiad], # Philippines
-PK => [   eqiad, codfw], # Pakistan
+PK => [esams, eqiad, codfw], # Pakistan
 PS => [esams, eqiad, codfw], # Palestine, State of
 QA => [esams, eqiad, codfw], # Qatar
 SA => [esams, eqiad, codfw], # Saudi Arabia

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a3b451b7248e2414a72b1a8ecc4ba99bf0aea87
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove an extra passwords::ldap::corp - change (labs/private)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Remove an extra passwords::ldap::corp
..


Remove an extra passwords::ldap::corp

It was declared twice

Change-Id: I9eb06c988cdfd0403d058c5f4a7c66f1db6e6637
---
M modules/passwords/manifests/init.pp
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index fdc5faa..dfbadb0 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -86,10 +86,6 @@
 $ldap_user_pass = ''
 }
 
-class passwords::openldap::corp {
-$sync_pass = 'syncsyncsync'
-}
-
 class passwords::labs::rabbitmq {
 $rabbit_userid = 'auser'
 $rabbit_password  = 'apassword'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9eb06c988cdfd0403d058c5f4a7c66f1db6e6637
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Update WikimediaTemplates to support 5.0.1 - change (operations...otrs)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Update WikimediaTemplates to support 5.0.1
..


Update WikimediaTemplates to support 5.0.1

* Updated AgentDashboardUserOnline.tt to version 5.0.1
* Update AgentDashboardUserOutOfOffice to 5.0.1
* Update AgentTicketZoom.tt to 5.0.1
* OTRS 5.0.x has moved the templates into a Templates directory as well
so moving those around
* Bump the package version to reflect all of the above and support
* explicitly only Framework version 5.0.x
* Remove confusing link to customerID

Change-Id: I2a42965d9b21c258b0e1e987aa200b26868254a4
---
D 
packages/WikimediaTemplates/Custom/Kernel/Output/HTML/Standard/AgentDashboardUserOnline.tt
A 
packages/WikimediaTemplates/Custom/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOnline.tt
R 
packages/WikimediaTemplates/Custom/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOutOfOffice.tt
R 
packages/WikimediaTemplates/Custom/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom.tt
M packages/WikimediaTemplates/WikimediaTemplates.sopm
5 files changed, 234 insertions(+), 186 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git 
a/packages/WikimediaTemplates/Custom/Kernel/Output/HTML/Standard/AgentDashboardUserOnline.tt
 
b/packages/WikimediaTemplates/Custom/Kernel/Output/HTML/Standard/AgentDashboardUserOnline.tt
deleted file mode 100644
index 8ff0500..000
--- 
a/packages/WikimediaTemplates/Custom/Kernel/Output/HTML/Standard/AgentDashboardUserOnline.tt
+++ /dev/null
@@ -1,135 +0,0 @@
-# --
-# AgentDashboardUserOnline.tt - provides HTML for global dashboard
-# Copyright (C) 2001-2015 OTRS AG, http://otrs.com/
-# --
-# This software comes with ABSOLUTELY NO WARRANTY. For details, see
-# the enclosed file COPYING for license information (AGPL). If you
-# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
-# --
-
-[% RenderBlockStart("ContentSmallUserOnlineFilter") %]
-
-[% Translate("Agents") | html %] ([% 
Data.Agent | html %])
-[% Translate("Customers") | html %] 
([% Data.Customer | html %])
-
-[% WRAPPER JSOnDocumentComplete %]
-//
-[% END %]
-[% RenderBlockStart("ContentSmallTicketGenericFilterNavBar") %]
-
-[% Data.SiteNavBar %]
-
-[% RenderBlockEnd("ContentSmallTicketGenericFilterNavBar") %]
-
-[% RenderBlockEnd("ContentSmallUserOnlineFilter") %]
-
-
-[% RenderBlockStart("ContentSmallUserOnlineRow") %]
-
-
-
-[% IF Data.UserCustomerID %]
-
-[% ELSE %]
-
-[% END %]
-[% Data.UserFullname | html %]
-[% RenderBlockStart("ContentSmallUserOnlineRowEmail") %]
-([% Data.UserEmail | truncate(50) | html %])
-[% RenderBlockEnd("ContentSmallUserOnlineRowEmail") %]
-[% RenderBlockStart("ContentSmallUserOnlineRowOutOfOffice") %]
-[% RenderBlockEnd("ContentSmallUserOnlineRowOutOfOffice") %]
-[% IF Data.UserCustomerID %]
-
-[% ELSE %]
-
-[% END %]
-[% IF Data.AgentEnableChat && Data.UserID != Env('UserID') %]
-
-[% END %]
-
-
-
-
-
-[% Data.UserLogin | html %]
-
-
-
-
-[% RenderBlockEnd("ContentSmallUserOnlineRow") %]
-[% RenderBlockStart("ContentSmallUserOnlineNone") %]
-
-
-[% Translate("none") | html %]
-
-
-[% RenderBlockEnd("ContentSmallUserOnlineNone") %]
-
-
-
-[% INCLUDE "ChatStartForm.tt" %]
-
-[% WRAPPER JSOnDocumentComplete %]
-//

[MediaWiki-commits] [Gerrit] puppet-run: do not let apt failures block agent - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: puppet-run: do not let apt failures block agent
..


puppet-run: do not let apt failures block agent

Change-Id: I7e3673ccfebdaad0a82848e3bb78b803cdd8e4d7
---
M modules/base/files/puppet/puppet-run
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  Faidon Liambotis: Verified; Looks good to me, approved
  Dzahn: Looks good to me, but someone else must approve



diff --git a/modules/base/files/puppet/puppet-run 
b/modules/base/files/puppet/puppet-run
index 30eb617..c2b7e19 100644
--- a/modules/base/files/puppet/puppet-run
+++ b/modules/base/files/puppet/puppet-run
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Bail out early if any of these first commands exit abnormally
 set -e
 
 # We pass show-diff, show the log may be sensitive,
@@ -10,8 +11,11 @@
 # Check this before apt-get update, so that our update doesn't screw up
 # package installs in a running (manual and/or initial install) puppet run
 PUPPETLOCK=`puppet agent --configprint agent_catalog_run_lockfile`
+
+# From here out, make a best effort to continue in the face of failure
+set +e
+
 if [ -n "$PUPPETLOCK" -a -e "$PUPPETLOCK" ]; then
-set +e
 PUPPETPID=$(cat $PUPPETLOCK)
 CMDLINE_FILE="/proc/$PUPPETPID/cmdline"
 if [ -f $CMDLINE_FILE ]; then
@@ -21,7 +25,6 @@
 exit 0
 fi
 fi
-set -e
 echo Ignoring stale puppet agent lock for pid `cat $PUPPETLOCK` 
>>/var/log/puppet.log
 fi
 

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-12-09T10:00:01+0000 - change (mediawiki...Wikidata)

[WikidataBuilder (Code Review)]

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-12-09T10:00:01+
..

New Wikidata Build - 2015-12-09T10:00:01+

Change-Id: I27a0aee33d771c9989d501d996f641b2b4accfbd
---
M composer.lock
M extensions/Wikibase/client/i18n/lki.json
A extensions/Wikibase/lib/i18n/lki.json
A extensions/Wikibase/repo/i18n/lki.json
M vendor/composer/installed.json
5 files changed, 39 insertions(+), 9 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 4bdc4c6..429b17c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1448,12 +1448,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "91ffefe6516fb9800198b3cb29f7c1855babcd79"
+"reference": "19af52bcfabfa2c0284a2153fa851488bc639ff4"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/91ffefe6516fb9800198b3cb29f7c1855babcd79;,
-"reference": "91ffefe6516fb9800198b3cb29f7c1855babcd79",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/19af52bcfabfa2c0284a2153fa851488bc639ff4;,
+"reference": "19af52bcfabfa2c0284a2153fa851488bc639ff4",
 "shasum": ""
 },
 "require": {
@@ -1524,7 +1524,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2015-12-08 16:12:18"
+"time": "2015-12-08 21:27:06"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/lki.json 
b/extensions/Wikibase/client/i18n/lki.json
index 3fd7cb6..49d10f4 100644
--- a/extensions/Wikibase/client/i18n/lki.json
+++ b/extensions/Wikibase/client/i18n/lki.json
@@ -5,7 +5,14 @@
]
},
"tooltip-t-wikibase": "پیوۀند وۀآیتم چۀسبیا/متصل و ژیرۀ/مخزن داده",
+   "wikibase-comment-update": "مورد {{WBREPONAME}} تغییر کرد",
"wikibase-dataitem": "{{WBREPONAME}} آیتم",
"wikibase-editlinks": "دۀسکاری پیوۀندۀل",
-   "wikibase-editlinkstitle": "دۀسکاری پیوندۀل میان‌ویکی"
+   "wikibase-editlinkstitle": "دۀسکاری پیوندۀل میان‌ویکی",
+   "wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
+   "wikibase-rc-hide-wikidata-hide": "ئآشاردن-پنهان کردن",
+   "wikibase-rc-hide-wikidata-show": "نیشان دائن",
+   "wikibase-rc-wikibase-edit-letter": "د",
+   "wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} دۀسکاری",
+   "wikibase-otherprojects": "پروژۀلئ تر"
 }
diff --git a/extensions/Wikibase/lib/i18n/lki.json 
b/extensions/Wikibase/lib/i18n/lki.json
new file mode 100644
index 000..0f616c4
--- /dev/null
+++ b/extensions/Wikibase/lib/i18n/lki.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Hosseinblue"
+   ]
+   },
+   "wikibase-sitelinks-wikipedia": "ویکی پدیا"
+}
diff --git a/extensions/Wikibase/repo/i18n/lki.json 
b/extensions/Wikibase/repo/i18n/lki.json
new file mode 100644
index 000..8585ed5
--- /dev/null
+++ b/extensions/Wikibase/repo/i18n/lki.json
@@ -0,0 +1,15 @@
+{
+   "@metadata": {
+   "authors": [
+   "Hosseinblue"
+   ]
+   },
+   "wikibase-edit": "دۀسکاری",
+   "wikibase-add": "اضافۀکردن",
+   "wikibase-label-empty": "هیچ نام مستعاری تعریف نشده است",
+   "wikibase-description-empty": "توضیحاتی تعریف نشده است.",
+   "wikibase-sitelinks-special": "سایتۀلئ تر",
+   "wikibase-aliases-empty": "هیچ نام مستعاری تعریف نشده است",
+   "wikibase-statementview-rank-normal": "رتبه معمولی",
+   "wikibase-statementview-referencesheading-pendingcountersubject": 
"{{PLURAL:$1|منبع|منابع}}"
+}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index d894eb7..6eb0a06 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1236,12 +1236,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "91ffefe6516fb9800198b3cb29f7c1855babcd79"
+"reference": "19af52bcfabfa2c0284a2153fa851488bc639ff4"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/91ffefe6516fb9800198b3cb29f7c1855babcd79;,
-"reference": "91ffefe6516fb9800198b3cb29f7c1855babcd79",
+"url": 

[MediaWiki-commits] [Gerrit] Code perfected again. - change (mediawiki...Quiz)

[Ananay (Code Review)]

Ananay has uploaded a new change for review.

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

Change subject: Code perfected again.
..

Code perfected again.

Change-Id: Icb6d4a5f599cb28a12c75be8423a7d6d9c4615a9
---
A Quiz.hooks.php
M Quiz.php
A extension.json
3 files changed, 112 insertions(+), 63 deletions(-)


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

diff --git a/Quiz.hooks.php b/Quiz.hooks.php
new file mode 100644
index 000..0fe4f12
--- /dev/null
+++ b/Quiz.hooks.php
@@ -0,0 +1,27 @@
+
+* @param $parser Parser the wikitext parser
+* @return Boolean true to continue hook processing
+   */
+   public static function onParserFirstCallInit( &$parser ) {
+   $parser->setHook( 'quiz', 'QuizHooks::renderQuiz' );
+   return true;
+   }
+   /**
+* Call the quiz parser on an input text.
+*
+* @param $input String text between  and  tags, in quiz 
syntax.
+* @param $argv Array an array containing any arguments passed to the 
extension
+* @param $parser Parser the wikitext parser.
+*
+* @return string An HTML quiz.
+   */
+   public static function renderQuiz( $input, $argv, $parser ) {
+   $parser->disableCache();
+   $quiz = new Quiz( $argv, $parser );
+   return $quiz->parseQuiz( $input );
+   }
+}
diff --git a/Quiz.php b/Quiz.php
index b92e37f..6a70de9 100644
--- a/Quiz.php
+++ b/Quiz.php
@@ -35,67 +35,50 @@
 if ( !defined( 'MEDIAWIKI' ) ) {
die( 'This is not a valid entry point to MediaWiki.' );
 }
-
-/**
- * Extension credits that will show up on Special:Version
- */
-$wgExtensionCredits['parserhook'][] = array(
-   'path'   => __FILE__,
-   'name'   => 'Quiz',
-   'version'=> '1.2.0',
-   'author' => 'Louis-Rémi Babe',
-   'url'=> 'https://www.mediawiki.org/wiki/Extension:Quiz',
-   'descriptionmsg' => 'quiz_desc',
-   'license-name'   => 'GPL-2.0+'
-);
-
-/**
- * Add this extension to MediaWiki's extensions list.
- */
-$dir = __DIR__ . '/';
-$wgAutoloadClasses['Quiz'] = $dir . 'Quiz.class.php';
-$wgAutoloadClasses['Question'] = $dir . 'Quiz.class.php';
-$wgMessagesDirs['QuizExtension'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['QuizExtension'] = $dir . 'Quiz.i18n.php';
-
-$wgHooks['ParserFirstCallInit'][] = 'wfQuizExtension';
-$wgHooks['ParserClearState'][] = 'Quiz::resetQuizID';
-
-$commonModuleInfo = array(
-   'localBasePath' => dirname( __FILE__ ) . '/modules',
-   'remoteExtPath' => 'Quiz/modules',
-);
-
-// Styles and any code common to all Special:Code subviews:
-$wgResourceModules['ext.quiz'] = array(
-   'scripts' => 'ext.quiz.js',
-   'styles' => 'ext.quiz.css',
-   'position' => 'top',
-) + $commonModuleInfo;
-
-/**
- * Register the extension with the WikiText parser.
- * The tag used is 
- *
- * @param $parser Parser the wikitext parser
- * @return Boolean true to continue hook processing
- */
-function wfQuizExtension( &$parser ) {
-   $parser->setHook( 'quiz', 'renderQuiz' );
-   return true;
-}
-
-/**
- * Call the quiz parser on an input text.
- *
- * @param $input String text between  and  tags, in quiz syntax.
- * @param $argv Array an array containing any arguments passed to the extension
- * @param $parser Parser the wikitext parser.
- *
- * @return string An HTML quiz.
- */
-function renderQuiz( $input, $argv, $parser ) {
-   $parser->disableCache();
-   $quiz = new Quiz( $argv, $parser );
-   return $quiz->parseQuiz( $input );
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'Quiz' );
+   /**
+* Extension credits that will show up on Special:Version
+*/
+   $wgExtensionCredits['parserhook'][] = array(
+   'path'   => __FILE__,
+   'name'   => 'Quiz',
+   'version'=> '1.2.0',
+   'author' => 'Louis-Rémi Babe',
+   'url'=> 
'https://www.mediawiki.org/wiki/Extension:Quiz',
+   'descriptionmsg' => 'quiz_desc',
+   'license-name'   => 'GPL-2.0+'
+   );
+   
+   /**
+* Add this extension to MediaWiki's extensions list.
+*/
+   $dir = __DIR__ . '/';
+   $wgAutoloadClasses['Quiz'] = $dir . 'Quiz.class.php';
+   $wgAutoloadClasses['Question'] = $dir . 'Quiz.class.php';
+   $wgAutoloadClasses['QuizHooks'] = $dir . 'Quiz.hooks.php';
+   $wgMessagesDirs['QuizExtension'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['QuizExtension'] = $dir . 'Quiz.i18n.php';
+   
+   $wgHooks['ParserFirstCallInit'][] = 'QuizHooks::onParserFirstCallInit';
+   $wgHooks['ParserClearState'][] = 'Quiz::resetQuizID';
+   
+   $commonModuleInfo = array(
+   

[MediaWiki-commits] [Gerrit] apt: add a trailing slash to backports' uri - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: apt: add a trailing slash to backports' uri
..

apt: add a trailing slash to backports' uri

Follow-up to cdd58af -- helps with comment_old taking effect.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/257834/1

diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 9072a75..4fd161c 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -103,7 +103,7 @@
 # enable backports for Debian systems
 if $::operatingsystem == 'Debian' {
 apt::repository { 'debian-backports':
-uri => 'http://mirrors.wikimedia.org/debian',
+uri => 'http://mirrors.wikimedia.org/debian/',
 dist=> "${::lsbdistcodename}-backports",
 components  => 'main contrib non-free',
 comment_old => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae453fe068beaec9625ba4ac29d2bea0f7ea1e48
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Extend LDAP indices for labs with puppetVar, roleOccupant an... - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: Extend LDAP indices for labs with puppetVar, roleOccupant and 
aAAARecord
..


Extend LDAP indices for labs with puppetVar, roleOccupant and aAAARecord

Change-Id: Ia3c7bfd30bcb3e9674b3217796e0300a0d48d73d
---
M modules/openldap/templates/labs-indices.erb
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/openldap/templates/labs-indices.erb 
b/modules/openldap/templates/labs-indices.erb
index 0d1fc62..268fa03 100644
--- a/modules/openldap/templates/labs-indices.erb
+++ b/modules/openldap/templates/labs-indices.erb
@@ -3,3 +3,6 @@
 index   aRecord eq
 index   cNAMERecord eq
 index   dc  eq
+index   puppetVar   eq
+index   roleOccupanteq
+index   aAAARecord  eq

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3c7bfd30bcb3e9674b3217796e0300a0d48d73d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] snapshot: fix logrotate.d syntax - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: snapshot: fix logrotate.d syntax
..


snapshot: fix logrotate.d syntax

Change-Id: I40cae016387902a12f35c36e8a6ea15c102acfe9
---
M modules/snapshot/files/logrotate.cirrusdump
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/snapshot/files/logrotate.cirrusdump 
b/modules/snapshot/files/logrotate.cirrusdump
index b86c054..c3565f1 100644
--- a/modules/snapshot/files/logrotate.cirrusdump
+++ b/modules/snapshot/files/logrotate.cirrusdump
@@ -1,6 +1,6 @@
 # This file is managed by puppet
 
-/var/log/cirrusdump/*.log {{
+/var/log/cirrusdump/*.log {
 daily
 notifempty
 dateext

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40cae016387902a12f35c36e8a6ea15c102acfe9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Update WikimediaEnableMultiLines to OTRS 5.0.1 - change (operations...otrs)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Update WikimediaEnableMultiLines to OTRS 5.0.1
..


Update WikimediaEnableMultiLines to OTRS 5.0.1

Merge the changes present in OTRS 5.0.1's Request.pm in our
WikimediaEnableMultiLines OTRS package. Bump the version numbers to
reflect that and have the package support only Framework version 5.0.x

Change-Id: I84764504e9cfc92be3c73f0eee8031c1a6a14fbb
---
M packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm
M packages/WikimediaEnableMultiLines/WikimediaEnableMultiLines.sopm
2 files changed, 31 insertions(+), 17 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved
  Faidon Liambotis: Looks good to me, but someone else must approve



diff --git 
a/packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm 
b/packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm
index 9947a2b..ced4fed 100644
--- a/packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm
+++ b/packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm
@@ -1,5 +1,4 @@
 # --
-# Kernel/System/Web/Request.pm - a wrapper for CGI.pm or Apache::Request.pm
 # Copyright (C) 2001-2015 OTRS AG, http://otrs.com/
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -73,15 +72,6 @@
 # max 5 MB posts
 $CGI::POST_MAX = $ConfigObject->Get('WebMaxFileUpload') || 1024 * 1024 * 
5;## no critic
 
-# we need to modify the tempdir
-# for windows because the users
-# group do not have enough rights
-# for the default tempdir c:\windows\temp
-# so we use a directory in otrs as tempdir (bug#10522)
-if ( $^O eq 'MSWin32' ) {
-$CGITempFile::TMPDIRECTORY = $ConfigObject->Get('TempDir');
-}
-
 # query object (in case use already existing WebRequest, e. g. fast cgi)
 $Self->{Query} = $Param{WebRequest} || CGI->new();
 
@@ -115,12 +105,11 @@
 
 =item GetParam()
 
-to get single request parameters.
-By default, trimming is performed on the data.
+to get single request parameters. By default, trimming is performed on the 
data.
 
 my $Param = $ParamObject->GetParam(
 Param => 'ID',
-Raw   => 1, # optional, input data is not changed
+Raw   => 1,   # optional, input data is not changed
 );
 
 =cut
@@ -129,6 +118,13 @@
 my ( $Self, %Param ) = @_;
 
 my $Value = $Self->{Query}->param( $Param{Param} );
+
+# Fallback to query string for mixed requests.
+my $RequestMethod = $Self->{Query}->request_method() // '';
+if ( $RequestMethod eq 'POST' && !defined $Value ) {
+$Value = $Self->{Query}->url_param( $Param{Param} );
+}
+
 $Kernel::OM->Get('Kernel::System::Encode')->EncodeInput( \$Value );
 
 my $Raw = defined $Param{Raw} ? $Param{Raw} : 0;
@@ -176,7 +172,19 @@
 # fetch all names
 my @ParamNames = $Self->{Query}->param();
 
-# is encode needed?
+# Fallback to query string for mixed requests.
+my $RequestMethod = $Self->{Query}->request_method() // '';
+if ( $RequestMethod eq 'POST' ) {
+my %POSTNames;
+@POSTNames{@ParamNames} = @ParamNames;
+my @GetNames = $Self->{Query}->url_param();
+GETNAME:
+for my $GetName (@GetNames) {
+next GETNAME if !defined $GetName;
+push @ParamNames, $GetName if !exists $POSTNames{$GetName};
+}
+}
+
 for my $Name (@ParamNames) {
 $Kernel::OM->Get('Kernel::System::Encode')->EncodeInput( \$Name );
 }
@@ -199,7 +207,13 @@
 sub GetArray {
 my ( $Self, %Param ) = @_;
 
-my @Values = $Self->{Query}->param( $Param{Param} );
+my @Values = $Self->{Query}->multi_param( $Param{Param} );
+
+# Fallback to query string for mixed requests.
+my $RequestMethod = $Self->{Query}->request_method() // '';
+if ( $RequestMethod eq 'POST' && !@Values ) {
+@Values = $Self->{Query}->url_param( $Param{Param} );
+}
 
 $Kernel::OM->Get('Kernel::System::Encode')->EncodeInput( \@Values );
 
diff --git a/packages/WikimediaEnableMultiLines/WikimediaEnableMultiLines.sopm 
b/packages/WikimediaEnableMultiLines/WikimediaEnableMultiLines.sopm
index 042baac..66af820 100644
--- a/packages/WikimediaEnableMultiLines/WikimediaEnableMultiLines.sopm
+++ b/packages/WikimediaEnableMultiLines/WikimediaEnableMultiLines.sopm
@@ -1,12 +1,12 @@
 
 
 WikimediaEnableMultiLines
-1.0.2
+1.0.3
 Wikimedia Foundation, Inc.
 https://wikitech.wikimedia.org/
 GNU AFFERO GENERAL PUBLIC LICENSE Version 3, November 
2007
 Enable blank multi lines in salutation, signature 
and responses.
-4.0.x
+5.0.x
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] Fix spelling mistake in prompt - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Fix spelling mistake in prompt
..

Fix spelling mistake in prompt

Change-Id: I5088154e31376798e964dfc8025c6727bbd46991
---
M scripts/welcome.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/49/257849/1

diff --git a/scripts/welcome.py b/scripts/welcome.py
index 45ac857..8e4995a 100755
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -917,7 +917,7 @@
 elif arg.startswith('-timeoffset'):
 if len(arg) == 11:
 globalvar.timeoffset = int(pywikibot.input(
-u'Which time offset (in minutest) for new users would you 
like to use?'))
+'Which time offset (in minutes) for new users would you 
like to use?'))
 else:
 globalvar.timeoffset = int(arg[12:])
 elif arg.startswith('-time'):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5088154e31376798e964dfc8025c6727bbd46991
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...NotebookViewer)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Initial commit
..


Initial commit

Implements:

 - A NotebookContent that represents a jupyter notebook. This
   uses a TextContent even though notebooks are JSON, since
   the PHP side can not really meaningfully do anything about
   the JSON, and so parsing it into JSON just wastes effort.
 - A rendering pipeline for it that involves (for now!) just
   shelling out to a simple python script (adopted from script
   from @rgbkrk)
 - Uses symfony/process for shelling out
 - Strips all custom JS and CSS from notebooks before rendering
   them

Bug: T120697
Change-Id: Iaaff2dd22d780fe89a82dd50d88bbb6c1e1c81cb
---
A NotebookContent.php
A NotebookContentHandler.php
A composer.json
A convertor.py
A extension.json
5 files changed, 135 insertions(+), 0 deletions(-)

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



diff --git a/NotebookContent.php b/NotebookContent.php
new file mode 100644
index 000..83852cd
--- /dev/null
+++ b/NotebookContent.php
@@ -0,0 +1,48 @@
+
+ * @author Yuvi Panda 
+ */
+
+use Symfony\Component\Process\Process;
+
+/**
+ * Represents the configuration of a Jupyter Notebook
+ */
+class NotebookContent extends TextContent {
+
+   function __construct( $text ) {
+   parent::__construct( $text, 'Notebook' );
+   }
+
+   protected function renderNotebook( $content ) {
+   $retval = null;
+   $process = new Process( __DIR__ . "/convertor.py" );
+   $process->setInput( $content );
+
+   $process->run();
+   if ( $process->isSuccessful() ) {
+   return $process->getOutput();
+   } else {
+   return "Parsing error";
+   }
+   }
+
+   protected function fillParserOutput( Title $title, $revId,
+   ParserOptions $options, $generateHtml, ParserOutput &$output
+   ) {
+   // FIXME: WikiPage::doEditContent generates parser output 
before validation.
+   // As such, native data may be invalid (though output is 
discarded later in that case).
+   if ( $generateHtml && $this->isValid() ) {
+   $output->setText( $this->renderNotebook( 
$this->getNativeData() ) );
+   } else {
+   $output->setText( 'error' );
+   }
+   }
+}
diff --git a/NotebookContentHandler.php b/NotebookContentHandler.php
new file mode 100644
index 000..d6fab60
--- /dev/null
+++ b/NotebookContentHandler.php
@@ -0,0 +1,26 @@
+
+ * @author Yuvi Panda 
+ */
+
+class NotebookContentHandler extends TextContentHandler {
+
+   public function __construct( $modelId = 'Notebook' ) {
+   parent::__construct( $modelId );
+   }
+
+   public function canBeUsedOn( Title $title ) {
+   return $title->inNamespace( NS_NOTEBOOK );
+   }
+
+   protected function getContentClass() {
+   return 'NotebookContent';
+   }
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..47ae9c2
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+   "require": {
+   "symfony/process": "~2.5"
+   }
+}
diff --git a/convertor.py b/convertor.py
new file mode 100755
index 000..b15be4e
--- /dev/null
+++ b/convertor.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import print_function
+import sys
+reload(sys)
+sys.setdefaultencoding("utf-8")
+
+from nbconvert.exporters import HTMLExporter
+from traitlets.config import Config
+
+config = Config({
+"HTMLExporter": {"template_file": "basic"},
+'NbConvertBase': {
+'display_data_priority': [
+'text/html',
+'text/markdown',
+'application/pdf',
+'image/svg+xml',
+'text/latex',
+'image/png',
+'image/jpeg',
+'text/plain',
+]
+}
+})
+ex = HTMLExporter(config=config)
+
+html, extra = ex.from_file(sys.stdin)
+sys.stdout.write(html)
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..cc8d66c
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,27 @@
+{
+   "name": "NotebookViewer",
+   "version": "0.0.1",
+   "author": [
+   "Yuvi Panda"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:NotebookViewer;,
+   "descriptionmsg": "notebookviewer-desc",
+   "license-name": "MIT",
+   "type": "other",
+   "AutoloadClasses": {
+   "NotebookContent": "NotebookContent.php",
+   "NotebookContentHandler": "NotebookContentHandler.php"
+   },
+   "namespaces": [
+   {
+   "id": 486,
+   "constant": "NS_NOTEBOOK",
+   "name": "Notebook",

[MediaWiki-commits] [Gerrit] Drop the WikimediaEnableMultilines packages - change (operations...otrs)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Drop the WikimediaEnableMultilines packages
..


Drop the WikimediaEnableMultilines packages

The WikimediaEnableMultilines package is no longer used and hence is
dropped

Change-Id: Ib7922372ccf0c837d41eff1a461545920f59d867
---
D packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm
D packages/WikimediaEnableMultiLines/WikimediaEnableMultiLines.sopm
2 files changed, 0 insertions(+), 395 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git 
a/packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm 
b/packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm
deleted file mode 100644
index ced4fed..000
--- a/packages/WikimediaEnableMultiLines/Custom/Kernel/System/Web/Request.pm
+++ /dev/null
@@ -1,382 +0,0 @@
-# --
-# Copyright (C) 2001-2015 OTRS AG, http://otrs.com/
-# --
-# This software comes with ABSOLUTELY NO WARRANTY. For details, see
-# the enclosed file COPYING for license information (AGPL). If you
-# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
-# --
-
-package Kernel::System::Web::Request;
-
-use strict;
-use warnings;
-
-use CGI ();
-use CGI::Carp;
-use File::Path qw();
-
-our @ObjectDependencies = (
-'Kernel::Config',
-'Kernel::System::CheckItem',
-'Kernel::System::Encode',
-);
-
-=head1 NAME
-
-Kernel::System::Web::Request - global CGI interface
-
-=head1 SYNOPSIS
-
-All cgi param functions.
-
-=head1 PUBLIC INTERFACE
-
-=over 4
-
-=cut
-
-=item new()
-
-create param object. Do not use it directly, instead use:
-
-use Kernel::System::ObjectManager;
-local $Kernel::OM = Kernel::System::ObjectManager->new(
-'Kernel::System::Web::Request' => {
-WebRequest   => CGI::Fast->new(), # optional, e. g. if fast cgi is 
used
-}
-);
-my $ParamObject = $Kernel::OM->Get('Kernel::System::Web::Request');
-
-If Kernel::System::Web::Request is instantiated several times, they will share 
the
-same CGI data (this can be helpful in filters which do not have access to the
-ParamObject, for example.
-
-If you need to reset the CGI data before creating a new instance, use
-
-CGI::initialize_globals();
-
-before calling Kernel::System::Web::Request->new();
-
-=cut
-
-sub new {
-my ( $Type, %Param ) = @_;
-
-# allocate new hash for object
-my $Self = {};
-bless( $Self, $Type );
-
-# get config object
-my $ConfigObject = $Kernel::OM->Get('Kernel::Config');
-
-# max 5 MB posts
-$CGI::POST_MAX = $ConfigObject->Get('WebMaxFileUpload') || 1024 * 1024 * 
5;## no critic
-
-# query object (in case use already existing WebRequest, e. g. fast cgi)
-$Self->{Query} = $Param{WebRequest} || CGI->new();
-
-return $Self;
-}
-
-=item Error()
-
-to get the error back
-
-if ( $ParamObject->Error() ) {
-print STDERR $ParamObject->Error() . "\n";
-}
-
-=cut
-
-sub Error {
-my ( $Self, %Param ) = @_;
-
-# Workaround, do not check cgi_error() with perlex, CGI module is not
-# working with perlex.
-if ( $ENV{'GATEWAY_INTERFACE'} && $ENV{'GATEWAY_INTERFACE'} =~ 
/^CGI-PerlEx/ ) {
-return;
-}
-
-return if !$Self->{Query}->cgi_error();
-## no critic
-return $Self->{Query}->cgi_error() . ' - POST_MAX=' . ( $CGI::POST_MAX / 
1024 ) . 'KB';
-## use critic
-}
-
-=item GetParam()
-
-to get single request parameters. By default, trimming is performed on the 
data.
-
-my $Param = $ParamObject->GetParam(
-Param => 'ID',
-Raw   => 1,   # optional, input data is not changed
-);
-
-=cut
-
-sub GetParam {
-my ( $Self, %Param ) = @_;
-
-my $Value = $Self->{Query}->param( $Param{Param} );
-
-# Fallback to query string for mixed requests.
-my $RequestMethod = $Self->{Query}->request_method() // '';
-if ( $RequestMethod eq 'POST' && !defined $Value ) {
-$Value = $Self->{Query}->url_param( $Param{Param} );
-}
-
-$Kernel::OM->Get('Kernel::System::Encode')->EncodeInput( \$Value );
-
-my $Raw = defined $Param{Raw} ? $Param{Raw} : 0;
-
-# wp
-if ( $ENV{QUERY_STRING} && $ENV{QUERY_STRING} =~ 
/Admin(Signature|Salutation|Response)/ ) {
-  $Raw = 1;
-}
-# /wp
-
-if ( !$Raw ) {
-
-# If it is a plain string, perform trimming
-if ( ref \$Value eq 'SCALAR' ) {
-$Kernel::OM->Get('Kernel::System::CheckItem')->StringClean(
-StringRef => \$Value,
-TrimLeft  => 1,
-TrimRight => 1,
-);
-}
-}
-
-return $Value;
-}
-
-=item GetParamNames()
-
-to get names of all parameters passed to the script.
-
-my @ParamNames = $ParamObject->GetParamNames();
-
-Example:
-
-Called URL: 
index.pl?Action=AdminSysConfig;Subaction=Save;Name=Config::Option::Valid
-
-my 

[MediaWiki-commits] [Gerrit] Fixed last sommit whitespaces and tabs - change (pywikibot/core)

[Georggi199 (Code Review)]

Georggi199 has uploaded a new change for review.

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

Change subject: Fixed last sommit whitespaces and tabs
..

Fixed last sommit whitespaces and tabs

Screw notepad++ tabs!

Bug T70613

Change-Id: I16bcb23788925043786bab453fcd27606a6c3522
---
M scripts/checkimages.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/52/257852/1

diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 4495d28..d0fe50d 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -1770,5 +1770,5 @@
 else:
 final = time.time()
 delta = int(final - start)
-   if delta != 0:
-   pywikibot.output("Execution time: %s seconds\n" % delta)
+if delta != 0:
+pywikibot.output("Execution time: %s seconds\n" % delta)

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

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

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

[MediaWiki-commits] [Gerrit] Remove string refs to function and make it non-public - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Remove string refs to function and make it non-public
..

Remove string refs to function and make it non-public

Change-Id: Iacc9852a35f131327b3afbc2c890bab7faf7b977
---
M lib/includes/store/sql/SiteLinkTable.php
1 file changed, 24 insertions(+), 24 deletions(-)


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

diff --git a/lib/includes/store/sql/SiteLinkTable.php 
b/lib/includes/store/sql/SiteLinkTable.php
index f224e49..31a3f22 100644
--- a/lib/includes/store/sql/SiteLinkTable.php
+++ b/lib/includes/store/sql/SiteLinkTable.php
@@ -63,28 +63,6 @@
}
 
/**
-* @param SiteLink $a
-* @param SiteLink $b
-*
-* @return int
-*/
-   public function compareSiteLinks( SiteLink $a, SiteLink $b ) {
-   $siteComp = strcmp( $a->getSiteId(), $b->getSiteId() );
-
-   if ( $siteComp !== 0 ) {
-   return $siteComp;
-   }
-
-   $pageComp = strcmp( $a->getPageName(), $b->getPageName() );
-
-   if ( $pageComp !== 0 ) {
-   return $pageComp;
-   }
-
-   return 0;
-   }
-
-   /**
 * @see SiteLinkStore::saveLinksOfItem
 *
 * @since 0.1
@@ -98,8 +76,8 @@
$newLinks = $item->getSiteLinkList()->toArray();
$oldLinks = $this->getSiteLinksForItem( $item->getId() );
 
-   $linksToInsert = array_udiff( $newLinks, $oldLinks, array( 
$this, 'compareSiteLinks' ) );
-   $linksToDelete = array_udiff( $oldLinks, $newLinks, array( 
$this, 'compareSiteLinks' ) );
+   $linksToInsert = $this->diffSiteLinks( $newLinks, $oldLinks );
+   $linksToDelete = $this->diffSiteLinks( $oldLinks, $newLinks );
 
if ( !$linksToInsert && !$linksToDelete ) {
wfDebugLog( __CLASS__, __FUNCTION__ . ": links did not 
change, returning." );
@@ -126,6 +104,28 @@
return $ok;
}
 
+   private function diffSiteLinks( array $firstList, array $secondList ) {
+   return array_udiff(
+   $firstList,
+   $secondList,
+   function( SiteLink $a, SiteLink $b ) {
+   $siteComp = strcmp( $a->getSiteId(), 
$b->getSiteId() );
+
+   if ( $siteComp !== 0 ) {
+   return $siteComp;
+   }
+
+   $pageComp = strcmp( $a->getPageName(), 
$b->getPageName() );
+
+   if ( $pageComp !== 0 ) {
+   return $pageComp;
+   }
+
+   return 0;
+   }
+   );
+   }
+
/**
 * Internal callback for inserting a list of links.
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacc9852a35f131327b3afbc2c890bab7faf7b977
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] Remove unused uses - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unused uses
..


Remove unused uses

While you are here, could you also merge the following patch please?
https://github.com/DataValues/Common/pull/39

Change-Id: I8cb23b25e61bbcb66888df7b568dd2cf633ec220
---
M repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Addshore: Looks good to me, approved
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php 
b/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
index ea2d637..6cb6c85 100644
--- a/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentFactoryTest.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Test;
 
-use ContentHandler;
 use Title;
 use Wikibase\DataModel\Entity\Entity;
 use Wikibase\DataModel\Entity\EntityRedirect;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cb23b25e61bbcb66888df7b568dd2cf633ec220
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ldap-labs: Issue new 2048bit certificates - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: ldap-labs: Issue new 2048bit certificates
..

ldap-labs: Issue new 2048bit certificates

Turns out 4096bit certificates mean too much CPU usage on the slapd
server. Reissue keys and certificates as 2048 as it seems we will get a
4x-7x performance improvement at the cost of a little bit less security

Change-Id: I9424e29c6ff203cb631d160393a4e8ce857f90ec
---
M files/ssl/ldap-labs.codfw.wikimedia.org.crt
M files/ssl/ldap-labs.eqiad.wikimedia.org.crt
2 files changed, 50 insertions(+), 242 deletions(-)


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

diff --git a/files/ssl/ldap-labs.codfw.wikimedia.org.crt 
b/files/ssl/ldap-labs.codfw.wikimedia.org.crt
index 9d089c8..805bc0a 100644
--- a/files/ssl/ldap-labs.codfw.wikimedia.org.crt
+++ b/files/ssl/ldap-labs.codfw.wikimedia.org.crt
@@ -1,125 +1,29 @@
-Certificate:
-Data:
-Version: 3 (0x2)
-Serial Number: 11 (0xb)
-Signature Algorithm: sha256WithRSAEncryption
-Issuer: C=US, ST=California, L=San Francisco, O=Wikimedia Foundation, 
OU=Operations, CN=WMF CA 2014-2017
-Validity
-Not Before: Nov 19 11:54:59 2015 GMT
-Not After : Nov  8 11:54:59 2017 GMT
-Subject: C=US, ST=California, O=Wikimedia Foundation, OU=Operations, 
CN=ldap-labs.codfw.wikimedia.org/emailAddress=i...@wikimedia.org
-Subject Public Key Info:
-Public Key Algorithm: rsaEncryption
-Public-Key: (4096 bit)
-Modulus:
-00:d7:b0:fc:41:d0:3c:c9:b8:7a:bf:16:79:f0:19:
-17:38:07:51:c9:60:4a:45:54:8d:63:14:d8:a9:5d:
-03:33:eb:b3:05:7f:38:4e:7b:58:4b:78:3e:7d:32:
-10:ea:22:bc:0b:d6:35:3c:e6:bf:ed:dc:35:d1:e2:
-d6:a7:01:87:f7:e6:29:b5:d6:0e:20:59:90:80:81:
-44:2c:af:67:69:e0:d1:46:df:aa:99:f6:b4:c9:05:
-02:0e:1b:54:da:4d:37:ff:f2:43:8f:9a:53:5f:4a:
-18:d1:90:13:64:f2:72:c6:ff:c5:72:05:ea:dd:a1:
-6e:d4:3d:ec:d8:b6:10:61:f4:8a:1a:4d:4f:cc:01:
-6e:27:a6:0a:79:df:88:63:21:af:40:b4:93:d4:30:
-28:59:1f:bd:51:64:be:b7:51:68:22:1c:44:42:0f:
-63:2f:b6:ba:4b:ed:b9:e7:60:85:f8:3d:55:15:57:
-35:b9:25:e7:36:cf:3b:42:b3:29:bf:cc:f0:40:f1:
-29:8c:1a:c3:4f:b4:a2:a3:5b:cc:88:57:1e:07:35:
-d6:a5:2d:f5:78:48:97:1f:36:85:bc:4d:4f:c1:b0:
-4e:07:72:97:e4:92:2b:71:d0:01:9e:39:8c:26:c4:
-51:30:f6:36:d7:30:6a:21:a3:ab:42:a0:c6:f4:98:
-6c:1d:e9:73:6f:72:92:27:13:09:36:bb:e1:bf:81:
-71:64:58:d1:16:5e:af:8b:9a:45:59:be:3b:f6:01:
-5e:b9:46:ce:40:7e:f5:54:5e:0b:a4:8a:ec:70:43:
-ac:e8:8b:a2:90:af:62:43:7a:c4:3a:9e:0a:ed:08:
-80:38:27:f4:64:aa:96:8b:f4:90:1a:fa:2d:86:54:
-0b:d9:b9:52:11:89:e6:2a:ad:b2:8a:e3:91:41:6b:
-b1:fc:75:f1:96:fe:6d:7b:e2:45:93:4a:74:99:f7:
-9f:8b:85:63:a1:f1:9f:7b:d2:d4:b9:33:70:94:2e:
-fe:73:d7:01:68:fc:f6:8f:06:90:1d:46:b5:eb:13:
-c0:23:ed:ea:a2:9a:ba:a0:dc:56:61:9e:05:a4:ed:
-0a:26:24:cb:bb:ae:71:3e:48:71:a2:78:7c:1e:41:
-f0:bc:ee:89:9e:65:6f:70:88:fe:55:69:04:83:0e:
-6d:af:3f:6f:3f:c8:94:66:32:82:c2:77:53:70:03:
-d4:1b:44:b2:45:39:f2:b1:24:c5:1b:5d:7d:c1:36:
-e6:58:f0:52:53:a7:de:50:fb:f0:d5:64:58:48:88:
-8a:47:0b:0a:0e:6b:bb:99:bd:16:e7:e6:6e:e6:a1:
-cf:40:23:2d:6b:a3:c3:a6:82:39:9a:b2:49:12:8b:
-23:52:c9
-Exponent: 65537 (0x10001)
-X509v3 extensions:
-X509v3 Basic Constraints: 
-CA:FALSE
-Netscape Comment: 
-OpenSSL Generated Certificate
-X509v3 Subject Key Identifier: 
-34:02:B3:1E:C4:CF:8B:04:C1:DC:47:7D:E2:7C:C3:54:D1:34:ED:0B
-X509v3 Authority Key Identifier: 
-
keyid:F4:0D:54:CB:AB:60:27:62:13:83:FB:F8:29:3B:E8:C8:98:AF:88:29
-
-Signature Algorithm: sha256WithRSAEncryption
- 64:78:ea:b5:ab:c9:c7:4d:6d:1e:30:04:52:47:6a:18:5c:96:
- e9:0f:92:0f:71:a9:ad:08:87:e2:4e:bf:af:f6:d4:d4:ba:1c:
- ac:5f:c1:21:92:0d:11:93:74:3e:ad:8e:ed:05:bd:f1:5b:53:
- 2f:f1:3a:c8:1a:79:eb:e0:c4:5d:f2:7b:81:f3:be:4a:80:3e:
- 27:f7:ef:08:d9:4b:32:d4:98:ef:22:a4:e6:ba:67:6e:86:26:
- ef:b5:5f:e4:e1:db:ea:db:e5:dd:17:b2:2f:7e:af:ad:67:e5:
- 08:89:07:4b:57:93:c1:6a:4e:7b:95:b7:8a:fa:9f:0f:cd:61:
- 

[MediaWiki-commits] [Gerrit] Set strictSSL false - change (mediawiki...cxserver)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Set strictSSL false
..

Set strictSSL false

For Yandex, set strictSSL false temporarily to keep it running.
The certificate issue is being investigated.

Change-Id: I486cd1df989284ba3d9a51b73d2c74b06918f5eb
---
M mt/Yandex.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/72/257872/1

diff --git a/mt/Yandex.js b/mt/Yandex.js
index 72d060c..3aa7df0 100644
--- a/mt/Yandex.js
+++ b/mt/Yandex.js
@@ -1,7 +1,7 @@
 var Q = require( 'q' ),
request = require( 'request' ),
util = require( 'util' ),
-   MTClient  = require( './MTClient.js' ),
+   MTClient = require( './MTClient.js' ),
conf = require( __dirname + '/../utils/Conf.js' );
 
 function Yandex() {
@@ -41,6 +41,7 @@
postData = {
url: conf( 'mt.yandex.api' ) + '/api/v1.5/tr.json/translate',
proxy: conf( 'proxy' ),
+   strictSSL: false,
form: {
key: key,
lang: sourceLang + '-' + targetLang,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I486cd1df989284ba3d9a51b73d2c74b06918f5eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Rename -time into -sleep - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Rename -time into -sleep
..


Rename -time into -sleep

Bug: T120894
Change-Id: Icb8c97a836ac21ac685fd445622ec2b3d8daf499
---
M scripts/checkimages.py
1 file changed, 13 insertions(+), 6 deletions(-)

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



diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 762f6d6..1265920 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -29,7 +29,9 @@
 
 -break  To break the bot after the first check (default: recursive)
 
--time[:#]   Time in seconds between repeat runs (default: 30)
+-sleep[:#]  Time in seconds between repeat runs (default: 30)
+
+-time[:#]   The -time option is deprecated. Use -sleep instead.
 
 -wait[:#]   Wait x second before check the images (default: 0)
 
@@ -1600,12 +1602,17 @@
 u'How many files do you want to check?'))
 else:
 limit = int(arg[7:])
-if arg.startswith('-time'):
-if len(arg) == 5:
-time_sleep = int(pywikibot.input(
-u'How many seconds do you want runs to be apart?'))
+if arg.startswith('-sleep') or arg.startswith('-time'):
+if arg.startswith('-sleep'):
+length = len('-sleep')
 else:
-time_sleep = int(arg[6:])
+pywikibot.tools.issue_deprecation_warning('-time', '-sleep', 2)
+length = len('-time')
+if len(arg) == length:
+time_sleep = int(pywikibot.input(
+'How many seconds do you want runs to be apart?'))
+else:
+time_sleep = int(arg[length + 1:])
 elif arg == '-break':
 repeat = False
 elif arg == '-nologerror':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb8c97a836ac21ac685fd445622ec2b3d8daf499
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Murfel 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add performance tests - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Add performance tests
..

Add performance tests

* Step 1: Add json export method

Change-Id: Ie7d5e458fe5f904de507605c7778ee20928e4347
---
A maintenance/MathPerformance.php
1 file changed, 135 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/MathPerformance.php b/maintenance/MathPerformance.php
new file mode 100644
index 000..cbdb770
--- /dev/null
+++ b/maintenance/MathPerformance.php
@@ -0,0 +1,135 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @ingroup Maintenance
+ */
+
+require_once ( __DIR__ . '/../../../maintenance/Maintenance.php' );
+class MathPerformance extends Maintenance {
+   const RTI_CHUNK_SIZE = 1;
+   public $purge = false;
+   /** @var boolean */
+   private $verbose;
+   /** @var DatabaseBase */
+   public $dbw;
+   /** @var DatabaseBase */
+   private $db;
+   /** @var MathRenderer */
+   private $current;
+   private $time = 0.0; // microtime( true );
+   private $performance = array();
+   private $renderingMode = 'mathml';
+
+   public function __construct() {
+   parent::__construct();
+   $this->mDescription = 'Run math performance tests.';
+   $this->addArg( 'action', 'Selects what should be done.', false 
);
+   $this->addArg( 'shares', 'How many pieces should be used.', 
false );
+   $this->addArg( 'share', 'Which piece should be used. Starting 
from 0.', false );
+   $this->addOption( 'table', 'table to load the formulae from', 
false );
+   $this->addOption( 'input', 'field that contains the input', 
false );
+   $this->addOption( 'hash', 'field that contains the hash', false 
);
+   $this->addOption( 'min', 'If set, processing is started at 
formula>min', false );
+   $this->addOption( 'max', 'If set, processing is stopped at 
formula<=max', false );
+   $this->addOption( 'output', 'The destination of the output 
defaults to stdout.', false );
+   $this->addOption( 'verbose', 'If set, output for successful 
rendering will produced', false,
+   false, 'v' );
+   }
+
+   /**
+* Measures time in ms.
+* In order to have a formula centric evaluation, we can not just the 
build in profiler
+* @param string $category
+*
+* @return int
+*/
+   private function time( $category = 'default' ) {
+   global $wgMathDebug;
+   $delta = ( microtime( true ) - $this->time ) * 1000;
+   if ( isset( $this->performance[$category] ) ) {
+   $this->performance[$category] += $delta;
+   } else {
+   $this->performance[$category] = $delta;
+   }
+   if ( $wgMathDebug ) {
+   $this->db->insert( 'mathperformance', array(
+   'math_inputhash'   => 
$this->current->getInputHash(),
+   'mathperformance_name' => substr( $category, 0, 
10 ),
+   'mathperformance_time' => $delta,
+   'mathperformance_mode' => 
MathHooks::mathModeToHashKey( $this->renderingMode )
+   ) );
+   }
+   $this->time = microtime( true );
+
+   return (int)$delta;
+   }
+
+
+   public function execute() {
+   global $wgMathValidModes;
+   $this->dbw = wfGetDB( DB_MASTER );
+   $this->db = wfGetDB( DB_MASTER );
+   $wgMathValidModes[] = $this->renderingMode;
+   $this->output( "Loaded.\n" );
+   $this->time = microtime( true );
+   if ( $this->getArg( 0, 'export' ) == 'export' ) {
+   $this->renderFromTable();
+   }
+   }
+
+   private function renderFromTable() {
+   $min = $this->getOption( 'min', 0 );
+   $max = $this->getOption( 'max', 0 );
+   $options = array();
+   if ( $max ) {
+   $options['LIMIT'] = $max - $min;
+   $options['OFFSET'] = $min;
+   }
+   $table = $this->getOption( 'table', 'mathoid' );
+   $tex = $this->getOption( 'input', 'math_input' );
+   $hash = $this->getOption( 'hash', 'math_inputhash' );
+   $shares = $this->getArg( 1, false ); // 'shares'
+   $share = $this->getArg( 2, 0 ); // 'share'
+   if ( $shares ) {
+   // echo "I'm share $share of $shares";
+   $counts = $this->db->selectField( $table, 

[MediaWiki-commits] [Gerrit] Fix MT error reporting - change (mediawiki...cxserver)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix MT error reporting
..


Fix MT error reporting

Change-Id: I995bdf86bb8887bf890b09da6fa4261dc2e9af8f
---
M routes/v1.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/routes/v1.js b/routes/v1.js
index aba665f..7e37543 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -152,9 +152,9 @@
},
function ( error ) {
res.send( 500, {
-   error: error
+   error: error.toString()
} );
-   logger.log( 'error', 'MT processing error: 
(%s)', error.toString() );
+   logger.error( 'MT processing error: ' + 
error.toString() );
}
);
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I995bdf86bb8887bf890b09da6fa4261dc2e9af8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Repool es1019 after maintenance - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Repool es1019 after maintenance
..

Repool es1019 after maintenance

Change-Id: I34dd52ee031c8ba76444c03741e22dea3fbdee36
References: T120122
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index dff9753..ebf6801 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -488,7 +488,7 @@
'cluster25' => array(
'10.64.16.187' => 1, # es1014, master
'10.64.48.114' => 3, # es1017
-#  '10.64.48.116' => 3, # es1019
+   '10.64.48.116' => 3, # es1019
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' => array(

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

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

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

[MediaWiki-commits] [Gerrit] etherpad: ferm rules for the etherpad service port - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: etherpad: ferm rules for the etherpad service port
..

etherpad: ferm rules for the etherpad service port

Allow port 9001

Change-Id: I4d268591e5fef3f11684c24d8eb4a94c2cfcc0e9
---
M manifests/role/etherpad.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/257874/1

diff --git a/manifests/role/etherpad.pp b/manifests/role/etherpad.pp
index 3bb35f7..c17327c 100644
--- a/manifests/role/etherpad.pp
+++ b/manifests/role/etherpad.pp
@@ -64,5 +64,8 @@
 proto => 'tcp',
 port  => 'http',
 }
-
+ferm::service { 'etherpad_service':
+proto => 'tcp',
+port  => '9001',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d268591e5fef3f11684c24d8eb4a94c2cfcc0e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Enable deref overlay - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Enable deref overlay
..

Enable deref overlay

There are plenty of

slap_global_control: unrecognized control: 1.3.6.1.4.1.4203.666.5.16

entries logged on seaborgium and serpens. These are caused by LDAP clients
using the LDAP dereference control as described in
https://tools.ietf.org/html/draft-masarati-ldap-deref-00.
This can reproduced with e.g.

ldapsearch (...)  -E deref=uniqueMember:uid cn="Directory Managers"

The available controls can be shown with
ldapsearch -xLLL -b "" -s base supportedControl

The configure script in the openldap package in Debian is wrong; the deref
overlay _is_ build as a module not by default, explicitly passing
--enable-deref to the configure script is not needed.

I've tested this in vagrant and the overlay works fine.

Change-Id: I22bb5945c717cd64780edf131965ae0a10a2e3c6
---
M modules/openldap/templates/slapd.erb
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/257866/1

diff --git a/modules/openldap/templates/slapd.erb 
b/modules/openldap/templates/slapd.erb
index 204bd0b..dd36c95 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -38,6 +38,7 @@
 moduleload  syncprov
 moduleload  auditlog
 moduleload  ppolicy
+moduleload  deref
 
 # Maximum number of entries that is returned for a search operation
 <% if @size_limit then %>
@@ -80,6 +81,8 @@
 overlay auditlog
 auditlog /var/lib/ldap/slapd-audit.log
 
+overlay deref
+
 ###
 ## Password policy (default is to store passwords in plaintext)
 # This policy will store passwords an unsalted SHA1 hashes.

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

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

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

[MediaWiki-commits] [Gerrit] Bug:T103870 - change (mediawiki/core)

[PranavK (Code Review)]

PranavK has uploaded a new change for review.

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

Change subject: Bug:T103870
..

Bug:T103870

Removed unnecessary blank line in Special:Export page

Change-Id: I5b314ef9204ca33d851a9fe88477d0be427e5199
---
M includes/specials/SpecialExport.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/257870/1

diff --git a/includes/specials/SpecialExport.php 
b/includes/specials/SpecialExport.php
index 7392972..ce039fb 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -65,7 +65,7 @@
 */
$catpages = 
$this->getPagesFromCategory( $t );
if ( $catpages ) {
-   $page .= implode( "\n", 
$catpages );
+   $page .= implode( "\n", 
$catpages ) . "\n";
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] No longer shows execution time if bot was not running - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: No longer shows execution time if bot was not running
..


No longer shows execution time if bot was not running

Bug: T70613
Change-Id: I2a17f2f4f05a8b134237ccd5037ba02e42c6e1bc
---
M scripts/checkimages.py
1 file changed, 6 insertions(+), 5 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, approved
  XZise: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 762f6d6..f351fef 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -1700,7 +1700,7 @@
 if site.code not in project_inserted:
 pywikibot.output(u"Your project is not supported by this script.\n"
  u"You have to edit the script and add it!")
-return
+return False
 
 # Reading the log of the new images if another generator is not given.
 if normal:
@@ -1764,10 +1764,11 @@
 if __name__ == "__main__":
 start = time.time()
 try:
-main()
+ret = main()
 except SystemExit:
 pass
 else:
-final = time.time()
-delta = int(final - start)
-pywikibot.output("Execution time: %s seconds\n" % delta)
+if ret is not False:
+final = time.time()
+delta = int(final - start)
+pywikibot.output("Execution time: %s seconds\n" % delta)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a17f2f4f05a8b134237ccd5037ba02e42c6e1bc
Gerrit-PatchSet: 9
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Georggi199 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] etherpad: ferm rules for the etherpad service port - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: etherpad: ferm rules for the etherpad service port
..


etherpad: ferm rules for the etherpad service port

Allow port 9001

Change-Id: I4d268591e5fef3f11684c24d8eb4a94c2cfcc0e9
---
M manifests/role/etherpad.pp
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/etherpad.pp b/manifests/role/etherpad.pp
index 3bb35f7..c17327c 100644
--- a/manifests/role/etherpad.pp
+++ b/manifests/role/etherpad.pp
@@ -64,5 +64,8 @@
 proto => 'tcp',
 port  => 'http',
 }
-
+ferm::service { 'etherpad_service':
+proto => 'tcp',
+port  => '9001',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] Split code and fix precision edge case in MwTimeIsoFormatter - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Split code and fix precision edge case in MwTimeIsoFormatter
..


Split code and fix precision edge case in MwTimeIsoFormatter

Meant as a clean up of existing code. I started this patch with
splitting the big function.

I found an issue where this formatter incorrectly formats values
with hour, minute or second precision as a day. The issue with this
is that you can not even see the hour, minute or second. It's
supressed. This patch introduces a fallback to the full timestamp.

Change-Id: If5974e808f78a5fbac82f0eeb8d825509c9495a9
---
M lib/includes/formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
2 files changed, 50 insertions(+), 31 deletions(-)

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



diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php 
b/lib/includes/formatters/MwTimeIsoFormatter.php
index bc969a2..f89e3b6 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -76,13 +76,13 @@
 * @return string Formatted date
 */
private function getLocalizedDate( $isoTimestamp, $precision ) {
-   $dateFormat = $this->getDateFormat( $precision );
$localizedYear = $this->getLocalizedYear( $isoTimestamp, 
$precision );
 
-   if ( $dateFormat === 'Y' ) {
+   if ( $precision <= TimeValue::PRECISION_YEAR ) {
return $localizedYear;
}
 
+   $dateFormat = $this->getDateFormat( $precision );
$mwTimestamp = $this->getMwTimestamp( $isoTimestamp, $precision 
);
$mwYear = $this->language->sprintfDate( 'Y', $mwTimestamp );
$localizedDate = $this->language->sprintfDate( $dateFormat, 
$mwTimestamp );
@@ -103,17 +103,18 @@
/**
 * @param int $precision
 *
+* @throws InvalidArgumentException
 * @return string Date format string to be used by Language::sprintfDate
 */
private function getDateFormat( $precision ) {
-   if ( $precision <= TimeValue::PRECISION_YEAR ) {
-   return 'Y';
-   } elseif ( $precision === TimeValue::PRECISION_MONTH ) {
+   if ( $precision === TimeValue::PRECISION_MONTH ) {
$format = $this->language->getDateFormatString( 
'monthonly', 'dmy' );
return sprintf( '%s Y', $this->getMonthFormat( $format 
) );
-   } else {
+   } elseif ( $precision === TimeValue::PRECISION_DAY ) {
$format = $this->language->getDateFormatString( 'date', 
'dmy' );
return sprintf( '%s %s Y', $this->getDayFormat( $format 
), $this->getMonthFormat( $format ) );
+   } else {
+   throw new InvalidArgumentException( 'Unsupported 
precision' );
}
}
 
@@ -198,7 +199,6 @@
 * @param string $isoTimestamp
 * @param int $precision
 *
-* @throws InvalidArgumentException
 * @return string
 */
private function getLocalizedYear( $isoTimestamp, $precision ) {
@@ -206,8 +206,8 @@
list( , $sign, $year ) = $matches;
$isBCE = $sign === '-';
 
-   $shift = 1e+0;
-   $unshift = 1e+0;
+   $shift = 1;
+   $unshift = 1;
$func = 'round';
 
switch ( $precision ) {
@@ -257,28 +257,16 @@
break;
}
 
-   if ( $shift !== 1e+0 || $unshift !== 1e+0 ) {
-   switch ( $func ) {
-   case 'ceil':
-   $shifted = ceil( $year / $shift ) * 
$unshift;
-   break;
-   case 'floor':
-   $shifted = floor( $year / $shift ) * 
$unshift;
-   break;
-   default:
-   $shifted = round( $year / $shift ) * 
$unshift;
-   }
-
-   // Year to small for precision, fall back to year
-   if ( $shifted == 0
-   && ( $precision < TimeValue::PRECISION_YEAR
-   || ( $isBCE && $precision === 
TimeValue::PRECISION_YEAR )
-   )
-   ) {
-   $msg = null;
-   } else {
-   $year = sprintf( '%.0f', $shifted );
-   }
+   $shifted = $this->shiftNumber( $year, $func, $shift, $unshift );
+ 

[MediaWiki-commits] [Gerrit] Fix MT error reporting - change (mediawiki...cxserver)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Fix MT error reporting
..

Fix MT error reporting

Change-Id: I995bdf86bb8887bf890b09da6fa4261dc2e9af8f
---
M routes/v1.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/57/257857/1

diff --git a/routes/v1.js b/routes/v1.js
index aba665f..7e37543 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -152,9 +152,9 @@
},
function ( error ) {
res.send( 500, {
-   error: error
+   error: error.toString()
} );
-   logger.log( 'error', 'MT processing error: 
(%s)', error.toString() );
+   logger.error( 'MT processing error: ' + 
error.toString() );
}
);
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I995bdf86bb8887bf890b09da6fa4261dc2e9af8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] Update cxserver to c88ef57 - change (mediawiki...deploy)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update cxserver to c88ef57
..


Update cxserver to c88ef57

Changes:
* c88ef57 Fix MT error reporting
* 2f56a40 config: Make Apertium MT default for hi<->ur pair

Change-Id: I4a1895416b02f63eb65ea53925f28f9cc0fccfb3
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/src b/src
index b345480..c88ef57 16
--- a/src
+++ b/src
-Subproject commit b345480e4d34394457886f5ea79a6bbe66806904
+Subproject commit c88ef57e9349dbcd9fc86215a281b06f19055b85

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a1895416b02f63eb65ea53925f28f9cc0fccfb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Adjust the visual hierarchy of suggestion items - change (mediawiki...ContentTranslation)

[Pginer (Code Review)]

Pginer has uploaded a new change for review.

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

Change subject: Adjust the visual hierarchy of suggestion items
..

Adjust the visual hierarchy of suggestion items

Styling changes to:
- Reduce the size of the image and item information from 100px to 90px
- Increase in size and weight for title to clarify the text hierarchy.
- Adjust element padding to facilitate scanning.
- Actions vertically aligned.
- Items missing an image show an article icon instead of a link as a placeholde$

Bug:T120930
Change-Id: I2a11ecb206be6b63349a76d0b5c026d1c6b8eeed
---
A modules/dashboard/images/page_lightgray.png
A modules/dashboard/images/page_lightgray.svg
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/dashboard/styles/ext.cx.translationlist.less
5 files changed, 55 insertions(+), 12 deletions(-)


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

diff --git a/modules/dashboard/images/page_lightgray.png 
b/modules/dashboard/images/page_lightgray.png
new file mode 100644
index 000..7d3a5c8
--- /dev/null
+++ b/modules/dashboard/images/page_lightgray.png
Binary files differ
diff --git a/modules/dashboard/images/page_lightgray.svg 
b/modules/dashboard/images/page_lightgray.svg
new file mode 100644
index 000..03ccf75
--- /dev/null
+++ b/modules/dashboard/images/page_lightgray.svg
@@ -0,0 +1,33 @@
+
+
+
+http://purl.org/dc/elements/1.1/;
+   xmlns:cc="http://creativecommons.org/ns#;
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg="http://www.w3.org/2000/svg;
+   xmlns="http://www.w3.org/2000/svg;
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 612 792"
+   id="svg2">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage; />
+
+  
+
+  
+  
+  
+
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index 72a5a31..c41d4e7 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -3,7 +3,7 @@
 .cx-tlitem,
 .cx-slitem {
.mw-ui-one-whole;
-   padding: 5px;
+   padding: 8px;
background-color: #fff;
border: 1px solid #ddd;
border-bottom: 0;
@@ -110,9 +110,9 @@
 .cx-slitem__image {
.mw-ui-one-sixth;
padding: 0;
-   width: 100px;
-   min-height: 100px;
-   .background-image-svg('../../tools/images/link_lightgray.svg', 
'../../tools/images/link_lightgray.png');
+   width: 90px;
+   min-height: 90px;
+   .background-image-svg('../../dashboard/images/page_lightgray.svg', 
'../../dashboard/images/page_lightgray.png');
background-repeat: no-repeat;
background-color: #fbfbfb;
background-position: center center;
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index bddf027..23c6cef 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -63,21 +63,22 @@
 .cx-slitem__desc {
color: #555;
font-size: 1.2em;
-   padding: 10px 0;
+   padding: 5px 0;
clear: both;
text-align: left;
 }
 
 .cx-slitem__details {
.mw-ui-four-sixths;
-   padding-left: 15px;
+   padding-left: 10px;
position: relative;
-   height: 100px;
+   min-height: 90px;
font-size: small;
 
.cx-slitem__translation-link {
.mw-ui-one-whole;
-   font-size: large;
+   font-size: 1.5em;
+   font-weight: bolder;
text-decoration: none;
padding-left: 0;
cursor: pointer;
@@ -96,6 +97,8 @@
 .cx-slitem__actions {
.mw-ui-one-sixth;
float: right;
+   position: relative;
+   padding-top: 90px/2 - 30px/2;
 }
 
 .cx-slitem__action {
@@ -105,6 +108,11 @@
height: 30px;
background-repeat: no-repeat;
background-position: center center;
+   opacity: 0.8;
+
+   &:hover{
+   opacity: 1;
+   }
 
&--discard {
background-size: 16px;
@@ -123,6 +131,7 @@
&--nonfavorite,
&--favorite:hover {
.background-image-svg('../images/star-green.svg', 
'../images/star-green.png');
+   opacity: 1;
}
 }
 
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less 
b/modules/dashboard/styles/ext.cx.translationlist.less
index 6f2b065..1af370a 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -66,9 +66,9 @@
.cx-tlitem__details {
.mw-ui-four-fifths;
 
-   padding-left: 15px;
+

[MediaWiki-commits] [Gerrit] Simplify down to a single threshold - change (mediawiki...ORES)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Simplify down to a single threshold
..

Simplify down to a single threshold

The UI doesn't support more than a single threshold, so remove vestigal
support.

Bug: T112856
Change-Id: I4fd5043758be28df025ecba8e30e0552aa42103f
---
M extension.json
M includes/Hooks.php
M includes/Scoring.php
3 files changed, 8 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/56/257856/1

diff --git a/extension.json b/extension.json
index 403b52a..64d0b53 100644
--- a/extension.json
+++ b/extension.json
@@ -53,14 +53,9 @@
"reverted",
"wp10"
],
-   "OresDamagingTagThresholds": {
-   "low": 0.8,
-   "medium": 0.87,
-   "high": 0.94
-   },
-   "OresDamagingFilterThreshold": 0.87,
+   "OresDamagingThreshold": 0.87,
"RecentChangesFlags": {
-   "damagingRisk": {
+   "damaging": {
"letter": "ores-damaging-letter",
"title": "ores-damaging-title",
"legend": "ores-damaging-legend",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 389ccb7..e41dcfb 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -73,7 +73,7 @@
$name, array &$tables, array &$fields, array &$conds,
array &$query_options, array &$join_conds, FormOptions $opts
) {
-   global $wgOresDamagingFilterThreshold;
+   global $wgOresDamagingThreshold;
 
$tables[] = 'ores_classification';
$fields[] = 'ores_probability';
@@ -85,7 +85,7 @@
// Filter out non-damaging edits.
$conds[] = 'ores_is_predicted = 1';
$conds[] = 'ores_probability > '
-   . wfGetDb( DB_SLAVE )->addQuotes( 
$wgOresDamagingFilterThreshold );
+   . wfGetDb( DB_SLAVE )->addQuotes( 
$wgOresDamagingThreshold );
}
 
return true;
@@ -126,14 +126,11 @@
 * Internal helper to label matching rows
 */
protected static function processRecentChangesList( RCCacheEntry 
$rcObj, array &$data ) {
-   $score = $rcObj->getAttribute( 'ores_probability' );
-   if ( $score !== null ) {
-   $type = Scoring::getDamagingThreshold( $score );
+   global $wgOresDamagingThreshold;
 
-   if ( $type ) {
-   $data['recentChangesFlags']['damaging'] = true;
-   // TODO: Stash the details in HTML so they can 
be retrieved by JS?
-   }
+   $score = $rcObj->getAttribute( 'ores_probability' );
+   if ( $score && $score >= $wgOresDamagingThreshold ) {
+   $data['recentChangesFlags']['damaging'] = true;
}
}
 }
diff --git a/includes/Scoring.php b/includes/Scoring.php
index e75abcc..1c9d517 100644
--- a/includes/Scoring.php
+++ b/includes/Scoring.php
@@ -45,32 +45,6 @@
return $wireData;
}
 
-   /**
-* @return string|null Threshold exceeded, or null if none.
-*
-* TODO: Should be in a model-specific module.
-*/
-   public static function getDamagingThreshold( $score ) {
-   global $wgOresDamagingTagThresholds;
-
-   $score = floatval( $score );
-   $type = null;
-
-   // Find the nearest threshold exceeded by $score.
-   $highestExceededThreshold = null;
-   foreach ( $wgOresDamagingTagThresholds as $name => $threshold ) 
{
-   if ( $score >= $threshold
-   // Ignore threshold if it's further from $score.
-   && ( $threshold > $highestExceededThreshold || 
$highestExceededThreshold === null )
-   ) {
-   $type = $name;
-   $highestExceededThreshold = $threshold;
-   }
-   }
-   return $type;
-   }
-
-
public static function instance() {
return new self();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fd5043758be28df025ecba8e30e0552aa42103f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Awight 

[MediaWiki-commits] [Gerrit] openldap: Notify slapd on acls.conf and indices.conf changes - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: openldap: Notify slapd on acls.conf and indices.conf changes
..


openldap: Notify slapd on acls.conf and indices.conf changes

Have slapd restart on indices.conf and acls.conf changes

Change-Id: If842435bb8cc1b22a4df74cce338ae7597e4b3f5
---
M modules/openldap/manifests/init.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/openldap/manifests/init.pp 
b/modules/openldap/manifests/init.pp
index 62391dc..32255d5 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -177,6 +177,8 @@
 Package['slapd'] -> Exec['rm_slapd.d']
 Exec['rm_slapd.d'] -> Service['slapd']
 File['/etc/ldap/slapd.conf'] ~> Service['slapd'] # We also notify
+File['/etc/ldap/acls.conf'] ~> Service['slapd'] # We also notify
+File['/etc/ldap/indices.conf'] ~> Service['slapd'] # We also notify
 File['/etc/default/slapd'] ~> Service['slapd'] # We also notify
 File[$datadir] -> Service['slapd']
 File['/etc/ldap/ldap.conf'] -> Service['slapd']

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If842435bb8cc1b22a4df74cce338ae7597e4b3f5
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ldap-labs: Issue new 2048bit certificates - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: ldap-labs: Issue new 2048bit certificates
..


ldap-labs: Issue new 2048bit certificates

Turns out 4096bit certificates mean too much CPU usage on the slapd
server. Reissue keys and certificates as 2048 as it seems we will get a
4x-7x performance improvement at the cost of a little bit less security

Change-Id: I9424e29c6ff203cb631d160393a4e8ce857f90ec
---
M files/ssl/ldap-labs.codfw.wikimedia.org.crt
M files/ssl/ldap-labs.eqiad.wikimedia.org.crt
2 files changed, 50 insertions(+), 242 deletions(-)

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



diff --git a/files/ssl/ldap-labs.codfw.wikimedia.org.crt 
b/files/ssl/ldap-labs.codfw.wikimedia.org.crt
index 9d089c8..805bc0a 100644
--- a/files/ssl/ldap-labs.codfw.wikimedia.org.crt
+++ b/files/ssl/ldap-labs.codfw.wikimedia.org.crt
@@ -1,125 +1,29 @@
-Certificate:
-Data:
-Version: 3 (0x2)
-Serial Number: 11 (0xb)
-Signature Algorithm: sha256WithRSAEncryption
-Issuer: C=US, ST=California, L=San Francisco, O=Wikimedia Foundation, 
OU=Operations, CN=WMF CA 2014-2017
-Validity
-Not Before: Nov 19 11:54:59 2015 GMT
-Not After : Nov  8 11:54:59 2017 GMT
-Subject: C=US, ST=California, O=Wikimedia Foundation, OU=Operations, 
CN=ldap-labs.codfw.wikimedia.org/emailAddress=i...@wikimedia.org
-Subject Public Key Info:
-Public Key Algorithm: rsaEncryption
-Public-Key: (4096 bit)
-Modulus:
-00:d7:b0:fc:41:d0:3c:c9:b8:7a:bf:16:79:f0:19:
-17:38:07:51:c9:60:4a:45:54:8d:63:14:d8:a9:5d:
-03:33:eb:b3:05:7f:38:4e:7b:58:4b:78:3e:7d:32:
-10:ea:22:bc:0b:d6:35:3c:e6:bf:ed:dc:35:d1:e2:
-d6:a7:01:87:f7:e6:29:b5:d6:0e:20:59:90:80:81:
-44:2c:af:67:69:e0:d1:46:df:aa:99:f6:b4:c9:05:
-02:0e:1b:54:da:4d:37:ff:f2:43:8f:9a:53:5f:4a:
-18:d1:90:13:64:f2:72:c6:ff:c5:72:05:ea:dd:a1:
-6e:d4:3d:ec:d8:b6:10:61:f4:8a:1a:4d:4f:cc:01:
-6e:27:a6:0a:79:df:88:63:21:af:40:b4:93:d4:30:
-28:59:1f:bd:51:64:be:b7:51:68:22:1c:44:42:0f:
-63:2f:b6:ba:4b:ed:b9:e7:60:85:f8:3d:55:15:57:
-35:b9:25:e7:36:cf:3b:42:b3:29:bf:cc:f0:40:f1:
-29:8c:1a:c3:4f:b4:a2:a3:5b:cc:88:57:1e:07:35:
-d6:a5:2d:f5:78:48:97:1f:36:85:bc:4d:4f:c1:b0:
-4e:07:72:97:e4:92:2b:71:d0:01:9e:39:8c:26:c4:
-51:30:f6:36:d7:30:6a:21:a3:ab:42:a0:c6:f4:98:
-6c:1d:e9:73:6f:72:92:27:13:09:36:bb:e1:bf:81:
-71:64:58:d1:16:5e:af:8b:9a:45:59:be:3b:f6:01:
-5e:b9:46:ce:40:7e:f5:54:5e:0b:a4:8a:ec:70:43:
-ac:e8:8b:a2:90:af:62:43:7a:c4:3a:9e:0a:ed:08:
-80:38:27:f4:64:aa:96:8b:f4:90:1a:fa:2d:86:54:
-0b:d9:b9:52:11:89:e6:2a:ad:b2:8a:e3:91:41:6b:
-b1:fc:75:f1:96:fe:6d:7b:e2:45:93:4a:74:99:f7:
-9f:8b:85:63:a1:f1:9f:7b:d2:d4:b9:33:70:94:2e:
-fe:73:d7:01:68:fc:f6:8f:06:90:1d:46:b5:eb:13:
-c0:23:ed:ea:a2:9a:ba:a0:dc:56:61:9e:05:a4:ed:
-0a:26:24:cb:bb:ae:71:3e:48:71:a2:78:7c:1e:41:
-f0:bc:ee:89:9e:65:6f:70:88:fe:55:69:04:83:0e:
-6d:af:3f:6f:3f:c8:94:66:32:82:c2:77:53:70:03:
-d4:1b:44:b2:45:39:f2:b1:24:c5:1b:5d:7d:c1:36:
-e6:58:f0:52:53:a7:de:50:fb:f0:d5:64:58:48:88:
-8a:47:0b:0a:0e:6b:bb:99:bd:16:e7:e6:6e:e6:a1:
-cf:40:23:2d:6b:a3:c3:a6:82:39:9a:b2:49:12:8b:
-23:52:c9
-Exponent: 65537 (0x10001)
-X509v3 extensions:
-X509v3 Basic Constraints: 
-CA:FALSE
-Netscape Comment: 
-OpenSSL Generated Certificate
-X509v3 Subject Key Identifier: 
-34:02:B3:1E:C4:CF:8B:04:C1:DC:47:7D:E2:7C:C3:54:D1:34:ED:0B
-X509v3 Authority Key Identifier: 
-
keyid:F4:0D:54:CB:AB:60:27:62:13:83:FB:F8:29:3B:E8:C8:98:AF:88:29
-
-Signature Algorithm: sha256WithRSAEncryption
- 64:78:ea:b5:ab:c9:c7:4d:6d:1e:30:04:52:47:6a:18:5c:96:
- e9:0f:92:0f:71:a9:ad:08:87:e2:4e:bf:af:f6:d4:d4:ba:1c:
- ac:5f:c1:21:92:0d:11:93:74:3e:ad:8e:ed:05:bd:f1:5b:53:
- 2f:f1:3a:c8:1a:79:eb:e0:c4:5d:f2:7b:81:f3:be:4a:80:3e:
- 27:f7:ef:08:d9:4b:32:d4:98:ef:22:a4:e6:ba:67:6e:86:26:
- ef:b5:5f:e4:e1:db:ea:db:e5:dd:17:b2:2f:7e:af:ad:67:e5:
- 08:89:07:4b:57:93:c1:6a:4e:7b:95:b7:8a:fa:9f:0f:cd:61:
- 

[MediaWiki-commits] [Gerrit] Removed unnecessary blank line from Special:Export page - change (mediawiki/core)

[PranavK (Code Review)]

PranavK has uploaded a new change for review.

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

Change subject: Removed unnecessary blank line from Special:Export page
..

Removed unnecessary blank line from Special:Export page

Change-Id: I9d143ee4b833e537ca27293d2aa63c93c50bb8d4
---
M includes/specials/SpecialExport.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/specials/SpecialExport.php 
b/includes/specials/SpecialExport.php
index 642ea69..7392972 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -65,7 +65,7 @@
 */
$catpages = 
$this->getPagesFromCategory( $t );
if ( $catpages ) {
-   $page .= "\n" . implode( "\n", 
$catpages );
+   $page .= implode( "\n", 
$catpages );
}
}
}

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

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

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

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

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

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


Update VE core submodule to master (cd979fe)

New changes:
d05ccd6 LinkInspectorTool: Move link specific code to LinkInspectorTool
51f5358 Localisation updates from https://translatewiki.net.
98d86e5 TextState(Chunk): Rename 'tag' to 'element'
6b1ea16 TextState: Recover annotation models via .data('view').
2d72d37 Localisation updates from https://translatewiki.net.
72b50d9 Update OOjs UI to v0.14.1
cd979fe build: Add grunt-tyops and make pass

Change-Id: Ic1be59b024993ed817a4045d7d7950a073b0005d
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index 06c5ed7..cd979fe 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 06c5ed71b5140cb14d34eb5546f8aa5ed6e184ec
+Subproject commit cd979fe71bf065401e6d21116c35c89a8bc822ba

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1be59b024993ed817a4045d7d7950a073b0005d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fe8a9ef..a7d2123 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: fe8a9ef..a7d2123
..


Syncronize VisualEditor: fe8a9ef..a7d2123

Change-Id: Idc46c4cc0ffa4a5a022119e187eebab9ec8f2ea6
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index fe8a9ef..a7d2123 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit fe8a9eff9193916f7e64930d395d0abc4acd29b2
+Subproject commit a7d2123d60e87872fd92dff95a040bd5f75257ab

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc46c4cc0ffa4a5a022119e187eebab9ec8f2ea6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fe8a9ef..a7d2123 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: fe8a9ef..a7d2123
..

Syncronize VisualEditor: fe8a9ef..a7d2123

Change-Id: Idc46c4cc0ffa4a5a022119e187eebab9ec8f2ea6
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/67/257867/1

diff --git a/VisualEditor b/VisualEditor
index fe8a9ef..a7d2123 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit fe8a9eff9193916f7e64930d395d0abc4acd29b2
+Subproject commit a7d2123d60e87872fd92dff95a040bd5f75257ab

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc46c4cc0ffa4a5a022119e187eebab9ec8f2ea6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add node_modules to .gitignore - change (data-values/value-view)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add node_modules to .gitignore
..


Add node_modules to .gitignore

Change-Id: Ie25202aacec72323f9aa20e9c37a3007c8e62efb
---
M .gitignore
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitignore b/.gitignore
index e1b3631..9ab7447 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
 .idea/
 
 vendor/
-build/
\ No newline at end of file
+build/
+node_modules/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie25202aacec72323f9aa20e9c37a3007c8e62efb
Gerrit-PatchSet: 1
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] diamond: fix StreamHandler module path - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: diamond: fix StreamHandler module path
..


diamond: fix StreamHandler module path

differently than others StreamHandler, FileHandler and NullHandler are in
logging, not logging.handlers

Change-Id: I47b291651de70186956331c9e0643da4e6732e63
---
M modules/diamond/templates/diamond.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/diamond/templates/diamond.conf.erb 
b/modules/diamond/templates/diamond.conf.erb
index 69a93fa..b49c469 100644
--- a/modules/diamond/templates/diamond.conf.erb
+++ b/modules/diamond/templates/diamond.conf.erb
@@ -36,7 +36,7 @@
 propagate = 1
 
 [handler_stdout]
-class = logging.handlers.StreamHandler
+class = logging.StreamHandler
 args = (None, )
 
 [handler_rotated_file]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47b291651de70186956331c9e0643da4e6732e63
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] openldap: Allow to specify cleartext hashing scheme - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: openldap: Allow to specify cleartext hashing scheme
..


openldap: Allow to specify cleartext hashing scheme

Allow the caller to specify the cleartext password hashing scheme. Then
override it for production LDAP servers.

Change-Id: I5e28ab7cab0467bea71abdf265085cb7e202b1ff
---
M hieradata/hosts/seaborgium.yaml
M hieradata/hosts/serpens.yaml
M modules/openldap/manifests/init.pp
M modules/openldap/templates/slapd.erb
4 files changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/seaborgium.yaml b/hieradata/hosts/seaborgium.yaml
index ceef463..68c97c5 100644
--- a/hieradata/hosts/seaborgium.yaml
+++ b/hieradata/hosts/seaborgium.yaml
@@ -1,3 +1,4 @@
 openldap::master: ldap-labs.codfw.wikimedia.org
 openldap::server_id: 1
 openldap::logging: sync
+openldap::hash_passwords: SSHA
diff --git a/hieradata/hosts/serpens.yaml b/hieradata/hosts/serpens.yaml
index 3ab0b3a..efc1d31 100644
--- a/hieradata/hosts/serpens.yaml
+++ b/hieradata/hosts/serpens.yaml
@@ -1,3 +1,4 @@
 openldap::master: ldap-labs.eqiad.wikimedia.org
 openldap::server_id: 2
 openldap::logging: sync
+openldap::hash_passwords: SSHA
diff --git a/modules/openldap/manifests/init.pp 
b/modules/openldap/manifests/init.pp
index a74bbef..62391dc 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -41,6 +41,11 @@
 #$logging
 #   Optional. Specify the kind of logging desired. Defaults to "sync stats"
 #   And it is not named loglevel cause that's a puppet metaparameter
+#$hash_passwords
+#   Optional. Specify what hashing scheme will be used by openldap to hash
+#   cleartext passwords sent to it on account creation or password change.
+#   Defauts to SHA. Valid values: SHA, SSHA, MD5, SMD5, CRYPT, SASL
+#   Do not supply this if you don't know what you are doing
 #
 # Actions:
 #   Install/configure slapd
@@ -68,6 +73,7 @@
 $extra_indices=undef,
 $size_limit=undef,
 $logging='sync stats',
+$hash_passwords='SHA',
 ) {
 
 require_package('slapd', 'ldap-utils', 'python-ldap')
diff --git a/modules/openldap/templates/slapd.erb 
b/modules/openldap/templates/slapd.erb
index 5067990..204bd0b 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -87,7 +87,7 @@
 
 overlay ppolicy
 ppolicy_hash_cleartext
-password-hash {SHA}
+password-hash {<%= @hash_passwords %>}
 
 ###
 ## Replication

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e28ab7cab0467bea71abdf265085cb7e202b1ff
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add performance tests - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add performance tests
..


Add performance tests

* Step 1: Add json export method

Change-Id: Ie7d5e458fe5f904de507605c7778ee20928e4347
---
A maintenance/MathPerformance.php
1 file changed, 135 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/MathPerformance.php b/maintenance/MathPerformance.php
new file mode 100644
index 000..cbdb770
--- /dev/null
+++ b/maintenance/MathPerformance.php
@@ -0,0 +1,135 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @ingroup Maintenance
+ */
+
+require_once ( __DIR__ . '/../../../maintenance/Maintenance.php' );
+class MathPerformance extends Maintenance {
+   const RTI_CHUNK_SIZE = 1;
+   public $purge = false;
+   /** @var boolean */
+   private $verbose;
+   /** @var DatabaseBase */
+   public $dbw;
+   /** @var DatabaseBase */
+   private $db;
+   /** @var MathRenderer */
+   private $current;
+   private $time = 0.0; // microtime( true );
+   private $performance = array();
+   private $renderingMode = 'mathml';
+
+   public function __construct() {
+   parent::__construct();
+   $this->mDescription = 'Run math performance tests.';
+   $this->addArg( 'action', 'Selects what should be done.', false 
);
+   $this->addArg( 'shares', 'How many pieces should be used.', 
false );
+   $this->addArg( 'share', 'Which piece should be used. Starting 
from 0.', false );
+   $this->addOption( 'table', 'table to load the formulae from', 
false );
+   $this->addOption( 'input', 'field that contains the input', 
false );
+   $this->addOption( 'hash', 'field that contains the hash', false 
);
+   $this->addOption( 'min', 'If set, processing is started at 
formula>min', false );
+   $this->addOption( 'max', 'If set, processing is stopped at 
formula<=max', false );
+   $this->addOption( 'output', 'The destination of the output 
defaults to stdout.', false );
+   $this->addOption( 'verbose', 'If set, output for successful 
rendering will produced', false,
+   false, 'v' );
+   }
+
+   /**
+* Measures time in ms.
+* In order to have a formula centric evaluation, we can not just the 
build in profiler
+* @param string $category
+*
+* @return int
+*/
+   private function time( $category = 'default' ) {
+   global $wgMathDebug;
+   $delta = ( microtime( true ) - $this->time ) * 1000;
+   if ( isset( $this->performance[$category] ) ) {
+   $this->performance[$category] += $delta;
+   } else {
+   $this->performance[$category] = $delta;
+   }
+   if ( $wgMathDebug ) {
+   $this->db->insert( 'mathperformance', array(
+   'math_inputhash'   => 
$this->current->getInputHash(),
+   'mathperformance_name' => substr( $category, 0, 
10 ),
+   'mathperformance_time' => $delta,
+   'mathperformance_mode' => 
MathHooks::mathModeToHashKey( $this->renderingMode )
+   ) );
+   }
+   $this->time = microtime( true );
+
+   return (int)$delta;
+   }
+
+
+   public function execute() {
+   global $wgMathValidModes;
+   $this->dbw = wfGetDB( DB_MASTER );
+   $this->db = wfGetDB( DB_MASTER );
+   $wgMathValidModes[] = $this->renderingMode;
+   $this->output( "Loaded.\n" );
+   $this->time = microtime( true );
+   if ( $this->getArg( 0, 'export' ) == 'export' ) {
+   $this->renderFromTable();
+   }
+   }
+
+   private function renderFromTable() {
+   $min = $this->getOption( 'min', 0 );
+   $max = $this->getOption( 'max', 0 );
+   $options = array();
+   if ( $max ) {
+   $options['LIMIT'] = $max - $min;
+   $options['OFFSET'] = $min;
+   }
+   $table = $this->getOption( 'table', 'mathoid' );
+   $tex = $this->getOption( 'input', 'math_input' );
+   $hash = $this->getOption( 'hash', 'math_inputhash' );
+   $shares = $this->getArg( 1, false ); // 'shares'
+   $share = $this->getArg( 2, 0 ); // 'share'
+   if ( $shares ) {
+   // echo "I'm share $share of $shares";
+   $counts = $this->db->selectField( $table, 'count(*)' );
+   $bucket = ceil( $counts 

[MediaWiki-commits] [Gerrit] labs: tap metrics towards graphite_exporter - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: labs: tap metrics towards graphite_exporter
..

labs: tap metrics towards graphite_exporter

send selected diamond metrics to graphite_exporter for prometheus to pick up

Bug: T92813
Change-Id: I74b3a0ddb96751baf1abb101a15bc6fc6ab1807b
---
M modules/graphite/templates/frontend-relay.conf.erb
M modules/role/manifests/labs/graphite.pp
2 files changed, 22 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/257861/1

diff --git a/modules/graphite/templates/frontend-relay.conf.erb 
b/modules/graphite/templates/frontend-relay.conf.erb
index 59ef7de..ae8c766 100644
--- a/modules/graphite/templates/frontend-relay.conf.erb
+++ b/modules/graphite/templates/frontend-relay.conf.erb
@@ -5,6 +5,10 @@
   <% end -%>
   ;
 
+# graphite -> prometheus metric mapping
+cluster graphite_exporter
+  forward localhost:9109
+;
 
 <% @c_relay_settings['cluster_tap'].each do |tap| -%>
 # duplicate (tap) this metric to <%= tap[1] %>
diff --git a/modules/role/manifests/labs/graphite.pp 
b/modules/role/manifests/labs/graphite.pp
index 2bf3ce1..b1d94aa 100644
--- a/modules/role/manifests/labs/graphite.pp
+++ b/modules/role/manifests/labs/graphite.pp
@@ -4,9 +4,24 @@
 class role::labs::graphite {
 
 class { 'role::graphite::base':
-storage_dir => '/srv/carbon',
-auth=> false,
-hostname=> 'graphite.wmflabs.org',
+storage_dir  => '/srv/carbon',
+auth => false,
+hostname => 'graphite.wmflabs.org',
+c_relay_settings => {
+'cluster_tap' => [
+['^.*\.cpu\.total.*$', 'graphite_exporter'],
+['^.*memory\..*$', 'graphite_exporter'],
+['^.*diskspace\..*$', 'graphite_exporter'],
+['^.*iostat\..*$', 'graphite_exporter'],
+['^.*loadavg\..*$', 'graphite_exporter'],
+['^.*network\..*$', 'graphite_exporter'],
+['^.*udp\..*$', 'graphite_exporter'],
+]
+},
+}
+
+class { 'prometheus::graphite_exporter':
+config_file => 'graphite_exporter_labs.conf',
 }
 
 include graphite::labs::archiver

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74b3a0ddb96751baf1abb101a15bc6fc6ab1807b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] prometheus: add graphite_exporter support - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: prometheus: add graphite_exporter support
..

prometheus: add graphite_exporter support

graphite_exporter accepts as input graphite line protocol metrics and converts
those to prometheus format, according to a mapping file.

Two configs are provided to target labs and production. In particular
only essential machine metrics from diamond are considered. This should
provide for an initial but realistic evaluation.

The mapping file tries to mimick metrics exported by
https://github.com/prometheus/node_exporter as much as possible.

Bug: T92813
Change-Id: Ibe558acfc0594e394e26464c9b4562e434876a4d
---
A modules/prometheus/files/graphite_exporter.conf
A modules/prometheus/files/graphite_exporter_labs.conf
A modules/prometheus/manifests/graphite_exporter.pp
3 files changed, 334 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/257860/1

diff --git a/modules/prometheus/files/graphite_exporter.conf 
b/modules/prometheus/files/graphite_exporter.conf
new file mode 100644
index 000..cf11d9d
--- /dev/null
+++ b/modules/prometheus/files/graphite_exporter.conf
@@ -0,0 +1,136 @@
+servers.*.cpu.total.*
+name="graphite_servers_cpu_percent"
+mode="$2"
+instance="$1"
+
+servers.*.memory.*
+name="graphite_servers_memory_${3}"
+instance="$1"
+
+servers.*.diskspace.*.inodes_free
+name="graphite_servers_filesystem_files_free"
+instance="$1"
+mountpoint="$2"
+
+servers.*.diskspace.*.inodes_used
+name="graphite_servers_filesystem_files_used"
+instance="$1"
+mountpoint="$2"
+
+servers.*.diskspace.*.byte_free
+name="graphite_servers_filesystem_free"
+instance="$1"
+mountpoint="$2"
+
+servers.*.diskspace.*.byte_used
+name="graphite_servers_filesystem_used"
+instance="$1"
+mountpoint="$2"
+
+servers.*.diskspace.*.byte_avail
+name="graphite_servers_filesystem_avail"
+instance="$1"
+mountpoint="$2"
+
+servers.*.loadavg.01
+name="graphite_servers_load1"
+instance="$1"
+
+servers.*.loadavg.05
+name="graphite_servers_load5"
+instance="$1"
+
+servers.*.loadavg.15
+name="graphite_servers_load15"
+instance="$1"
+
+servers.*.loadavg.processes_running
+name="graphite_servers_procs_running"
+instance="$1"
+
+
+
+
+servers.*.iostat.*.reads_per_second
+name="graphite_servers_disk_reads_per_second"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.writes_per_second
+name="graphite_servers_disk_writes_per_second"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.read_byte_per_second
+name="graphite_servers_disk_read_byte_per_second"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.write_byte_per_second
+name="graphite_servers_disk_write_byte_per_second"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.iops
+name="graphite_servers_disk_io_per_second"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.used_percent
+name="graphite_servers_disk_io_used_percent"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.service_time
+name="graphite_servers_disk_service_time_milliseconds"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.average_request_size_bytes
+name="graphite_servers_disk_average_request_size_bytes"
+instance="$1"
+device="$2"
+
+servers.*.iostat.*.average_queue_length
+name="graphite_servers_disk_average_queue_length"
+instance="$1"
+device="$2"
+
+servers.*.network.*.rx_byte
+name="graphite_servers_network_receive_bytes_per_second"
+instance="$1"
+device="$2"
+
+servers.*.network.*.tx_byte
+name="graphite_servers_network_transmit_bytes_per_second"
+instance="$1"
+device="$2"
+
+servers.*.network.*.rx_drop
+name="graphite_servers_network_receive_drop_per_second"
+instance="$1"
+device="$2"
+
+servers.*.network.*.tx_drop
+name="graphite_servers_network_transmit_drop_per_second"
+instance="$1"
+device="$2"
+
+servers.*.network.*.rx_errors
+name="graphite_servers_network_receive_errs_per_second"
+instance="$1"
+device="$2"
+
+servers.*.network.*.tx_errors
+name="graphite_servers_network_transmit_errs_per_second"
+instance="$1"
+device="$2"
+
+servers.*.network.*.rx_packets
+name="graphite_servers_network_receive_packets_per_second"
+instance="$1"
+device="$2"
+
+servers.*.udp.*
+name="graphite_servers_netstat_Udp_${2}_per_minute"
+instance="$1"
diff --git a/modules/prometheus/files/graphite_exporter_labs.conf 
b/modules/prometheus/files/graphite_exporter_labs.conf
new file mode 100644
index 000..e4c283c
--- /dev/null
+++ b/modules/prometheus/files/graphite_exporter_labs.conf
@@ -0,0 +1,164 @@
+*.*.cpu.total.*
+name="graphite_servers_cpu_percent"
+mode="$3"
+instance="$2"
+job="$1"
+
+*.*.memory.*
+name="graphite_servers_memory_${3}"
+job="$1"
+instance="$2"
+
+*.*.diskspace.*.inodes_free
+name="graphite_servers_filesystem_files_free"
+job="$1"
+instance="$2"
+mountpoint="$3"
+
+*.*.diskspace.*.inodes_used
+name="graphite_servers_filesystem_files_used"
+job="$1"
+instance="$2"
+mountpoint="$3"
+

[MediaWiki-commits] [Gerrit] Use LabelDescriptionLookup in LanguageLinkBadgeDisplay - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use LabelDescriptionLookup in LanguageLinkBadgeDisplay
..


Use LabelDescriptionLookup in LanguageLinkBadgeDisplay

instead of loading entities to get labels.

Bug: T120838
Change-Id: I9ec47a2649ac326eefc3707ea3c4257adc079dea
---
M client/includes/Hooks/LanguageLinkBadgeDisplay.php
M client/includes/Hooks/SidebarHookHandlers.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Hooks/LanguageLinkBadgeDisplayTest.php
M client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
M client/tests/phpunit/includes/Hooks/SidebarHookHandlersTest.php
6 files changed, 81 insertions(+), 91 deletions(-)

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



diff --git a/client/includes/Hooks/LanguageLinkBadgeDisplay.php 
b/client/includes/Hooks/LanguageLinkBadgeDisplay.php
index 0a9240e..8acfbe1 100644
--- a/client/includes/Hooks/LanguageLinkBadgeDisplay.php
+++ b/client/includes/Hooks/LanguageLinkBadgeDisplay.php
@@ -8,7 +8,8 @@
 use Sanitizer;
 use Title;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
+use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookupException;
 use Wikibase\DataModel\SiteLink;
 
 /**
@@ -24,9 +25,9 @@
 class LanguageLinkBadgeDisplay {
 
/**
-* @var EntityLookup
+* @var LabelDescriptionLookup;
 */
-   protected $entityLookup;
+   protected $labelDescriptionLookup;
 
/**
 * @var array
@@ -39,12 +40,16 @@
protected $language;
 
/**
-* @param EntityLookup $entityLookup
+* @param LabelDescriptionLookup $labelDescriptionLookup
 * @param array $badgeClassNames
 * @param Language $language
 */
-   public function __construct( EntityLookup $entityLookup, array 
$badgeClassNames, Language $language ) {
-   $this->entityLookup = $entityLookup;
+   public function __construct(
+   LabelDescriptionLookup $labelDescriptionLookup,
+   array $badgeClassNames,
+   Language $language
+   ) {
+   $this->labelDescriptionLookup = $labelDescriptionLookup;
$this->badgeClassNames = $badgeClassNames;
$this->language = $language;
}
@@ -119,19 +124,19 @@
 * added to the link's title attribute, so the can be effectively 
ignored
 * on this client wiki.
 *
-* @param ItemId[] $badges
+* @param ItemId[] $badgesIds
 *
 * @return array An associative array with the keys 'class' and 
'itemtitle' with assigned
 * string values. These fields correspond to the fields in the 
description array for language
 * links used by the SkinTemplateGetLanguageLink hook and expected by 
the applyBadges()
 * function.
 */
-   private function getBadgeInfo( array $badges ) {
+   private function getBadgeInfo( array $badgeIds ) {
$classes = array();
$labels = array();
 
-   foreach ( $badges as $badge ) {
-   $badgeSerialization = $badge->getSerialization();
+   foreach ( $badgeIds as $badgeId ) {
+   $badgeSerialization = $badgeId->getSerialization();
$classes[] = 'badge-' . Sanitizer::escapeClass( 
$badgeSerialization );
 
// nicer classes for well known badges
@@ -140,7 +145,7 @@
$classes[] = Sanitizer::escapeClass( 
$this->badgeClassNames[$badgeSerialization] );
 
// add label (but only if this badge is well 
known on this wiki)
-   $label = $this->getLabel( $badge );
+   $label = $this->getLabel( $badgeId );
 
if ( $label !== null ) {
$labels[] = $label;
@@ -159,21 +164,22 @@
/**
 * Returns the label for the given badge.
 *
-* @param ItemId $badge
+* @param ItemId $badgeId
 *
 * @return string|null
 */
-   private function getLabel( ItemId $badge ) {
-   $entity = $this->entityLookup->getEntity( $badge );
-   if ( !$entity ) {
+   private function getLabel( ItemId $badgeId ) {
+   try {
+   $term = $this->labelDescriptionLookup->getLabel( 
$badgeId );
+   } catch ( LabelDescriptionLookupException $ex ) {
return null;
}
 
-   $title = $entity->getLabel( $this->language->getCode() );
-   if ( !$title ) {
-   return null;
+   if ( $term !== null ) {
+ 

[MediaWiki-commits] [Gerrit] Do not specify pep8 and pyflakes explicitly in dev-requirements - change (pywikibot/core)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Do not specify pep8 and pyflakes explicitly in dev-requirements
..

Do not specify pep8 and pyflakes explicitly in dev-requirements

They are installed by installing flake8 automatically

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


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/62/257862/1

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 373c987..9b7b9f3 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -6,9 +6,7 @@
 
 nose
 
-pep8
 pep257>=0.6
-pyflakes>=0.9
 flake8
 codecov
 coverage

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

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

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

[MediaWiki-commits] [Gerrit] Use is_readable and require_once for consistency - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use is_readable and require_once for consistency
..


Use is_readable and require_once for consistency

For consistency across our code base.

Change-Id: Ide95d9295fb694fd529d33cabff476da7dec4e1f
---
M lib/WikibaseLib.php
M purtle/Purtle.php
M view/WikibaseView.php
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 2809f32..b748967 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -48,8 +48,8 @@
 
 // This is the path to the autoloader generated by composer in case of a 
composer install.
 if ( ( !defined( 'WIKIBASE_DATAMODEL_VERSION' ) || !defined( 'Diff_VERSION' ) 
|| !defined( 'DATAVALUES_VERSION' ) )
-   && file_exists( __DIR__ . '/../vendor/autoload.php' ) ) {
-   include_once __DIR__ . '/../vendor/autoload.php';
+   && is_readable( __DIR__ . '/../vendor/autoload.php' ) ) {
+   require_once __DIR__ . '/../vendor/autoload.php';
 }
 
 call_user_func( function() {
diff --git a/purtle/Purtle.php b/purtle/Purtle.php
index ee2262c..660aa87 100644
--- a/purtle/Purtle.php
+++ b/purtle/Purtle.php
@@ -9,7 +9,7 @@
 
 // Include the composer autoloader if it is present.
 if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-   include_once __DIR__ . '/vendor/autoload.php';
+   require_once __DIR__ . '/vendor/autoload.php';
 }
 
 if ( defined( 'MEDIAWIKI' ) ) {
diff --git a/view/WikibaseView.php b/view/WikibaseView.php
index 7d94340..6177dac 100644
--- a/view/WikibaseView.php
+++ b/view/WikibaseView.php
@@ -9,7 +9,7 @@
 
 // Include the composer autoloader if it is present.
 if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-   include_once __DIR__ . '/vendor/autoload.php';
+   require_once __DIR__ . '/vendor/autoload.php';
 }
 
 if ( defined( 'MEDIAWIKI' ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide95d9295fb694fd529d33cabff476da7dec4e1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update cxserver to c88ef57 - change (mediawiki...deploy)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: Update cxserver to c88ef57
..

Update cxserver to c88ef57

Changes:
* c88ef57 Fix MT error reporting
* 2f56a40 config: Make Apertium MT default for hi<->ur pair

Change-Id: I4a1895416b02f63eb65ea53925f28f9cc0fccfb3
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/src b/src
index b345480..c88ef57 16
--- a/src
+++ b/src
-Subproject commit b345480e4d34394457886f5ea79a6bbe66806904
+Subproject commit c88ef57e9349dbcd9fc86215a281b06f19055b85

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a1895416b02f63eb65ea53925f28f9cc0fccfb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] Make sure that we don't cache ParserOutputs without HTML - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Make sure that we don't cache ParserOutputs without HTML
..

Make sure that we don't cache ParserOutputs without HTML

Otherwise the article body will be empty.

Change-Id: I1db1b451e44168fe5e92b05a0b2539fc77864c5d
---
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
2 files changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index 91aa9d7..c2b9bd8 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -173,6 +173,10 @@
$this->getEntityInfo( $parserOutput ),
$options->getEditSection()
);
+   } else {
+   // If we don't have HTML, the ParserOutput in question
+   // shouldn't be cacheable.
+   $parserOutput->updateCacheExpiry( 0 );
}
 
//@todo: record sitelinks as iwlinks
diff --git 
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php 
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
index e72d82e..aa96919 100644
--- 
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
+++ 
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
@@ -115,6 +115,21 @@
);
}
 
+
+   public function testGetParserOutput_dontGenerateHtml() {
+   $entityParserOutputGenerator = 
$this->newEntityParserOutputGenerator();
+
+   $item = $this->newItem();
+   $timestamp = wfTimestamp( TS_MW );
+   $revision = new EntityRevision( $item, 13044, $timestamp );
+
+   $parserOutput = $entityParserOutputGenerator->getParserOutput( 
$revision, $this->getParserOptions(), false );
+
+   $this->assertSame( '', $parserOutput->getText() );
+   // ParserOutput without HTML must not end up in the cache.
+   $this->assertFalse( $parserOutput->isCacheable() );
+   }
+
public function testTitleText_ItemHasNolabel() {
$entityParserOutputGenerator = 
$this->newEntityParserOutputGenerator();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1db1b451e44168fe5e92b05a0b2539fc77864c5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Fix stray $1 in some Special:Tags error messages - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix stray $1 in some Special:Tags error messages
..


Fix stray $1 in some Special:Tags error messages

Removed '$1' on line 395 of SpecialTags.php, it should
no longer appear in the text.

Bug: T97639
Change-Id: I7f225df684c20f4d0606f001b90a7fb97595600d
---
M includes/specials/SpecialTags.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialTags.php 
b/includes/specials/SpecialTags.php
index 97f2380..0cef7b0 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -392,7 +392,7 @@
$func = $activate ? 'canActivateTag' : 'canDeactivateTag';
$result = ChangeTags::$func( $tag, $user );
if ( !$result->isGood() ) {
-   $out->wrapWikiMsg( "\n$1" . 
$result->getWikiText() .
+   $out->addWikiText( "\n" . 
$result->getWikiText() .
"\n" );
if ( !$result->isOK() ) {
return;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f225df684c20f4d0606f001b90a7fb97595600d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Georggi199 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Further updates to LDAP indices - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Further updates to LDAP indices
..

Further updates to LDAP indices

From the logs on seaborgium:

Dec  9 11:30:02 seaborgium slapd[4659]: <= bdb_substring_candidates: (dc) not 
indexed
Dec  9 11:30:02 seaborgium slapd[4659]: <= bdb_equality_candidates: 
(puppetClass) not indexed

Change-Id: If48cb1a039d8734d6efb36559d1a756c878e262c
---
M modules/openldap/templates/labs-indices.erb
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/257871/1

diff --git a/modules/openldap/templates/labs-indices.erb 
b/modules/openldap/templates/labs-indices.erb
index 268fa03..c45e53e 100644
--- a/modules/openldap/templates/labs-indices.erb
+++ b/modules/openldap/templates/labs-indices.erb
@@ -2,7 +2,8 @@
 index   associatedDomaineq
 index   aRecord eq
 index   cNAMERecord eq
-index   dc  eq
+index   dc  eq,sub
 index   puppetVar   eq
+index   puppetClass eq
 index   roleOccupanteq
 index   aAAARecord  eq

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

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

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

[MediaWiki-commits] [Gerrit] Fix broken references-heading CSS - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix broken references-heading CSS
..

Fix broken references-heading CSS

The selector was broken. And it should use margin, because margins do
not stack. This is how it should be here. JS add an  with the same
margin-top: 0.5em. The additional margin here does have the effect that
our entity pages look more similar in no-JS and JS mode.

Change-Id: I5ad7bd10f20cd7cbf95a27ac1250cce3f1c5cd4c
---
M view/resources/wikibase/wikibase.css
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/view/resources/wikibase/wikibase.css 
b/view/resources/wikibase/wikibase.css
index 2030971..54bccd4 100644
--- a/view/resources/wikibase/wikibase.css
+++ b/view/resources/wikibase/wikibase.css
@@ -481,8 +481,8 @@
 
 /* REFERENCES */
 
-.wikibase-statementview-reference-heading {
-   padding-top: 0.5em;
+.wikibase-statementview-references-heading {
+   margin-top: 0.5em;
 }
 
 .wikibase-statementview-references-heading, .wikibase-statementview-references 
{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ad7bd10f20cd7cbf95a27ac1250cce3f1c5cd4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Add three new groups to pawiki, and allow sysops to add or r... - change (operations/mediawiki-config)

[Luke081515 (Code Review)]

Luke081515 has uploaded a new change for review.

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

Change subject: Add three new groups to pawiki, and allow sysops to add or 
remove users to them
..

Add three new groups to pawiki, and allow sysops to add or remove users to them

The following groups were added:
* patroller (rights: patrol)
* autopatrol (rights: autopatrol)
* transwiki (rights: import)
Sysops can add or remove users from that group.

Bug: T120369
Change-Id: I5bdc1f5a532924430522102642bb78dd05d6ae34
---
M wmf-config/InitialiseSettings.php
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8bc8196..4e90f8d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7992,6 +7992,11 @@
'rollbacker' => array( 'rollback' => true ),
'sysop' => array( 'import' => true ),
),
+   'pawiki' => array(
+   'patroller' => array( 'patrol' => true ); // T120369
+   'autopatrolled' => array( 'autopatrol' => true ); // T120369
+   'transwiki' => array ( 'import' => true ); // T120369
+   );
// T8303
'plwiki' => array(
'user' => array( 'upload' => false ),
@@ -8960,6 +8965,9 @@
'+outreachwiki' => array(
'bureaucrat' => array( 'translationadmin' ),
),
+   '+pawiki' => array(
+   'sysop' => array( 'patroller', 'autopatrolled', 'transwiki' ), 
// T120369
+   ),
'+plwiki' => array(
'bureaucrat' => array( 'abusefilter', 'flood' ),
),
@@ -9613,6 +9621,9 @@
'translationadmin', // T56207
),
),
+   '+pawiki' => array(
+   'sysop' => array( 'patroller', 'autopatrolled', 'transwiki' ), 
// T120369
+   ),
'+plwiki' => array(
'bureaucrat' => array( 'abusefilter', 'flood' ),
),

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

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

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

[MediaWiki-commits] [Gerrit] Do not cache MathML results in database - change (mediawiki...Math)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Do not cache MathML results in database
..

Do not cache MathML results in database

* Currently the Math extension stores the rendering result from restbase
  in the database.
* This creates unnecessary write operations on the database

Change-Id: I5f07474fbf8017e39e94ac2b17676db1c3e92e72
---
M MathMathML.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/MathMathML.php b/MathMathML.php
index 1de96be..dff9f41 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -100,6 +100,7 @@
$this->mathml = $rbi->getMathML();
$this->svg = $rbi->getSvg();
$this->svgPath = $rbi->getFullSvgUrl();
+   $this->changed = false;
return $rbi->getSuccess();
}
if ( $forceReRendering ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f07474fbf8017e39e94ac2b17676db1c3e92e72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] Do not cache MathML results in database - change (mediawiki...Math)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Do not cache MathML results in database
..


Do not cache MathML results in database

* Currently the Math extension stores the rendering result from restbase
  in the database.
* This creates unnecessary write operations on the database

Change-Id: I5f07474fbf8017e39e94ac2b17676db1c3e92e72
---
M MathMathML.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/MathMathML.php b/MathMathML.php
index 1de96be..dff9f41 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -100,6 +100,7 @@
$this->mathml = $rbi->getMathML();
$this->svg = $rbi->getSvg();
$this->svgPath = $rbi->getFullSvgUrl();
+   $this->changed = false;
return $rbi->getSuccess();
}
if ( $forceReRendering ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f07474fbf8017e39e94ac2b17676db1c3e92e72
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Implement file modified time cache invalidation for Template... - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Implement file modified time cache invalidation for 
TemplateModule
..

Implement file modified time cache invalidation for TemplateModule

Bug: T120887
Change-Id: Ifc81a47aa8d11cf320205decf342b8577c193a2e
---
M view/src/Module/TemplateModule.php
M view/tests/phpunit/Module/TemplateModuleTest.php
2 files changed, 56 insertions(+), 8 deletions(-)


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

diff --git a/view/src/Module/TemplateModule.php 
b/view/src/Module/TemplateModule.php
index aa4f67f..9115abd 100644
--- a/view/src/Module/TemplateModule.php
+++ b/view/src/Module/TemplateModule.php
@@ -54,4 +54,25 @@
return false; // always use getScript() to acquire JavaScript 
(even in debug mode)
}
 
+   /**
+* @see ResourceLoaderModule::getModifiedHash
+*
+* @param ResourceLoaderContext $context
+*
+* @return string
+*/
+   public function getModifiedHash( ResourceLoaderContext $context ) {
+   return (string)filemtime( __DIR__ . 
'/../../resources/templates.php' );
+   }
+
+   /**
+* @see ResourceLoaderModule::getModifiedTime
+*
+* @param ResourceLoaderContext $context
+*
+* @return int
+*/
+   public function getModifiedTime( ResourceLoaderContext $context ) {
+   return $this->getHashMtime( $context );
+   }
 }
diff --git a/view/tests/phpunit/Module/TemplateModuleTest.php 
b/view/tests/phpunit/Module/TemplateModuleTest.php
index 8075318..67dfb70 100644
--- a/view/tests/phpunit/Module/TemplateModuleTest.php
+++ b/view/tests/phpunit/Module/TemplateModuleTest.php
@@ -17,15 +17,8 @@
 class TemplateModuleTest extends PHPUnit_Framework_TestCase {
 
public function testGetScript() {
-   $context = $this->getMockBuilder( 'ResourceLoaderContext' )
-   ->disableOriginalConstructor()
-   ->getMock();
-   $context->expects( $this->any() )
-   ->method( 'getLanguage' )
-   ->will( $this->returnValue( 'en' ) );
-
$instance = new TemplateModule();
-   $script = $instance->getScript( $context );
+   $script = $instance->getScript( 
$this->getResourceLoaderContext() );
$this->assertInternalType( 'string', $script );
$this->assertContains( 'wbTemplates', $script );
$this->assertContains( 'set( {', $script );
@@ -36,4 +29,38 @@
$this->assertFalse( $instance->supportsURLLoading() );
}
 
+   public function testGetModifiedTime() {
+   $instance = new TemplateModule();
+   $val = $instance->getModifiedTime( 
$this->getResourceLoaderContext() );
+
+   $this->assertInternalType( 'int', $val );
+   }
+
+   public function testGetModifiedHash() {
+   $context = $this->getResourceLoaderContext();
+   $file = __DIR__ . '/../../../resources/templates.php';
+
+   $instance = new TemplateModule();
+   $oldHash = $instance->getModifiedHash( $context );
+   $this->assertInternalType( 'string' , $oldHash );
+
+   if ( !is_writable( $file ) || !touch( $file, mt_rand( 0, time() 
) ) ) {
+   $this->markTestSkipped( "Can't test the modified hash, 
if we can't touch the file" );
+   }
+
+   clearstatcache( $file );
+   $this->assertNotEquals( $oldHash, $instance->getModifiedHash( 
$context ) );
+   }
+
+   private function getResourceLoaderContext() {
+   $context = $this->getMockBuilder( 'ResourceLoaderContext' )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $context->expects( $this->any() )
+   ->method( 'getLanguage' )
+   ->will( $this->returnValue( 'en' ) );
+
+   return $context;
+   }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc81a47aa8d11cf320205decf342b8577c193a2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Update cxserver to efd9b52 - change (mediawiki...deploy)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: Update cxserver to efd9b52
..

Update cxserver to efd9b52

Changes:
* efd9b52 Set strictSSL false

Change-Id: Id60e67e241b8f50da998f7711d90b86bb6cbb6ea
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy 
refs/changes/76/257876/1

diff --git a/src b/src
index c88ef57..efd9b52 16
--- a/src
+++ b/src
-Subproject commit c88ef57e9349dbcd9fc86215a281b06f19055b85
+Subproject commit efd9b52516cabe2e1ce0b403441c9b8becc8558b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id60e67e241b8f50da998f7711d90b86bb6cbb6ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] TextExtracts do not crop after initials - change (mediawiki...TextExtracts)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: TextExtracts do not crop after initials
..


TextExtracts do not crop after initials

Disables sentence termination at a full stop preceeded by a capital
alphabet which is likely to be an initial.

Bug: T115795
Change-Id: Ibf38e87823155c704ffb106642944cbd05e3f632
---
M includes/ExtractFormatter.php
M tests/ExtractFormatterTest.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/ExtractFormatter.php b/includes/ExtractFormatter.php
index a6581f3..644dcaa 100644
--- a/includes/ExtractFormatter.php
+++ b/includes/ExtractFormatter.php
@@ -80,7 +80,7 @@
public static function getFirstSentences( $text, 
$requestedSentenceCount ) {
// Based on code from OpenSearchXml by Brion Vibber
$endchars = array(
-   '\.\s', '\!\s', '\?\s', // regular ASCII
+   '[^\p{Lu}]\.\s', '\!\s', '\?\s', // regular ASCII
'。', // full-width ideographic full-stop
'．', '！', '？', // double-width roman forms
'｡', // half-width ideographic full stop
diff --git a/tests/ExtractFormatterTest.php b/tests/ExtractFormatterTest.php
index 227f95c..de39909 100644
--- a/tests/ExtractFormatterTest.php
+++ b/tests/ExtractFormatterTest.php
@@ -109,12 +109,12 @@
1,
'Foo was born in 1977.',
),
-   /* @fixme
+   // Bug T115795 - Test no cropping after initials
array(
'P.J. Harvey is a singer. She is awesome!',
1,
'P.J. Harvey is a singer.',
-   ),*/
+   ),
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf38e87823155c704ffb106642944cbd05e3f632
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Sumit 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Sumit 
Gerrit-Reviewer: Waldir 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [WIP] resourceloader: Disable CSSMin data URI embedding - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: [WIP] resourceloader: Disable CSSMin data URI embedding
..

[WIP] resourceloader: Disable CSSMin data URI embedding

Bug: T118514
Change-Id: I564f20a43fb19c4673785fd6d25eb09957f50e4c
---
M includes/libs/CSSMin.php
M includes/resourceloader/ResourceLoaderFileModule.php
M includes/resourceloader/ResourceLoaderWikiModule.php
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/257888/1

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index 6ca0fed..9988944 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -254,7 +254,7 @@
 *   even if / * @embed * / is found.
 * @return string Remapped CSS data
 */
-   public static function remap( $source, $local, $remote, $embedData = 
true ) {
+   public static function remap( $source, $local, $remote, $embedData = 
false ) {
// High-level overview:
// * For each CSS rule in $source that includes at least one 
url() value:
//   * Check for an @embed comment at the start indicating that 
all URIs should be embedded
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php 
b/includes/resourceloader/ResourceLoaderFileModule.php
index 1421b10..70c427b 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -898,7 +898,7 @@
}
}
return MemoizedCallable::call( 'CSSMin::remap',
-   array( $style, $localDir, $remoteDir, true ) );
+   array( $style, $localDir, $remoteDir, false ) );
}
 
/**
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php 
b/includes/resourceloader/ResourceLoaderWikiModule.php
index 52eb2d8..315bc42 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -213,7 +213,7 @@
$style = CSSJanus::transform( $style, true, 
false );
}
$style = MemoizedCallable::call( 'CSSMin::remap',
-   array( $style, false, $this->getConfig()->get( 
'ScriptPath' ), true ) );
+   array( $style, false, $this->getConfig()->get( 
'ScriptPath' ), false ) );
if ( !isset( $styles[$media] ) ) {
$styles[$media] = array();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I564f20a43fb19c4673785fd6d25eb09957f50e4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.8
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Repool es1019 after maintenance - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Repool es1019 after maintenance
..


Repool es1019 after maintenance

Change-Id: I34dd52ee031c8ba76444c03741e22dea3fbdee36
References: T120122
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index dff9753..ebf6801 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -488,7 +488,7 @@
'cluster25' => array(
'10.64.16.187' => 1, # es1014, master
'10.64.48.114' => 3, # es1017
-#  '10.64.48.116' => 3, # es1019
+   '10.64.48.116' => 3, # es1019
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34dd52ee031c8ba76444c03741e22dea3fbdee36
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Additional release note for I495683 - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Additional release note for I495683
..


Additional release note for I495683

Mention that $wgSharedDB, $wgSharedTables, and $wgLocalDatabases must be
set consistently for LocalIdLookup to work with shared user tables.

Change-Id: I92d231b78bf7e4fb05b59d0baf69a65b2f728bf7
---
M RELEASE-NOTES-1.27
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index c27fb0f..77f7e2ff 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -57,6 +57,10 @@
 * Removed $wgProfilePerHost, $wgUDPProfilerHost, $wgUDPProfilerPort,
   $wgUDPProfilerFormatString, $wgStatsMethod, $wgAggregateStatsID, 
$wgStatsFormatString,
   and $wgProfileCallTree (deprecated since 1.20).
+* For proper operation of LocalIdLookup with shared user tables, ensure that
+  $wgSharedDB and $wgSharedTables are properly set even on the "central" wiki
+  that all others are sharing from and that $wgLocalDatabases is set to the
+  full list of sharing wikis on all those wikis.
 
 === New features in 1.27 ===
 * $wgDataCenterId and $wgDataCenterRoles where added, which will serve as

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

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

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

[MediaWiki-commits] [Gerrit] Make sure that we don't cache ParserOutputs without HTML - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Make sure that we don't cache ParserOutputs without HTML
..


Make sure that we don't cache ParserOutputs without HTML

Otherwise the article body will be empty.

Change-Id: I1db1b451e44168fe5e92b05a0b2539fc77864c5d
---
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
2 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index 91aa9d7..c2b9bd8 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -173,6 +173,10 @@
$this->getEntityInfo( $parserOutput ),
$options->getEditSection()
);
+   } else {
+   // If we don't have HTML, the ParserOutput in question
+   // shouldn't be cacheable.
+   $parserOutput->updateCacheExpiry( 0 );
}
 
//@todo: record sitelinks as iwlinks
diff --git 
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php 
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
index e72d82e..d8c64b0 100644
--- 
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
+++ 
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
@@ -115,6 +115,20 @@
);
}
 
+   public function testGetParserOutput_dontGenerateHtml() {
+   $entityParserOutputGenerator = 
$this->newEntityParserOutputGenerator();
+
+   $item = $this->newItem();
+   $timestamp = wfTimestamp( TS_MW );
+   $revision = new EntityRevision( $item, 13044, $timestamp );
+
+   $parserOutput = $entityParserOutputGenerator->getParserOutput( 
$revision, $this->getParserOptions(), false );
+
+   $this->assertSame( '', $parserOutput->getText() );
+   // ParserOutput without HTML must not end up in the cache.
+   $this->assertFalse( $parserOutput->isCacheable() );
+   }
+
public function testTitleText_ItemHasNolabel() {
$entityParserOutputGenerator = 
$this->newEntityParserOutputGenerator();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1db1b451e44168fe5e92b05a0b2539fc77864c5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.27.0-wmf.8
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make sure that we don't cache ParserOutputs without HTML - change (mediawiki...Wikibase)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Make sure that we don't cache ParserOutputs without HTML
..

Make sure that we don't cache ParserOutputs without HTML

Otherwise the article body will be empty.

Change-Id: I1db1b451e44168fe5e92b05a0b2539fc77864c5d
---
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
2 files changed, 18 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index 91aa9d7..c2b9bd8 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -173,6 +173,10 @@
$this->getEntityInfo( $parserOutput ),
$options->getEditSection()
);
+   } else {
+   // If we don't have HTML, the ParserOutput in question
+   // shouldn't be cacheable.
+   $parserOutput->updateCacheExpiry( 0 );
}
 
//@todo: record sitelinks as iwlinks
diff --git 
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php 
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
index e72d82e..d8c64b0 100644
--- 
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
+++ 
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
@@ -115,6 +115,20 @@
);
}
 
+   public function testGetParserOutput_dontGenerateHtml() {
+   $entityParserOutputGenerator = 
$this->newEntityParserOutputGenerator();
+
+   $item = $this->newItem();
+   $timestamp = wfTimestamp( TS_MW );
+   $revision = new EntityRevision( $item, 13044, $timestamp );
+
+   $parserOutput = $entityParserOutputGenerator->getParserOutput( 
$revision, $this->getParserOptions(), false );
+
+   $this->assertSame( '', $parserOutput->getText() );
+   // ParserOutput without HTML must not end up in the cache.
+   $this->assertFalse( $parserOutput->isCacheable() );
+   }
+
public function testTitleText_ItemHasNolabel() {
$entityParserOutputGenerator = 
$this->newEntityParserOutputGenerator();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1db1b451e44168fe5e92b05a0b2539fc77864c5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.27.0-wmf.8
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Hoo man 

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

[MediaWiki-commits] [Gerrit] Actual performance tests - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Actual performance tests
..

Actual performance tests

* Tests for the new restbase rendering

Change-Id: I739e79ba31b5882b6d535744ee6359949e6c4898
---
M maintenance/MathPerformance.php
1 file changed, 112 insertions(+), 58 deletions(-)


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

diff --git a/maintenance/MathPerformance.php b/maintenance/MathPerformance.php
index cbdb770..4d297b2 100644
--- a/maintenance/MathPerformance.php
+++ b/maintenance/MathPerformance.php
@@ -19,18 +19,18 @@
  * @ingroup Maintenance
  */
 
-require_once ( __DIR__ . '/../../../maintenance/Maintenance.php' );
+require_once( __DIR__ . '/../../../maintenance/Maintenance.php' );
+
 class MathPerformance extends Maintenance {
const RTI_CHUNK_SIZE = 1;
public $purge = false;
+   /** @var DatabaseBase */
+   public $dbw;
/** @var boolean */
private $verbose;
/** @var DatabaseBase */
-   public $dbw;
-   /** @var DatabaseBase */
private $db;
-   /** @var MathRenderer */
-   private $current;
+   private $currentHash;
private $time = 0.0; // microtime( true );
private $performance = array();
private $renderingMode = 'mathml';
@@ -51,6 +51,97 @@
false, 'v' );
}
 
+   public function execute() {
+   global $wgMathValidModes;
+   $this->dbw = wfGetDB( DB_MASTER );
+   $this->db = wfGetDB( DB_MASTER );
+   $wgMathValidModes[] = $this->renderingMode;
+   $this->verbose = $this->getOption( 'verbose', false );
+   $this->vPrint( "Loaded." );
+   $action = trim( $this->getArg( 0, 'export' ) );
+   switch ( $action ) {
+   case 'export':
+   $this->actionExport();
+   break;
+   case "benchmark":
+   $this->actionBenchmark();
+   break;
+   }
+   $this->vPrint( "Done." );
+   }
+
+   private function actionExport() {
+   $tex = $this->getOption( 'input', 'math_input' );
+   $hash = $this->getOption( 'hash', 'math_inputhash' );
+   $formulae = $this->getFormulae( $hash, $tex );
+   $out = array();
+   foreach ( $formulae as $formula ) {
+   $out[] = array( $hash => base64_encode( $formula->$hash 
), $tex => $formula->$tex );
+   }
+   $output = $this->getOption( 'output', 'php://stdout' );
+   file_put_contents( $output, json_encode( $out, 
JSON_PRETTY_PRINT ) );
+   }
+
+   /**
+* @param $hash
+* @param $tex
+* @return bool|ResultWrapper
+* @throws DBUnexpectedError
+*/
+   private function getFormulae( $hash, $tex ) {
+   $min = $this->getOption( 'min', 0 );
+   $max = $this->getOption( 'max', 0 );
+   $options = array();
+   if ( $max ) {
+   $options['LIMIT'] = $max - $min;
+   $options['OFFSET'] = $min;
+   }
+   $table = $this->getOption( 'table', 'mathoid' );
+   $shares = $this->getArg( 1, false ); // 'shares'
+   $share = $this->getArg( 2, 0 ); // 'share'
+   if ( $shares ) {
+   $this->vPrint( "Processing share $share of $shares." );
+   $counts = $this->db->selectField( $table, 'count(*)' );
+   $bucket = ceil( $counts / $shares );
+   $min = $share * $bucket;
+   $max = $min + $bucket;
+   $options['LIMIT'] = $max - $min;
+   $options['OFFSET'] = $min;
+   }
+   $formulae = $this->db->select(
+   $table,
+   array( $hash, $tex ),
+   '',
+   __METHOD__,
+   $options
+   );
+   return $formulae;
+   }
+
+   private function actionBenchmark() {
+   $tex = $this->getOption( 'input', 'math_input' );
+   $hash = $this->getOption( 'hash', 'math_inputhash' );
+   $formulae = $this->getFormulae( $hash, $tex );
+   foreach ( $formulae as $formula ) {
+   $this->currentHash = $formula->$hash;
+   $rbi = new MathRestbaseInterface( $formula->$tex, false 
);
+   $this->resetTimer();
+   $rbi->checkTeX();
+   $this->time( 'check' );
+   if ( 

[MediaWiki-commits] [Gerrit] Clean up recentChangesFlags rollups - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Clean up recentChangesFlags rollups
..


Clean up recentChangesFlags rollups

Move ad-hoc variables under an array, in preparation for merging with
RC flags implemented by extensions.

Bug: T120921
Change-Id: I5dd91ba5e5ed36785d9fbf01673defcd227c8b01
---
M includes/changes/EnhancedChangesList.php
1 file changed, 19 insertions(+), 15 deletions(-)

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



diff --git a/includes/changes/EnhancedChangesList.php 
b/includes/changes/EnhancedChangesList.php
index 0883982..ed374b0 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -178,18 +178,24 @@
# Collate list of users
$userlinks = array();
# Other properties
-   $unpatrolled = false;
-   $isnew = false;
-   $allBots = true;
-   $allMinors = true;
$curId = 0;
# Some catalyst variables...
$namehidden = true;
$allLogs = true;
$RCShowChangedSize = $this->getConfig()->get( 
'RCShowChangedSize' );
+   $collectedRcFlags = array(
+   // All are by bots?
+   'bot' => true,
+   // Includes a new page?
+   'newpage' => false,
+   // All are minor edits?
+   'minor' => true,
+   // Contains an unpatrolled edit?
+   'unpatrolled' => false,
+   );
foreach ( $block as $rcObj ) {
if ( $rcObj->mAttribs['rc_type'] == RC_NEW ) {
-   $isnew = true;
+   $collectedRcFlags['newpage'] = true;
}
// If all log actions to this page were hidden, then 
don't
// give the name of the affected page for this block!
@@ -201,7 +207,7 @@
$userlinks[$u] = 0;
}
if ( $rcObj->unpatrolled ) {
-   $unpatrolled = true;
+   $collectedRcFlags['unpatrolled'] = true;
}
if ( $rcObj->mAttribs['rc_type'] != RC_LOG ) {
$allLogs = false;
@@ -213,10 +219,10 @@
}
 
if ( !$rcObj->mAttribs['rc_bot'] ) {
-   $allBots = false;
+   $collectedRcFlags['bot'] = false;
}
if ( !$rcObj->mAttribs['rc_minor'] ) {
-   $allMinors = false;
+   $collectedRcFlags['minor'] = false;
}
 
$userlinks[$u]++;
@@ -247,12 +253,9 @@
$r .= "$tl";
 
# Main line
-   $r .= '' . 
$this->recentChangesFlags( array(
-   'newpage' => $isnew, # show, when one have this flag
-   'minor' => $allMinors, # show only, when all have this 
flag
-   'unpatrolled' => $unpatrolled, # show, when one have 
this flag
-   'bot' => $allBots, # show only, when all have this flag
-   ) );
+   $r .= '' . $this->recentChangesFlags(
+   $collectedRcFlags
+   );
 
# Timestamp
$r .= '' . $block[0]->timestamp . '';
@@ -289,7 +292,8 @@
return '';
}
 
-   $r .= $this->getLogText( $block, $queryParams, $allLogs, 
$isnew, $namehidden );
+   $r .= $this->getLogText( $block, $queryParams, $allLogs,
+   $collectedRcFlags['newpage'], $namehidden );
 
$r .= ' . . ';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5dd91ba5e5ed36785d9fbf01673defcd227c8b01
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Additional release note for I495683 - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Additional release note for I495683
..

Additional release note for I495683

Mention that $wgSharedDB, $wgSharedTables, and $wgLocalDatabases must be
set consistently for LocalIdLookup to work with shared user tables.

Change-Id: I92d231b78bf7e4fb05b59d0baf69a65b2f728bf7
---
M RELEASE-NOTES-1.27
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index c27fb0f..77f7e2ff 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -57,6 +57,10 @@
 * Removed $wgProfilePerHost, $wgUDPProfilerHost, $wgUDPProfilerPort,
   $wgUDPProfilerFormatString, $wgStatsMethod, $wgAggregateStatsID, 
$wgStatsFormatString,
   and $wgProfileCallTree (deprecated since 1.20).
+* For proper operation of LocalIdLookup with shared user tables, ensure that
+  $wgSharedDB and $wgSharedTables are properly set even on the "central" wiki
+  that all others are sharing from and that $wgLocalDatabases is set to the
+  full list of sharing wikis on all those wikis.
 
 === New features in 1.27 ===
 * $wgDataCenterId and $wgDataCenterRoles where added, which will serve as

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

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

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

[MediaWiki-commits] [Gerrit] Smaller (better) default timeouts - change (performance/WebPageTest)

[Phedenskog (Code Review)]

Phedenskog has uploaded a new change for review.

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

Change subject: Smaller (better) default timeouts
..

Smaller (better) default timeouts

I got overexcited and added an extremely high timeout for the
tests run using WPT.org. Now it is set to normal.

Change-Id: I52b5d141371e4b8d13b63edc2ae348faf7d3c148
---
M scripts/batch/mobile-wpt-org.txt
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest 
refs/changes/89/257889/1

diff --git a/scripts/batch/mobile-wpt-org.txt b/scripts/batch/mobile-wpt-org.txt
index df4cf62..4c75244 100644
--- a/scripts/batch/mobile-wpt-org.txt
+++ b/scripts/batch/mobile-wpt-org.txt
@@ -11,16 +11,16 @@
 # nodejs installed), just make sure to change the value of the WebPageTest key:
 # $ WPT_ORG_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost 
WPT_ORG_MOBILE_RUNS=1 bin/index.js --batch ./scripts/batch/mobile-wpt-org.txt
 
---webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_MotoG:Motorola G - Chrome --label 
chrome-m --runs <%WPT_ORG_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> 
--connectivity 3GFast --namespace webpagetest.enwiki-mobile.anonymous.Facebook 
--timeout 2400 --reporter statsv https://en.m.wikipedia.org/wiki/Facebook
+--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_MotoG:Motorola G - Chrome --label 
chrome-m --runs <%WPT_ORG_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> 
--connectivity 3GFast --namespace webpagetest.enwiki-mobile.anonymous.Facebook 
--timeout 600 --reporter statsv https://en.m.wikipedia.org/wiki/Facebook
 
 # Experimental run using iPhone 6
---webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_iPhone6 --label iphone6 --runs 1 
--endpoint <%STATSV_ENDPOINT> --connectivity 3GFast --namespace 
webpagetest.enwiki-mobile.anonymous.Facebook --timeout 2400 --first true 
--reporter statsv https://en.m.wikipedia.org/wiki/Facebook
+--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_iPhone6 --label iphone6 --runs 1 
--endpoint <%STATSV_ENDPOINT> --connectivity 3GFast --namespace 
webpagetest.enwiki-mobile.anonymous.Facebook --timeout 600 --first true 
--reporter statsv https://en.m.wikipedia.org/wiki/Facebook
 
 # Experimental run using iPad Mini 2
---webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_iPadMini2 --label ipadmini2 --runs 1 
--endpoint <%STATSV_ENDPOINT> --connectivity 3GFast --namespace 
webpagetest.enwiki-mobile.anonymous.Facebook --timeout 2400 --first true 
--reporter statsv https://en.m.wikipedia.org/wiki/Facebook
+--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Dulles_iPadMini2 --label ipadmini2 --runs 1 
--endpoint <%STATSV_ENDPOINT> --connectivity 3GFast --namespace 
webpagetest.enwiki-mobile.anonymous.Facebook --timeout 600 --first true 
--reporter statsv https://en.m.wikipedia.org/wiki/Facebook
 
 # Experimental run using real 3G connection in India
---webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Bangalore_Headspin --label Bangalore-real3g 
--runs 1 --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile-real3g.anonymous.Abdulkalam --timeout 3000 --reporter 
statsv --first true 
https://hi.wikipedia.org/wiki/%E0%A4%85%E0%A4%AC%E0%A5%8D%E0%A4%A6%E0%A5%81%E0%A4%B2_%E0%A4%95%E0%A4%B2%E0%A4%BE%E0%A4%AE
+--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location Bangalore_Headspin --label Bangalore-real3g 
--runs 1 --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile-real3g.anonymous.Abdulkalam --timeout 600 --reporter 
statsv --first true 
https://hi.wikipedia.org/wiki/%E0%A4%85%E0%A4%AC%E0%A5%8D%E0%A4%A6%E0%A5%81%E0%A4%B2_%E0%A4%95%E0%A4%B2%E0%A4%BE%E0%A4%AE
 
 # Experimental run using real 3G connection in San Francisco
---webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location SanFrancisco_Headspin --label 
SanFrancisco-real3g --runs 1 --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile-real3g.anonymous.Facebook --timeout 3000 --first true 
--reporter statsv https://en.m.wikipedia.org/wiki/Facebook
+--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org 
--median SpeedIndex --location SanFrancisco_Headspin --label 
SanFrancisco-real3g --runs 1 --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile-real3g.anonymous.Facebook --timeout 600 --first true 
--reporter statsv https://en.m.wikipedia.org/wiki/Facebook

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

[MediaWiki-commits] [Gerrit] Fix JSCS 2.7 warnings - change (performance/WebPageTest)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: Fix JSCS 2.7 warnings
..

Fix JSCS 2.7 warnings

Change-Id: I21e19c1b42f01ec56a20fe4edc5fd72eb862422e
---
M lib/index.js
M lib/util.js
M lib/wpt.js
3 files changed, 27 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest 
refs/changes/93/257893/1

diff --git a/lib/index.js b/lib/index.js
index 797c2b6..19b9e53 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -84,31 +84,28 @@
 // lets report back using our internal reporting
 // so we don't break the next/coming runs
 return callback({});
-} else {
-var collectedMetrics = collectMetrics.collect(data, argv);
-// log browser and version if it's availible
-if (data.data.median && data.data.median.firstView) {
-var browserName = data.data.median.firstView.browser_name;
-var browserVersion = 
data.data.median.firstView.browser_version;
-// for some browsers the name and version is not availible
-if (browserName && browserVersion) {
-console.log('Tested using ' + browserName + ' ' + 
browserVersion);
-}
-}
-var reporter = require('./reporter').get(argv.reporter);
-reporter.report(collectedMetrics, argv);
-
-// did we get some error, then signal it!
-// in some cases WebPageTest doesn't report an error object 
but the error code
-// shows an error, so lets check that
-if (data.data.median && data.data.median.firstView &&
-   data.data.median.firstView.result > 0) {
-return callback({});
-} else {
-return callback();
-}
-
 }
+var collectedMetrics = collectMetrics.collect(data, argv);
+// log browser and version if it's availible
+if (data.data.median && data.data.median.firstView) {
+var browserName = data.data.median.firstView.browser_name;
+var browserVersion = 
data.data.median.firstView.browser_version;
+// for some browsers the name and version is not availible
+if (browserName && browserVersion) {
+console.log('Tested using ' + browserName + ' ' + 
browserVersion);
+}
+}
+var reporter = require('./reporter').get(argv.reporter);
+reporter.report(collectedMetrics, argv);
+
+// did we get some error, then signal it!
+// in some cases WebPageTest doesn't report an error object but 
the error code
+// shows an error, so lets check that
+if (data.data.median && data.data.median.firstView &&
+   data.data.median.firstView.result > 0) {
+return callback({});
+}
+return callback();
 });
 }
 };
diff --git a/lib/util.js b/lib/util.js
index 6101d2b..db240bc 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -83,12 +83,11 @@
  */
 getInputURLorFile: function(arg) {
 // is it a file or URL we wanna test?
-if (arg.indexOf('http') === -1) {
-var fileContent = this.readFile(arg);
-return this.replaceWithEnv(fileContent);
-} else {
+if (arg.indexOf('http') !== -1) {
 return arg;
 }
+var fileContent = this.readFile(arg);
+return this.replaceWithEnv(fileContent);
 },
 /**
  * Replace all occurrences placeholders matching <%YOUR_KEY>
diff --git a/lib/wpt.js b/lib/wpt.js
index 2d9d6d2..4fdba0a 100644
--- a/lib/wpt.js
+++ b/lib/wpt.js
@@ -24,10 +24,10 @@
 console.error('Configuration:' + JSON.stringify(wptOptions, 
null, 2));
 cb(err);
 return;
-} else {
-console.log('WebPageTest run: ' + data.data.summary);
-cb(null, data);
 }
+
+console.log('WebPageTest run: ' + data.data.summary);
+cb(null, data);
 });
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21e19c1b42f01ec56a20fe4edc5fd72eb862422e
Gerrit-PatchSet: 1
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Add XXX to newTermSearchInteractor in WikibaseClient - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add XXX to newTermSearchInteractor in WikibaseClient
..


Add XXX to newTermSearchInteractor in WikibaseClient

Change-Id: Ic765f1b0045e4de7ce0636b13ee709ef2dbb08ec
---
M client/includes/WikibaseClient.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index 8e2042c..07c9f1b 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -295,6 +295,8 @@
/**
 * @param string $displayLanguageCode
 *
+* XXX: This is not used by client itself, but is used by 
ArticlePlaceholder!
+*
 * @return TermIndexSearchInteractor
 */
public function newTermSearchInteractor( $displayLanguageCode ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic765f1b0045e4de7ce0636b13ee709ef2dbb08ec
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

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