[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add attributes parameter to ShowSearchHitTitle

[jenkins-bot (Code Review)]

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

Change subject: Add attributes parameter to ShowSearchHitTitle
..


Add attributes parameter to ShowSearchHitTitle

This would allow extensions to define custom attributes on title link,
such as put information in "title", change attributes depending on
specific search hit, etc.

Now Wikidata does the same by overriding LinkBegin, but this applies
to all links, not specifically to search result link.

Since ShowSearchHitTitle is always used with the link, I think it makes
sense to enable this specific customization.

Change-Id: I19f64e0909d92e32ddf6271f74c014e8b65d5014
---
M docs/hooks.txt
M includes/widget/search/FullSearchResultWidget.php
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  DCausse: Looks good to me, but someone else must approve



diff --git a/docs/hooks.txt b/docs/hooks.txt
index b7fe8c1..5740040 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2947,6 +2947,7 @@
 $terms: String of the search terms entered
 $specialSearch: The SpecialSearch object
 &$query: Array of query string parameters for the link representing the search 
result.
+&$attributes: Array of title link attributes, can be modified by extension.
 
 'SidebarBeforeOutput': Allows to edit sidebar just before it is output by 
skins.
 Warning: This hook is run on each display. You should consider to use
diff --git a/includes/widget/search/FullSearchResultWidget.php 
b/includes/widget/search/FullSearchResultWidget.php
index 0d0fa12..4c98399 100644
--- a/includes/widget/search/FullSearchResultWidget.php
+++ b/includes/widget/search/FullSearchResultWidget.php
@@ -133,13 +133,14 @@
$title = clone $result->getTitle();
$query = [];
 
+   $attributes = [ 'data-serp-pos' => $position ];
Hooks::run( 'ShowSearchHitTitle',
-   [ &$title, &$snippet, $result, $terms, 
$this->specialPage, &$query ] );
+   [ &$title, &$snippet, $result, $terms, 
$this->specialPage, &$query, &$attributes ] );
 
$link = $this->linkRenderer->makeLink(
$title,
$snippet,
-   [ 'data-serp-pos' => $position ],
+   $attributes,
$query
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19f64e0909d92e32ddf6271f74c014e8b65d5014
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Smalyshev 
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] mediawiki...CentralAuth[master]: Remove direct execution guard

[jenkins-bot (Code Review)]

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

Change subject: Remove direct execution guard
..


Remove direct execution guard

Not needed with modern PHP. Was never needed for class-only files.

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

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



diff --git a/includes/specials/SpecialWikiSets.php 
b/includes/specials/SpecialWikiSets.php
index 6a38679..d8aaeea 100644
--- a/includes/specials/SpecialWikiSets.php
+++ b/includes/specials/SpecialWikiSets.php
@@ -7,11 +7,6 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo "CentralAuth extension\n";
-   exit( 1 );
-}
-
 class SpecialWikiSets extends SpecialPage {
private $mCanEdit;
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: Fix typo in archive_index.html

[Tim Starling (Code Review)]

Tim Starling has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387977 )

Change subject: dumps: Fix typo in archive_index.html
..


dumps: Fix typo in archive_index.html

Change-Id: Ia8e3f7ff10b1c01649fee2fcd263b738b8555acf
---
M modules/dumps/files/web/html/archive_index.html
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/dumps/files/web/html/archive_index.html 
b/modules/dumps/files/web/html/archive_index.html
index 16469b1..1cb9e9f 100644
--- a/modules/dumps/files/web/html/archive_index.html
+++ b/modules/dumps/files/web/html/archive_index.html
@@ -18,7 +18,7 @@
 

 These dumps, one or two for the various projects for the years listed 
below, are
-provided as historical material only.  For the ealier files, '''do not 
try to import these into a
+provided as historical material only.  For the earlier files, '''do 
not try to import these into a
 current installation of MediaWiki.'''  The dumps are in varying 
formats depending on
 when they were created.  Happy perusing!


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8e3f7ff10b1c01649fee2fcd263b738b8555acf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update dumps archive_index.html for the files I just uploaded

[Tim Starling (Code Review)]

Tim Starling has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383958 )

Change subject: Update dumps archive_index.html for the files I just uploaded
..


Update dumps archive_index.html for the files I just uploaded

Change-Id: I6e87761939d8769046ceee062b1628ab28cfe091
---
M modules/dumps/files/web/html/archive_index.html
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  Krinkle: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/dumps/files/web/html/archive_index.html 
b/modules/dumps/files/web/html/archive_index.html
index 71ae382..16469b1 100644
--- a/modules/dumps/files/web/html/archive_index.html
+++ b/modules/dumps/files/web/html/archive_index.html
@@ -23,6 +23,7 @@
 when they were created.  Happy perusing!

2001 (UseModWiki) tarballs of the directory
+   2001 (UseModWiki) dump converted to MediaWiki 
XML
2002 (UseModWiki) tarballs of the directory
2003 (phpwiki?) dumps of sql tables
2005 (MediaWiki 1.5?) XML files, warning: old 
schema!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e87761939d8769046ceee062b1628ab28cfe091
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: Fix typo in archive_index.html

[Legoktm (Code Review)]

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

Change subject: dumps: Fix typo in archive_index.html
..

dumps: Fix typo in archive_index.html

Change-Id: Ia8e3f7ff10b1c01649fee2fcd263b738b8555acf
---
M modules/dumps/files/web/html/archive_index.html
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/387977/1

diff --git a/modules/dumps/files/web/html/archive_index.html 
b/modules/dumps/files/web/html/archive_index.html
index 71ae382..3aa7307 100644
--- a/modules/dumps/files/web/html/archive_index.html
+++ b/modules/dumps/files/web/html/archive_index.html
@@ -18,7 +18,7 @@
 

 These dumps, one or two for the various projects for the years listed 
below, are
-provided as historical material only.  For the ealier files, '''do not 
try to import these into a
+provided as historical material only.  For the earlier files, '''do 
not try to import these into a
 current installation of MediaWiki.'''  The dumps are in varying 
formats depending on
 when they were created.  Happy perusing!


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Move “Language settings” dialog headline up

[VolkerE (Code Review)]

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

Change subject: Move “Language settings” dialog headline up
..

Move “Language settings” dialog headline up

Moving “Language settings” dialog headline up to put on a
virtual line with ToggleButton and apply `#000` to it as
dialog titles elsewhere.

Bug: T175295
Change-Id: Id2d7a7b90996ec7be96e8bafd7bbe78eb8f0e1c9
---
M resources/css/ext.uls.languagesettings.less
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 9402e7b..2631372 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -37,13 +37,13 @@
 }
 
 .languagesettings-menu h1 {
+   color: #000;
font-size: 16pt;
line-height: 20pt;
margin-top: 0;
font-weight: normal;
border: 0;
-   padding: 15px 0 3px 15px;
-   color: #54595d;
+   padding: 8px 0 3px 15px;
 }
 
 #languagesettings-settings-panel {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove spacing to visually connect arbitrary separated parts

[VolkerE (Code Review)]

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

Change subject: Remove spacing to visually connect arbitrary separated parts
..

Remove spacing to visually connect arbitrary separated parts

Removing spacing between arbitrary separated parts of the settings
dialog in order to visually connect them.
Also reducing `padding` of buttons row and set it only on one
selector.

Bug: T175295
Change-Id: If59645454f47751683eddfb85396602b67eb868c
---
M resources/css/ext.uls.languagesettings.less
1 file changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 8dd097f..9402e7b 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -47,9 +47,10 @@
 }
 
 #languagesettings-settings-panel {
-   padding: 0 15px;
-   color: #222;
background: #fff;
+   color: #222;
+   margin-top: 0; // Override `.columns`
+   padding: 0 15px;
 }
 
 #languagesettings-settings-panel h3 {
@@ -82,6 +83,7 @@
 
 .uls-language-settings-close-block {
background: #fff;
+   margin-top: 0; // Override `.columns`
 }
 
 #languagesettings-panels .menu-section.active,
@@ -104,12 +106,12 @@
 .language-settings-buttons {
border-top: 1px solid #eaecf0;
margin-top: 25px;
-   padding: 15px;
width: auto;
text-align: right;
 
.columns {
-   padding: 0;
+   margin-top: 0;
+   padding: 12px;
}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Add missing documentation for protected functions

[jenkins-bot (Code Review)]

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

Change subject: Add missing documentation for protected functions
..


Add missing documentation for protected functions

Bug: T178007
Change-Id: Ia1ae78b30b889b7a8965354ae0a404bf9a520917
---
M .phpcs.xml
M includes/AbuseFilterModifyLogFormatter.php
M includes/Views/AbuseFilterViewEdit.php
M includes/special/SpecialAbuseFilter.php
M includes/special/SpecialAbuseLog.php
5 files changed, 17 insertions(+), 1 deletion(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index aabe27c..acf946c 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
 
 

-   



diff --git a/includes/AbuseFilterModifyLogFormatter.php 
b/includes/AbuseFilterModifyLogFormatter.php
index 8a148f2..3a55314 100644
--- a/includes/AbuseFilterModifyLogFormatter.php
+++ b/includes/AbuseFilterModifyLogFormatter.php
@@ -2,6 +2,9 @@
 
 class AbuseFilterModifyLogFormatter extends LogFormatter {
 
+   /**
+* @return string
+*/
protected function getMessageKey() {
return 'abusefilter-logentry-modify';
}
diff --git a/includes/Views/AbuseFilterViewEdit.php 
b/includes/Views/AbuseFilterViewEdit.php
index 18fb9eb..50c9769 100644
--- a/includes/Views/AbuseFilterViewEdit.php
+++ b/includes/Views/AbuseFilterViewEdit.php
@@ -1097,6 +1097,9 @@
return AbuseFilter::translateFromHistory( $row );
}
 
+   /**
+* @return null
+*/
protected function exposeWarningMessages() {
global $wgOut, $wgAbuseFilterDefaultWarningMessage;
$wgOut->addJsConfigVars(
diff --git a/includes/special/SpecialAbuseFilter.php 
b/includes/special/SpecialAbuseFilter.php
index c419410..1a4cbf4 100644
--- a/includes/special/SpecialAbuseFilter.php
+++ b/includes/special/SpecialAbuseFilter.php
@@ -125,6 +125,9 @@
$this->mFilter = $filter;
}
 
+   /**
+* @return string
+*/
protected function getGroupName() {
return 'wiki';
}
diff --git a/includes/special/SpecialAbuseLog.php 
b/includes/special/SpecialAbuseLog.php
index ea98bb7..f039869 100644
--- a/includes/special/SpecialAbuseLog.php
+++ b/includes/special/SpecialAbuseLog.php
@@ -632,6 +632,11 @@
}
}
 
+   /**
+* @param int $userId
+* @param string $userName
+* @return string
+*/
protected static function getUserLinks( $userId, $userName ) {
static $cache = [];
 
@@ -677,6 +682,9 @@
return (bool)$row->afl_deleted;
}
 
+   /**
+* @return string
+*/
protected function getGroupName() {
return 'changes';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1ae78b30b889b7a8965354ae0a404bf9a520917
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Dbarratt 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...HitCounters[master]: Update .gitignore on HitCounters

[jenkins-bot (Code Review)]

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

Change subject: Update .gitignore on HitCounters
..


Update .gitignore on HitCounters

It was essentially copied from the .gitignore in AbuseFilter

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

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



diff --git a/.gitignore b/.gitignore
index 16c3a67..8d843bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
 /node_modules/
 /vendor
 /composer.lock
+
+# Editors
+*.kate-swp
 *~
-.#*
 \#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I625e32c590d17b14ac6cb29a0f57de62a996c4ee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Matěj Suchánek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Move buttons further to the side of dialog

[VolkerE (Code Review)]

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

Change subject: Move buttons further to the side of dialog
..

Move buttons further to the side of dialog

Moving apply and cancel buttons to align with padded edge of dialog
in order for resembling “final” state of buttons better.

Bug: T175295
Change-Id: I96b8b6dc3a3fca907a8f5d2923a19b0f86172c61
---
M resources/css/ext.uls.languagesettings.less
M resources/js/ext.uls.languagesettings.js
2 files changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 7a46721..8dd097f 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -107,6 +107,10 @@
padding: 15px;
width: auto;
text-align: right;
+
+   .columns {
+   padding: 0;
+   }
 }
 
 .language-settings-buttons button {
diff --git a/resources/js/ext.uls.languagesettings.js 
b/resources/js/ext.uls.languagesettings.js
index 65bbe72..e5c8492 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -34,7 +34,7 @@
'';
// Apply and Cancel buttons
buttonsRow = '' +
-   '' +
+   '' +
'' +
'' +
'' +

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: build: Replace jshint/jscs with eslint

[jenkins-bot (Code Review)]

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

Change subject: build: Replace jshint/jscs with eslint
..


build: Replace jshint/jscs with eslint

Change-Id: Ic85a99fa261ac27549bcaa4a94a2112b9ed80e14
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.wikimediaEvents.humanSearchRelevance.js
M modules/ext.wikimediaEvents.readingDepth.js
M modules/ext.wikimediaEvents.searchSatisfaction.js
M package.json
9 files changed, 65 insertions(+), 87 deletions(-)

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



diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..489d7b7
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,14 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true
+   },
+   "globals": {
+   "mediaWiki": false
+   },
+   "rules": {
+   "valid-jsdoc": 0,
+   "operator-linebreak" : 0
+   }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 5e54610..000
--- a/.jscsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "preset": "wikimedia",
-   "es3": true,
-   "requireVarDeclFirst": null
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index ff367dc..000
--- a/.jshintrc
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "freeze": true,
-   "latedef": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-
-   // Relaxing
-   "laxbreak": true,
-
-   // Environment
-   "browser": true,
-   "es3": true,
-
-   "predef": [
-   "mediaWiki",
-   "jQuery"
-   ],
-   "globals": {
-   "JSON": true
-   }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 200c69f..c1b8031 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,19 +1,12 @@
-/*jshint node:true */
+/* eslint-env node */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
 
grunt.initConfig( {
-   jshint: {
-   options: {
-   jshintrc: true
-   },
-   all: '.'
-   },
-   jscs: {
+   eslint: {
all: [
'*.js',
'modules/**/*.js'
@@ -38,6 +31,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana', 
'stylelint' ] );
+   grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana', 
'stylelint' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index e2419ec..5803354 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -1,6 +1,8 @@
 ( function ( mw, $ ) {
'use strict';
 
+   var config;
+
function sample( acceptPercentage ) {
var rand = mw.user.generateRandomSessionId(),
// take the first 52 bits of the rand value to match js
@@ -37,7 +39,7 @@
// The config value is coded into the page output and cached in varnish.
// That means any changes to sampling rates or pages chosen will take 
up to
// a week to propogate into the wild.
-   var config = mw.config.get( 'wgWMESearchRelevancePages' );
+   config = mw.config.get( 'wgWMESearchRelevancePages' );
 
// bad configuration
if ( !config.hasOwnProperty( 'sampleRate' ) || !config.hasOwnProperty( 
'queries' ) ) {
diff --git a/modules/ext.wikimediaEvents.readingDepth.js 
b/modules/ext.wikimediaEvents.readingDepth.js
index ecc16dd..ba2d206 100644
--- a/modules/ext.wikimediaEvents.readingDepth.js
+++ b/modules/ext.wikimediaEvents.readingDepth.js
@@ -8,16 +8,30 @@
  */
 ( function ( $, mw, config, user, mwExperiments ) {
 
+   var pausedAt,
+   msPaused = 0,
+   perf = window.performance,
+   EVENT = {
+   pageTitle: config.get( 'wgTitle' ),
+   namespaceId: config.get( 'wgNamespaceNumber' ),
+   skin: config.get( 'skin' ),
+   isAnon: user.isAnon(),
+

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: importDump.php: Declare uploadCount property

[jenkins-bot (Code Review)]

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

Change subject: importDump.php: Declare uploadCount property
..


importDump.php: Declare uploadCount property

Bug: T174255
Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
(cherry picked from commit e8bad2adfb26539fe290565b5cc69f9b276ec782)
---
M maintenance/importDump.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 6717a8e..025809d 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -37,6 +37,7 @@
public $revCount = 0;
public $dryRun = false;
public $uploads = false;
+   protected $uploadCount = 0;
public $imageBasePath = false;
public $nsFilter = false;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MarkAHershberger 
Gerrit-Reviewer: Parent5446 
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] mediawiki...MassMessage[master]: Page count should be localized in MassMessage messages

[jenkins-bot (Code Review)]

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

Change subject: Page count should be localized in MassMessage messages
..


Page count should be localized in MassMessage messages

Change-Id: I5e03c8f69ed9a913574b33cc258043417c82f1c4
---
M includes/SpecialMassMessage.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/SpecialMassMessage.php b/includes/SpecialMassMessage.php
index 9ab37e7..f8db4bd 100644
--- a/includes/SpecialMassMessage.php
+++ b/includes/SpecialMassMessage.php
@@ -75,7 +75,7 @@
$result = $form->tryAuthorizedSubmit();
if ( $result === true || ( $result instanceof Status && 
$result->isGood() ) ) {
if ( $this->state === 'submit' ) { // If it's preview, 
everything is shown already.
-   $msg = $this->msg( 'massmessage-submitted' 
)->params( $this->count )->plain();
+   $msg = $this->msg( 'massmessage-submitted' 
)->numParams( $this->count )->plain();
$output->addWikiText( $msg );
$output->addWikiMsg( 'massmessage-nextsteps' );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e03c8f69ed9a913574b33cc258043417c82f1c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Wctaiwan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix case of SpecialRecentChanges class

[jenkins-bot (Code Review)]

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

Change subject: Fix case of SpecialRecentChanges class
..


Fix case of SpecialRecentChanges class

Test fails with $wgAutoloadAttemptLowercase = false

Change-Id: Ib8cd202d36d35a36e7513f81cea4a7f8346661bc
---
M tests/phpunit/includes/specials/SpecialRecentchangesTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php 
b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
index e9c7d4b..73edd28 100644
--- a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
+++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
@@ -15,7 +15,7 @@
 
# setup the CLSP object
$this->changesListSpecialPage = 
TestingAccessWrapper::newFromObject(
-   new SpecialRecentchanges
+   new SpecialRecentChanges
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8cd202d36d35a36e7513f81cea4a7f8346661bc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix case of SpecialRecentChanges class

[Krinkle (Code Review)]

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

Change subject: Fix case of SpecialRecentChanges class
..

Fix case of SpecialRecentChanges class

Test fails with $wgAutoloadAttemptLowercase = false

Change-Id: Ib8cd202d36d35a36e7513f81cea4a7f8346661bc
---
M tests/phpunit/includes/specials/SpecialRecentchangesTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/387973/2

diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php 
b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
index e9c7d4b..73edd28 100644
--- a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
+++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
@@ -15,7 +15,7 @@
 
# setup the CLSP object
$this->changesListSpecialPage = 
TestingAccessWrapper::newFromObject(
-   new SpecialRecentchanges
+   new SpecialRecentChanges
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8cd202d36d35a36e7513f81cea4a7f8346661bc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Fix Doxygen rendering

[jenkins-bot (Code Review)]

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

Change subject: README: Fix Doxygen rendering
..


README: Fix Doxygen rendering

Fixing Doxygen markup rendering with support for various software.
This is the second, slightly changed attempt as
I62045ad670e730ec66b149b7d2ea4f5b56b58d8e got reverted.

Bug: T104669
Change-Id: I5a30b5a2122ae39ed45be74ec348f6506c5f38b7
---
M README.md
1 file changed, 30 insertions(+), 28 deletions(-)

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



diff --git a/README.md b/README.md
index d5437fc..71e23f0 100644
--- a/README.md
+++ b/README.md
@@ -80,38 +80,40 @@
 
 Release process:
 
-$ cd path/to/oojs-ui/
-$ git remote update
-$ git checkout -B release -t origin/master
 
-# Ensure tests pass
-$ npm install && composer update && npm test && composer test
+$ cd path/to/oojs-ui/
+$ git remote update
+$ git checkout -B release -t origin/master
 
-# Avoid using "npm version patch" because that creates
-# both a commit and a tag, and we shouldn't tag until after
-# the commit is merged.
+# Ensure tests pass
+$ npm install && composer update && npm test && composer test
 
-# Update release notes
-# Copy the resulting list into a new section at the top of History.md and edit
-# into five sub-sections, in order:
-# * Breaking changes
-# * Deprecations
-# * Features
-# * Styles
-# * Code
-$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
-$ edit History.md
+# Avoid using "npm version patch" because that creates
+# both a commit and a tag, and we shouldn't tag until after
+# the commit is merged.
 
-# Update the version number
-$ edit package.json
+# Update release notes
+# Copy the resulting list into a new section at the top of History.md and 
edit
+# into five sub-sections, in order:
+# * Breaking changes
+# * Deprecations
+# * Features
+# * Styles
+# * Code
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
+$ edit History.md
 
-$ git add -p
-$ git commit -m "Tag vX.X.X"
-$ git review
+# Update the version number
+$ edit package.json
 
-# After merging:
-$ git remote update
-$ git checkout origin/master
-$ git tag "vX.X.X"
-$ npm run publish-build && git push --tags && npm publish
+$ git add -p
+$ git commit -m "Tag vX.X.X"
+$ git review
+
+# After merging:
+$ git remote update
+$ git checkout origin/master
+$ git tag "vX.X.X"
+$ npm run publish-build && git push --tags && npm publish
+
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a30b5a2122ae39ed45be74ec348f6506c5f38b7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: build: Replace jshint/jscs with eslint

[Krinkle (Code Review)]

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

Change subject: build: Replace jshint/jscs with eslint
..

build: Replace jshint/jscs with eslint

Change-Id: Ic85a99fa261ac27549bcaa4a94a2112b9ed80e14
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.wikimediaEvents.humanSearchRelevance.js
M modules/ext.wikimediaEvents.readingDepth.js
M modules/ext.wikimediaEvents.searchSatisfaction.js
M package.json
9 files changed, 65 insertions(+), 87 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/72/387972/1

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..489d7b7
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,14 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true
+   },
+   "globals": {
+   "mediaWiki": false
+   },
+   "rules": {
+   "valid-jsdoc": 0,
+   "operator-linebreak" : 0
+   }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 5e54610..000
--- a/.jscsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "preset": "wikimedia",
-   "es3": true,
-   "requireVarDeclFirst": null
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index ff367dc..000
--- a/.jshintrc
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "freeze": true,
-   "latedef": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-
-   // Relaxing
-   "laxbreak": true,
-
-   // Environment
-   "browser": true,
-   "es3": true,
-
-   "predef": [
-   "mediaWiki",
-   "jQuery"
-   ],
-   "globals": {
-   "JSON": true
-   }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 200c69f..c1b8031 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,19 +1,12 @@
-/*jshint node:true */
+/* eslint-env node */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
 
grunt.initConfig( {
-   jshint: {
-   options: {
-   jshintrc: true
-   },
-   all: '.'
-   },
-   jscs: {
+   eslint: {
all: [
'*.js',
'modules/**/*.js'
@@ -38,6 +31,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana', 
'stylelint' ] );
+   grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana', 
'stylelint' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index e2419ec..5803354 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -1,6 +1,8 @@
 ( function ( mw, $ ) {
'use strict';
 
+   var config;
+
function sample( acceptPercentage ) {
var rand = mw.user.generateRandomSessionId(),
// take the first 52 bits of the rand value to match js
@@ -37,7 +39,7 @@
// The config value is coded into the page output and cached in varnish.
// That means any changes to sampling rates or pages chosen will take 
up to
// a week to propogate into the wild.
-   var config = mw.config.get( 'wgWMESearchRelevancePages' );
+   config = mw.config.get( 'wgWMESearchRelevancePages' );
 
// bad configuration
if ( !config.hasOwnProperty( 'sampleRate' ) || !config.hasOwnProperty( 
'queries' ) ) {
diff --git a/modules/ext.wikimediaEvents.readingDepth.js 
b/modules/ext.wikimediaEvents.readingDepth.js
index ecc16dd..ba2d206 100644
--- a/modules/ext.wikimediaEvents.readingDepth.js
+++ b/modules/ext.wikimediaEvents.readingDepth.js
@@ -8,16 +8,30 @@
  */
 ( function ( $, mw, config, user, mwExperiments ) {
 
+   var pausedAt,
+   msPaused = 0,
+   perf = window.performance,
+   EVENT = {
+   pageTitle: config.get( 'wgTitle' ),
+   namespaceId: config.get( 'wgNamespaceNumber' ),
+   skin: config.get( 'skin' ),
+   isAnon: 

[MediaWiki-commits] [Gerrit] integration/jenkins[master]: Re-enable $wgAutoloadAttemptLowercase for older branches

[Krinkle (Code Review)]

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

Change subject: Re-enable $wgAutoloadAttemptLowercase for older branches
..

Re-enable $wgAutoloadAttemptLowercase for older branches

Follows-up 44c08d5e, which was causing commits to REL1_29 to fail
due to SpecialRecentChanges not existing and something.

Bug: T166759
Change-Id: I80933521a2b08d55c52176d884b5699be315478b
---
M mediawiki/conf.d/00_dev_settings.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/71/387971/2

diff --git a/mediawiki/conf.d/00_dev_settings.php 
b/mediawiki/conf.d/00_dev_settings.php
index edb2883..3e474ef 100644
--- a/mediawiki/conf.d/00_dev_settings.php
+++ b/mediawiki/conf.d/00_dev_settings.php
@@ -45,5 +45,8 @@
 // Back-compat
 $wgRateLimitLog = $wgDebugLogGroups['ratelimit'];
 
-// Be strict about class name letter-case.
-$wgAutoloadAttemptLowercase = false;
+// Don't apply to REL1_29 and earlier yet
+if ( substr( getenv( 'ZUUL_BRANCH' ), 0, 5 ) !== 'REL1_' ) {
+   // Be strict about class name letter-case.
+   $wgAutoloadAttemptLowercase = false;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80933521a2b08d55c52176d884b5699be315478b
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Introduce CSS class to enable lower specificity style overrides

[VolkerE (Code Review)]

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

Change subject: Introduce CSS class to enable lower specificity style overrides
..

Introduce CSS class to enable lower specificity style overrides

Making `#language-settings-dialog` carry the same CSS class
`.language-settings-dialog` to be able to override it in theme styles
more sanly. Follow-up to Id9c8652820641d6

Bug: T175295
Change-Id: I1aa69f8701ed6d6cb2ed59cabf11332f2a10d21f
---
M resources/css/ext.uls.languagesettings.less
M resources/js/ext.uls.languagesettings.js
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 7a46721..ce326c3 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -74,7 +74,7 @@
font-size: 12pt;
 }
 
-#language-settings-dialog {
+.language-settings-dialog {
background: #f8f9fa;
/* Ensure base font size is same in different skins */
font-size: medium;
diff --git a/resources/js/ext.uls.languagesettings.js 
b/resources/js/ext.uls.languagesettings.js
index 65bbe72..ac4dd77 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -44,7 +44,7 @@
settingsMenu +
settingsPanel +
'';
-   windowTemplate = '' +
+   windowTemplate = '' +
closeRow +
panelsRow +
buttonsRow +

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.6]: Update search satisfaction schema to not require isForced

[jenkins-bot (Code Review)]

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

Change subject: Update search satisfaction schema to not require isForced
..


Update search satisfaction schema to not require isForced

This parameter requires a still WIP patch, so it shouldn't
have been a required parameter.

Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
(cherry picked from commit 0626b0d6ec38c656b262c52f7c7c53e6be13ff9d)
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 1de11da..1558b72 100644
--- a/extension.json
+++ b/extension.json
@@ -110,7 +110,7 @@
"schema.SearchSatisfaction": {
"class": "ResourceLoaderSchemaModule",
"schema": "SearchSatisfaction",
-   "revision": 17374996
+   "revision": 17378115
},
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.5]: Update search satisfaction schema to not require isForced

[jenkins-bot (Code Review)]

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

Change subject: Update search satisfaction schema to not require isForced
..


Update search satisfaction schema to not require isForced

This parameter requires a still WIP patch, so it shouldn't
have been a required parameter.

Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
(cherry picked from commit 0626b0d6ec38c656b262c52f7c7c53e6be13ff9d)
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 1de11da..1558b72 100644
--- a/extension.json
+++ b/extension.json
@@ -110,7 +110,7 @@
"schema.SearchSatisfaction": {
"class": "ResourceLoaderSchemaModule",
"schema": "SearchSatisfaction",
-   "revision": 17374996
+   "revision": 17378115
},
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.31.0-wmf.5
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.6]: Update search satisfaction schema to not require isForced

[EBernhardson (Code Review)]

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

Change subject: Update search satisfaction schema to not require isForced
..

Update search satisfaction schema to not require isForced

This parameter requires a still WIP patch, so it shouldn't
have been a required parameter.

Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
(cherry picked from commit 0626b0d6ec38c656b262c52f7c7c53e6be13ff9d)
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/69/387969/1

diff --git a/extension.json b/extension.json
index 1de11da..1558b72 100644
--- a/extension.json
+++ b/extension.json
@@ -110,7 +110,7 @@
"schema.SearchSatisfaction": {
"class": "ResourceLoaderSchemaModule",
"schema": "SearchSatisfaction",
-   "revision": 17374996
+   "revision": 17378115
},
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.5]: Update search satisfaction schema to not require isForced

[EBernhardson (Code Review)]

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

Change subject: Update search satisfaction schema to not require isForced
..

Update search satisfaction schema to not require isForced

This parameter requires a still WIP patch, so it shouldn't
have been a required parameter.

Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
(cherry picked from commit 0626b0d6ec38c656b262c52f7c7c53e6be13ff9d)
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/68/387968/1

diff --git a/extension.json b/extension.json
index 1de11da..1558b72 100644
--- a/extension.json
+++ b/extension.json
@@ -110,7 +110,7 @@
"schema.SearchSatisfaction": {
"class": "ResourceLoaderSchemaModule",
"schema": "SearchSatisfaction",
-   "revision": 17374996
+   "revision": 17378115
},
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.31.0-wmf.5
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Update search satisfaction schema to not require isForced

[jenkins-bot (Code Review)]

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

Change subject: Update search satisfaction schema to not require isForced
..


Update search satisfaction schema to not require isForced

This parameter requires a still WIP patch, so it shouldn't
have been a required parameter.

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

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



diff --git a/extension.json b/extension.json
index 1de11da..1558b72 100644
--- a/extension.json
+++ b/extension.json
@@ -110,7 +110,7 @@
"schema.SearchSatisfaction": {
"class": "ResourceLoaderSchemaModule",
"schema": "SearchSatisfaction",
-   "revision": 17374996
+   "revision": 17378115
},
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MassMessage[master]: Page count should be localized in MassMessage messages

[Huji (Code Review)]

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

Change subject: Page count should be localized in MassMessage messages
..

Page count should be localized in MassMessage messages

Change-Id: I5e03c8f69ed9a913574b33cc258043417c82f1c4
---
M includes/SpecialMassMessage.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/SpecialMassMessage.php b/includes/SpecialMassMessage.php
index 9ab37e7..f8db4bd 100644
--- a/includes/SpecialMassMessage.php
+++ b/includes/SpecialMassMessage.php
@@ -75,7 +75,7 @@
$result = $form->tryAuthorizedSubmit();
if ( $result === true || ( $result instanceof Status && 
$result->isGood() ) ) {
if ( $this->state === 'submit' ) { // If it's preview, 
everything is shown already.
-   $msg = $this->msg( 'massmessage-submitted' 
)->params( $this->count )->plain();
+   $msg = $this->msg( 'massmessage-submitted' 
)->numParams( $this->count )->plain();
$output->addWikiText( $msg );
$output->addWikiMsg( 'massmessage-nextsteps' );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e03c8f69ed9a913574b33cc258043417c82f1c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hyiene: Move css rule to Minerva

[jenkins-bot (Code Review)]

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

Change subject: Hyiene: Move css rule to Minerva
..


Hyiene: Move css rule to Minerva

In preparation for "Adopt new special page template for special pages"
(T169379) move the text alignment rule to Minerva. Left alignment looks
strange on non-Minerva skins.

Change-Id: Id9b0e955d6e2a113f91484c7ee6bbc9275e3a2ec
Depends-On: I5118a58bcb948c93e511587b8a3f29246b33acd7
---
M resources/mobile.special.styles/common.less
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/resources/mobile.special.styles/common.less 
b/resources/mobile.special.styles/common.less
index 70f177e..1862755 100644
--- a/resources/mobile.special.styles/common.less
+++ b/resources/mobile.special.styles/common.less
@@ -35,7 +35,6 @@
font-size: 1.1em;
font-weight: bold;
border-bottom: 0;
-   text-align: center;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9b0e955d6e2a113f91484c7ee6bbc9275e3a2ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Hygiene: Move css rule to Minerva

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Move css rule to Minerva
..


Hygiene: Move css rule to Minerva

In preparation for "Adopt new special page template for special pages"
(T169379) move the text alignment rule to Minerva.

Change-Id: I5118a58bcb948c93e511587b8a3f29246b33acd7
---
M skinStyles/mobile.special.styles/minerva.less
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/skinStyles/mobile.special.styles/minerva.less 
b/skinStyles/mobile.special.styles/minerva.less
index 28a2ba1..47b3cfd 100644
--- a/skinStyles/mobile.special.styles/minerva.less
+++ b/skinStyles/mobile.special.styles/minerva.less
@@ -21,5 +21,6 @@
h2 {
// Important given we have no idea which rules special pages 
are enforcing
font-family: @fontFamily !important;
+   text-align: center;
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5118a58bcb948c93e511587b8a3f29246b33acd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...JSBreadCrumbs[master]: Refactored.

[Cicalese (Code Review)]

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

Change subject: Refactored.
..

Refactored.

Change-Id: If08cc5bfe5b9ecf566e6be8f658d970a666e78e0
---
D JSBreadCrumbs.hooks.php
D JSBreadCrumbs.php
A extension.json
M i18n/en.json
M i18n/qqq.json
A includes/JSBreadCrumbsHooks.php
D js/BreadCrumbs.js
R resources/JSBreadCrumbs.css
A resources/JSBreadCrumbs.js
9 files changed, 317 insertions(+), 397 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JSBreadCrumbs 
refs/changes/66/387966/1

diff --git a/JSBreadCrumbs.hooks.php b/JSBreadCrumbs.hooks.php
deleted file mode 100644
index 0e248e5..000
--- a/JSBreadCrumbs.hooks.php
+++ /dev/null
@@ -1,149 +0,0 @@
-isAllowed('read') ) {
-   if ( self::enableBreadCrumbs() ) {
-   $out->addModules( 'ext.JSBreadCrumbs' );
-   }
-   }
-
-   return true;
-   }
-
-   /**
-* MakeGlobalVariablesScript hook
-*
-* @param array $vars
-* @param OutputPage $outPage
-*
-* @return bool
-*/
-   public static function addJSVars( $vars, $outPage ) {
-   global $wgJSBreadCrumbsSeparator, $wgJSBreadCrumbsCookiePath, 
$wgJSBreadCrumbsCSSSelector, $wgJSBreadCrumbsSkinCSSArray,
-   $wgJSBreadCrumbsSkinCSSSelector, $wgUser;
-
-   if ( !self::enableBreadCrumbs() ) {
-   return true;
-   }
-
-   // Allow localized separator to be overriden
-   if ( $wgJSBreadCrumbsSeparator !== '' ) {
-   $separator = $wgJSBreadCrumbsSeparator;
-   } else {
-   $separator = wfMessage( "jsbreadcrumbs-separator" 
)->escaped();
-   }
-
-   $variables = array();
-
-   $skinName = $outPage->getSkin()->getSkinName();
-   if(array_key_exists($skinName, $wgJSBreadCrumbsSkinCSSArray)) {
-   $outPage->addJsConfigVars('wgJSBreadCrumbsCSSSelector', 
$wgJSBreadCrumbsSkinCSSArray[$skinName]);
-   } else {
-   $outPage->addJsConfigVars('wgJSBreadCrumbsCSSSelector', 
$wgJSBreadCrumbsSkinCSSSelector);
-   }
-
-   $outPage->addJsConfigVars('wgJSBreadCrumbsMaxCrumbs', 
$wgUser->getOption( "jsbreadcrumbs-numberofcrumbs" ));
-   $outPage->addJsConfigVars('wgJSBreadCrumbsShowSidebar', 
$wgUser->getOption( "jsbreadcrumbs-showcrumbssidebar" ));
-   
$outPage->addJsConfigVars('wgJSBreadCrumbsPervasiveWikiFarm', 
$wgUser->getOption ("jsbreadcrumbs-pervasivewikifarm" ));
-   $outPage->addJsConfigVars('wgJSBreadCrumbsSeparator', 
$separator);
-   $outPage->addJsConfigVars('wgJSBreadCrumbsCookiePath', 
$wgJSBreadCrumbsCookiePath);
-   
$outPage->addJsConfigVars('wgJSBreadCrumbsLeadingDescription', 
$wgUser->getOption( "jsbreadcrumbs-leading-description" ));
-   
$outPage->addJsConfigVars('wgJSBreadCrumbsShowSiteName', $wgUser->getOption( 
"jsbreadcrumbs-showsite" ));
-
-
-   global $wgTitle;
-   if ( self::getDisplayTitle($wgTitle, $displayTitle) ) {
-
-   if(trim( str_replace( '', '', strip_tags( 
$displayTitle ) ) ) != '' ) {
-   
$outPage->addJsConfigVars('wgJSBreadCrumbsPageName', $displayTitle );
-   } else {
-   
$outPage->addJsConfigVars('wgJSBreadCrumbsPageName', 
$wgTitle->getPrefixedText());
-   }
-   } else {
-   $outPage->addJsConfigVars('wgJSBreadCrumbsPageName', 
$wgTitle->getPrefixedText());
-   }
-
-   $vars = array_merge( $vars, $variables );
-
-   return true;
-   }
-
-   /**
-* GetPreferences hook
-*
-* Add module-releated items to the preferences
-*/
-   public static function addPreferences( $user, $defaultPreferences ) {
-   $defaultPreferences['jsbreadcrumbs-showcrumbs'] = array(
-   'type' => 'toggle',
-   'label-message' => 'prefs-jsbreadcrumbs-showcrumbs',
-   'section' => 'rendering/jsbreadcrumbs',
-   );
-
-   $defaultPreferences['jsbreadcrumbs-showcrumbssidebar'] = array(
-   'type' => 'toggle',
-   'label-message' => 
'prefs-jsbreadcrumbs-showcrumbssidebar',
-   'section' => 'rendering/jsbreadcrumbs',
-   );
-
-   $defaultPreferences['jsbreadcrumbs-showsite'] = array(
-   'type' => 'toggle',
-   'label-message' => 'prefs-jsbreadcrumbs-showsite',
-

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hyiene: Move css rule to Minerva

[Jdlrobson (Code Review)]

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

Change subject: Hyiene: Move css rule to Minerva
..

Hyiene: Move css rule to Minerva

In preparation for "Adopt new special page template for special pages"
(T169379) move the text alignment rule to Minerva. Left alignment looks
strange on non-Minerva skins.

Change-Id: Id9b0e955d6e2a113f91484c7ee6bbc9275e3a2ec
Depends-On: I5118a58bcb948c93e511587b8a3f29246b33acd7
---
M resources/mobile.special.styles/common.less
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/resources/mobile.special.styles/common.less 
b/resources/mobile.special.styles/common.less
index 70f177e..1862755 100644
--- a/resources/mobile.special.styles/common.less
+++ b/resources/mobile.special.styles/common.less
@@ -35,7 +35,6 @@
font-size: 1.1em;
font-weight: bold;
border-bottom: 0;
-   text-align: center;
}
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Hygiene: Move css rule to Minerva

[Jdlrobson (Code Review)]

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

Change subject: Hygiene: Move css rule to Minerva
..

Hygiene: Move css rule to Minerva

In preparation for "Adopt new special page template for special pages"
(T169379) move the text alignment rule to Minerva.

Change-Id: I5118a58bcb948c93e511587b8a3f29246b33acd7
---
M skinStyles/mobile.special.styles/minerva.less
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/skinStyles/mobile.special.styles/minerva.less 
b/skinStyles/mobile.special.styles/minerva.less
index 28a2ba1..47b3cfd 100644
--- a/skinStyles/mobile.special.styles/minerva.less
+++ b/skinStyles/mobile.special.styles/minerva.less
@@ -21,5 +21,6 @@
h2 {
// Important given we have no idea which rules special pages 
are enforcing
font-family: @fontFamily !important;
+   text-align: center;
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Fix Doxygen rendering

[VolkerE (Code Review)]

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

Change subject: README: Fix Doxygen rendering
..

README: Fix Doxygen rendering

Fixing Doxygen markup rendering with support for various software.
This is the second, slightly changed attempt as
I62045ad670e730ec66b149b7d2ea4f5b56b58d8e got reverted.

Bug: T104669
Change-Id: I5a30b5a2122ae39ed45be74ec348f6506c5f38b7
---
M README.md
1 file changed, 30 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/63/387963/1

diff --git a/README.md b/README.md
index d5437fc..71e23f0 100644
--- a/README.md
+++ b/README.md
@@ -80,38 +80,40 @@
 
 Release process:
 
-$ cd path/to/oojs-ui/
-$ git remote update
-$ git checkout -B release -t origin/master
 
-# Ensure tests pass
-$ npm install && composer update && npm test && composer test
+$ cd path/to/oojs-ui/
+$ git remote update
+$ git checkout -B release -t origin/master
 
-# Avoid using "npm version patch" because that creates
-# both a commit and a tag, and we shouldn't tag until after
-# the commit is merged.
+# Ensure tests pass
+$ npm install && composer update && npm test && composer test
 
-# Update release notes
-# Copy the resulting list into a new section at the top of History.md and edit
-# into five sub-sections, in order:
-# * Breaking changes
-# * Deprecations
-# * Features
-# * Styles
-# * Code
-$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
-$ edit History.md
+# Avoid using "npm version patch" because that creates
+# both a commit and a tag, and we shouldn't tag until after
+# the commit is merged.
 
-# Update the version number
-$ edit package.json
+# Update release notes
+# Copy the resulting list into a new section at the top of History.md and 
edit
+# into five sub-sections, in order:
+# * Breaking changes
+# * Deprecations
+# * Features
+# * Styles
+# * Code
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
+$ edit History.md
 
-$ git add -p
-$ git commit -m "Tag vX.X.X"
-$ git review
+# Update the version number
+$ edit package.json
 
-# After merging:
-$ git remote update
-$ git checkout origin/master
-$ git tag "vX.X.X"
-$ npm run publish-build && git push --tags && npm publish
+$ git add -p
+$ git commit -m "Tag vX.X.X"
+$ git review
+
+# After merging:
+$ git remote update
+$ git checkout origin/master
+$ git tag "vX.X.X"
+$ npm run publish-build && git push --tags && npm publish
+
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a30b5a2122ae39ed45be74ec348f6506c5f38b7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Update search satisfaction schema to not require isForced

[EBernhardson (Code Review)]

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

Change subject: Update search satisfaction schema to not require isForced
..

Update search satisfaction schema to not require isForced

This parameter requires a still WIP patch, so it shouldn't
have been a required parameter.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/62/387962/1

diff --git a/extension.json b/extension.json
index 1de11da..1558b72 100644
--- a/extension.json
+++ b/extension.json
@@ -110,7 +110,7 @@
"schema.SearchSatisfaction": {
"class": "ResourceLoaderSchemaModule",
"schema": "SearchSatisfaction",
-   "revision": 17374996
+   "revision": 17378115
},
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I846ef96df601d612769b5a6a5eaa72091ea10935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Untangle promises

[Bmansurov (Code Review)]

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

Change subject: Untangle promises
..


Untangle promises

Also, follow the convention and make the pdf URL componenets lowercase.

Bug: T176627
Change-Id: I9b99e53f0553c1f98e5788dcdcb3373d81257bfd
---
M README.md
M routes/html2pdf-v1.js
2 files changed, 46 insertions(+), 45 deletions(-)

Approvals:
  Pmiazga: Looks good to me, approved
  Bmansurov: Verified



diff --git a/README.md b/README.md
index 6cf57a5..ad5aaee 100644
--- a/README.md
+++ b/README.md
@@ -9,5 +9,5 @@
 * `node server.js`
 
 And visit the following pages in your web browser:
-* Letter size: http://localhost:3030/en.wikipedia.org/v1/pdf/Book/Letter
-* A4: http://localhost:3030/en.wikipedia.org/v1/pdf/Book/A4
+* Letter size: http://localhost:3030/en.wikipedia.org/v1/pdf/Book/letter
+* A4: http://localhost:3030/en.wikipedia.org/v1/pdf/Book/a4
diff --git a/routes/html2pdf-v1.js b/routes/html2pdf-v1.js
index 35264b2..c50f14d 100644
--- a/routes/html2pdf-v1.js
+++ b/routes/html2pdf-v1.js
@@ -1,6 +1,5 @@
 'use strict';
 
-
 const sUtil = require('../lib/util');
 
 /**
@@ -23,38 +22,33 @@
  * @return {} Promise which resolves with PDF buffer
  */
 function articleToPdf(url, format) {
-return new Promise((resolve, reject) => {
-puppeteer.launch({ args: app.conf.puppeteer_flags }).then(
-(browser) => {
-browser.newPage().then((page) => {
-page.goto(url, { waitUntil: 'networkidle' }).then(() => {
-const options = Object.assign(
-{}, app.conf.pdf_options, { format }
-);
-page.pdf(options).then((pdf) => {
-resolve(pdf);
-browser.close();
-}).catch((error) => {
-app.logger.log('trace/error', {
-msg: `Cannot convert page ${url} to PDF: 
${error}`
-});
-});
-}).catch((error) => {
-app.logger.log('trace/error', {
-msg: `Cannot open URL ${url}: ${error}`
-});
-});
-}).catch((error) => {
-app.logger.log('trace/error', {
-msg: `Cannot open new page: ${error}`
-});
-});
-}).catch((error) => {
-app.logger.log('trace/error', {
-msg: `Cannot launch puppeteer: ${error}`
-});
-});
-});
+let browser;
+let page;
+
+return puppeteer.launch({ args: app.conf.puppeteer_flags })
+.then((browser_) => {
+browser = browser_;
+return browser.newPage();
+})
+.then((page_) => {
+page = page_;
+return page.goto(url, { waitUntil: 'networkidle' });
+})
+.then(() => {
+return page.pdf(Object.assign(
+{}, app.conf.pdf_options, { format }
+));
+})
+.catch((error) => {
+if (browser) {
+browser.close();
+}
+throw error;
+})
+.then((pdf) => {
+browser.close();
+return pdf;
+});
 }
 
 function getContentDisposition(title) {
@@ -66,7 +60,7 @@
 /**
  * Returns PDF representation of the article
  */
-router.get('/:title/:format(Letter|A4)', (req, res) => {
+router.get('/:title/:format(letter|a4)', (req, res) => {
 const restbaseRequest = app.restbase_tpl.expand({
 request: {
 params: {
@@ -76,15 +70,22 @@
 }
 });
 
-const headers = {
-'Content-Type': 'application/pdf',
-'Content-Disposition': getContentDisposition(req.params.title)
-};
-
-articleToPdf(restbaseRequest.uri, req.params.format).then((pdf) => {
-res.writeHead(200, headers);
-res.end(pdf, 'binary');
-});
+return articleToPdf(restbaseRequest.uri, req.params.format)
+.then((pdf) => {
+const headers = {
+'Content-Type': 'application/pdf',
+'Content-Disposition': getContentDisposition(req.params.title)
+};
+res.writeHead(200, headers);
+res.end(pdf, 'binary');
+})
+.catch((error) => {
+app.logger.log('trace/error', {
+msg: `Cannot convert page ${restbaseRequest.uri} to PDF.`,
+error
+});
+res.status(500).send();
+});
 });
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Escape article title before sending it to RESTBase

[Bmansurov (Code Review)]

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

Change subject: Escape article title before sending it to RESTBase
..


Escape article title before sending it to RESTBase

The change takes care of article titles such as
https://en.wikipedia.org/wiki/CP/M-86 before sending them to RESTBase.

I've noted to add tests to cover this and other edge cases in follow up
patches where I've already added tests.

Bug: T176627
Change-Id: I1d32590d2ba5943ef2899cd1be60f0027326fd6c
---
M routes/html2pdf-v1.js
M test/features/v1/html2pdf.js
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/routes/html2pdf-v1.js b/routes/html2pdf-v1.js
index c50f14d..35bb7cc 100644
--- a/routes/html2pdf-v1.js
+++ b/routes/html2pdf-v1.js
@@ -65,7 +65,7 @@
 request: {
 params: {
 domain: req.params.domain,
-path: `page/html/${req.params.title}`
+path: `page/html/${encodeURIComponent(req.params.title)}`
 }
 }
 });
diff --git a/test/features/v1/html2pdf.js b/test/features/v1/html2pdf.js
index 958c6c8..4680f25 100644
--- a/test/features/v1/html2pdf.js
+++ b/test/features/v1/html2pdf.js
@@ -10,7 +10,7 @@
 
it('should return a letter-sized PDF', function() {
return preq.get(
-   server.config.uri + 'en.wikipedia.org/v1/pdf/Letter'
+   server.config.uri + 
'en.wikipedia.org/v1/pdf/CP%2FM-86/letter'
)
.then(function(res) {
assert.status(res, 200);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d32590d2ba5943ef2899cd1be60f0027326fd6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Align `.mw-ui-pressed` to OOUI's active button state

[jenkins-bot (Code Review)]

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

Change subject: Align `.mw-ui-pressed` to OOUI's active button state
..


Align `.mw-ui-pressed` to OOUI's active button state

Aligning `.mw-ui-pressed`, which is only available in ULS
to OOUI's active button state. It features an Accent10 blue border
for a cleaner appearance.

Change-Id: I147547cab74de2d84fb88d6e232b08fc8c4f4907
---
M resources/css/ext.uls.languagesettings.less
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 974316d..7a46721 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -123,6 +123,7 @@
 #languagesettings-panels .mw-ui-pressed {
background-color: #2a4b8d;
color: #fff;
+   border-color: #2a4b8d;
 }
 
 .checkbox input[type='checkbox'] {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I147547cab74de2d84fb88d6e232b08fc8c4f4907
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Make usages of mw.user clearer

[Jdlrobson (Code Review)]

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

Change subject: Hygiene: Make usages of mw.user clearer
..

Hygiene: Make usages of mw.user clearer

Bug: T172454
Change-Id: I420c924a573fb4d86e9017dad87d290304b6a6dc
---
M resources/mobile.editor.common/EditorOverlayBase.js
M resources/mobile.init/BetaOptinPanel.js
M resources/mobile.search/MobileWebSearchLogger.js
M resources/mobile.special.mobilediff.scripts/init.js
M resources/mobile.startup/user.js
M tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
6 files changed, 23 insertions(+), 13 deletions(-)


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

diff --git a/resources/mobile.editor.common/EditorOverlayBase.js 
b/resources/mobile.editor.common/EditorOverlayBase.js
index 6a64da2..c0ad8e2 100644
--- a/resources/mobile.editor.common/EditorOverlayBase.js
+++ b/resources/mobile.editor.common/EditorOverlayBase.js
@@ -1,5 +1,6 @@
 ( function ( M, $ ) {
var Overlay = M.require( 'mobile.startup/Overlay' ),
+   user = mw.user,
PageGateway = M.require( 'mobile.startup/PageGateway' ),
Icon = M.require( 'mobile.startup/Icon' ),
toast = M.require( 'mobile.startup/toast' ),
@@ -47,7 +48,7 @@
var self = this;
 
if ( options.isNewPage ) {
-   options.placeholder = mw.msg( 
'mobile-frontend-editor-placeholder-new-page', mw.user );
+   options.placeholder = mw.msg( 
'mobile-frontend-editor-placeholder-new-page', user );
}
// change the message to request a summary when not in article 
namespace
if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ) {
@@ -161,7 +162,7 @@
if ( this.isNewPage &&
// TODO: Replace with an OOUI dialog
// eslint-disable-next-line no-alert
-   !window.confirm( mw.msg( 
'mobile-frontend-editor-new-page-confirm', mw.user ) )
+   !window.confirm( mw.msg( 
'mobile-frontend-editor-new-page-confirm', user ) )
) {
return false;
} else {
diff --git a/resources/mobile.init/BetaOptinPanel.js 
b/resources/mobile.init/BetaOptinPanel.js
index a0adeb0..2964e6c 100644
--- a/resources/mobile.init/BetaOptinPanel.js
+++ b/resources/mobile.init/BetaOptinPanel.js
@@ -1,6 +1,7 @@
 ( function ( M, $ ) {
 
var Button = M.require( 'mobile.startup/Button' ),
+   user = mw.user,
Panel = M.require( 'mobile.startup/Panel' );
 
/**
@@ -19,7 +20,7 @@
template: mw.template.get( 'mobile.init', 'Panel.hogan' ),
defaults: $.extend( {}, Panel.prototype.defaults, {
postUrl: undefined,
-   editToken: mw.user.tokens.get( 'editToken' ),
+   editToken: user.tokens.get( 'editToken' ),
text: mw.msg( 'mobile-frontend-panel-betaoptin-msg' ),
buttons: [
new Button( {
diff --git a/resources/mobile.search/MobileWebSearchLogger.js 
b/resources/mobile.search/MobileWebSearchLogger.js
index f73ff6f..49f4340 100644
--- a/resources/mobile.search/MobileWebSearchLogger.js
+++ b/resources/mobile.search/MobileWebSearchLogger.js
@@ -1,4 +1,6 @@
 ( function ( M, mw ) {
+   var user = mw.user;
+
/**
 * Coordinates the logging of MobileWebSchema events.
 * Implements schema defined at 
https://meta.wikimedia.org/wiki/Schema:MobileWebSearch
@@ -18,7 +20,7 @@
 * @private
 */
_newUserSession: function () {
-   this.userSessionToken = 
mw.user.generateRandomSessionId();
+   this.userSessionToken = user.generateRandomSessionId();
},
 
/**
@@ -28,7 +30,7 @@
 * @private
 */
_newSearchSession: function () {
-   this.searchSessionToken = 
mw.user.generateRandomSessionId();
+   this.searchSessionToken = 
user.generateRandomSessionId();
this.searchSessionCreatedAt = new Date().getTime();
},
 
diff --git a/resources/mobile.special.mobilediff.scripts/init.js 
b/resources/mobile.special.mobilediff.scripts/init.js
index d900f09..31c2748 100644
--- a/resources/mobile.special.mobilediff.scripts/init.js
+++ b/resources/mobile.special.mobilediff.scripts/init.js
@@ -5,7 +5,9 @@
  * @author Florian Schmidt 
  */
 ( function ( M, $ ) {
-   if ( !mw.user.tokens.exists( 'patrolToken' ) ) {
+   var user = mw.user;
+
+   if ( 

[MediaWiki-commits] [Gerrit] integration/config[master]: Run phan for mediawiki/extensions/ParserMigration

[Legoktm (Code Review)]

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

Change subject: Run phan for mediawiki/extensions/ParserMigration
..

Run phan for mediawiki/extensions/ParserMigration

Change-Id: I6ddfc2a2f93ff354cf8b5629edef568ebfc77f8f
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/60/387960/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index db35b44..b8d6eef 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3976,6 +3976,7 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+  - name: extension-phan-generic
 
   - name: mediawiki/extensions/Patroller
 template:

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

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

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

[MediaWiki-commits] [Gerrit] data-values/value-view[master]: Normalize search term before matching against result

[Smalyshev (Code Review)]

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

Change subject: Normalize search term before matching against result
..

Normalize search term before matching against result

Users can search for non-normalized unicode strings, and the index
can contain normalized ones. The search would match on the backend
but frontend will fail to display it.

Note that this patch relies on ES6 function to normalize. It would not
break on ES5 but the fix won't work either. If we want ES5, we should
use a polyfill like https://github.com/walling/unorm .

Bug: T170779
Change-Id: I9d1c5b15d9555693a5d12d9a93461782d0492186
---
M lib/jquery.ui/jquery.ui.suggester.js
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/data-values/value-view 
refs/changes/59/387959/1

diff --git a/lib/jquery.ui/jquery.ui.suggester.js 
b/lib/jquery.ui/jquery.ui.suggester.js
index 4be305b..ac9a4b5 100644
--- a/lib/jquery.ui/jquery.ui.suggester.js
+++ b/lib/jquery.ui/jquery.ui.suggester.js
@@ -539,7 +539,14 @@
 
if ( typeof requestTerm === 'string' && requestTerm !== 
self._term ) {
// Skip request since it does not correspond to 
the current search term.
-   return;
+   if ( typeof String.prototype.normalize === 
'function' ) {
+   // If we can normalize, check 
normalized strings too
+   if ( requestTerm.normalize() !== 
self._term.normalize() ) {
+   return;
+   }
+   } else {
+   return;
+   }
}
if ( self.options.menu ) {
// Suggester (including the menu) might have 
been destroyed in the meantime.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d1c5b15d9555693a5d12d9a93461782d0492186
Gerrit-PatchSet: 1
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...ParserMigration[master]: Add phan configuration for static analysis

[Legoktm (Code Review)]

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

Change subject: Add phan configuration for static analysis
..

Add phan configuration for static analysis

Change-Id: Id3fbeb0784de11b672c162fc6bb71ae877287ddf
---
M .gitignore
M includes/Hooks.php
A tests/phan/config.php
A tests/phan/stubs/README
4 files changed, 310 insertions(+), 1 deletion(-)


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

diff --git a/.gitignore b/.gitignore
index 202fe83..3ba079b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 .*.swp
 /composer.lock
 /vendor
+/tests/phan/issues
diff --git a/includes/Hooks.php b/includes/Hooks.php
index bc063fb..63bc635 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,7 +4,7 @@
 
 class Hooks {
/**
-* @param User $user
+* @param \User $user
 * @param array &$defaultPreferences
 * @return bool
 */
diff --git a/tests/phan/config.php b/tests/phan/config.php
new file mode 100644
index 000..a84f96e
--- /dev/null
+++ b/tests/phan/config.php
@@ -0,0 +1,305 @@
+ [
+   ],
+
+   /**
+* A list of directories that should be parsed for class and
+* method information. After excluding the directories
+* defined in exclude_analysis_directory_list, the remaining
+* files will be statically analyzed for errors.
+*
+* Thus, both first-party and third-party code being used by
+* your application should be included in this list.
+*/
+   'directory_list' => [
+   'includes/',
+   'tests/phan/stubs/',
+   './../../includes',
+   './../../languages',
+   './../../maintenance',
+   './../../vendor',
+   ],
+
+   /**
+* A file list that defines files that will be excluded
+* from parsing and analysis and will not be read at all.
+*
+* This is useful for excluding hopelessly unanalyzable
+* files that can't be removed for whatever reason.
+*/
+   'exclude_file_list' => [
+   ],
+
+   /**
+* A list of directories holding code that we want
+* to parse, but not analyze. Also works for individual
+* files.
+*/
+   "exclude_analysis_directory_list" => [
+   'tests/phan/stubs/',
+   './../../includes',
+   './../../languages',
+   './../../maintenance',
+   './../../vendor',
+   ],
+
+   /**
+* Backwards Compatibility Checking. This is slow
+* and expensive, but you should consider running
+* it before upgrading your version of PHP to a
+* new version that has backward compatibility
+* breaks.
+*/
+   'backward_compatibility_checks' => false,
+
+   /**
+* A set of fully qualified class-names for which
+* a call to parent::__construct() is required
+*/
+   'parent_constructor_required' => [
+   ],
+
+   /**
+* Run a quick version of checks that takes less
+* time at the cost of not running as thorough
+* an analysis. You should consider setting this
+* to true only when you wish you had more issues
+* to fix in your code base.
+*
+* In quick-mode the scanner doesn't rescan a function
+* or a method's code block every time a call is seen.
+* This means that the problem here won't be detected:
+*
+* ```php
+*  false,
+
+   /**
+* By default, Phan will not analyze all node types
+* in order to save time. If this config is set to true,
+* Phan will dig deeper into the AST tree and do an
+* analysis on all nodes, possibly finding more issues.
+*
+* See \Phan\Analysis::shouldVisit for the set of skipped
+* nodes.
+*/
+   'should_visit_all_nodes' => true,
+
+   /**
+* If enabled, check all methods that override a
+* parent method to make sure its signature is
+* compatible with the parent's. This check
+* can add quite a bit of time to the analysis.
+*/
+   'analyze_signature_compatibility' => true,
+
+   // Emit all issues. They are then suppressed via
+   // suppress_issue_types, rather than a minimum
+   // severity.
+   "minimum_severity" => 0,
+
+   /**
+* If true, missing properties will be created when
+* they are first seen. If false, we'll report an
+* error message if there is an attempt to write
+* to a class property that wasn't explicitly
+* defined.
+*/
+   'allow_missing_properties' => false,
+
+   /**
+* Allow null to be cast as any type and for any
+* type to be cast to null. 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.6]: Turn on Cirrus AB test for DBN group sizing

[jenkins-bot (Code Review)]

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

Change subject: Turn on Cirrus AB test for DBN group sizing
..


Turn on Cirrus AB test for DBN group sizing

Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
(cherry picked from commit 62d7c4f375395f1360634b7363d10abc955b9b88)
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 20 insertions(+), 6 deletions(-)

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



diff --git a/extension.json b/extension.json
index 18556d4..1de11da 100644
--- a/extension.json
+++ b/extension.json
@@ -107,6 +107,11 @@
"schema": "CompletionSuggestions",
"revision": 13630018
},
+   "schema.SearchSatisfaction": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfaction",
+   "revision": 17374996
+   },
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",
"schema": "TestSearchSatisfaction2",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4f743e0..40b1cc1 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,9 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   validBuckets = [],
+   validBuckets = mw.config.get( 'wgDBname' ) === 
'enwiki' ?
+   [ 'control', 'dbn20', 'dbn20-i', 
'dbn35', 'dbn35-i' ] :
+   [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -134,9 +136,12 @@
test: 350,
subTest: null
},
+   // .0005 works out to 
~2.7k sessions per week.
+   // .15 increases that 
to 810k per week. Giving
+   // 160k sessions per 
bucket per week.
enwiki: {
-   test: 2000,
-   subTest: null
+   test: 0.15,
+   subTest: 0.996
},
enwiktionary: {
test: 40,
@@ -529,7 +534,11 @@
 
function genLogEventFn( source, session ) {
return function ( action, extraData ) {
-   var scrollTop = $( window ).scrollTop(),
+   // A/B testing data is verbose and blacklisted from 
mysql. Our dashboarding though
+   // still sources data from mysql. For that reason send 
AB test data to different
+   // schema.
+   var schema = session.get( 'subTest' ) ? 
'SearchSatisfaction' : 'TestSearchSatisfaction2',
+   scrollTop = $( window ).scrollTop(),
evt = {
// searchResultPage, visitPage, 
checkin, click or iwclick
action: action,
@@ -583,9 +592,9 @@
}
 
// ship the event
-   mw.loader.using( [ 'schema.TestSearchSatisfaction2' ] 
).then( function () {
+   mw.loader.using( [ 'schema.' + schema ] ).then( 
function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( schema, evt );
} );
};
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.5]: Turn on Cirrus AB test for DBN group sizing

[jenkins-bot (Code Review)]

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

Change subject: Turn on Cirrus AB test for DBN group sizing
..


Turn on Cirrus AB test for DBN group sizing

Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
(cherry picked from commit 62d7c4f375395f1360634b7363d10abc955b9b88)
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 20 insertions(+), 6 deletions(-)

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



diff --git a/extension.json b/extension.json
index 18556d4..1de11da 100644
--- a/extension.json
+++ b/extension.json
@@ -107,6 +107,11 @@
"schema": "CompletionSuggestions",
"revision": 13630018
},
+   "schema.SearchSatisfaction": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfaction",
+   "revision": 17374996
+   },
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",
"schema": "TestSearchSatisfaction2",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4f743e0..40b1cc1 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,9 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   validBuckets = [],
+   validBuckets = mw.config.get( 'wgDBname' ) === 
'enwiki' ?
+   [ 'control', 'dbn20', 'dbn20-i', 
'dbn35', 'dbn35-i' ] :
+   [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -134,9 +136,12 @@
test: 350,
subTest: null
},
+   // .0005 works out to 
~2.7k sessions per week.
+   // .15 increases that 
to 810k per week. Giving
+   // 160k sessions per 
bucket per week.
enwiki: {
-   test: 2000,
-   subTest: null
+   test: 0.15,
+   subTest: 0.996
},
enwiktionary: {
test: 40,
@@ -529,7 +534,11 @@
 
function genLogEventFn( source, session ) {
return function ( action, extraData ) {
-   var scrollTop = $( window ).scrollTop(),
+   // A/B testing data is verbose and blacklisted from 
mysql. Our dashboarding though
+   // still sources data from mysql. For that reason send 
AB test data to different
+   // schema.
+   var schema = session.get( 'subTest' ) ? 
'SearchSatisfaction' : 'TestSearchSatisfaction2',
+   scrollTop = $( window ).scrollTop(),
evt = {
// searchResultPage, visitPage, 
checkin, click or iwclick
action: action,
@@ -583,9 +592,9 @@
}
 
// ship the event
-   mw.loader.using( [ 'schema.TestSearchSatisfaction2' ] 
).then( function () {
+   mw.loader.using( [ 'schema.' + schema ] ).then( 
function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( schema, evt );
} );
};
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.31.0-wmf.6]: Allow turning Cirrus usage off from query

[jenkins-bot (Code Review)]

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

Change subject: Allow turning Cirrus usage off from query
..


Allow turning Cirrus usage off from query

Bug: T179428
Change-Id: I653384345315884dbf94a770f83aac2558d16b17
(cherry picked from commit 2c80695f9e7275915aef000d50270ebb9d28a931)
---
M repo/Wikibase.hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index dd41057..0d6eb3d 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -113,8 +113,13 @@
$request = RequestContext::getMain()->getRequest();
$settings = $wikibaseRepo->getSettings();
$searchSettings = $settings->getSetting( 'entitySearch' );
-   if ( $searchSettings['useCirrus'] === null && $request->getVal( 
'useCirrus' ) ) {
-   $searchSettings['useCirrus'] = true;
+   $useCirrus = $request->getVal( 'useCirrus' );
+   if ( $useCirrus !== null ) {
+   // if we have request one, use it
+   $searchSettings['useCirrus'] =
+   // This really should be global utility function
+   ( $useCirrus === 'on' || $useCirrus === 'true' 
|| $useCirrus === 'yes' ||
+ $useCirrus === '1' );
$settings->setSetting( 'entitySearch', $searchSettings 
);
}
if ( $searchSettings['useCirrus'] ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I653384345315884dbf94a770f83aac2558d16b17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ParserMigration[wmf/1.31.0-wmf.6]: API: Fix WikiPage namespace

[jenkins-bot (Code Review)]

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

Change subject: API: Fix WikiPage namespace
..


API: Fix WikiPage namespace

Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
(cherry picked from commit c7f420055541558190aa7f48fbfb5438a4119b5a)
---
M includes/ApiParserMigration.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/ApiParserMigration.php b/includes/ApiParserMigration.php
index ac19acc..df651f0 100644
--- a/includes/ApiParserMigration.php
+++ b/includes/ApiParserMigration.php
@@ -18,7 +18,7 @@
if ( $title->isRedirect() && (
!isset( $params['redirect'] ) || $params['redirect'] 
!== 'no'
) ) {
-   $title = WikiPage::factory( $title 
)->getRedirectTarget();
+   $title = \WikiPage::factory( $title 
)->getRedirectTarget();
}
$revision = \Revision::newFromTitle( $title );
if ( !$revision ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserMigration
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.31.0-wmf.6]: Allow turning Cirrus usage off from query

[jenkins-bot (Code Review)]

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

Change subject: Allow turning Cirrus usage off from query
..


Allow turning Cirrus usage off from query

Bug: T179428
Change-Id: I653384345315884dbf94a770f83aac2558d16b17
(cherry picked from commit 2c80695f9e7275915aef000d50270ebb9d28a931)
---
M extensions/Wikibase/repo/Wikibase.hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php 
b/extensions/Wikibase/repo/Wikibase.hooks.php
index dd41057..0d6eb3d 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -113,8 +113,13 @@
$request = RequestContext::getMain()->getRequest();
$settings = $wikibaseRepo->getSettings();
$searchSettings = $settings->getSetting( 'entitySearch' );
-   if ( $searchSettings['useCirrus'] === null && $request->getVal( 
'useCirrus' ) ) {
-   $searchSettings['useCirrus'] = true;
+   $useCirrus = $request->getVal( 'useCirrus' );
+   if ( $useCirrus !== null ) {
+   // if we have request one, use it
+   $searchSettings['useCirrus'] =
+   // This really should be global utility function
+   ( $useCirrus === 'on' || $useCirrus === 'true' 
|| $useCirrus === 'yes' ||
+ $useCirrus === '1' );
$settings->setSetting( 'entitySearch', $searchSettings 
);
}
if ( $searchSettings['useCirrus'] ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I653384345315884dbf94a770f83aac2558d16b17
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Add negative weight to disambig entities""

[jenkins-bot (Code Review)]

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

Change subject: Revert "Revert "Add negative weight to disambig entities""
..


Revert "Revert "Add negative weight to disambig entities""

This reverts commit fc02c31e37d313008604fe08431b7c0707be6c87.
Reinstates patch https://gerrit.wikimedia.org/r/#/c/386464/

Should be merged only after I874d2d00a83476cfcb1db0e06ad8a0c0fee9d05b
is deployed.

Bug: T148411
Change-Id: I3864f47bab7aad08b0c15053301442ff50598b24
---
M wmf-config/Wikibase-production.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index 3b531f4..e60077b 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -135,6 +135,9 @@
$wgWBQualityConstraintsSparqlEndpoint = 
$wgWBRepoSettings['sparqlEndpoint'];
$wgWBQualityConstraintsSparqlMaxMillis = 5000; // limit SPARQL 
queries to just 5 seconds for now
$wgWBQualityConstraintsTypeCheckMaxEntities = 10; // only check 
few entities in PHP => fall back to SPARQL very quickly
+   // T148411: Use profile that demotes disambigs by default
+   
$wgWBRepoSettings['entitySearch']['defaultPrefixRescoreProfile'] = 
'wikibase_prefix_boost';
+   $wgWBRepoSettings['entitySearch']['statementBoost'] = [ 
'P31=Q4167410' => '-10' ];
}
 
if ( $wgDBname === 'wikidatawiki' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3864f47bab7aad08b0c15053301442ff50598b24
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.6]: Turn on Cirrus AB test for DBN group sizing

[EBernhardson (Code Review)]

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

Change subject: Turn on Cirrus AB test for DBN group sizing
..

Turn on Cirrus AB test for DBN group sizing

Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
(cherry picked from commit 62d7c4f375395f1360634b7363d10abc955b9b88)
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 20 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/57/387957/1

diff --git a/extension.json b/extension.json
index 18556d4..1de11da 100644
--- a/extension.json
+++ b/extension.json
@@ -107,6 +107,11 @@
"schema": "CompletionSuggestions",
"revision": 13630018
},
+   "schema.SearchSatisfaction": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfaction",
+   "revision": 17374996
+   },
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",
"schema": "TestSearchSatisfaction2",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4f743e0..40b1cc1 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,9 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   validBuckets = [],
+   validBuckets = mw.config.get( 'wgDBname' ) === 
'enwiki' ?
+   [ 'control', 'dbn20', 'dbn20-i', 
'dbn35', 'dbn35-i' ] :
+   [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -134,9 +136,12 @@
test: 350,
subTest: null
},
+   // .0005 works out to 
~2.7k sessions per week.
+   // .15 increases that 
to 810k per week. Giving
+   // 160k sessions per 
bucket per week.
enwiki: {
-   test: 2000,
-   subTest: null
+   test: 0.15,
+   subTest: 0.996
},
enwiktionary: {
test: 40,
@@ -529,7 +534,11 @@
 
function genLogEventFn( source, session ) {
return function ( action, extraData ) {
-   var scrollTop = $( window ).scrollTop(),
+   // A/B testing data is verbose and blacklisted from 
mysql. Our dashboarding though
+   // still sources data from mysql. For that reason send 
AB test data to different
+   // schema.
+   var schema = session.get( 'subTest' ) ? 
'SearchSatisfaction' : 'TestSearchSatisfaction2',
+   scrollTop = $( window ).scrollTop(),
evt = {
// searchResultPage, visitPage, 
checkin, click or iwclick
action: action,
@@ -583,9 +592,9 @@
}
 
// ship the event
-   mw.loader.using( [ 'schema.TestSearchSatisfaction2' ] 
).then( function () {
+   mw.loader.using( [ 'schema.' + schema ] ).then( 
function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( schema, evt );
} );
};
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.5]: Turn on Cirrus AB test for DBN group sizing

[EBernhardson (Code Review)]

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

Change subject: Turn on Cirrus AB test for DBN group sizing
..

Turn on Cirrus AB test for DBN group sizing

Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
(cherry picked from commit 62d7c4f375395f1360634b7363d10abc955b9b88)
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 20 insertions(+), 6 deletions(-)


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

diff --git a/extension.json b/extension.json
index 18556d4..1de11da 100644
--- a/extension.json
+++ b/extension.json
@@ -107,6 +107,11 @@
"schema": "CompletionSuggestions",
"revision": 13630018
},
+   "schema.SearchSatisfaction": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfaction",
+   "revision": 17374996
+   },
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",
"schema": "TestSearchSatisfaction2",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4f743e0..40b1cc1 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,9 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   validBuckets = [],
+   validBuckets = mw.config.get( 'wgDBname' ) === 
'enwiki' ?
+   [ 'control', 'dbn20', 'dbn20-i', 
'dbn35', 'dbn35-i' ] :
+   [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -134,9 +136,12 @@
test: 350,
subTest: null
},
+   // .0005 works out to 
~2.7k sessions per week.
+   // .15 increases that 
to 810k per week. Giving
+   // 160k sessions per 
bucket per week.
enwiki: {
-   test: 2000,
-   subTest: null
+   test: 0.15,
+   subTest: 0.996
},
enwiktionary: {
test: 40,
@@ -529,7 +534,11 @@
 
function genLogEventFn( source, session ) {
return function ( action, extraData ) {
-   var scrollTop = $( window ).scrollTop(),
+   // A/B testing data is verbose and blacklisted from 
mysql. Our dashboarding though
+   // still sources data from mysql. For that reason send 
AB test data to different
+   // schema.
+   var schema = session.get( 'subTest' ) ? 
'SearchSatisfaction' : 'TestSearchSatisfaction2',
+   scrollTop = $( window ).scrollTop(),
evt = {
// searchResultPage, visitPage, 
checkin, click or iwclick
action: action,
@@ -583,9 +592,9 @@
}
 
// ship the event
-   mw.loader.using( [ 'schema.TestSearchSatisfaction2' ] 
).then( function () {
+   mw.loader.using( [ 'schema.' + schema ] ).then( 
function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( schema, evt );
} );
};
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7963af774dd5ca2f9da7c03ae97a1180004753
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove hiera keys for snapshots that we no longer need

[ArielGlenn (Code Review)]

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

Change subject: remove hiera keys for snapshots that we no longer need
..


remove hiera keys for snapshots that we no longer need

Roles spell out this functionality explicitly now.

Change-Id: I0780d5d315e4ba6b08ac4dbc46662b1f5eab3588
---
M hieradata/hosts/snapshot1001.yaml
M hieradata/hosts/snapshot1005.yaml
M hieradata/hosts/snapshot1006.yaml
M hieradata/hosts/snapshot1007.yaml
4 files changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/hieradata/hosts/snapshot1001.yaml 
b/hieradata/hosts/snapshot1001.yaml
index 8e2562f..6e2a15c 100644
--- a/hieradata/hosts/snapshot1001.yaml
+++ b/hieradata/hosts/snapshot1001.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: regular
 snapshot::dumps::maxjobs: 6
-snapshot::dumps::monitor: false
-snapshot::cron::misc: false
diff --git a/hieradata/hosts/snapshot1005.yaml 
b/hieradata/hosts/snapshot1005.yaml
index 44bb8a2..01f5dc3 100644
--- a/hieradata/hosts/snapshot1005.yaml
+++ b/hieradata/hosts/snapshot1005.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: enwiki
 snapshot::dumps::maxjobs: 28
-snapshot::dumps::monitor: false
-snapshot::cron::misc: false
diff --git a/hieradata/hosts/snapshot1006.yaml 
b/hieradata/hosts/snapshot1006.yaml
index fa17665..a0fdda5 100644
--- a/hieradata/hosts/snapshot1006.yaml
+++ b/hieradata/hosts/snapshot1006.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: wikidatawiki
 snapshot::dumps::maxjobs: 28
-snapshot::dumps::monitor: false
-snapshot::cron::misc: false
diff --git a/hieradata/hosts/snapshot1007.yaml 
b/hieradata/hosts/snapshot1007.yaml
index 5e273e9..947f240 100644
--- a/hieradata/hosts/snapshot1007.yaml
+++ b/hieradata/hosts/snapshot1007.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: regular
 snapshot::dumps::maxjobs: 20
-snapshot::dumps::monitor: true
-snapshot::cron::misc: true

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove hiera keys for snapshots that we no longer need

[ArielGlenn (Code Review)]

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

Change subject: remove hiera keys for snapshots that we no longer need
..

remove hiera keys for snapshots that we no longer need

Roles spell out this functionality explicitly now.

Change-Id: I0780d5d315e4ba6b08ac4dbc46662b1f5eab3588
---
M hieradata/hosts/snapshot1001.yaml
M hieradata/hosts/snapshot1005.yaml
M hieradata/hosts/snapshot1006.yaml
M hieradata/hosts/snapshot1007.yaml
4 files changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/387955/1

diff --git a/hieradata/hosts/snapshot1001.yaml 
b/hieradata/hosts/snapshot1001.yaml
index 8e2562f..6e2a15c 100644
--- a/hieradata/hosts/snapshot1001.yaml
+++ b/hieradata/hosts/snapshot1001.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: regular
 snapshot::dumps::maxjobs: 6
-snapshot::dumps::monitor: false
-snapshot::cron::misc: false
diff --git a/hieradata/hosts/snapshot1005.yaml 
b/hieradata/hosts/snapshot1005.yaml
index 44bb8a2..01f5dc3 100644
--- a/hieradata/hosts/snapshot1005.yaml
+++ b/hieradata/hosts/snapshot1005.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: enwiki
 snapshot::dumps::maxjobs: 28
-snapshot::dumps::monitor: false
-snapshot::cron::misc: false
diff --git a/hieradata/hosts/snapshot1006.yaml 
b/hieradata/hosts/snapshot1006.yaml
index fa17665..a0fdda5 100644
--- a/hieradata/hosts/snapshot1006.yaml
+++ b/hieradata/hosts/snapshot1006.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: wikidatawiki
 snapshot::dumps::maxjobs: 28
-snapshot::dumps::monitor: false
-snapshot::cron::misc: false
diff --git a/hieradata/hosts/snapshot1007.yaml 
b/hieradata/hosts/snapshot1007.yaml
index 5e273e9..947f240 100644
--- a/hieradata/hosts/snapshot1007.yaml
+++ b/hieradata/hosts/snapshot1007.yaml
@@ -1,4 +1,2 @@
 snapshot::dumps::runtype: regular
 snapshot::dumps::maxjobs: 20
-snapshot::dumps::monitor: true
-snapshot::cron::misc: true

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ParserMigration[wmf/1.31.0-wmf.6]: API: Fix WikiPage namespace

[Legoktm (Code Review)]

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

Change subject: API: Fix WikiPage namespace
..

API: Fix WikiPage namespace

Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
(cherry picked from commit c7f420055541558190aa7f48fbfb5438a4119b5a)
---
M includes/ApiParserMigration.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/ApiParserMigration.php b/includes/ApiParserMigration.php
index ac19acc..df651f0 100644
--- a/includes/ApiParserMigration.php
+++ b/includes/ApiParserMigration.php
@@ -18,7 +18,7 @@
if ( $title->isRedirect() && (
!isset( $params['redirect'] ) || $params['redirect'] 
!== 'no'
) ) {
-   $title = WikiPage::factory( $title 
)->getRedirectTarget();
+   $title = \WikiPage::factory( $title 
)->getRedirectTarget();
}
$revision = \Revision::newFromTitle( $title );
if ( !$revision ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserMigration
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...ParserMigration[master]: API: Fix WikiPage namespace

[jenkins-bot (Code Review)]

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

Change subject: API: Fix WikiPage namespace
..


API: Fix WikiPage namespace

Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
---
M includes/ApiParserMigration.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/ApiParserMigration.php b/includes/ApiParserMigration.php
index ac19acc..df651f0 100644
--- a/includes/ApiParserMigration.php
+++ b/includes/ApiParserMigration.php
@@ -18,7 +18,7 @@
if ( $title->isRedirect() && (
!isset( $params['redirect'] ) || $params['redirect'] 
!== 'no'
) ) {
-   $title = WikiPage::factory( $title 
)->getRedirectTarget();
+   $title = \WikiPage::factory( $title 
)->getRedirectTarget();
}
$revision = \Revision::newFromTitle( $title );
if ( !$revision ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserMigration
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Use shell-safe verp when not making CiviMail records

[Ejegg (Code Review)]

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

Change subject: Use shell-safe verp when not making CiviMail records
..

Use shell-safe verp when not making CiviMail records

This will give us the option to turn off CiviMail records if TY mail
start to lag too far behind.

Change-Id: I33997b0dec07fdfabdc029aa89b0d1d962fc4494
---
M sites/all/modules/thank_you/thank_you.module
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/53/387953/1

diff --git a/sites/all/modules/thank_you/thank_you.module 
b/sites/all/modules/thank_you/thank_you.module
index 17bdbb1..883cb68 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -144,8 +144,15 @@
$form['transaction_id'] = array(
'#type' => 'textfield',
'#title' => t('Transaction ID'),
-   '#description' => t('Some kind of key we would use to find your 
records, example: "CNTCT-1234"'),
+   '#description' => t('ID to show in the text of the email, for 
example: "CNTCT-1234"'),
'#default_value' => 'TEST-' . mt_rand(),
+   );
+
+   $form['contribution_id'] = array(
+   '#type' => 'textfield',
+   '#title' => t('Contribution ID'),
+   '#description' => t('Actual ID of contribution to be thanked, 
for example: 12345'),
+   '#default_value' => mt_rand(),
);
 
$form['recurring'] = array(
@@ -336,7 +343,8 @@
 'receive_date' => $mailingData['receive_date'],
 'recipient_address' => $mailingData['email'],
 'recurring' => $is_recurring,
-'transaction_id' => "CNTCT-{$mailingData['contact_id']}",
+'transaction_id' => "CNTCT-{$mailingData['contact_id']}", // shown in 
the body of the text
+   'contribution_id' => $contribution_id, // used for the bounce 
header
 'unsubscribe_link' => build_unsub_link( $contribution_id, 
$mailingData['email'], $locale ),
 'contribution_tags' => wmf_thank_you_get_tag_names($contribution_id),
 );
@@ -408,6 +416,7 @@
 function thank_you_send_mail( $params ) {
 $require_params = array(
 'amount',
+'contribution_id',
 'currency',
 'from_name',
 'from_address',
@@ -470,7 +479,7 @@
if ( $civi_queue_record ) {
$email['reply_to'] = $civi_queue_record->getVerp();
} else {
-   $email['reply_to'] = 'bounce-' . str_replace( '@', '=', 
$email['to_address'] ) . '@donate.wikimedia.org';
+   $email['reply_to'] = 
"ty.{$params['contact_id']}.{$params['contribution_id']}@donate.wikimedia.org";
}
 
try {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33997b0dec07fdfabdc029aa89b0d1d962fc4494
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mount nfs share from dumpsdata host on snapshots

[ArielGlenn (Code Review)]

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

Change subject: mount nfs share from dumpsdata host on snapshots
..


mount nfs share from dumpsdata host on snapshots

Eventually the mount from the datasets host will go away, but we don't
move everything at once.

Change-Id: I3c824bac58d398632ca868fdda15e7a69bd5767d
---
M modules/snapshot/manifests/dumps/packages.pp
1 file changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/modules/snapshot/manifests/dumps/packages.pp 
b/modules/snapshot/manifests/dumps/packages.pp
index 4af86f7..ca55cc0 100644
--- a/modules/snapshot/manifests/dumps/packages.pp
+++ b/modules/snapshot/manifests/dumps/packages.pp
@@ -22,4 +22,23 @@
 require  => File['/mnt/data'],
 remounts => false,
 }
+
+file { [ '/mnt/dumpsdata' ]:
+ensure => 'directory',
+}
+
+$dumpsgenserver = $::site ? {
+'eqiad' => 'dumpsdata1001.eqiad.wmnet',
+default => 'dumpsdata1001.eqiad.wmnet',
+}
+
+mount { '/mnt/dumpsdata':
+ensure   => 'mounted',
+device   => "${dumpsgenserver}:/data",
+fstype   => 'nfs',
+name => '/mnt/dumpsdata',
+options  => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+require  => File['/mnt/dumpsdata'],
+remounts => false,
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clean up "bad parameter" error messages in Message handler

[jenkins-bot (Code Review)]

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

Change subject: Clean up "bad parameter" error messages in Message handler
..


Clean up "bad parameter" error messages in Message handler

Change-Id: I64b54b1991d17ae97a8dd9414d6807daab982a3a
---
M includes/Message.php
1 file changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/includes/Message.php b/includes/Message.php
index 0240fa7..2a55d0e 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1167,11 +1167,17 @@
} elseif ( isset( $param['list'] ) ) {
return $this->formatListParam( $param['list'], 
$param['type'], $format );
} else {
-   $warning = 'Invalid parameter for message "' . 
$this->getKey() . '": ' .
-   htmlspecialchars( serialize( $param ) );
-   trigger_error( $warning, E_USER_WARNING );
-   $e = new Exception;
-   wfDebugLog( 'Bug58676', $warning . "\n" . 
$e->getTraceAsString() );
+   if ( !is_scalar( $param ) ) {
+   $param = serialize( $param );
+   }
+   \MediaWiki\Logger\LoggerFactory::getInstance( 
'Bug58676' )->warning(
+   'Invalid parameter for message 
"{msgkey}": {param}',
+   [
+   'exception' => new Exception,
+   'msgkey' => $this->getKey(),
+   'param' => htmlspecialchars( 
$param ),
+   ]
+   );
 
return [ 'before', '[INVALID]' ];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64b54b1991d17ae97a8dd9414d6807daab982a3a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ParserMigration[master]: API: Fix WikiPage namespace

[Legoktm (Code Review)]

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

Change subject: API: Fix WikiPage namespace
..

API: Fix WikiPage namespace

Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
---
M includes/ApiParserMigration.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserMigration 
refs/changes/52/387952/1

diff --git a/includes/ApiParserMigration.php b/includes/ApiParserMigration.php
index ac19acc..df651f0 100644
--- a/includes/ApiParserMigration.php
+++ b/includes/ApiParserMigration.php
@@ -18,7 +18,7 @@
if ( $title->isRedirect() && (
!isset( $params['redirect'] ) || $params['redirect'] 
!== 'no'
) ) {
-   $title = WikiPage::factory( $title 
)->getRedirectTarget();
+   $title = \WikiPage::factory( $title 
)->getRedirectTarget();
}
$revision = \Revision::newFromTitle( $title );
if ( !$revision ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae726e9d7d33f1e6328ed4659e6bab4c7086dbaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserMigration
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] wikimedia/wikimania-scholarships[master]: MessageDirs in Gruntfile.js

[jenkins-bot (Code Review)]

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

Change subject: MessageDirs in Gruntfile.js
..


MessageDirs in Gruntfile.js

Bug: T121927
Change-Id: I36294c02e05f3f4c2e5fb162d68c915931e5be78
---
M Gruntfile.js
M package.json
2 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index d992e70..aa21e8c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,15 @@
 /* jshint node:true */
 module.exports = function ( grunt ) {
+
+   MessagesDirs = {
+   "wikimania/scholarships": "data/i18n"
+   };
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
 
grunt.initConfig( {
+   banana: MessagesDirs,
jshint: {
options: {
jshintrc: true
@@ -19,6 +25,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'jshint' ] );
+   grunt.registerTask( 'test', [ 'jsonlint', 'jshint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 4108670..d076183 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   },
   "devDependencies": {
 "grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
 "grunt-contrib-jshint": "1.1.0",
 "grunt-jsonlint": "1.1.0"
   }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36294c02e05f3f4c2e5fb162d68c915931e5be78
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Nehajha 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mount nfs share from dumpsdata host on snapshots

[ArielGlenn (Code Review)]

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

Change subject: mount nfs share from dumpsdata host on snapshots
..

mount nfs share from dumpsdata host on snapshots

Eventually the mount from the datasets host will go away, but we don't
move everything at once.

Change-Id: I3c824bac58d398632ca868fdda15e7a69bd5767d
---
M modules/snapshot/manifests/dumps/packages.pp
1 file changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/modules/snapshot/manifests/dumps/packages.pp 
b/modules/snapshot/manifests/dumps/packages.pp
index 4af86f7..ca55cc0 100644
--- a/modules/snapshot/manifests/dumps/packages.pp
+++ b/modules/snapshot/manifests/dumps/packages.pp
@@ -22,4 +22,23 @@
 require  => File['/mnt/data'],
 remounts => false,
 }
+
+file { [ '/mnt/dumpsdata' ]:
+ensure => 'directory',
+}
+
+$dumpsgenserver = $::site ? {
+'eqiad' => 'dumpsdata1001.eqiad.wmnet',
+default => 'dumpsdata1001.eqiad.wmnet',
+}
+
+mount { '/mnt/dumpsdata':
+ensure   => 'mounted',
+device   => "${dumpsgenserver}:/data",
+fstype   => 'nfs',
+name => '/mnt/dumpsdata',
+options  => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+require  => File['/mnt/dumpsdata'],
+remounts => false,
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Revert "Revert "[PerformanceInspector] Register extension""

[jenkins-bot (Code Review)]

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

Change subject: Revert "Revert "[PerformanceInspector] Register extension""
..


Revert "Revert "[PerformanceInspector] Register extension""

Works now.

This reverts commit 931a0f6749ed60d0d8598f1eb755164a22a76790.

Change-Id: I449df67841887e6d3c50eb91e8a15b9fb1f08a49
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index dd99884..c36a483 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1901,7 +1901,10 @@
 Pdf Handler
 descmsg = pdf-desc
 
-# Performance Inspector // 2016-03-08: Boilerplate only
+Performance Inspector
+optional = performanceinspector-modules-css-name, 
performanceinspector-modules-css-label
+optional = performanceinspector-modules-css-column-url, 
performanceinspector-newpp-value-and-limit
+optional = performanceinspector-newpp-template-time-report-column-percentreal, 
performanceinspector-newpp-scribunto
 
 Petition
 aliasfile = Petition/Petition.alias.php

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: DifferenceEngine: Fix wikidiff2 version check

[jenkins-bot (Code Review)]

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

Change subject: DifferenceEngine: Fix wikidiff2 version check
..


DifferenceEngine: Fix wikidiff2 version check

The feature was actually released in 1.5.0.

Change-Id: Ic1a8818e34327510a75a4252f98b1f67aeeacb04
(cherry picked from commit 66c9faccb78440fbebd2f07863a1218fce57a620)
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index a9d6ad6..a893fe8 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -922,7 +922,7 @@
$wikidiff2Version = phpversion( 'wikidiff2' );
if (
$wikidiff2Version !== false &&
-   version_compare( $wikidiff2Version, '0.3', '>=' 
)
+   version_compare( $wikidiff2Version, '1.5.0', 
'>=' )
) {
$text = wikidiff2_do_diff(
$otext,

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable REL1_28 in ExtensionDistributor

[jenkins-bot (Code Review)]

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

Change subject: Disable REL1_28 in ExtensionDistributor
..


Disable REL1_28 in ExtensionDistributor

Change-Id: Ibadd0f36a45afbcef92296fc8338cc26c855d6da
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 27e2e2c..e01eab0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1006,7 +1006,6 @@
'master',
'REL1_30',
'REL1_29',
-   'REL1_28',
'REL1_27',
];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibadd0f36a45afbcef92296fc8338cc26c855d6da
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Revert "Revert "[PerformanceInspector] Register extension""

[Raimond Spekking (Code Review)]

Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Revert "[PerformanceInspector] Register extension""
..

Revert "Revert "[PerformanceInspector] Register extension""

Works now.

This reverts commit 931a0f6749ed60d0d8598f1eb755164a22a76790.

Change-Id: I449df67841887e6d3c50eb91e8a15b9fb1f08a49
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/39/387939/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index dd99884..c36a483 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1901,7 +1901,10 @@
 Pdf Handler
 descmsg = pdf-desc
 
-# Performance Inspector // 2016-03-08: Boilerplate only
+Performance Inspector
+optional = performanceinspector-modules-css-name, 
performanceinspector-modules-css-label
+optional = performanceinspector-modules-css-column-url, 
performanceinspector-newpp-value-and-limit
+optional = performanceinspector-newpp-template-time-report-column-percentreal, 
performanceinspector-newpp-scribunto
 
 Petition
 aliasfile = Petition/Petition.alias.php

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Get removeUselessSpaces working with tabs

[Framawiki (Code Review)]

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

Change subject: Get removeUselessSpaces working with tabs
..

Get removeUselessSpaces working with tabs

Bug: T179043
Change-Id: I65c57ace1a2357ece28e1cbab258574d117d57a6
---
M pywikibot/cosmetic_changes.py
M tests/cosmetic_changes_tests.py
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/38/387938/1

diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index 179542e..6631531 100755
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -621,7 +621,7 @@
 exceptions = ['comment', 'math', 'nowiki', 'pre', 'startspace', 
'table']
 if self.site.sitename != 'wikipedia:cs':
 exceptions.append('template')
-text = textlib.replaceExcept(text, r'(?m) +( |$)', r'\1', exceptions,
+text = textlib.replaceExcept(text, r'(?m)[\t ]+( |$)', r'\1', 
exceptions,
  site=self.site)
 return text
 
diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py
index 668fdb1..83d2c4e 100644
--- a/tests/cosmetic_changes_tests.py
+++ b/tests/cosmetic_changes_tests.py
@@ -70,6 +70,9 @@
 # startspace
 self.assertEqual(' Foo  bar ',
  self.cct.removeUselessSpaces(' Foo  bar '))
+# tab
+self.assertEqual('Fo bar',
+ self.cct.removeUselessSpaces('Fo bar  '))
 
 def test_removeNonBreakingSpaceBeforePercent(self):
 """Test removeNonBreakingSpaceBeforePercent method."""

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable REL1_28 in ExtensionDistributor

[Legoktm (Code Review)]

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

Change subject: Disable REL1_28 in ExtensionDistributor
..

Disable REL1_28 in ExtensionDistributor

Change-Id: Ibadd0f36a45afbcef92296fc8338cc26c855d6da
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 27e2e2c..e01eab0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1006,7 +1006,6 @@
'master',
'REL1_30',
'REL1_29',
-   'REL1_28',
'REL1_27',
];
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: DifferenceEngine: Fix wikidiff2 version check

[Legoktm (Code Review)]

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

Change subject: DifferenceEngine: Fix wikidiff2 version check
..

DifferenceEngine: Fix wikidiff2 version check

The feature was actually released in 1.5.0.

Change-Id: Ic1a8818e34327510a75a4252f98b1f67aeeacb04
(cherry picked from commit 66c9faccb78440fbebd2f07863a1218fce57a620)
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/387935/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index a9d6ad6..a893fe8 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -922,7 +922,7 @@
$wikidiff2Version = phpversion( 'wikidiff2' );
if (
$wikidiff2Version !== false &&
-   version_compare( $wikidiff2Version, '0.3', '>=' 
)
+   version_compare( $wikidiff2Version, '1.5.0', 
'>=' )
) {
$text = wikidiff2_do_diff(
$otext,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1a8818e34327510a75a4252f98b1f67aeeacb04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Revert "[PerformanceInspector] Register extension"

[jenkins-bot (Code Review)]

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

Change subject: Revert "[PerformanceInspector] Register extension"
..


Revert "[PerformanceInspector] Register extension"

error: fatal: submit not permitted

fatal: one or more reviews failed; review output above

This reverts commit 82e807a131969140605ac43ea2ab277a1fca4a22.

Change-Id: I586577839fe8876f2adcd43ee7f0539bd4fe4c8c
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index c36a483..dd99884 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1901,10 +1901,7 @@
 Pdf Handler
 descmsg = pdf-desc
 
-Performance Inspector
-optional = performanceinspector-modules-css-name, 
performanceinspector-modules-css-label
-optional = performanceinspector-modules-css-column-url, 
performanceinspector-newpp-value-and-limit
-optional = performanceinspector-newpp-template-time-report-column-percentreal, 
performanceinspector-newpp-scribunto
+# Performance Inspector // 2016-03-08: Boilerplate only
 
 Petition
 aliasfile = Petition/Petition.alias.php

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Revert "[PerformanceInspector] Register extension"

[Raimond Spekking (Code Review)]

Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "[PerformanceInspector] Register extension"
..

Revert "[PerformanceInspector] Register extension"

error: fatal: submit not permitted

fatal: one or more reviews failed; review output above

This reverts commit 82e807a131969140605ac43ea2ab277a1fca4a22.

Change-Id: I586577839fe8876f2adcd43ee7f0539bd4fe4c8c
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/34/387934/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index c36a483..dd99884 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1901,10 +1901,7 @@
 Pdf Handler
 descmsg = pdf-desc
 
-Performance Inspector
-optional = performanceinspector-modules-css-name, 
performanceinspector-modules-css-label
-optional = performanceinspector-modules-css-column-url, 
performanceinspector-newpp-value-and-limit
-optional = performanceinspector-newpp-template-time-report-column-percentreal, 
performanceinspector-newpp-scribunto
+# Performance Inspector // 2016-03-08: Boilerplate only
 
 Petition
 aliasfile = Petition/Petition.alias.php

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Revert "README: Fix Doxygen markup"

[jenkins-bot (Code Review)]

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

Change subject: Revert "README: Fix Doxygen markup"
..


Revert "README: Fix Doxygen markup"

Previous rendering didn't result in unparsed backticks showing up,
and did use preformatted rendering.

Looks like either version causes the headings to be parsed, which
seems like a bug and is contrary to how Doxygen's own manual
explains the rendering behaviour.

This reverts commit ec3bea795756b3f7784b601a170b2f6992f450e7.

Bug: T104669
Change-Id: I62045ad670e730ec66b149b7d2ea4f5b56b58d8e
---
M README.md
1 file changed, 30 insertions(+), 30 deletions(-)

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



diff --git a/README.md b/README.md
index 8439be9..2f7711b 100644
--- a/README.md
+++ b/README.md
@@ -79,39 +79,39 @@
 --
 
 Release process:
-```bash
-$ cd path/to/oojs-ui/
-$ git remote update
-$ git checkout -B release -t origin/master
+
+$ cd path/to/oojs-ui/
+$ git remote update
+$ git checkout -B release -t origin/master
 
-# Ensure tests pass
-$ npm install && composer update && npm test && composer test
+# Ensure tests pass
+$ npm install && composer update && npm test && composer test
 
-# Avoid using "npm version patch" because that creates
-# both a commit and a tag, and we shouldn't tag until after
-# the commit is merged.
+# Avoid using "npm version patch" because that creates
+# both a commit and a tag, and we shouldn't tag until after
+# the commit is merged.
 
-# Update release notes
-# Copy the resulting list into a new section at the top of History.md and 
edit
-# into five sub-sections, in order:
-# * Breaking changes
-# * Deprecations
-# * Features
-# * Styles
-# * Code
-$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
-$ edit History.md
+# Update release notes
+# Copy the resulting list into a new section at the top of History.md and edit
+# into five sub-sections, in order:
+# * Breaking changes
+# * Deprecations
+# * Features
+# * Styles
+# * Code
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
+$ edit History.md
 
-# Update the version number
-$ edit package.json
+# Update the version number
+$ edit package.json
 
-$ git add -p
-$ git commit -m "Tag vX.X.X"
-$ git review
+$ git add -p
+$ git commit -m "Tag vX.X.X"
+$ git review
 
-# After merging:
-$ git remote update
-$ git checkout origin/master
-$ git tag "vX.X.X"
-$ npm run publish-build && git push --tags && npm publish
-```
+# After merging:
+$ git remote update
+$ git checkout origin/master
+$ git tag "vX.X.X"
+$ npm run publish-build && git push --tags && npm publish
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62045ad670e730ec66b149b7d2ea4f5b56b58d8e
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add dumpsgen to sudo rules for the appropriate admin groups

[ArielGlenn (Code Review)]

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

Change subject: add dumpsgen to sudo rules for the appropriate admin groups
..


add dumpsgen to sudo rules for the appropriate admin groups

This user will replace the datasets user, just add it where needed

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

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 94f1d6f..b8a00e4 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -286,7 +286,8 @@
 gid: 743
 description: People who can sudo into the datasets user on snapshot hosts.
 members: [hoo]
-privileges: ['ALL = (datasets) NOPASSWD: ALL']
+privileges: ['ALL = (datasets) NOPASSWD: ALL',
+ 'ALL = (dumpsgen) NOPASSWD: ALL']
   restbase-roots:
 gid: 744
 description: people who have full root on restbase nodes

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I881c54f2ad1ab637f18ea631ce3759282a1e1746
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: ArielGlenn 
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] mediawiki...Linter[master]: Use VE's new offset conversion method

[Esanders (Code Review)]

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

Change subject: Use VE's new offset conversion method
..

Use VE's new offset conversion method

Change-Id: I64767fccae26522fdce5287c5486c322108c168a
Depends-On: Idc960a37433c5b8d952a677d1529a25b94fac7f7
---
M modules/ext.linter.edit.js
1 file changed, 1 insertion(+), 13 deletions(-)


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

diff --git a/modules/ext.linter.edit.js b/modules/ext.linter.edit.js
index 3915fd5..63a3c01 100644
--- a/modules/ext.linter.edit.js
+++ b/modules/ext.linter.edit.js
@@ -3,18 +3,6 @@
var location = mw.config.get( 'wgLinterErrorLocation' ),
$textbox = $( '#wpTextbox1' );
 
-   /**
-* Convert the normal offset for one that is usable
-* by VE's DOM that changes newlines into 
-*
-* @param {ve.ui.Surface} surface
-* @param {int} offset
-* @return {int}
-*/
-   function fixOffset( surface, offset ) {
-   return ( surface.getDom().slice( 0, offset ).match( 
/\n/g ) || [] ).length + 1 + offset;
-   }
-
if ( location ) {
if ( $textbox.length ) {
$textbox.focus().textSelection( 'setSelection', 
{ start: location[ 0 ], end: location[ 1 ] } );
@@ -28,7 +16,7 @@
surface = 
ve.init.target.getSurface();
 
if ( surface.getMode() === 'source' ) {
-   range = new ve.Range( 
fixOffset( surface, location[ 0 ] ), fixOffset( surface, location[ 1 ] ) );
+   range = 
surface.getModel().getRangeFromSourceOffsets( location[ 0 ], location[ 1 ] );

surface.getModel().setLinearSelection( range );
}
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Wait for selection reset when setting selection in NWE

[Esanders (Code Review)]

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

Change subject: Wait for selection reset when setting selection in NWE
..

Wait for selection reset when setting selection in NWE

Change-Id: I05fc5678a6945c13c7f390cb30e7fac6efb2767f
---
M modules/ext.linter.edit.js
1 file changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter 
refs/changes/29/387929/1

diff --git a/modules/ext.linter.edit.js b/modules/ext.linter.edit.js
index fa13f98..3915fd5 100644
--- a/modules/ext.linter.edit.js
+++ b/modules/ext.linter.edit.js
@@ -22,13 +22,16 @@
// Register NWE code should it be loaded
// TODO: We should somehow force source mode if VE is 
opened
mw.hook( 've.activationComplete' ).add( function () {
-   var range,
-   surface = ve.init.target.getSurface();
+   // Selection is reset on a setTimeout after 
activation, so wait for that.
+   setTimeout( function () {
+   var range,
+   surface = 
ve.init.target.getSurface();
 
-   if ( surface.getMode() === 'source' ) {
-   range = new ve.Range( fixOffset( 
surface, location[ 0 ] ), fixOffset( surface, location[ 1 ] ) );
-   surface.getModel().setLinearSelection( 
range );
-   }
+   if ( surface.getMode() === 'source' ) {
+   range = new ve.Range( 
fixOffset( surface, location[ 0 ] ), fixOffset( surface, location[ 1 ] ) );
+   
surface.getModel().setLinearSelection( range );
+   }
+   } );
} );
}
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...NavigationTiming[master]: Send value zero for unload and redirecting

[jenkins-bot (Code Review)]

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

Change subject: Send value zero for unload and redirecting
..


Send value zero for unload and redirecting

The median stackable values are wrong since we only send values
for unload and reddirecting when we got one, instead of sending
zeroes.

Bug: T178479
Change-Id: I04e2a8574ace65ff5fd187b4c44b0319c977020a
---
M modules/ext.navigationTiming.js
M tests/ext.navigationTiming.test.js
2 files changed, 29 insertions(+), 8 deletions(-)

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



diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index b5bb2da..84aa956 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -134,18 +134,27 @@
}
}
} );
+   // If DNS is cached, it will be marked as start/end matching 
fetchStart.
+   // so this will actually never be 0
+   timingData.dnsLookup = timing.domainLookupEnd - 
timing.domainLookupStart;
 
-   if ( timing.domainLookupStart ) {
-   timingData.dnsLookup = timing.domainLookupEnd - 
timing.domainLookupStart;
-   }
-
+   // Watchout: There are some fields that are handled differently 
than the rest
+   // * redirectStart/redirectEnd,
+   // * unloadEventStart/unloadEventEnd
+   // * secureConnectionStart
+   // They can be zeroes instead of timestamps.
+   // See https://www.w3.org/TR/navigation-timing-2/
if ( timing.redirectStart ) {
timingData.redirectCount = 
performance.navigation.redirectCount;
timingData.redirecting = timing.redirectEnd - 
timing.redirectStart;
+   } else {
+   timingData.redirecting = 0;
}
 
if ( timing.unloadEventStart ) {
timingData.unload = timing.unloadEventEnd - 
timing.unloadEventStart;
+   } else {
+   timingData.unload = 0;
}
 
if ( timing.msFirstPaint > navStart ) {
diff --git a/tests/ext.navigationTiming.test.js 
b/tests/ext.navigationTiming.test.js
index 1adf4aa..8a99ad1 100644
--- a/tests/ext.navigationTiming.test.js
+++ b/tests/ext.navigationTiming.test.js
@@ -90,12 +90,16 @@
connectStart: 226,
secureConnectionStart: 235,
connectEnd: 250,
+   redirectEnd: 0,
+   redirectStart: 0,
requestStart: 250,
responseStart: 300,
responseEnd: 400,
domComplete: 450,
loadEventStart: 570,
-   loadEventEnd: 575
+   loadEventEnd: 575,
+   unload: 0,
+   redirecting: 0
},
navigation: {
// type: TYPE_NAVIGATE
@@ -120,7 +124,9 @@
responseEnd: [ 'number', 300 ],
domComplete: [ 'number', 350 ],
loadEventStart: [ 'number', 470 ],
-   loadEventEnd: [ 'number', 475 ]
+   loadEventEnd: [ 'number', 475 ],
+   unload: [ 'number', 0 ],
+   redirecting: [ 'number', 0 ]
};
 
for ( key in expected ) {
@@ -145,12 +151,16 @@
connectStart: 100,
secureConnectionStart: 0,
connectEnd: 100,
+   redirectStart: 10,
+   redirectEnd: 20,
requestStart: 110,
responseStart: 200,
responseEnd: 300,
domComplete: 350,
loadEventStart: 470,
-   loadEventEnd: 475
+   loadEventEnd: 475,
+   unloadEventStart: 10,
+   unloadEventEnd: 21
},
navigation: {
// type: TYPE_NAVIGATE
@@ -175,7 +185,9 @@
responseEnd: [ 'number', 200 ],
domComplete: [ 'number', 250 ],
loadEventStart: [ 'number', 370 ],
-   loadEventEnd: [ 'number', 375 ]
+   loadEventEnd: [ 'number', 375 ],
+   unload: [ 'number', 11 ],
+   redirecting: [ 'number', 10 ]
};
 
for ( key in expected ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04e2a8574ace65ff5fd187b4c44b0319c977020a

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Adapt Offline Library screen for sideloading.

[jenkins-bot (Code Review)]

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

Change subject: Adapt Offline Library screen for sideloading.
..


Adapt Offline Library screen for sideloading.

Bug: T179067
Change-Id: I20f1001fa24e834bc0319fb7194c7782bd6f3070
---
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
A app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles.xml
6 files changed, 109 insertions(+), 31 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index cc739d5..09ac863 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -11,6 +11,7 @@
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SimpleItemAnimator;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -20,9 +21,14 @@
 
 import org.wikipedia.R;
 import org.wikipedia.activity.FragmentUtil;
+import org.wikipedia.page.LinkMovementMethodExt;
+import org.wikipedia.richtext.RichTextUtil;
+import org.wikipedia.settings.SettingsActivity;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.util.ShareUtil;
+import org.wikipedia.util.StringUtil;
+import org.wikipedia.util.UriUtil;
 import org.wikipedia.views.DefaultViewHolder;
 import org.wikipedia.views.DrawableItemDecoration;
 import org.wikipedia.views.PageItemView;
@@ -49,6 +55,9 @@
 @BindView(R.id.disk_usage_view) DiskUsageView diskUsageView;
 @BindView(R.id.compilation_search_error) WikiErrorView errorView;
 @BindView(R.id.compilation_empty_container) View emptyContainer;
+@BindView(R.id.compilation_empty_description) TextView emptyDescription;
+@BindView(R.id.compilation_packs_hint) TextView packsHint;
+@BindView(R.id.compilation_data_usage_hint) TextView dataUsageHint;
 private Unbinder unbinder;
 
 private boolean updating;
@@ -87,6 +96,22 @@
 }
 });
 
+emptyDescription.setMovementMethod(LinkMovementMethod.getInstance());
+
emptyDescription.setText(StringUtil.fromHtml(getString(R.string.offline_library_empty_description_sideload)));
+RichTextUtil.removeUnderlinesFromLinks(emptyDescription);
+packsHint.setMovementMethod(LinkMovementMethod.getInstance());
+
packsHint.setText(StringUtil.fromHtml(getString(R.string.offline_library_packs_hint)));
+RichTextUtil.removeUnderlinesFromLinks(packsHint);
+dataUsageHint.setMovementMethod(new LinkMovementMethodExt(new 
LinkMovementMethodExt.UrlHandler() {
+@Override
+public void onUrlClick(@NonNull String url, @Nullable String 
titleString) {
+if (url.equals(UriUtil.LOCAL_URL_SETTINGS)) {
+startActivity(SettingsActivity.newIntent(getContext()));
+}
+}
+}));
+
dataUsageHint.setText(StringUtil.fromHtml(getString(R.string.offline_library_data_usage_hint)));
+RichTextUtil.removeUnderlinesFromLinks(dataUsageHint);
 return view;
 }
 
diff --git a/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml 
b/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
new file mode 100644
index 000..ec59c7b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
@@ -0,0 +1,12 @@
+http://schemas.android.com/apk/res/android;>
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml 
b/app/src/main/res/layout/fragment_local_compilations.xml
index 6cf9f0b..304f59a 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -33,45 +33,77 @@
 android:layout_height="wrap_content"
 android:layout_gravity="center"/>
 
-
+android:orientation="vertical">
 
-
+android:layout_margin="8dp"
+app:cardBackgroundColor="?attr/paper_color">
 
-
+android:orientation="vertical">
 
-
+
 
-
+
 
-
+
+
 
-
+
+
+
+
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add dumpsgen to sudo rules for the appropriate admin groups

[ArielGlenn (Code Review)]

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

Change subject: add dumpsgen to sudo rules for the appropriate admin groups
..

add dumpsgen to sudo rules for the appropriate admin groups

This user will replace the datasets user, just add it where needed

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/387917/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 94f1d6f..b8a00e4 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -286,7 +286,8 @@
 gid: 743
 description: People who can sudo into the datasets user on snapshot hosts.
 members: [hoo]
-privileges: ['ALL = (datasets) NOPASSWD: ALL']
+privileges: ['ALL = (datasets) NOPASSWD: ALL',
+ 'ALL = (dumpsgen) NOPASSWD: ALL']
   restbase-roots:
 gid: 744
 description: people who have full root on restbase nodes

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...NavigationTiming[wmf/1.31.0-wmf.6]: Send value zero for unload and redirecting

[Krinkle (Code Review)]

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

Change subject: Send value zero for unload and redirecting
..

Send value zero for unload and redirecting

The median stackable values are wrong since we only send values
for unload and reddirecting when we got one, instead of sending
zeroes.

Bug: T178479
Change-Id: I04e2a8574ace65ff5fd187b4c44b0319c977020a
---
M modules/ext.navigationTiming.js
M tests/ext.navigationTiming.test.js
2 files changed, 29 insertions(+), 8 deletions(-)


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

diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index b5bb2da..84aa956 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -134,18 +134,27 @@
}
}
} );
+   // If DNS is cached, it will be marked as start/end matching 
fetchStart.
+   // so this will actually never be 0
+   timingData.dnsLookup = timing.domainLookupEnd - 
timing.domainLookupStart;
 
-   if ( timing.domainLookupStart ) {
-   timingData.dnsLookup = timing.domainLookupEnd - 
timing.domainLookupStart;
-   }
-
+   // Watchout: There are some fields that are handled differently 
than the rest
+   // * redirectStart/redirectEnd,
+   // * unloadEventStart/unloadEventEnd
+   // * secureConnectionStart
+   // They can be zeroes instead of timestamps.
+   // See https://www.w3.org/TR/navigation-timing-2/
if ( timing.redirectStart ) {
timingData.redirectCount = 
performance.navigation.redirectCount;
timingData.redirecting = timing.redirectEnd - 
timing.redirectStart;
+   } else {
+   timingData.redirecting = 0;
}
 
if ( timing.unloadEventStart ) {
timingData.unload = timing.unloadEventEnd - 
timing.unloadEventStart;
+   } else {
+   timingData.unload = 0;
}
 
if ( timing.msFirstPaint > navStart ) {
diff --git a/tests/ext.navigationTiming.test.js 
b/tests/ext.navigationTiming.test.js
index 1adf4aa..8a99ad1 100644
--- a/tests/ext.navigationTiming.test.js
+++ b/tests/ext.navigationTiming.test.js
@@ -90,12 +90,16 @@
connectStart: 226,
secureConnectionStart: 235,
connectEnd: 250,
+   redirectEnd: 0,
+   redirectStart: 0,
requestStart: 250,
responseStart: 300,
responseEnd: 400,
domComplete: 450,
loadEventStart: 570,
-   loadEventEnd: 575
+   loadEventEnd: 575,
+   unload: 0,
+   redirecting: 0
},
navigation: {
// type: TYPE_NAVIGATE
@@ -120,7 +124,9 @@
responseEnd: [ 'number', 300 ],
domComplete: [ 'number', 350 ],
loadEventStart: [ 'number', 470 ],
-   loadEventEnd: [ 'number', 475 ]
+   loadEventEnd: [ 'number', 475 ],
+   unload: [ 'number', 0 ],
+   redirecting: [ 'number', 0 ]
};
 
for ( key in expected ) {
@@ -145,12 +151,16 @@
connectStart: 100,
secureConnectionStart: 0,
connectEnd: 100,
+   redirectStart: 10,
+   redirectEnd: 20,
requestStart: 110,
responseStart: 200,
responseEnd: 300,
domComplete: 350,
loadEventStart: 470,
-   loadEventEnd: 475
+   loadEventEnd: 475,
+   unloadEventStart: 10,
+   unloadEventEnd: 21
},
navigation: {
// type: TYPE_NAVIGATE
@@ -175,7 +185,9 @@
responseEnd: [ 'number', 200 ],
domComplete: [ 'number', 250 ],
loadEventStart: [ 'number', 370 ],
-   loadEventEnd: [ 'number', 375 ]
+   loadEventEnd: [ 'number', 375 ],
+   unload: [ 'number', 11 ],
+   redirecting: [ 'number', 10 ]
};
 
for ( key in expected ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix up replica/pos logging

[jenkins-bot (Code Review)]

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

Change subject: Fix up replica/pos logging
..


Fix up replica/pos logging

Change-Id: I8670aef4a684c1c7f9bb510e7f2cc1530bdcfed0
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 1be8926..6bb8945 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -603,8 +603,8 @@
if ( $result == -1 || is_null( $result ) ) {
// Timed out waiting for replica DB, use master instead
$this->replLogger->warning(
-   __METHOD__ . ": Timed out waiting on {host} pos 
{$this->mWaitForPos}",
-   [ 'host' => $server ]
+   __METHOD__ . ': Timed out waiting on {host} pos 
{pos}',
+   [ 'host' => $server, 'pos' => 
$this->mWaitForPos ]
);
$ok = false;
} else {
@@ -1640,16 +1640,18 @@
if ( $pos instanceof DBMasterPos ) {
$result = $conn->masterPosWait( $pos, $timeout );
if ( $result == -1 || is_null( $result ) ) {
-   $msg = __METHOD__ . ": Timed out waiting on 
{$conn->getServer()} pos {$pos}";
-   $this->replLogger->warning( "$msg" );
+   $msg = __METHOD__ . ': Timed out waiting on 
{host} pos {pos}';
+   $this->replLogger->warning( $msg,
+   [ 'host' => $conn->getServer(), 'pos' 
=> $pos ] );
$ok = false;
} else {
-   $this->replLogger->info( __METHOD__ . ": Done" 
);
+   $this->replLogger->info( __METHOD__ . ': Done' 
);
$ok = true;
}
} else {
$ok = false; // something is misconfigured
-   $this->replLogger->error( "Could not get master pos for 
{$conn->getServer()}." );
+   $this->replLogger->error( 'Could not get master pos for 
{host}',
+   [ 'host' => $conn->getServer() ] );
}
 
return $ok;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8670aef4a684c1c7f9bb510e7f2cc1530bdcfed0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Add method for converting plaintext offsets to source-mode o...

[Esanders (Code Review)]

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

Change subject: Add method for converting plaintext offsets to source-mode 
offsets
..

Add method for converting plaintext offsets to source-mode offsets

Change-Id: Idc960a37433c5b8d952a677d1529a25b94fac7f7
---
M src/dm/ve.dm.Surface.js
1 file changed, 36 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/01/387901/1

diff --git a/src/dm/ve.dm.Surface.js b/src/dm/ve.dm.Surface.js
index 053c531..6a54cfe 100644
--- a/src/dm/ve.dm.Surface.js
+++ b/src/dm/ve.dm.Surface.js
@@ -1061,6 +1061,42 @@
 };
 
 /**
+ * Get a VE source-mode surface offset from a plaintext source offset.
+ *
+ * @param {number} offset Source text offset
+ * @return {number} Source surface offset
+ */
+ve.dm.Surface.prototype.getOffsetFromSourceOffset = function ( offset ) {
+   var lineOffset = 0,
+   line = 0,
+   lines = this.getDocument().getDocumentNode().getChildren();
+
+   while ( lineOffset < offset + 1 ) {
+   lineOffset += lines[ line ].getLength() + 1;
+   line++;
+   }
+   return offset + line;
+};
+
+/**
+ * Get a VE source-mode surface range from plaintext source offsets.
+ *
+ * @param {number} from Source text from offset
+ * @param {number} [to] Source text to offset, omit for a collapsed range
+ * @return {ve.Range} Source surface offset
+ */
+ve.dm.Surface.prototype.getRangeFromSourceOffsets = function ( from, to ) {
+   var fromOffset = this.getOffsetFromSourceOffset( from );
+   return new ve.Range(
+   fromOffset,
+   // Skip toOffset calculation if collapsed
+   to === undefined || to === from ?
+   fromOffset :
+   this.getOffsetFromSourceOffset( to )
+   );
+};
+
+/**
  * Get the author ID
  *
  * @return {number} The author ID

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc960a37433c5b8d952a677d1529a25b94fac7f7
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

[jenkins-bot (Code Review)]

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

Change subject: Update GUI
..


Update GUI

Change-Id: I456ada2bbe42e8d9ec3187f676d457c03b2f0cb6
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/gui b/gui
index 62eef24..4999f59 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 62eef24e11f9a898c9fac5f233861a00f39f3dc2
+Subproject commit 4999f5955040352debf77aeae93bed518bb300e0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I456ada2bbe42e8d9ec3187f676d457c03b2f0cb6
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: interface::noflow - runtime disable on fresh install

[BBlack (Code Review)]

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

Change subject: interface::noflow - runtime disable on fresh install
..


interface::noflow - runtime disable on fresh install

Change-Id: Ie6e3ce44a4e095b3f5c5ae8010a64cf9ed87249e
---
M modules/interface/manifests/noflow.pp
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/modules/interface/manifests/noflow.pp 
b/modules/interface/manifests/noflow.pp
index 7a66b1c..8751ef7 100644
--- a/modules/interface/manifests/noflow.pp
+++ b/modules/interface/manifests/noflow.pp
@@ -1,6 +1,8 @@
 # Definition: interface::noflow
 #
-# Disable ethernet flow control at boot time via up-commands.
+# Disable ethernet flow control at boot time via up-commands, and also at
+# runtime when first adding to boot time up-commands, so that it's applied on
+# freshly-installed hosts without another reboot required.
 #
 # Parameters:
 # - $interface=$name:
@@ -15,4 +17,13 @@
 interface => $interface,
 command   => $cmd,
 }
+
+# Exec immediately at runtime when first added to interfaces file
+exec { "noflow-${interface}":
+path=> '/usr/bin:/usr/sbin:/bin:/sbin',
+command => $cmd,
+require => Package['ethtool'],
+subscribe   => Augeas["${interface}_noflow-${interface}"],
+refreshonly => true,
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve connection logging a little more

[jenkins-bot (Code Review)]

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

Change subject: Improve connection logging a little more
..


Improve connection logging a little more

Don't include the trace in the actual message, that keeps us from
grouping these messages by type. Instead inject the trace as an
extra parameter we'll pick up in logstash

Change-Id: I48184c1af2560827ef50baff4fc0443f00697504
---
M includes/libs/rdbms/database/Database.php
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index a9dd074..e04566e 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -948,9 +948,8 @@
$msg = __METHOD__ . ': lost connection to 
{dbserver}; reconnected';
$params = [ 'dbserver' => $this->getServer() ];
$this->connLogger->warning( $msg, $params );
-   $this->queryLogger->warning(
-   "$msg:\n" . ( new RuntimeException() 
)->getTraceAsString(),
-   $params );
+   $this->queryLogger->warning( $msg, $params +
+   [ 'trace' => ( new RuntimeException() 
)->getTraceAsString() ] );
 
if ( !$recoverable ) {
# Callers may catch the exception and 
continue to use the DB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48184c1af2560827ef50baff4fc0443f00697504
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Correctly "prefer offline content" from offline article packs.

[jenkins-bot (Code Review)]

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

Change subject: Correctly "prefer offline content" from offline article packs.
..


Correctly "prefer offline content" from offline article packs.

The previous implementation of "prefer offline content" wasn't taking
offline packs into account, and was only dealing with HTTP-cached content.

Change-Id: I3ab66a357a71186b93e905d6c6a821eb4b340ae8
---
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
1 file changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java 
b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
index efdc299..350f2d7 100644
--- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
@@ -40,6 +40,7 @@
 import org.wikipedia.readinglist.ReadingList;
 import org.wikipedia.readinglist.page.ReadingListPage;
 import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
+import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.DateUtil;
 import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.DimenUtil;
@@ -379,11 +380,16 @@
 
L10nUtil.setupDirectionality(model.getTitle().getWikiSite().languageCode(), 
Locale.getDefault().getLanguage(),
 bridge);
 
-pageLoadFromNetwork(new ErrorCallback() {
-@Override public void call(final Throwable networkError) {
-fragment.onPageLoadError(networkError);
-}
-});
+if (Prefs.preferOfflineContent() && 
OfflineManager.instance().titleExists(model.getTitle().getDisplayText())) {
+pageLoadFromCompilation();
+} else {
+pageLoadFromNetwork(new ErrorCallback() {
+@Override
+public void call(final Throwable networkError) {
+fragment.onPageLoadError(networkError);
+}
+});
+}
 }
 
 private void pageLoadFromNetwork(final ErrorCallback errorCallback) {
@@ -433,7 +439,7 @@
 PageTitle newTitle = TextUtils.isEmpty(normalizedTitle) ? 
model.getTitle()
 : new PageTitle(normalizedTitle, 
model.getTitle().getWikiSite());
 
-Page page = new Page(newTitle, new ArrayList(), new 
PageProperties(newTitle));
+Page page = new Page(newTitle, new ArrayList<>(), new 
PageProperties(newTitle));
 
 model.setPage(page);
 editHandler.setPage(model.getPage());

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ab66a357a71186b93e905d6c6a821eb4b340ae8
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: importDump.php: Declare uploadCount property

[jenkins-bot (Code Review)]

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

Change subject: importDump.php: Declare uploadCount property
..


importDump.php: Declare uploadCount property

(cherry picked from commit e8bad2adfb26539fe290565b5cc69f9b276ec782)

Bug: T174255
Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
---
M maintenance/importDump.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index f0e0555..38d786b 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -37,6 +37,7 @@
public $revCount = 0;
public $dryRun = false;
public $uploads = false;
+   protected $uploadCount = 0;
public $imageBasePath = false;
public $nsFilter = false;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Add default value for processor_form

[jenkins-bot (Code Review)]

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

Change subject: Add default value for processor_form
..


Add default value for processor_form

Bug: T177893
Change-Id: Ib8b0015bf3baee4f6dba375d9ea1f499362f1101
---
M adyen_gateway/adyen.adapter.php
M adyen_gateway/adyen_gateway.body.php
M gateway_common/gateway.adapter.php
M tests/phpunit/Adapter/Adyen/AdyenTest.php
4 files changed, 32 insertions(+), 6 deletions(-)

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



diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 7fae0dd..9a68fdb 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -43,6 +43,16 @@
);
}
 
+   function setGatewayDefaults( $options = array() ) {
+   if ( $this->getData_Unstaged_Escaped( 'processor_form' ) == 
null ) {
+   $skinCodes = $this->getSkinCodes();
+   $processor_form = $skinCodes['base'];
+   $this->addRequestData(
+   array( 'processor_form' => $processor_form )
+   );
+   }
+   }
+
// FIXME: That's not what ReturnValueMap is for!
// Unused?
function defineReturnValueMap() {
@@ -312,4 +322,16 @@
return ( $calculated_sig === $requestVars[ 'merchantSig' ] );
}
 
+   /**
+* Reformat skin codes array to access by Name
+*/
+   public function getSkinCodes() {
+   $skins = $this->accountInfo['skins'];
+   $skinCodes = array();
+   foreach ( $skins as $code => $skin ) {
+   $skinCodes[$skin['Name']] = $code;
+   }
+   return $skinCodes;
+   }
+
 }
diff --git a/adyen_gateway/adyen_gateway.body.php 
b/adyen_gateway/adyen_gateway.body.php
index 3a5ed78..6cac331 100644
--- a/adyen_gateway/adyen_gateway.body.php
+++ b/adyen_gateway/adyen_gateway.body.php
@@ -26,11 +26,7 @@
 
public function setClientVariables( &$vars ) {
parent::setClientVariables( $vars );
-   $skins = $this->adapter->getAccountConfig( 'Skins' );
-   $skinCodes = array();
-   foreach ( $skins as $code => $skin ) {
-   $skinCodes[$skin['Name']] = $code;
-   }
+   $skinCodes = $this->adapter->getSkinCodes();
$vars['wgAdyenGatewaySkinCodes'] = $skinCodes;
}
 }
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 396648a..a4c82ef 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1247,7 +1247,7 @@
}
 
function setGatewayDefaults( $options = array() ) {
- }
+   }
 
public function getCurrencies( $options = array() ) {
return $this->config['currencies'];
diff --git a/tests/phpunit/Adapter/Adyen/AdyenTest.php 
b/tests/phpunit/Adapter/Adyen/AdyenTest.php
index d02e186..20cc8ab 100644
--- a/tests/phpunit/Adapter/Adyen/AdyenTest.php
+++ b/tests/phpunit/Adapter/Adyen/AdyenTest.php
@@ -265,4 +265,12 @@
$this->assertEquals( 
'xoI76zyUFjjBzubzSPEopAgoA9Bt7PjwQAi5QHk/GKo=', $defaultSig );
$this->assertEquals( 
'UKMVUkWR5GqsgfUEtqZalzh+kTa7kXyrDw9nbj4D/0Q=', $altSig );
}
+
+   public function testGetSkinCodes() {
+   $init = $this->getDonorTestData();
+   unset( $init['processor_form'] );
+   $gateway = $this->getFreshGatewayObject( $init );
+   $skinCodes = $gateway->getSkinCodes();
+   $this->assertEquals( $skinCodes['base'], 'testskin' );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8b0015bf3baee4f6dba375d9ea1f499362f1101
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Mepps 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Make Offline Library enableable via Settings.

[jenkins-bot (Code Review)]

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

Change subject: Make Offline Library enableable via Settings.
..


Make Offline Library enableable via Settings.

There is now a new Setting called "Enable Offline Library" that acts as
the gateway to enabling the entire Offline feature.

When this setting is enabled, it automatically triggers the dynamic
permission request that asks the user for read/write permissions, and goes
on to search the device for ZIM files.

This means that after enabling this new setting, the user doesn't actually
have to navigate to the Offline Library screen to start using their ZIM
files. They'll just start working.

Bug: T179072
Change-Id: Iecf652a9a12399cb8e8bbc3988776af942bc00cf
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
M app/src/main/java/org/wikipedia/feed/onboarding/OfflineOnboardingCard.java
M app/src/main/java/org/wikipedia/settings/BasePreferenceLoader.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/java/org/wikipedia/settings/SettingsActivity.java
M app/src/main/java/org/wikipedia/settings/SettingsFragment.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
A app/src/main/java/org/wikipedia/settings/SwitchPreferenceWithLinks.java
M app/src/main/java/org/wikipedia/views/ExploreOverflowView.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/xml/preferences.xml
14 files changed, 120 insertions(+), 36 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index b22967f..7f65cb5 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -35,7 +35,6 @@
 import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.FeedbackUtil;
 import org.wikipedia.util.PermissionUtil;
-import org.wikipedia.util.ReleaseUtil;
 import org.wikipedia.util.log.L;
 
 import java.util.List;
@@ -145,11 +144,7 @@
 protected void onOfflineCompilationsError(Throwable t) {
 }
 
-protected void searchOfflineCompilationsWithPermission(boolean force) {
-if (!ReleaseUtil.isPreBetaRelease()) {
-// TODO: enable when ready for production.
-return;
-}
+public void searchOfflineCompilationsWithPermission(boolean force) {
 if (!PermissionUtil.hasWriteExternalStoragePermission(this)) {
 if (PermissionUtil.shouldShowWritePermissionRationale(this)) {
 requestStoragePermission();
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 3397f09..61a291c 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -29,7 +29,7 @@
 boolean online = DeviceUtil.isOnline();
 
 conditionallyAddPendingClient(new SearchClient(), age == 0);
-conditionallyAddPendingClient(new OfflineCompilationClient(), age == 0 
&& !online && OfflineManager.hasCompilation() && isPreBetaRelease());
+conditionallyAddPendingClient(new OfflineCompilationClient(), age == 0 
&& !online && OfflineManager.hasCompilation());
 conditionallyAddPendingClient(new OnboardingClient(), age == 0);
 conditionallyAddPendingClient(new AnnouncementClient(), age == 0 && 
online);
 conditionallyAddPendingClient(new AggregatedFeedContentClient(), 
online);
diff --git 
a/app/src/main/java/org/wikipedia/feed/onboarding/OfflineOnboardingCard.java 
b/app/src/main/java/org/wikipedia/feed/onboarding/OfflineOnboardingCard.java
index c5f9164..5517dbb 100644
--- a/app/src/main/java/org/wikipedia/feed/onboarding/OfflineOnboardingCard.java
+++ b/app/src/main/java/org/wikipedia/feed/onboarding/OfflineOnboardingCard.java
@@ -6,8 +6,8 @@
 import org.wikipedia.feed.announcement.Announcement;
 import org.wikipedia.feed.model.CardType;
 import org.wikipedia.offline.OfflineManager;
+import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.DeviceUtil;
-import org.wikipedia.util.ReleaseUtil;
 
 public class OfflineOnboardingCard extends OnboardingCard {
 public OfflineOnboardingCard(@NonNull Announcement announcement) {
@@ -19,8 +19,7 @@
 }
 
 public boolean shouldShow() {
-// TODO: remove pre-beta flag when ready.
-return super.shouldShow() && ReleaseUtil.isPreBetaRelease() && 
DeviceUtil.isOnline() && !OfflineManager.hasCompilation();
+return super.shouldShow() && Prefs.offlineLibraryEnabled() && 
DeviceUtil.isOnline() && 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: importDump.php: Declare uploadCount property

[Krinkle (Code Review)]

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

Change subject: importDump.php: Declare uploadCount property
..

importDump.php: Declare uploadCount property

Bug: T174255
Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
(cherry picked from commit e8bad2adfb26539fe290565b5cc69f9b276ec782)
---
M maintenance/importDump.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 6717a8e..025809d 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -37,6 +37,7 @@
public $revCount = 0;
public $dryRun = false;
public $uploads = false;
+   protected $uploadCount = 0;
public $imageBasePath = false;
public $nsFilter = false;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Externalize comp suggest builder code

[jenkins-bot (Code Review)]

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

Change subject: Externalize comp suggest builder code
..


Externalize comp suggest builder code

The CompletionSuggester was a bit hairy, the goal is to
- externalize the code responsible for building the suggest to its own class.
- reduce mutable states
- use more Elastica classes

Bug: T178906
Change-Id: Ie3ea3b0c2718c1cc5ac079a703cfc92dac86e934
---
M autoload.php
M includes/CompletionSuggester.php
A includes/Query/CompSuggestQueryBuilder.php
M tests/unit/CompletionSuggesterTest.php
4 files changed, 382 insertions(+), 376 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 8ecde96..77c95f1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -113,6 +113,7 @@
'CirrusSearch\\PhraseSuggesterProfiles' => __DIR__ . 
'/profiles/PhraseSuggesterProfiles.php',
'CirrusSearch\\Query\\BaseSimpleKeywordFeatureTest' => __DIR__ . 
'/tests/unit/Query/BaseSimpleKeywordFeatureTest.php',
'CirrusSearch\\Query\\BoostTemplatesFeature' => __DIR__ . 
'/includes/Query/BoostTemplatesFeature.php',
+   'CirrusSearch\\Query\\CompSuggestQueryBuilder' => __DIR__ . 
'/includes/Query/CompSuggestQueryBuilder.php',
'CirrusSearch\\Query\\ContentModelFeature' => __DIR__ . 
'/includes/Query/ContentModelFeature.php',
'CirrusSearch\\Query\\FileNumericFeature' => __DIR__ . 
'/includes/Query/FileNumericFeature.php',
'CirrusSearch\\Query\\FileTypeFeature' => __DIR__ . 
'/includes/Query/FileTypeFeature.php',
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index 27317c4..fd2f0db 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -2,16 +2,14 @@
 
 namespace CirrusSearch;
 
-use CirrusSearch;
-use Elastica\Request;
-use CirrusSearch\BuildDocument\Completion\SuggestBuilder;
+use CirrusSearch\Query\CompSuggestQueryBuilder;
+use Elastica\Exception\ExceptionInterface;
+use Elastica\Index;
+use Elastica\Query;
 use CirrusSearch\Search\SearchContext;
 use MediaWiki\MediaWikiServices;
-use SearchSuggestion;
 use SearchSuggestionSet;
 use Status;
-use ApiUsageException;
-use UsageException;
 use User;
 
 /**
@@ -57,49 +55,41 @@
  * in suggest profiles to fetch more than what the use asked.
  */
 class CompletionSuggester extends ElasticsearchIntermediary {
-   const VARIANT_EXTRA_DISCOUNT = 0.0001;
/**
-* @var string term to search.
-*/
-   private $term;
-
-   /**
-* @var string[]|null search variants
-*/
-   private $variants;
-
-   /**
-* @var integer maximum number of result
+* @var integer maximum number of result (final)
 */
private $limit;
 
/**
-* @var integer offset
+* @var integer offset (final)
 */
private $offset;
 
/**
-* @var string index base name to use
+* @var string index base name to use (final)
 */
private $indexBaseName;
 
/**
-* Search environment configuration
+* @var Index (final)
+*/
+   private $completionIndex;
+
+   /**
+* Search environment configuration (final)
 * @var SearchConfig
 */
private $config;
 
/**
-* @var string Query type (comp_suggest_geo or comp_suggest)
-*/
-   public $queryType;
-
-   /**
-* @var SearchContext
+* @var SearchContext (final)
 */
private $searchContext;
 
-   private $settings;
+   /**
+* @var CompSuggestQueryBuilder $compSuggestBuilder (final)
+*/
+   private $compSuggestBuilder;
 
/**
 * @param Connection $conn
@@ -126,36 +116,19 @@
$this->limit = $limit;
$this->offset = $offset;
$this->indexBaseName = $index ?: $config->get( 
SearchConfig::INDEX_BASE_NAME );
+   $this->completionIndex = $this->connection->getIndex( 
$this->indexBaseName,
+   Connection::TITLE_SUGGEST_TYPE );
$this->searchContext = new SearchContext( $this->config, 
$namespaces );
 
if ( $profileName == null ) {
$profileName = $this->config->get( 
'CirrusSearchCompletionSettings' );
}
-   $this->settings = $this->config->getElement( 
'CirrusSearchCompletionProfiles', $profileName );
-   }
-
-   /**
-* @param string $search
-* @throws ApiUsageException
-* @throws UsageException
-*/
-   private function checkRequestLength( $search ) {
-   $requestLength = mb_strlen( $search );
-   if ( $requestLength > 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox: initial puppet commit

[Ayounsi (Code Review)]

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

Change subject: Netbox: initial puppet commit
..

Netbox: initial puppet commit

Change-Id: Ia3354fcf251952a27d58eba3487043d8d4bd26fe
---
M hieradata/role/common/deployment_server.yaml
M manifests/site.pp
A modules/netbox/manifests/init.pp
A modules/netbox/templates/configuration.py.erb
A modules/netbox/templates/gunicorn.erb
A modules/netbox/templates/ldap_config.py.erb
A modules/profile/manifests/netbox.pp
A modules/role/manifests/netbox.pp
A modules/role/templates/netbox/netbox.wikimedia.org.erb
9 files changed, 366 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 8eac2e3..865799c 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -173,6 +173,9 @@
   # Librenms software
   librenms/librenms:
 repository: operations/software/librenms
+  # Netbox software
+  netbox/deploy:
+repository: operations/software/netbox-deploy
   relforge/mjolnir:
 repository: search/MjoLniR
   statsv/statsv:
diff --git a/manifests/site.pp b/manifests/site.pp
index 0861aed..091fab0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1954,7 +1954,7 @@
 
 # network monitoring tools, stretch (T125020, T166180)
 node /^netmon(1002|2001)\.wikimedia\.org$/ {
-role(network::monitor, librenms, rancid, smokeping)
+role(network::monitor, librenms, rancid, smokeping, netbox)
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/netbox/manifests/init.pp b/modules/netbox/manifests/init.pp
new file mode 100644
index 000..d2b073f
--- /dev/null
+++ b/modules/netbox/manifests/init.pp
@@ -0,0 +1,58 @@
+# == Class: netbox::base
+#
+# Installs Netbox
+#
+class netbox(
+$secret_key,
+$ldap_password,
+$db_password,
+$debug=false,
+$port=8001,
+$config_path = '/srv/deployment/netbox/deploy',
+$venv_path = '/srv/deployment/netbox/venv',
+$directory = '/srv/deployment/netbox/netbox'
+$ensure='present',
+
+) {
+
+require_package('virtualenv', 'python3-dev',
+'gunicorn', 'libldap2-dev',
+'build-essential', 'python3-pip',
+'libsasl2-dev', 'libssl-dev')
+
+# If new install, postgres user needs to be manually added, see:
+# 
http://netbox.readthedocs.io/en/stable/installation/postgresql/#database-creation
+require_package('postgresql', 'libpq-dev')
+
+}
+
+file { "${directory}/netbox/netbox/configuration.py":
+ensure  => $ensure,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => template('netbox/configuration.py.erb'),
+}
+
+file { "${directory}/netbox/netbox/ldap_config.py":
+ensure  => $ensure,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => template('netbox/ldap_config.py.erb'),
+}
+
+service { 'gunicorn':
+ensure=> ensure_service($ensure),
+enable=> true,
+hasstatus => false,
+}
+
+file { '/etc/gunicorn.d/netbox':
+ensure  => $ensure,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => template('netbox/gunicorn.erb'),
+require => Package['gunicorn'],
+}
diff --git a/modules/netbox/templates/configuration.py.erb 
b/modules/netbox/templates/configuration.py.erb
new file mode 100644
index 000..402e4c9
--- /dev/null
+++ b/modules/netbox/templates/configuration.py.erb
@@ -0,0 +1,145 @@
+#
+#   #
+#   Required settings   #
+#   #
+#
+
+# This is a list of valid fully-qualified domain names (FQDNs) for the NetBox 
server. NetBox will not permit write
+# access to the server via any other hostnames. The first FQDN in the list 
will be treated as the preferred name.
+#
+# Example: ALLOWED_HOSTS = ['netbox.example.com', 'netbox.internal.local']
+# We are behind an apache httpd server, so use X-Forwarded_Host header
+USE_X_FORWARDED_HOST = True
+ALLOWED_HOSTS = ['netbox.wikimedia.org']
+
+# PostgreSQL database configuration.
+DATABASE = {
+'NAME': 'netbox', # Database name
+'USER': 'netbox',   # PostgreSQL username
+'PASSWORD': '<%= @db_password %>',   # PostgreSQL password
+'HOST': 'localhost',  # Database server
+'PORT': '',   # Database port (leave blank for default)
+}
+
+# This key is used for secure generation of random numbers and strings. It 
must never be exposed outside of this file.
+# For optimal security, SECRET_KEY should be at least 50 characters in length 
and contain a mix of letters, numbers, and
+# symbols. NetBox will not run without this defined. For more information, see
+# 

[MediaWiki-commits] [Gerrit] labs/private[master]: Add fake keys for Netbox deployment

[Ayounsi (Code Review)]

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

Change subject: Add fake keys for Netbox deployment
..

Add fake keys for Netbox deployment

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/78/387878/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index db1b0a0..ab4e6f7 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -502,3 +502,8 @@
 class passwords::rddmarc {
 $db_password = 'notsecret'
 }
+
+class passwords::netbox {
+$db_password = 'notsecret'
+$secret_key = 'notsecret'
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Rename CDN config variables to be generic, deprecating...

[Jforrester (Code Review)]

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

Change subject: [WIP] Rename CDN config variables to be generic, deprecating 
the old names
..

[WIP] Rename CDN config variables to be generic, deprecating the old names

Untested. Messy. Not totally sure this is a good idea.

Should https://www.mediawiki.org/wiki/Manual:Squid_caching be renamed too?

Bug: T104148
Change-Id: I7a725dae551c867a4fa7c213838d52c7fb862756
---
M includes/AjaxResponse.php
M includes/Block.php
M includes/DefaultSettings.php
M includes/MediaWiki.php
M includes/OutputPage.php
M includes/ServiceWiring.php
M includes/Setup.php
M includes/actions/RawAction.php
M includes/api/ApiMain.php
M includes/clientpool/SquidPurgeClient.php
M includes/deferred/CdnCacheUpdate.php
M includes/skins/Skin.php
M maintenance/benchmarks/benchmarkPurge.php
M tests/phpunit/includes/WebRequestTest.php
M thumb.php
15 files changed, 157 insertions(+), 67 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/387877/1

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 3e42c08..2c18cab 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -180,12 +180,19 @@
# and tell the client to always check with the CDN. 
Otherwise,
# tell the client to use a cached copy, without a way 
to purge it.
 
-   if ( $this->mConfig->get( 'UseSquid' ) ) {
+   $config = $this->mConfig;
+
+   // Backwards-compatibility reading of old $wgUseSquid 
setting as of MediaWiki 1.31
+   $configUseCdn = $config->has( 'UseSquid' ) ?
+   $config->get( 'UseSquid' ) :
+   $config->get( 'UseCdn' );
+
+   if ( $configUseCdn ) {
# Expect explicit purge of the proxy cache, but 
require end user agents
# to revalidate against the proxy on each visit.
# Surrogate-Control controls our CDN, 
Cache-Control downstream caches
 
-   if ( $this->mConfig->get( 'UseESI' ) ) {
+   if ( $config->get( 'UseESI' ) ) {
header( 'Surrogate-Control: max-age=' . 
$this->mCacheDuration . ', content="ESI/1.0"' );
header( 'Cache-Control: s-maxage=0, 
must-revalidate, max-age=0' );
} else {
diff --git a/includes/Block.php b/includes/Block.php
index d1e78bb..16ce1a6 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1203,7 +1203,7 @@
if ( !IP::isValid( $ipaddr ) ) {
continue;
}
-   # Don't check trusted IPs (includes local squids which 
will be in every request)
+   # Don't check trusted IPs (includes local CDNs which 
will be in every request)
if ( $proxyLookup->isTrustedProxy( $ipaddr ) ) {
continue;
}
@@ -1264,7 +1264,7 @@
 * @param array $ipChain List of IPs (strings). This is used to 
determine how "close"
 * a block is to the server, and if a block matches exactly, or is 
in a range.
 * The order is furthest from the server to nearest e.g., (Browser, 
proxy1, proxy2,
-* local-squid, ...)
+* local-cdn, ...)
 * @throws MWException
 * @return Block|null The "best" block from the list
 */
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d9f032c..608edb1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2650,7 +2650,8 @@
  * @name   HTTP proxy (CDN) settings
  *
  * Many of these settings apply to any HTTP proxy used in front of MediaWiki,
- * although they are referred to as Squid settings for historical reasons.
+ * although they are sometimes still referred to as Squid settings for
+ * historical reasons.
  *
  * Achieving a high hit ratio with an HTTP proxy requires special
  * configuration. See https://www.mediawiki.org/wiki/Manual:Squid_caching for
@@ -2662,8 +2663,10 @@
 /**
  * Enable/disable CDN.
  * See https://www.mediawiki.org/wiki/Manual:Squid_caching
+ *
+ * @since 1.31 Renamed from $wgUseSquid.
  */
-$wgUseSquid = false;
+$wgUseCdn = false;
 
 /**
  * If you run Squid3 with ESI support, enable this (default:false):
@@ -2673,6 +2676,7 @@
 /**
  * Send the Key HTTP header for better caching.
  * See https://datatracker.ietf.org/doc/draft-fielding-http-key/ for details.
+ *
  * @since 1.27
  */
 $wgUseKeyHeader = false;
@@ -2703,12 +2707,15 @@
  * out s-maxage in the CDN config.
  *
  * 18000 seconds = 5 hours, more cache 

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Port Popups browser tests to selenium

[jenkins-bot (Code Review)]

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

Change subject: Port Popups browser tests to selenium
..


Port Popups browser tests to selenium

Bug: T177262
Change-Id: Ie77cf7bc79f454904983ed5cf65dc9fe2b1ececc
---
D Gemfile
D Gemfile.lock
D tests/browser/README.mediawiki
D tests/browser/environments.yml
D tests/browser/features/previews.feature
D tests/browser/features/support/env.rb
D tests/browser/features/support/hooks.rb
D tests/browser/features/support/pages/article_page.rb
D tests/browser/features/support/permissions.sqlite
D tests/browser/features/support/step_definitions/common_steps.rb
D tests/browser/features/support/step_definitions/previews.rb
A tests/selenium/.eslintrc.json
R tests/selenium/LocalSettings.php
A tests/selenium/README.md
R tests/selenium/fixtures/test_page.wikitext
A tests/selenium/pageobjects/popups.page.js
A tests/selenium/specs/previews.js
17 files changed, 139 insertions(+), 288 deletions(-)

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



diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index 4ed439b..000
--- a/Gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'chunky_png', '~> 1.3.4'
-gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1'
-gem 'rake', '~> 10.4', '>= 10.4.2'
-gem 'rubocop', '~> 0.29.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 5703a5d..000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,124 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-ast (2.3.0)
-astrolabe (1.3.1)
-  parser (~> 2.2)
-builder (3.2.2)
-childprocess (0.5.9)
-  ffi (~> 1.0, >= 1.0.11)
-chunky_png (1.3.8)
-cucumber (1.3.20)
-  builder (>= 2.1.2)
-  diff-lcs (>= 1.1.3)
-  gherkin (~> 2.12)
-  multi_json (>= 1.7.5, < 2.0)
-  multi_test (>= 0.1.2)
-data_magic (1.0)
-  faker (>= 1.1.2)
-  yml_reader (>= 0.6)
-diff-lcs (1.2.5)
-dimensions (1.2.0)
-domain_name (0.5.20161129)
-  unf (>= 0.0.5, < 1.0.0)
-faker (1.6.6)
-  i18n (~> 0.5)
-faraday (0.10.0)
-  multipart-post (>= 1.2, < 3)
-faraday-cookie_jar (0.0.6)
-  faraday (>= 0.7.4)
-  http-cookie (~> 1.0.0)
-faraday_middleware (0.10.1)
-  faraday (>= 0.7.4, < 1.0)
-ffi (1.9.14)
-gherkin (2.12.2)
-  multi_json (~> 1.3)
-headless (2.3.1)
-http-cookie (1.0.3)
-  domain_name (~> 0.5)
-i18n (0.7.0)
-jsduck (5.3.4)
-  dimensions (~> 1.2.0)
-  json (~> 1.8.0)
-  parallel (~> 0.7.1)
-  rdiscount (~> 2.1.6)
-  rkelly-remix (~> 0.0.4)
-json (1.8.3)
-mediawiki_api (0.7.0)
-  faraday (~> 0.9, >= 0.9.0)
-  faraday-cookie_jar (~> 0.0, >= 0.0.6)
-  faraday_middleware (~> 0.10, >= 0.10.0)
-mediawiki_selenium (1.7.3)
-  cucumber (~> 1.3, >= 1.3.20)
-  headless (~> 2.0, >= 2.1.0)
-  json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.7, >= 0.7.0)
-  page-object (~> 1.0)
-  rest-client (~> 1.6, >= 1.6.7)
-  rspec-core (~> 2.14, >= 2.14.4)
-  rspec-expectations (~> 2.14, >= 2.14.4)
-  selenium-webdriver (< 3)
-  syntax (~> 1.2, >= 1.2.0)
-  thor (~> 0.19, >= 0.19.1)
-mime-types (2.99.3)
-multi_json (1.12.1)
-multi_test (0.1.2)
-multipart-post (2.0.0)
-net-http-persistent (2.9.4)
-netrc (0.11.0)
-page-object (1.2.2)
-  net-http-persistent (~> 2.9.4)
-  page_navigation (>= 0.9)
-  selenium-webdriver (>= 2.53.0)
-  watir-webdriver (>= 0.6.11, < 0.9.9)
-page_navigation (0.10)
-  data_magic (>= 0.22)
-parallel (0.7.1)
-parser (2.3.3.1)
-  ast (~> 2.2)
-powerpack (0.1.1)
-rainbow (2.1.0)
-rake (10.5.0)
-rdiscount (2.1.8)
-rest-client (1.8.0)
-  http-cookie (>= 1.0.2, < 2.0)
-  mime-types (>= 1.16, < 3.0)
-  netrc (~> 0.7)
-rkelly-remix (0.0.7)
-rspec-core (2.99.2)
-rspec-expectations (2.99.2)
-  diff-lcs (>= 1.1.3, < 2.0)
-rubocop (0.29.1)
-  astrolabe (~> 1.3)
-  parser (>= 2.2.0.1, < 3.0)
-  powerpack (~> 0.1)
-  rainbow (>= 1.99.1, < 3.0)
-  ruby-progressbar (~> 1.4)
-ruby-progressbar (1.8.1)
-rubyzip (1.2.0)
-selenium-webdriver (2.53.4)
-  childprocess (~> 0.5)
-  rubyzip (~> 1.0)
-  websocket (~> 1.0)
-syntax (1.2.1)
-thor (0.19.4)
-unf (0.1.4)
-  unf_ext
-unf_ext (0.0.7.2)
-watir-webdriver (0.9.3)
-  selenium-webdriver (>= 2.46.2)
-websocket (1.2.3)
-yml_reader (0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  chunky_png (~> 1.3.4)
-  jsduck (~> 5.3.4)
-  mediawiki_selenium (~> 1.7, >= 1.7.1)
-  rake (~> 10.4, >= 10.4.2)
-  rubocop (~> 0.29.1)
-
-BUNDLED WITH
-   1.12.5
diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
deleted file mode 100644
index e3c2a6d..000
--- 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

d37b628 Submodule update
f0ea364 Hack proximity search to support entering lat& long directly
a0959b3 CiviCRM submodule commit
0edfb9d CRM-21371 - An api error when calling drush cvapi should be treated 
as a drush error
47f6d10 Backport of formatting cleanup.
20ccb2a Remove a trailing space
98efead Fix for overwriting of start_time.
126683d Fix thrown exception in Omnimail.
9841cf7 Rename job_suffix to job_identifier.

Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d
---
0 files changed, 0 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LVS+Caches: disable Ethernet flowcontrol

[BBlack (Code Review)]

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

Change subject: LVS+Caches: disable Ethernet flowcontrol
..


LVS+Caches: disable Ethernet flowcontrol

(but only on the 10G hosts, meaning not lvs1001-6!)

Change-Id: Id3981005b4ef6e08335a5c1237595a15e36d0743
---
M modules/cacheproxy/manifests/performance.pp
A modules/interface/manifests/noflow.pp
M modules/lvs/manifests/interface_tweaks.pp
3 files changed, 28 insertions(+), 1 deletion(-)

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



diff --git a/modules/cacheproxy/manifests/performance.pp 
b/modules/cacheproxy/manifests/performance.pp
index 92918da..9ecc2bd 100644
--- a/modules/cacheproxy/manifests/performance.pp
+++ b/modules/cacheproxy/manifests/performance.pp
@@ -49,6 +49,9 @@
 value => 'off',
 }
 
+# Disable ethernet PAUSE behavior, dropping is better than buffering (in 
reasonable cases!)
+interface::noflow { $iface_primary: }
+
 # RPS/RSS to spread network i/o evenly.  Note this enables FQ as well,
 # which must be enabled before turning on BBR congestion control below
 interface::rps { 'primary':
diff --git a/modules/interface/manifests/noflow.pp 
b/modules/interface/manifests/noflow.pp
new file mode 100644
index 000..7a66b1c
--- /dev/null
+++ b/modules/interface/manifests/noflow.pp
@@ -0,0 +1,18 @@
+# Definition: interface::noflow
+#
+# Disable ethernet flow control at boot time via up-commands.
+#
+# Parameters:
+# - $interface=$name:
+#   The network interface to operate on
+define interface::noflow($interface=$name) {
+# Command will fail on some hosts, depending on kernel/driver revs and/or
+# ethernet hardware capabilities, in which case we don't care, hence ||:
+$cmd = "ethtool -A ${interface} autoneg off tx off rx off ||:"
+
+# Add to ifup commands in /etc/network/interfaces
+interface::up_command { "noflow-${interface}":
+interface => $interface,
+command   => $cmd,
+}
+}
diff --git a/modules/lvs/manifests/interface_tweaks.pp 
b/modules/lvs/manifests/interface_tweaks.pp
index ac41429..cc48a7e 100644
--- a/modules/lvs/manifests/interface_tweaks.pp
+++ b/modules/lvs/manifests/interface_tweaks.pp
@@ -45,13 +45,19 @@
 setting   => 'rx',
 value => 4078,
 }
+
+# Disable ethernet PAUSE behavior, dropping is better than buffering 
(in reasonable cases!)
+interface::noflow { $interface: }
 }
-# lvs1001-6 have bnx2 1G cards, different maximum but still useful!
 else {
+# lvs1001-6 have bnx2 1G cards, different maximum but still useful!
 interface::ring { "${name} rxring":
 interface => $interface,
 setting   => 'rx',
 value => 2040,
 }
+
+# We don't use noflow here because PAUSE is doing useful things for 
this
+# case.  lvs1003 in particular can get overwhelmed in small bursts...
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[Eileen (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

d37b628 Submodule update
f0ea364 Hack proximity search to support entering lat& long directly
a0959b3 CiviCRM submodule commit
0edfb9d CRM-21371 - An api error when calling drush cvapi should be treated 
as a drush error
47f6d10 Backport of formatting cleanup.
20ccb2a Remove a trailing space
98efead Fix for overwriting of start_time.
126683d Fix thrown exception in Omnimail.
9841cf7 Rename job_suffix to job_identifier.

Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/76/387876/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add dumpsgen user to the snapshots hosts

[ArielGlenn (Code Review)]

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

Change subject: add dumpsgen user to the snapshots hosts
..


add dumpsgen user to the snapshots hosts

slowly replacing the bad datasets user

Change-Id: Ie4049a26d9b4a7a14a225a0ec0ccc7b1b4edf82b
---
M modules/profile/manifests/dumps/generation/worker/common.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/dumps/generation/worker/common.pp 
b/modules/profile/manifests/dumps/generation/worker/common.pp
index c268ada..e2c02b0 100644
--- a/modules/profile/manifests/dumps/generation/worker/common.pp
+++ b/modules/profile/manifests/dumps/generation/worker/common.pp
@@ -6,6 +6,7 @@
 
 # dataset server nfs mount, config files,
 # stages files, dblists, html templates
+class { '::dumpsuser': }
 class { '::dumps::deprecated::user': }
 class { '::snapshot::dumps': }
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update

[jenkins-bot (Code Review)]

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

Change subject: Submodule update
..


Submodule update

f0ea364 Hack proximity search to support entering lat& long directly

Change-Id: I2c1d963a3be8e3fc6444bc0631d0ca842ca9fdbc
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index 0edfb9d..f0ea364 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 0edfb9dffeb3dc5be994f08d945b55e1cfdbc495
+Subproject commit f0ea3643e3d34f77bbd4f3a11a1134fe1602fa2a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c1d963a3be8e3fc6444bc0631d0ca842ca9fdbc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add dumpsgen user to the snapshots hosts

[ArielGlenn (Code Review)]

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

Change subject: add dumpsgen user to the snapshots hosts
..

add dumpsgen user to the snapshots hosts

slowly replacing the bad datasets user

Change-Id: Ie4049a26d9b4a7a14a225a0ec0ccc7b1b4edf82b
---
M modules/profile/manifests/dumps/generation/worker/common.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/387875/1

diff --git a/modules/profile/manifests/dumps/generation/worker/common.pp 
b/modules/profile/manifests/dumps/generation/worker/common.pp
index c268ada..e2c02b0 100644
--- a/modules/profile/manifests/dumps/generation/worker/common.pp
+++ b/modules/profile/manifests/dumps/generation/worker/common.pp
@@ -6,6 +6,7 @@
 
 # dataset server nfs mount, config files,
 # stages files, dblists, html templates
+class { '::dumpsuser': }
 class { '::dumps::deprecated::user': }
 class { '::snapshot::dumps': }
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update

[Eileen (Code Review)]

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

Change subject: Submodule update
..

Submodule update

f0ea364 Hack proximity search to support entering lat& long directly

Change-Id: I2c1d963a3be8e3fc6444bc0631d0ca842ca9fdbc
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/387874/1

diff --git a/civicrm b/civicrm
index 0edfb9d..f0ea364 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 0edfb9dffeb3dc5be994f08d945b55e1cfdbc495
+Subproject commit f0ea3643e3d34f77bbd4f3a11a1134fe1602fa2a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c1d963a3be8e3fc6444bc0631d0ca842ca9fdbc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Replace settings block rounded gradient with color

[VolkerE (Code Review)]

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

Change subject: Replace settings block rounded gradient with color
..

Replace settings block rounded gradient with color

Replacing vertical background gradient with single color, as no
faux 3D gradients are part of current style guide.

Change-Id: If98a6cb22a9551a5d69d782759eadd5cec7e0efc
---
M resources/css/ext.uls.interface.less
M resources/css/ext.uls.languagesettings.less
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/resources/css/ext.uls.interface.less 
b/resources/css/ext.uls.interface.less
index cf5031f..615b979 100644
--- a/resources/css/ext.uls.interface.less
+++ b/resources/css/ext.uls.interface.less
@@ -2,8 +2,8 @@
 @import 'mediawiki.mixins';
 
 #uls-settings-block {
+   background-color: #f8f9fa;
border-top: 1px solid #c8ccd1;
-   .vertical-gradient( #fbfbfb, #f0f0f0 );
padding-left: 10px;
line-height: 1.2em;
border-radius: 0 0 2px 2px;
diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 974316d..ecc4284 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -2,7 +2,7 @@
 
 /* stylelint-disable selector-no-id */
 #uls-settings-block {
-   .vertical-gradient( #fbfbfb, #f0f0f0 );
+   background-color: #f8f9fa;
border-top: 1px solid #c8ccd1;
padding-left: 10px;
line-height: 1.2em;

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

[Smalyshev (Code Review)]

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

Change subject: Update GUI
..

Update GUI

Change-Id: I456ada2bbe42e8d9ec3187f676d457c03b2f0cb6
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/gui b/gui
index 62eef24..4999f59 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 62eef24e11f9a898c9fac5f233861a00f39f3dc2
+Subproject commit 4999f5955040352debf77aeae93bed518bb300e0

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Escape article title before sending it to RESTBase

[Bmansurov (Code Review)]

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

Change subject: Escape article title before sending it to RESTBase
..

Escape article title before sending it to RESTBase

The change takes care of article titles such as
https://en.wikipedia.org/wiki/CP/M-86 before sending them to RESTBase.

I've noted to add tests to cover this and other edge cases in follow up
patches where I've already added tests.

Bug: T176627
Change-Id: I1d32590d2ba5943ef2899cd1be60f0027326fd6c
---
M routes/html2pdf-v1.js
M test/features/v1/html2pdf.js
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/routes/html2pdf-v1.js b/routes/html2pdf-v1.js
index c50f14d..35bb7cc 100644
--- a/routes/html2pdf-v1.js
+++ b/routes/html2pdf-v1.js
@@ -65,7 +65,7 @@
 request: {
 params: {
 domain: req.params.domain,
-path: `page/html/${req.params.title}`
+path: `page/html/${encodeURIComponent(req.params.title)}`
 }
 }
 });
diff --git a/test/features/v1/html2pdf.js b/test/features/v1/html2pdf.js
index 958c6c8..4680f25 100644
--- a/test/features/v1/html2pdf.js
+++ b/test/features/v1/html2pdf.js
@@ -10,7 +10,7 @@
 
it('should return a letter-sized PDF', function() {
return preq.get(
-   server.config.uri + 'en.wikipedia.org/v1/pdf/Letter'
+   server.config.uri + 
'en.wikipedia.org/v1/pdf/CP%2FM-86/letter'
)
.then(function(res) {
assert.status(res, 200);

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Only update contact on email match too

[Ejegg (Code Review)]

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

Change subject: Only update contact on email match too
..

Only update contact on email match too

In case of forwarded emails.

T177663

Change-Id: I797571eeb3d66a40abb59cd43727f33df17ffe40
---
M sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 84 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/70/387870/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
index a6fb81c..a8eca49 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
@@ -687,20 +687,27 @@
 }
 
   /**
-   * When we get a contact ID and matching hash, update instead of create new
-   * @group contactHash
+   * When we get a contact ID and matching hash and email, update instead of
+   * creating new contact.
*/
   public function testImportWithContactIdAndHash() {
 $existingContact = civicrm_api3('Contact', 'Create', array(
   'contact_type' => 'Individual',
   'first_name' => 'Test',
-  'last_name' => 'Es' . mt_rand()
+  'last_name' => 'Es' . mt_rand(),
 ));
 $this->contact_id = $existingContact['id'];
 $existingContact = $existingContact['values'][$existingContact['id']];
+$email = 'booboo' . mt_rand() . '@example.org';
 civicrm_api3('Email', 'Create', array(
   'contact_id' => $this->contact_id,
-  'email' => 'booboo' . mt_rand() . '@example.org',
+  'email' => $email,
+  'location_type_id' => 1,
+));
+civicrm_api3('Address', 'Create', array(
+  'contact_id' => $this->contact_id,
+  'country' => wmf_civicrm_get_country_id('FR'),
+  'street_address' => '777 Trompe L\'Oeil Boulevard',
   'location_type_id' => 1,
 ));
 $msg = array(
@@ -709,7 +716,9 @@
   'currency' => 'USD',
   'date' => '2017-01-01 00:00:00',
   'invoice_id' => mt_rand(),
-  'email' => 'newspecialem...@wikimedia.org',
+  'country' => 'US',
+  'street_address' => '123 42nd St. #321',
+  'email' => $email,
   'gateway' => 'test_gateway',
   'gateway_txn_id' => mt_rand(),
   'gross' => '1.25',
@@ -717,15 +726,14 @@
 );
 $contribution = wmf_civicrm_contribution_message_import($msg);
 $this->assertEquals($existingContact['id'], $contribution['contact_id']);
-$email = $this->callAPISuccessGetSingle(
-  'Email', array('contact_id' => $existingContact['id'], 'location_type' 
=> 1)
+$address = $this->callAPISuccessGetSingle(
+  'Address', array('contact_id' => $existingContact['id'], 'location_type' 
=> 1)
 );
-$this->assertEquals($msg['email'], $email['email']);
+$this->assertEquals($msg['street_address'], $address['street_address']);
   }
 
   /**
* If we get a contact ID and a bad hash, leave the existing contact alone
-   * @group contactHash
*/
   public function testImportWithContactIdAndBadHash() {
 $existingContact = civicrm_api3('Contact', 'Create', array(
@@ -733,11 +741,18 @@
   'first_name' => 'Test',
   'last_name' => 'Es' . mt_rand()
 ));
+$email = 'booboo' . mt_rand() . '@example.org';
 $this->contact_id = $existingContact['id'];
 $existingContact = $existingContact['values'][$existingContact['id']];
 civicrm_api3('Email', 'Create', array(
   'contact_id' => $this->contact_id,
-  'email' => 'booboo' . mt_rand() . '@example.org',
+  'email' => $email,
+  'location_type_id' => 1,
+));
+civicrm_api3('Address', 'Create', array(
+  'contact_id' => $this->contact_id,
+  'country' => wmf_civicrm_get_country_id('FR'),
+  'street_address' => '777 Trompe L\'Oeil Boulevard',
   'location_type_id' => 1,
 ));
 $msg = array(
@@ -747,7 +762,9 @@
   'currency' => 'USD',
   'date' => '2017-01-01 00:00:00',
   'invoice_id' => mt_rand(),
-  'email' => 'newspecialem...@wikimedia.org',
+  'email' => $email,
+  'country' => 'US',
+  'street_address' => '123 42nd St. #321',
   'gateway' => 'test_gateway',
   'gateway_txn_id' => mt_rand(),
   'gross' => '1.25',
@@ -755,10 +772,56 @@
 );
 $contribution = wmf_civicrm_contribution_message_import($msg);
 $this->assertNotEquals($existingContact['id'], 
$contribution['contact_id']);
-$email = $this->callAPISuccessGetSingle(
-  'Email', array('contact_id' => $existingContact['id'], 'location_type' 
=> 1)
+$address = $this->callAPISuccessGetSingle(
+  'Address', array('contact_id' => $existingContact['id'], 'location_type' 
=> 1)
 );
-$this->assertNotEquals($msg['email'], $email['email']);
+