[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: WIP: prohibit some globals

[MaxSem (Code Review)]

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

Change subject: WIP: prohibit some globals
..

WIP: prohibit some globals

Change-Id: Ib75750212128bba70de7cd7d815b982982ed1505
---
A MediaWiki/Sniffs/VariableAnalysis/ForbiddenGlobalVariablesSniff.php
A MediaWiki/Tests/files/VariableAnalysis/forbidden_global_variables.php
A MediaWiki/Tests/files/VariableAnalysis/forbidden_global_variables.php.expect
3 files changed, 105 insertions(+), 0 deletions(-)


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

diff --git 
a/MediaWiki/Sniffs/VariableAnalysis/ForbiddenGlobalVariablesSniff.php 
b/MediaWiki/Sniffs/VariableAnalysis/ForbiddenGlobalVariablesSniff.php
new file mode 100644
index 000..d7ef8a0
--- /dev/null
+++ b/MediaWiki/Sniffs/VariableAnalysis/ForbiddenGlobalVariablesSniff.php
@@ -0,0 +1,66 @@
+getTokens();
+   if ( !isset( $tokens[$stackPtr]['scope_opener'] ) ) {
+   // An interface or abstract function which doesn't have 
a body
+   return;
+   }
+   $scopeOpener = ++$tokens[$stackPtr]['scope_opener'];
+   $scopeCloser = $tokens[$stackPtr]['scope_closer'];
+
+   $globalLine = 0;
+   $globalVariables = [];
+
+   for ( $i = $scopeOpener; $i < $scopeCloser; $i++ ) {
+   if ( array_key_exists( $tokens[$i]['type'], 
Tokens::$emptyTokens ) ) {
+   continue;
+   }
+   if ( $tokens[$i]['type'] === 'T_GLOBAL' ) {
+   $globalLine = $tokens[$i]['line'];
+   }
+   if ( $tokens[$i]['type'] === 'T_VARIABLE' && 
$tokens[$i]['line'] == $globalLine ) {
+   $globalVariables[] = [ $tokens[$i]['content'], 
$i ];
+   }
+   }
+   foreach ( $globalVariables as $global ) {
+   if ( in_array( $global[0], $this->forbiddenGlobals ) ) {
+   $phpcsFile->addWarning(
+   "Global {$global[0]} should not be 
used.",
+   $global[1],
+   'ForbiddenGlobal' . $global[0]
+   );
+   }
+   }
+   }
+}
diff --git 
a/MediaWiki/Tests/files/VariableAnalysis/forbidden_global_variables.php 
b/MediaWiki/Tests/files/VariableAnalysis/forbidden_global_variables.php
new file mode 100644
index 000..a41ea36
--- /dev/null
+++ b/MediaWiki/Tests/files/VariableAnalysis/forbidden_global_variables.php
@@ -0,0 +1,39 @@
+https://gerrit.wikimedia.org/r/373433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Updated version 1.29.1 from 'upstream/1.29.1'

[Legoktm (Code Review)]

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

Change subject: Updated version 1.29.1 from 'upstream/1.29.1'
..


Updated version 1.29.1 from 'upstream/1.29.1'

with Debian dir 00a579fc3bd7e6af6091aa8ee0545bb86deaa429

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05bcef01a2e225544143a98f6bc0f119c87ba47b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Bump changelog

[Legoktm (Code Review)]

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

Change subject: Bump changelog
..


Bump changelog

Change-Id: If0ec171c9f61cbe1d09e729bb485178c56be4a7c
---
M debian/changelog
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 98e3c2b..af46ce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mediawiki (1:1.29.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update debian/copyright for new bundled libraries
+  * Drop unnecessary patches 
+
+ -- Kunal Mehta   Wed, 23 Aug 2017 22:17:04 -0700
+
 mediawiki (1:1.28.1-1) unstable; urgency=medium
 
   * New upstream release

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0ec171c9f61cbe1d09e729bb485178c56be4a7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: watch: Track 1.29

[Legoktm (Code Review)]

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

Change subject: watch: Track 1.29
..


watch: Track 1.29

Change-Id: Ib0f53d972d5f8a26b14e1797001006f086a6dd6d
---
M debian/watch
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/debian/watch b/debian/watch
index c3b79f8..e20595e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
 opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \
-https://releases.wikimedia.org/mediawiki/1.28/ mediawiki-([0-9.]*).tar.gz
+https://releases.wikimedia.org/mediawiki/1.29/ mediawiki-([0-9.]*).tar.gz

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0f53d972d5f8a26b14e1797001006f086a6dd6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Update version in changelog and other packaging fix-ups

[Legoktm (Code Review)]

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

Change subject: Update version in changelog and other packaging fix-ups
..


Update version in changelog and other packaging fix-ups

Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
---
M debian/changelog
M debian/mediawiki.install
A debian/patches/pear-phail-fail-shebang.diff
M debian/patches/series
M vendor/pear/mail_mime/scripts/phail.php
5 files changed, 12 insertions(+), 3 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index af46ce3..bfac1a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mediawiki (1:1.29.0-1) unstable; urgency=medium
+mediawiki (1:1.29.1-1) unstable; urgency=medium
 
   * New upstream release
   * Update debian/copyright for new bundled libraries
diff --git a/debian/mediawiki.install b/debian/mediawiki.install
index 151f52f..ace55b1 100644
--- a/debian/mediawiki.install
+++ b/debian/mediawiki.install
@@ -1,4 +1,4 @@
 debian/etc/*   etc/mediawiki
-*.php *.phtml includes index.php languages maintenance mw-config resources 
serialized skins vendor usr/share/mediawiki
+*.php includes index.php languages maintenance mw-config resources serialized 
skins vendor usr/share/mediawiki
 cache extensions images var/lib/mediawiki
 debian/images/*.png usr/share/mediawiki/resources/assets/debian
diff --git a/debian/patches/pear-phail-fail-shebang.diff 
b/debian/patches/pear-phail-fail-shebang.diff
new file mode 100644
index 000..a980291
--- /dev/null
+++ b/debian/patches/pear-phail-fail-shebang.diff
@@ -0,0 +1,8 @@
+--- a/vendor/pear/mail_mime/scripts/phail.php
 b/vendor/pear/mail_mime/scripts/phail.php
+@@ -1,4 +1,4 @@
+-#!@prefix@/bin/php -Cq
++#!/usr/bin/php -Cq
+ https://gerrit.wikimedia.org/r/373432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Remove unnecessary php-jwt patch

[Legoktm (Code Review)]

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

Change subject: Remove unnecessary php-jwt patch
..


Remove unnecessary php-jwt patch

Change-Id: Iadae20dad5873ea85049698a03a209548e241698
---
D debian/patches/php-jwt-fix-shebang.diff
M debian/patches/series
M vendor/pear/mail_mime/scripts/phail.php
3 files changed, 1 insertion(+), 11 deletions(-)

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



diff --git a/debian/patches/php-jwt-fix-shebang.diff 
b/debian/patches/php-jwt-fix-shebang.diff
deleted file mode 100644
index f81420b..000
--- a/debian/patches/php-jwt-fix-shebang.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: mediawiki-1.27.0/vendor/firebase/php-jwt/run-tests.sh
-===
 mediawiki-1.27.0.orig/vendor/firebase/php-jwt/run-tests.sh 2016-06-30 
22:48:42.714833779 +
-+++ mediawiki-1.27.0/vendor/firebase/php-jwt/run-tests.sh  2016-06-30 
22:48:42.713833779 +
-@@ -1,4 +1,3 @@
--
- #!/usr/bin/env bash
- gpg --fingerprint D8406D0D82947747293778314AA394086372C20A
- if [ $? -ne 0 ]; then
diff --git a/debian/patches/series b/debian/patches/series
index 6ba5991..e415bd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debian_installer_overrides.diff
 pear-phail-fail-shebang.diff
-php-jwt-fix-shebang.diff
diff --git a/vendor/pear/mail_mime/scripts/phail.php 
b/vendor/pear/mail_mime/scripts/phail.php
index e6427a5..20abdfe 100755
--- a/vendor/pear/mail_mime/scripts/phail.php
+++ b/vendor/pear/mail_mime/scripts/phail.php
@@ -1,4 +1,4 @@
-#!@prefix@/bin/php -Cq
+#!/usr/bin/php -Cq
 https://gerrit.wikimedia.org/r/373427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadae20dad5873ea85049698a03a209548e241698
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Remove unncessary pear-phail shebang patch

[Legoktm (Code Review)]

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

Change subject: Remove unncessary pear-phail shebang patch
..


Remove unncessary pear-phail shebang patch

Change-Id: I699f5e784d092124d3f8f26c8ed5731f7f66dfdb
---
D debian/patches/pear-phail-fail-shebang.diff
M debian/patches/series
2 files changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/debian/patches/pear-phail-fail-shebang.diff 
b/debian/patches/pear-phail-fail-shebang.diff
deleted file mode 100644
index a980291..000
--- a/debian/patches/pear-phail-fail-shebang.diff
+++ /dev/null
@@ -1,8 +0,0 @@
 a/vendor/pear/mail_mime/scripts/phail.php
-+++ b/vendor/pear/mail_mime/scripts/phail.php
-@@ -1,4 +1,4 @@
--#!@prefix@/bin/php -Cq
-+#!/usr/bin/php -Cq
- https://gerrit.wikimedia.org/r/373428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I699f5e784d092124d3f8f26c8ed5731f7f66dfdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Updated version 1.29.0 from 'upstream/1.29.0'

[Legoktm (Code Review)]

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

Change subject: Updated version 1.29.0 from 'upstream/1.29.0'
..


Updated version 1.29.0 from 'upstream/1.29.0'

with Debian dir ea9fe61195f87573bccd126cd971d1dda5831013

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62e44091ed90f6a1608f75b0302b8f1e8c0fbe18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Update changelog for 1:1.28.1-1

[Legoktm (Code Review)]

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

Change subject: Update changelog for 1:1.28.1-1
..


Update changelog for 1:1.28.1-1

Change-Id: I3a8d81ff283a30aa6fc4513b98483c3a05bea060
---
M debian/changelog
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 6db2cc8..98e3c2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mediawiki (1:1.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update debian/copyright for file renames and new
+bundled libraries
+  * Remove executable bit from SpecialNewpages.php to
+fix lintian warning
+
+ -- Kunal Mehta   Mon, 10 Apr 2017 14:49:51 -0700
+
 mediawiki (1:1.27.2-1) unstable; urgency=medium
 
   * Improve NEWS file (Closes: #852862, #854352)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a8d81ff283a30aa6fc4513b98483c3a05bea060
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
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/debian[master-stable]: Update debian/copyright for 1.29.0

[Legoktm (Code Review)]

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

Change subject: Update debian/copyright for 1.29.0
..


Update debian/copyright for 1.29.0

Change-Id: Iaf21ef1bba1bfc5afeb18771cd19dac8588eee3b
---
M debian/copyright
1 file changed, 29 insertions(+), 24 deletions(-)

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



diff --git a/debian/copyright b/debian/copyright
index f43e671..7ca00a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@
 Source: https://releases.wikimedia.org/mediawiki/
 
 Files: *
-Copyright: 2001-2016, MediaWiki developers
+Copyright: 2001-2017, MediaWiki developers
 License: GPL-2.0+
 
 Files: extensions/Cite/*
@@ -18,7 +18,7 @@
 License: GPL-2.0+
 
 Files: extensions/Cite/includes/CiteDataModule.php 
extensions/Cite/includes/CiteHooks.php extensions/Cite/modules/ve-cite/*
-Copyright: 2011-2016, Cite VisualEditor Team and others
+Copyright: 2011-2017, Cite VisualEditor Team and others
 License: Expat
 
 Files: extensions/CiteThisPage/*
@@ -79,7 +79,7 @@
Robert Rohde
Ross McClure
Juraj Simlovic
-License: GPL-2.0
+License: GPL-2.0+
 
 Files: extensions/PdfHandler/*
 Copyright: Martin Seidel
@@ -161,15 +161,11 @@
 License: BSD-2-clause
 
 Files: includes/widget/*
-Copyright: 2011-2015, MediaWiki Widgets Team and others
+Copyright: 2011-2017, MediaWiki Widgets Team and others
 License: Expat
 
 Files: profileinfo.php
 Copyright: 2005, Kate Turner
-License: Expat
-
-Files: resources/lib/es5-shim/es5-shim.js
-Copyright: 2009-2014, Kristopher Michael Kowal and contributors
 License: Expat
 
 Files: resources/lib/jquery/jquery.appear.js
@@ -208,6 +204,10 @@
 Copyright: Andris Reinman 
 License: Unlicense
 
+Files: resources/lib/jquery/jquery.migrate.js
+Copyright: jQuery Foundation and other contributors
+License: Expat
+
 Files: resources/lib/jquery/jquery.mockjax.js
 Copyright: 2010, appendTo LLC
 License: Expat or GPL-2.0
@@ -215,6 +215,10 @@
 Files: resources/lib/jquery/jquery.xmldom.js
 Copyright: 2009, Jonathan Sharp, Out West Media LLC.
 License: Expat or GPL-2.0
+
+Files: resources/lib/jquery/jquery3.js
+Coyright: JS Foundation and ther contributors
+License: Expat
 
 Files: resources/lib/jquery.chosen/*
 Copyright: 2011-2013, Harvest
@@ -232,12 +236,8 @@
 Copyright: 2012, jQuery Foundation and other contributors
 License: Expat
 
-Files: resources/lib/json2/json2.js
-License: PD
-Copyright: Public Domain
-
 Files: resources/lib/moment/*
-Copyright: 2011-2014, Tim Wood, Iskren Chernev, Moment.js contributors
+Copyright: 2011-2016, Tim Wood, Iskren Chernev, Moment.js contributors
 License: Expat
 
 Files: resources/lib/mustache/*
@@ -288,13 +288,6 @@
 License: CC-BY-3.0 or GPL-2.0
 Copyright: 2011-2012 Krinkle
 
-Files: resources/src/jquery/jquery.placeholder.js
-Copyright: Mathias Bynens 
-   2012, Trevor Parscal 
-   2012, Krinkle 
-   2013, Alex Ivanov 
-License: Expat
-
 Files: resources/src/jquery/jquery.tablesorter.*
 Copyright: 2007, Christian Bach
2011, Leo Koppelkamm
@@ -318,7 +311,7 @@
 License: Expat
 
 Files: resources/src/mediawiki.widgets/*
-Copyright: 2011-2015, MediaWiki Widgets Team and others
+Copyright: 2011-2016, MediaWiki Widgets Team and others
 License: Expat
 
 Files: skins/CologneBlue/*
@@ -379,7 +372,7 @@
 License: BSD-3-clause
 
 Files: vendor/oojs/oojs-ui/*
-Copyright: 2011-2016, OOjs UI Team and other contributors
+Copyright: 2011-2017, OOjs UI Team and other contributors
 License: Expat
 
 Files: vendor/oyejorge/less.php/*
@@ -428,7 +421,7 @@
 License: BSD-2-clause
 
 Files: vendor/pimple/pimple/*
-Copyright: 2009-2014, Fabien Potencier
+Copyright: 2009-2015, Fabien Potencier
 License: Expat
 
 Files: vendor/psr/log/*
@@ -439,8 +432,12 @@
 Copyright: 2014, Nicolas Ruflin
 License: Expat
 
+Files: vendor/stil/gd-text/*
+Copyright: FIXME
+License: Expat
+
 Files: vendor/symfony/process/*
-Copyright: 2004-2016, Fabien Potencier
+Copyright: 2004-2017, Fabien Potencier
 License: Expat
 
 Files: vendor/wikimedia/assert/*
@@ -484,6 +481,10 @@
 Copyright: 2015, Ori Livneh 
 License: Expat
 
+File: vendor/wikimedia/remex-html/*
+Copyright: 2016 Wikimedia Foundation
+License: Expat
+
 Files: vendor/wikimedia/running-stat/*
 Copyright: Ori Livneh
 License: GPL-2.0+
@@ -496,6 +497,10 @@
 Copyright: Stanislav Malyshev
 License: LGPL-2.1
 
+Files: vendor/wikimedia/timestamp/*
+Copyright: 2012 Tyler Romeo 
+License: GPL-2.0+
+
 Files: vendor/wikimedia/utfnormal/*
 Copyright: 2004, Brion Vibber 
 License: GPL-2.0+

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

Gerrit-MessageType: 

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Remove unncessary pear-phail shebang patch

[Legoktm (Code Review)]

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

Change subject: Remove unncessary pear-phail shebang patch
..

Remove unncessary pear-phail shebang patch

Change-Id: I699f5e784d092124d3f8f26c8ed5731f7f66dfdb
---
D debian/patches/pear-phail-fail-shebang.diff
M debian/patches/series
2 files changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/28/373428/1

diff --git a/debian/patches/pear-phail-fail-shebang.diff 
b/debian/patches/pear-phail-fail-shebang.diff
deleted file mode 100644
index a980291..000
--- a/debian/patches/pear-phail-fail-shebang.diff
+++ /dev/null
@@ -1,8 +0,0 @@
 a/vendor/pear/mail_mime/scripts/phail.php
-+++ b/vendor/pear/mail_mime/scripts/phail.php
-@@ -1,4 +1,4 @@
--#!@prefix@/bin/php -Cq
-+#!/usr/bin/php -Cq
- https://gerrit.wikimedia.org/r/373428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I699f5e784d092124d3f8f26c8ed5731f7f66dfdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Updated version 1.29.1 from 'upstream/1.29.1'

[Legoktm (Code Review)]

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

Change subject: Updated version 1.29.1 from 'upstream/1.29.1'
..

Updated version 1.29.1 from 'upstream/1.29.1'

with Debian dir 00a579fc3bd7e6af6091aa8ee0545bb86deaa429

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/31/373431/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05bcef01a2e225544143a98f6bc0f119c87ba47b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Update debian/copyright for 1.29.0

[Legoktm (Code Review)]

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

Change subject: Update debian/copyright for 1.29.0
..

Update debian/copyright for 1.29.0

Change-Id: Iaf21ef1bba1bfc5afeb18771cd19dac8588eee3b
---
M debian/copyright
1 file changed, 29 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/26/373426/1

diff --git a/debian/copyright b/debian/copyright
index f43e671..7ca00a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@
 Source: https://releases.wikimedia.org/mediawiki/
 
 Files: *
-Copyright: 2001-2016, MediaWiki developers
+Copyright: 2001-2017, MediaWiki developers
 License: GPL-2.0+
 
 Files: extensions/Cite/*
@@ -18,7 +18,7 @@
 License: GPL-2.0+
 
 Files: extensions/Cite/includes/CiteDataModule.php 
extensions/Cite/includes/CiteHooks.php extensions/Cite/modules/ve-cite/*
-Copyright: 2011-2016, Cite VisualEditor Team and others
+Copyright: 2011-2017, Cite VisualEditor Team and others
 License: Expat
 
 Files: extensions/CiteThisPage/*
@@ -79,7 +79,7 @@
Robert Rohde
Ross McClure
Juraj Simlovic
-License: GPL-2.0
+License: GPL-2.0+
 
 Files: extensions/PdfHandler/*
 Copyright: Martin Seidel
@@ -161,15 +161,11 @@
 License: BSD-2-clause
 
 Files: includes/widget/*
-Copyright: 2011-2015, MediaWiki Widgets Team and others
+Copyright: 2011-2017, MediaWiki Widgets Team and others
 License: Expat
 
 Files: profileinfo.php
 Copyright: 2005, Kate Turner
-License: Expat
-
-Files: resources/lib/es5-shim/es5-shim.js
-Copyright: 2009-2014, Kristopher Michael Kowal and contributors
 License: Expat
 
 Files: resources/lib/jquery/jquery.appear.js
@@ -208,6 +204,10 @@
 Copyright: Andris Reinman 
 License: Unlicense
 
+Files: resources/lib/jquery/jquery.migrate.js
+Copyright: jQuery Foundation and other contributors
+License: Expat
+
 Files: resources/lib/jquery/jquery.mockjax.js
 Copyright: 2010, appendTo LLC
 License: Expat or GPL-2.0
@@ -215,6 +215,10 @@
 Files: resources/lib/jquery/jquery.xmldom.js
 Copyright: 2009, Jonathan Sharp, Out West Media LLC.
 License: Expat or GPL-2.0
+
+Files: resources/lib/jquery/jquery3.js
+Coyright: JS Foundation and ther contributors
+License: Expat
 
 Files: resources/lib/jquery.chosen/*
 Copyright: 2011-2013, Harvest
@@ -232,12 +236,8 @@
 Copyright: 2012, jQuery Foundation and other contributors
 License: Expat
 
-Files: resources/lib/json2/json2.js
-License: PD
-Copyright: Public Domain
-
 Files: resources/lib/moment/*
-Copyright: 2011-2014, Tim Wood, Iskren Chernev, Moment.js contributors
+Copyright: 2011-2016, Tim Wood, Iskren Chernev, Moment.js contributors
 License: Expat
 
 Files: resources/lib/mustache/*
@@ -288,13 +288,6 @@
 License: CC-BY-3.0 or GPL-2.0
 Copyright: 2011-2012 Krinkle
 
-Files: resources/src/jquery/jquery.placeholder.js
-Copyright: Mathias Bynens 
-   2012, Trevor Parscal 
-   2012, Krinkle 
-   2013, Alex Ivanov 
-License: Expat
-
 Files: resources/src/jquery/jquery.tablesorter.*
 Copyright: 2007, Christian Bach
2011, Leo Koppelkamm
@@ -318,7 +311,7 @@
 License: Expat
 
 Files: resources/src/mediawiki.widgets/*
-Copyright: 2011-2015, MediaWiki Widgets Team and others
+Copyright: 2011-2016, MediaWiki Widgets Team and others
 License: Expat
 
 Files: skins/CologneBlue/*
@@ -379,7 +372,7 @@
 License: BSD-3-clause
 
 Files: vendor/oojs/oojs-ui/*
-Copyright: 2011-2016, OOjs UI Team and other contributors
+Copyright: 2011-2017, OOjs UI Team and other contributors
 License: Expat
 
 Files: vendor/oyejorge/less.php/*
@@ -428,7 +421,7 @@
 License: BSD-2-clause
 
 Files: vendor/pimple/pimple/*
-Copyright: 2009-2014, Fabien Potencier
+Copyright: 2009-2015, Fabien Potencier
 License: Expat
 
 Files: vendor/psr/log/*
@@ -439,8 +432,12 @@
 Copyright: 2014, Nicolas Ruflin
 License: Expat
 
+Files: vendor/stil/gd-text/*
+Copyright: FIXME
+License: Expat
+
 Files: vendor/symfony/process/*
-Copyright: 2004-2016, Fabien Potencier
+Copyright: 2004-2017, Fabien Potencier
 License: Expat
 
 Files: vendor/wikimedia/assert/*
@@ -484,6 +481,10 @@
 Copyright: 2015, Ori Livneh 
 License: Expat
 
+File: vendor/wikimedia/remex-html/*
+Copyright: 2016 Wikimedia Foundation
+License: Expat
+
 Files: vendor/wikimedia/running-stat/*
 Copyright: Ori Livneh
 License: GPL-2.0+
@@ -496,6 +497,10 @@
 Copyright: Stanislav Malyshev
 License: LGPL-2.1
 
+Files: vendor/wikimedia/timestamp/*
+Copyright: 2012 Tyler Romeo 
+License: GPL-2.0+
+
 Files: vendor/wikimedia/utfnormal/*
 Copyright: 2004, Brion Vibber 
 License: GPL-2.0+

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Update version in changelog and other packaging fix-ups

[Legoktm (Code Review)]

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

Change subject: Update version in changelog and other packaging fix-ups
..

Update version in changelog and other packaging fix-ups

Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
---
M debian/changelog
M debian/mediawiki.install
A debian/patches/pear-phail-fail-shebang.diff
M debian/patches/series
M vendor/pear/mail_mime/scripts/phail.php
5 files changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/32/373432/1

diff --git a/debian/changelog b/debian/changelog
index af46ce3..bfac1a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mediawiki (1:1.29.0-1) unstable; urgency=medium
+mediawiki (1:1.29.1-1) unstable; urgency=medium
 
   * New upstream release
   * Update debian/copyright for new bundled libraries
diff --git a/debian/mediawiki.install b/debian/mediawiki.install
index 151f52f..ace55b1 100644
--- a/debian/mediawiki.install
+++ b/debian/mediawiki.install
@@ -1,4 +1,4 @@
 debian/etc/*   etc/mediawiki
-*.php *.phtml includes index.php languages maintenance mw-config resources 
serialized skins vendor usr/share/mediawiki
+*.php includes index.php languages maintenance mw-config resources serialized 
skins vendor usr/share/mediawiki
 cache extensions images var/lib/mediawiki
 debian/images/*.png usr/share/mediawiki/resources/assets/debian
diff --git a/debian/patches/pear-phail-fail-shebang.diff 
b/debian/patches/pear-phail-fail-shebang.diff
new file mode 100644
index 000..a980291
--- /dev/null
+++ b/debian/patches/pear-phail-fail-shebang.diff
@@ -0,0 +1,8 @@
+--- a/vendor/pear/mail_mime/scripts/phail.php
 b/vendor/pear/mail_mime/scripts/phail.php
+@@ -1,4 +1,4 @@
+-#!@prefix@/bin/php -Cq
++#!/usr/bin/php -Cq
+ https://gerrit.wikimedia.org/r/373432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: watch: Track 1.29

[Legoktm (Code Review)]

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

Change subject: watch: Track 1.29
..

watch: Track 1.29

Change-Id: Ib0f53d972d5f8a26b14e1797001006f086a6dd6d
---
M debian/watch
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/29/373429/1

diff --git a/debian/watch b/debian/watch
index c3b79f8..e20595e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
 opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \
-https://releases.wikimedia.org/mediawiki/1.28/ mediawiki-([0-9.]*).tar.gz
+https://releases.wikimedia.org/mediawiki/1.29/ mediawiki-([0-9.]*).tar.gz

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0f53d972d5f8a26b14e1797001006f086a6dd6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Updated version 1.29.0 from 'upstream/1.29.0'

[Legoktm (Code Review)]

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

Change subject: Updated version 1.29.0 from 'upstream/1.29.0'
..

Updated version 1.29.0 from 'upstream/1.29.0'

with Debian dir ea9fe61195f87573bccd126cd971d1dda5831013

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/25/373425/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62e44091ed90f6a1608f75b0302b8f1e8c0fbe18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Bump changelog

[Legoktm (Code Review)]

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

Change subject: Bump changelog
..

Bump changelog

Change-Id: If0ec171c9f61cbe1d09e729bb485178c56be4a7c
---
M debian/changelog
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/30/373430/1

diff --git a/debian/changelog b/debian/changelog
index 98e3c2b..af46ce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mediawiki (1:1.29.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update debian/copyright for new bundled libraries
+  * Drop unnecessary patches 
+
+ -- Kunal Mehta   Wed, 23 Aug 2017 22:17:04 -0700
+
 mediawiki (1:1.28.1-1) unstable; urgency=medium
 
   * New upstream release

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0ec171c9f61cbe1d09e729bb485178c56be4a7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Remove unnecessary php-jwt patch

[Legoktm (Code Review)]

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

Change subject: Remove unnecessary php-jwt patch
..

Remove unnecessary php-jwt patch

Change-Id: Iadae20dad5873ea85049698a03a209548e241698
---
D debian/patches/php-jwt-fix-shebang.diff
M debian/patches/series
M vendor/pear/mail_mime/scripts/phail.php
3 files changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/27/373427/1

diff --git a/debian/patches/php-jwt-fix-shebang.diff 
b/debian/patches/php-jwt-fix-shebang.diff
deleted file mode 100644
index f81420b..000
--- a/debian/patches/php-jwt-fix-shebang.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: mediawiki-1.27.0/vendor/firebase/php-jwt/run-tests.sh
-===
 mediawiki-1.27.0.orig/vendor/firebase/php-jwt/run-tests.sh 2016-06-30 
22:48:42.714833779 +
-+++ mediawiki-1.27.0/vendor/firebase/php-jwt/run-tests.sh  2016-06-30 
22:48:42.713833779 +
-@@ -1,4 +1,3 @@
--
- #!/usr/bin/env bash
- gpg --fingerprint D8406D0D82947747293778314AA394086372C20A
- if [ $? -ne 0 ]; then
diff --git a/debian/patches/series b/debian/patches/series
index 6ba5991..e415bd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debian_installer_overrides.diff
 pear-phail-fail-shebang.diff
-php-jwt-fix-shebang.diff
diff --git a/vendor/pear/mail_mime/scripts/phail.php 
b/vendor/pear/mail_mime/scripts/phail.php
index e6427a5..20abdfe 100755
--- a/vendor/pear/mail_mime/scripts/phail.php
+++ b/vendor/pear/mail_mime/scripts/phail.php
@@ -1,4 +1,4 @@
-#!@prefix@/bin/php -Cq
+#!/usr/bin/php -Cq
 https://gerrit.wikimedia.org/r/373427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadae20dad5873ea85049698a03a209548e241698
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: chmod -x variables.less

[Legoktm (Code Review)]

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

Change subject: chmod -x variables.less
..

chmod -x variables.less

There's no reason for this file to be executable.

Change-Id: If783cf367fa57292ba93ac33ab6c31adfa3cc624
---
M variables.less
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/variables.less b/variables.less
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If783cf367fa57292ba93ac33ab6c31adfa3cc624
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
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...ConfirmEdit[master]: chmod -x i18n/en.json

[Legoktm (Code Review)]

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

Change subject: chmod -x i18n/en.json
..

chmod -x i18n/en.json

There's no reason for this file to be executable.

Change-Id: I16fc9ad07daae9d63616d289ba9aef6a73e1bf1b
---
M i18n/en.json
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16fc9ad07daae9d63616d289ba9aef6a73e1bf1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
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...SimpleChanges[REL1_29]: Fix for bug in $wgSimpleChangesOnlyLatest handling with Medi...

[jenkins-bot (Code Review)]

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

Change subject: Fix for bug in $wgSimpleChangesOnlyLatest handling with 
MediaWiki 1.29
..


Fix for bug in $wgSimpleChangesOnlyLatest handling with MediaWiki 1.29

* See bug report here: https://www.mediawiki.org/wiki/Topic:Tv1tm9gz02bn1we9
* Fix is simply inserting our code later in the query building

Change-Id: I601531325359189a6b96b76bc9376bc4af49abf5
(cherry picked from commit 1528e85dc708577fa79334f1a9cf592612097ee7)

Causing issues on 1.29, should be therefore backported.

Change-Id: Idf7744131c0ab2b954fd29b291f14d67e4cabaf5
---
M SpecialSimpleChanges.php
1 file changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/SpecialSimpleChanges.php b/SpecialSimpleChanges.php
index 0c41802..3ba26bb 100644
--- a/SpecialSimpleChanges.php
+++ b/SpecialSimpleChanges.php
@@ -14,12 +14,11 @@
 *
 * @inheritdoc
 */
-   protected function buildQuery( &$tables, &$fields, &$conds,
-   &$query_options, &$join_conds, FormOptions $opts ) {
+   protected function runMainQueryHook( &$tables, &$fields, &$conds, 
&$query_options, &$join_conds,
+   $opts
+   ) {
 
global $wgContentNamespaces, 
$wgSimpleChangesOnlyContentNamespaces, $wgSimpleChangesOnlyLatest;
-
-   parent::buildQuery( $tables, $fields, $conds, $query_options, 
$join_conds, $opts );
 
# don't count log entries toward limit of number of changes 
displayed
$conds[] = 'rc_type != ' . RC_LOG;
@@ -45,6 +44,8 @@
$join_conds['page'] = array( 'LEFT JOIN', 
'rc_cur_id=page_id' );
}
}
+
+   return parent::runMainQueryHook( $tables, $fields, $conds, 
$query_options, $join_conds, $opts );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf7744131c0ab2b954fd29b291f14d67e4cabaf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleChanges
Gerrit-Branch: REL1_29
Gerrit-Owner: Reception123 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: tosfos 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Require MobileFrontend to be installed when enabling Minerva

[jenkins-bot (Code Review)]

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

Change subject: Require MobileFrontend to be installed when enabling Minerva
..


Require MobileFrontend to be installed when enabling Minerva

Enabling the Minerva role fails because it depends on MobileFrontend
and will throw an exception during the provisioning process.

Bug: T171942
Change-Id: I3f97ea6e5eb6bab4ce6f5e740034ca03e4bbdfb6
---
M puppet/modules/role/manifests/minerva.pp
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/manifests/minerva.pp 
b/puppet/modules/role/manifests/minerva.pp
index 81a967c..65e820c 100644
--- a/puppet/modules/role/manifests/minerva.pp
+++ b/puppet/modules/role/manifests/minerva.pp
@@ -2,5 +2,8 @@
 # Configures Minerva, a MediaWiki skin, as an option.
 # https://www.mediawiki.org/wiki/Skin:MinervaNeue
 class role::minerva {
+require ::role::mediawiki
+include ::role::mobilefrontend
+
 mediawiki::skin { 'MinervaNeue': }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f97ea6e5eb6bab4ce6f5e740034ca03e4bbdfb6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mainframe98 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mainframe98 
Gerrit-Reviewer: Zfilipin 
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/dns[master]: add ipv6 record for californium

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373422 )

Change subject: add ipv6 record for californium
..


add ipv6 record for californium

Change-Id: If22a0b51c9a1b14a3d1e476e72efd3277bb5eb39
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7ee540c..6e3c76f 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -51,6 +51,7 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1002.wikimedia.org.
 
 7.5.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   chromium.wikimedia.org.
+7.4.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   californium.wikimedia.org.
 
 6.3.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   silver.wikimedia.org.
 9.4.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   bast1001.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index bbe2f95..a64ef7c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -145,6 +145,7 @@
 bast40011H  IN A198.35.26.5
 bast40011H  IN  2620:0:863:1:198:35:26:5
 californium 1H  IN A208.80.154.147
+californium 1H  IN  2620:0:861:2:208:80:154:147
 chromium1H  IN A208.80.154.157
 chromium1H  IN  2620:0:861:2:208:80:154:157
 cobalt  1H  IN A208.80.154.81

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If22a0b51c9a1b14a3d1e476e72efd3277bb5eb39
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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/dns[master]: add ipv6 record for californium

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373422 )

Change subject: add ipv6 record for californium
..

add ipv6 record for californium

Change-Id: If22a0b51c9a1b14a3d1e476e72efd3277bb5eb39
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/22/373422/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7ee540c..6e3c76f 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -51,6 +51,7 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1002.wikimedia.org.
 
 7.5.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   chromium.wikimedia.org.
+7.4.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   californium.wikimedia.org.
 
 6.3.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   silver.wikimedia.org.
 9.4.1.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   bast1001.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index bbe2f95..a64ef7c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -145,6 +145,7 @@
 bast40011H  IN A198.35.26.5
 bast40011H  IN  2620:0:863:1:198:35:26:5
 californium 1H  IN A208.80.154.147
+californium 1H  IN  2620:0:861:2:208:80:154:147
 chromium1H  IN A208.80.154.157
 chromium1H  IN  2620:0:861:2:208:80:154:157
 cobalt  1H  IN A208.80.154.81

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If22a0b51c9a1b14a3d1e476e72efd3277bb5eb39
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmasters: allow horizon access via ipv6

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373421 )

Change subject: labs puppetmasters: allow horizon access via ipv6
..


labs puppetmasters: allow horizon access via ipv6

Bug: T173982
Change-Id: If60ca727b381c9574bf8b2df14259bbad1160d6b
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 9 insertions(+), 7 deletions(-)

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



diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 511eefa..f9013b0 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -11,6 +11,7 @@
 $labs_instance_range = $novaconfig['fixed_range']
 $horizon_host = hiera('labs_horizon_host')
 $horizon_host_ip = ipresolve(hiera('labs_horizon_host'), 4)
+$horizon_host_ipv6 = ipresolve(hiera('labs_horizon_host'), 6)
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # Only allow puppet access from the instances
@@ -53,13 +54,13 @@
 
 $fwrules = {
 puppetmaster => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters}))) proto tcp dport 8141 
ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters}))) proto 
tcp dport 8141 ACCEPT;",
 },
 puppetbackend => {
-rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
+rule => "saddr (${horizon_host_ip} ${designate_host_ip} 
${horizon_host_ipv6}) proto tcp dport 8101 ACCEPT;",
 },
 puppetbackendgetter => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index 981a82a..564b70b 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -12,6 +12,7 @@
 $labs_instance_range = $novaconfig['fixed_range']
 $horizon_host = hiera('labs_horizon_host')
 $horizon_host_ip = ipresolve(hiera('labs_horizon_host'), 4)
+$horizon_host_ipv6 = ipresolve(hiera('labs_horizon_host'), 6)
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # XXX: break this up into profiles and
@@ -86,19 +87,19 @@
 
 $fwrules = {
 puppetmaster_balancer => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6}) proto tcp dport 8140 ACCEPT;",
 },
 puppetmaster => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters}))) proto tcp dport 8141 
ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters}))) proto 
tcp dport 8141 ACCEPT;",
 },
 puppetbackend => {
-rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
+rule => "saddr (${horizon_host_ip} ${horizon_host_ipv6} 
${designate_host_ip}) proto tcp dport 8101 ACCEPT;",
 },
 puppetcertcleaning => {
 rule => "saddr (${designate_host_ip}) proto tcp dport 22 ACCEPT;",
 },
 puppetbackendgetter => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If60ca727b381c9574bf8b2df14259bbad1160d6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmasters: allow horizon access via ipv6

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373421 )

Change subject: labs puppetmasters: allow horizon access via ipv6
..

labs puppetmasters: allow horizon access via ipv6

Bug: T173982
Change-Id: If60ca727b381c9574bf8b2df14259bbad1160d6b
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/373421/1

diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 511eefa..f9013b0 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -11,6 +11,7 @@
 $labs_instance_range = $novaconfig['fixed_range']
 $horizon_host = hiera('labs_horizon_host')
 $horizon_host_ip = ipresolve(hiera('labs_horizon_host'), 4)
+$horizon_host_ipv6 = ipresolve(hiera('labs_horizon_host'), 6)
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # Only allow puppet access from the instances
@@ -53,13 +54,13 @@
 
 $fwrules = {
 puppetmaster => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters}))) proto tcp dport 8141 
ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters}))) proto 
tcp dport 8141 ACCEPT;",
 },
 puppetbackend => {
-rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
+rule => "saddr (${horizon_host_ip} ${designate_host_ip} 
${horizon_host_ipv6}) proto tcp dport 8101 ACCEPT;",
 },
 puppetbackendgetter => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index 981a82a..564b70b 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -12,6 +12,7 @@
 $labs_instance_range = $novaconfig['fixed_range']
 $horizon_host = hiera('labs_horizon_host')
 $horizon_host_ip = ipresolve(hiera('labs_horizon_host'), 4)
+$horizon_host_ipv6 = ipresolve(hiera('labs_horizon_host'), 6)
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # XXX: break this up into profiles and
@@ -86,19 +87,19 @@
 
 $fwrules = {
 puppetmaster_balancer => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6}) proto tcp dport 8140 ACCEPT;",
 },
 puppetmaster => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters}))) proto tcp dport 8141 
ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters}))) proto 
tcp dport 8141 ACCEPT;",
 },
 puppetbackend => {
-rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
+rule => "saddr (${horizon_host_ip} ${horizon_host_ipv6} 
${designate_host_ip}) proto tcp dport 8101 ACCEPT;",
 },
 puppetcertcleaning => {
 rule => "saddr (${designate_host_ip}) proto tcp dport 22 ACCEPT;",
 },
 puppetbackendgetter => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${horizon_host_ipv6} @resolve((${all_puppetmasters})) 
@resolve((${all_puppetmasters}), )) proto tcp dport 8100 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T172896: Add mw-empty-elt class to empty li items that can't...

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373420 )

Change subject: T172896: Add mw-empty-elt class to empty li items that can't be 
deleted
..

T172896: Add mw-empty-elt class to empty li items that can't be deleted

* This piece of wikitext "* {{DCdatabase|Batman}}" generates an empty
   item that cannot be removed because it has template encapsulation
  information.

* In keeping with how empty list items are treated in core, this
  patch adds the mw-empty-elt class to it.

Change-Id: I906ee8347726e1fb2cc0b1304ba8e0714afe5f12
---
M lib/utils/DOMUtils.js
M lib/wt2html/pp/handlers/cleanup.js
2 files changed, 19 insertions(+), 18 deletions(-)


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

diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js
index 8fd5b5e..e073bde 100644
--- a/lib/utils/DOMUtils.js
+++ b/lib/utils/DOMUtils.js
@@ -1335,24 +1335,19 @@
 * `strict` adds the condition that all whitespace is forbidden.
 */
nodeEssentiallyEmpty: function(node, strict) {
-   var childNodes = node.childNodes;
-   if (childNodes.length === 0) {
-   return true;
-   } else {
-   var n = node.firstChild;
-   while (n) {
-   if (DU.isElt(n) && !this.isDiffMarker(n)) {
-   return false;
-   } else if (DU.isText(n) &&
-   (strict || !/^[ 
\t]*$/.test(n.nodeValue))) {
-   return false;
-   } else if (DU.isComment(n)) {
-   return false;
-   }
-   n = n.nextSibling;
+   var n = node.firstChild;
+   while (n) {
+   if (DU.isElt(n) && !this.isDiffMarker(n)) {
+   return false;
+   } else if (DU.isText(n) &&
+   (strict || !/^[ 
\t]*$/.test(n.nodeValue))) {
+   return false;
+   } else if (DU.isComment(n)) {
+   return false;
}
-   return true;
+   n = n.nextSibling;
}
+   return true;
},
 
/**
diff --git a/lib/wt2html/pp/handlers/cleanup.js 
b/lib/wt2html/pp/handlers/cleanup.js
index d588ec8..f335105 100644
--- a/lib/wt2html/pp/handlers/cleanup.js
+++ b/lib/wt2html/pp/handlers/cleanup.js
@@ -38,7 +38,7 @@
 }
 
 function stripEmptyElements(node, env, atTopLevel, tplInfo) {
-   if (!atTopLevel || !tplInfo || !DU.isElt(node)) {
+   if (!atTopLevel || !DU.isElt(node) || (!tplInfo && node.nodeName !== 
'LI')) {
return true;
}
 
@@ -48,13 +48,19 @@
//   the info over, but more pain than worth it. We can reconsider if
//   this ever becomes an issue.
// * it has any attributes.
-   if (!node.firstChild && node !== tplInfo.first &&
+   if (!node.firstChild && tplInfo && node !== tplInfo.first &&
node.nodeName in { 'TR': 1, 'LI': 1 } && node.attributes.length 
=== 0
) {
var nextNode = node.nextSibling;
DU.deleteNode(node);
return nextNode;
} else {
+   // Non-deleted empty  nodes should get the mw-empty-elt 
class
+   if (node.nodeName === 'LI' && DU.nodeEssentiallyEmpty(node)) {
+   var classNames = node.getAttribute('class');
+   classNames = classNames ? classNames + ' mw-empty-elt': 
'mw-empty-elt';
+   node.setAttribute('class', classNames);
+   }
return true;
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Replace colors with WikimediaUI color palette ones

[VolkerE (Code Review)]

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

Change subject: Replace colors with WikimediaUI color palette ones
..

Replace colors with WikimediaUI color palette ones

Replacing outdated colors with WikimediaUI color palette ones.

Change-Id: Iea9756ced7766cc4e2b9f83c92738bba1d2c3924
---
M resources/uploadWizard.css
1 file changed, 24 insertions(+), 21 deletions(-)


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

diff --git a/resources/uploadWizard.css b/resources/uploadWizard.css
index c1a842c..9e01f90 100644
--- a/resources/uploadWizard.css
+++ b/resources/uploadWizard.css
@@ -18,18 +18,19 @@
 }
 
 #mwe-upwiz-steps li {
-   color: #666;
+   color: #54595d;
margin-right: -1px;
-   border-top: solid 1px #a7d7f9;
-   border-bottom: solid 1px #a7d7f9;
+   border-color: #a7d7f9;
+   border-style: solid;
+   border-width: 1px 0;
 }
 
 #mwe-upwiz-steps li:first-child {
-   border-left: solid 1px #a7d7f9;
+   border-left-width: 1px;
 }
 
 #mwe-upwiz-steps li:last-child {
-   border-right: solid 1px #a7d7f9;
+   border-right-width: 1px;
 }
 
 #mwe-upwiz-steps li.head {
@@ -93,7 +94,7 @@
 }
 
 .mwe-upwiz-file.odd .mwe-upwiz-visible-file {
-   background: #f5f5f5;
+   background: #f8f9fa;
 }
 
 .mwe-upwiz-file-indicator,
@@ -140,12 +141,12 @@
 }
 
 .mwe-upwiz-filled-filelist {
-   border: 1px solid #d8d8d8;
+   border: 1px solid #c8ccd1;
 }
 
 .mwe-upwiz-file-status {
display: none;
-   color: #797979;
+   color: #72777d;
 }
 
 .mwe-upwiz-file-status-line ul {
@@ -158,7 +159,7 @@
height: 100px;
width: 100px;
padding: 0.5em;
-   border: 1px solid #e0e0e0;
+   border: 1px solid #eaecf0;
margin-right: 1em;
text-align: center;
/* @embed */
@@ -236,7 +237,7 @@
 }
 
 .filled + .filled {
-   border-top: 1px solid #d8d8d8;
+   border-top: 1px solid #c8ccd1;
 }
 
 #mwe-upwiz-upload-ctrls {
@@ -300,7 +301,7 @@
/* @embed */
background: url( images/32px-alert.png ) no-repeat center center;
font-weight: bold;
-   color: #c00;
+   color: #d33;
 }
 
 .mwe-upwiz-progress {
@@ -316,9 +317,10 @@
 }
 
 .mwe-upwiz-thumbnail {
-   border: 1px solid #ccc;
+   background-color: #fff;
+   border: 1px solid #c8ccd1;
+   border-radius: 2px;
text-align: center;
-   background: #fff;
width: 100px;
height: 100px;
padding: 8px;
@@ -341,9 +343,10 @@
 }
 
 #mwe-upwiz-deeds-thumbnails {
+   background-color: #f8f9fa;
+   border-radius: 2px;
text-align: center;
margin: 1em 0;
-   background: #f0f0f0;
 }
 
 #mwe-upwiz-deeds-thumbnails .mwe-upwiz-thumbnail {
@@ -501,21 +504,21 @@
 }
 
 .ui-corner-top {
-   border-top-left-radius: 4px;
-   border-top-right-radius: 4px;
+   border-top-left-radius: 2px;
+   border-top-right-radius: 2px;
 }
 
 .ui-corner-bottom {
-   border-bottom-left-radius: 4px;
-   border-bottom-right-radius: 4px;
+   border-bottom-left-radius: 2px;
+   border-bottom-right-radius: 2px;
 }
 
 .ui-corner-all {
-   border-radius: 4px;
+   border-radius: 2px;
 }
 
 .mwe-upwiz-deed-license-group-subhead {
-   color: #797979;
+   color: #72777d;
margin-top: 0;
margin-bottom: 0;
 }
@@ -529,7 +532,7 @@
 }
 
 .mwe-upwiz-objref-pick-image input:disabled + label {
-   color: #808080;
+   color: #72777d;
font-weight: normal;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea9756ced7766cc4e2b9f83c92738bba1d2c3924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
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...SendGrid[master]: Update to composer.json to use more API based dependencies

[D3r1ck01 (Code Review)]

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

Change subject: Update to composer.json to use more API based dependencies
..


Update to composer.json to use more API based dependencies

Added more SendGrid's API based dependencies for composer.

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

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



diff --git a/composer.json b/composer.json
index 097771d..4b7096e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
 "name": "mediawiki/sendgrid",
 "require": {
+"php": ">=5.6",
 "sendgrid/sendgrid": "~6.0",
-"php-http/httplug": "^1.0",
-"php-http/discovery": "^0.8"
+"sendgrid/php-http-client": "~3.7"
 },
 "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"phpunit/phpunit": "~4.6",
+"phpunit/phpunit": "4.*",
+"squizlabs/php_codesniffer": "2.*",
 "jakub-onderka/php-console-highlighter": "0.3.2"
 },
 "scripts": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab8defbad66a466a4d1a216358b8972a1821dc02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Update to composer.json to use more API based dependencies

[D3r1ck01 (Code Review)]

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

Change subject: Update to composer.json to use more API based dependencies
..

Update to composer.json to use more API based dependencies

Added more SendGrid's API based dependencies for composer.

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


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

diff --git a/composer.json b/composer.json
index 097771d..4b7096e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
 "name": "mediawiki/sendgrid",
 "require": {
+"php": ">=5.6",
 "sendgrid/sendgrid": "~6.0",
-"php-http/httplug": "^1.0",
-"php-http/discovery": "^0.8"
+"sendgrid/php-http-client": "~3.7"
 },
 "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"phpunit/phpunit": "~4.6",
+"phpunit/phpunit": "4.*",
+"squizlabs/php_codesniffer": "2.*",
 "jakub-onderka/php-console-highlighter": "0.3.2"
 },
 "scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab8defbad66a466a4d1a216358b8972a1821dc02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add README.md to the repository

[D3r1ck01 (Code Review)]

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

Change subject: Add README.md to the repository
..

Add README.md to the repository

This will have a description of the repo / extension and
useful links related to this extensions.

Change-Id: I134c5160b00671ae1ca43a414f9883ab844b331f
---
A README.md
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/README.md b/README.md
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/README.md

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I134c5160b00671ae1ca43a414f9883ab844b331f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add README.md to the repository

[D3r1ck01 (Code Review)]

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

Change subject: Add README.md to the repository
..


Add README.md to the repository

This will have a description of the repo / extension and
useful links related to this extensions.

Change-Id: I134c5160b00671ae1ca43a414f9883ab844b331f
---
A README.md
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/README.md b/README.md
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/README.md

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I134c5160b00671ae1ca43a414f9883ab844b331f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add fr.json for french translation

[D3r1ck01 (Code Review)]

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

Change subject: Add fr.json for french translation
..


Add fr.json for french translation

Description of the extension translation in French.

Change-Id: Ia6cbbe2ab9428aee0ba38b5ae14344c289b5ef80
---
M i18n/en.json
A i18n/fr.json
2 files changed, 10 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 1c802ad..894bf90 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,5 @@
"Alangi Derick"
]
},
-   "sendgrid-desc": "Send emails through SendGrid API service from 
Mediawiki"
-}
+   "sendgrid-desc": "Send emails through SendGrid API service from 
Mediawiki."
+}
\ No newline at end of file
diff --git a/i18n/fr.json b/i18n/fr.json
new file mode 100644
index 000..36cf2c2
--- /dev/null
+++ b/i18n/fr.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Alangi Derick"
+   ]
+   },
+   "sendgrid-desc": "Envoyer des emails via le service SendGrid API depuis 
Mediawiki."
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6cbbe2ab9428aee0ba38b5ae14344c289b5ef80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add fr.json for french translation

[D3r1ck01 (Code Review)]

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

Change subject: Add fr.json for french translation
..

Add fr.json for french translation

Description of the extension translation in French.

Change-Id: Ia6cbbe2ab9428aee0ba38b5ae14344c289b5ef80
---
M i18n/en.json
A i18n/fr.json
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SendGrid 
refs/changes/16/373416/1

diff --git a/i18n/en.json b/i18n/en.json
index 1c802ad..894bf90 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,5 @@
"Alangi Derick"
]
},
-   "sendgrid-desc": "Send emails through SendGrid API service from 
Mediawiki"
-}
+   "sendgrid-desc": "Send emails through SendGrid API service from 
Mediawiki."
+}
\ No newline at end of file
diff --git a/i18n/fr.json b/i18n/fr.json
new file mode 100644
index 000..36cf2c2
--- /dev/null
+++ b/i18n/fr.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Alangi Derick"
+   ]
+   },
+   "sendgrid-desc": "Envoyer des emails via le service SendGrid API depuis 
Mediawiki."
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6cbbe2ab9428aee0ba38b5ae14344c289b5ef80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.skinning: Vertical align inline media in Parsoid o...

[jenkins-bot (Code Review)]

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

Change subject: mediawiki.skinning: Vertical align inline media in Parsoid 
output
..


mediawiki.skinning: Vertical align inline media in Parsoid output

Change-Id: I56df80a25b43f9084e8cb5e537836ac773732259
---
M resources/src/mediawiki.skinning/content.parsoid.less
1 file changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki.skinning/content.parsoid.less 
b/resources/src/mediawiki.skinning/content.parsoid.less
index 3dc7f20..654b655 100644
--- a/resources/src/mediawiki.skinning/content.parsoid.less
+++ b/resources/src/mediawiki.skinning/content.parsoid.less
@@ -193,3 +193,36 @@
display: inline-block;
}
 }
+
+/**
+ * Inline media items
+ */
+*:first-child {
+   > img,
+   > video {
+   .mw-valign-middle > & {
+   vertical-align: middle;
+   }
+   .mw-valign-baseline > & {
+   vertical-align: baseline;
+   }
+   .mw-valign-sub > & {
+   vertical-align: sub;
+   }
+   .mw-valign-super > & {
+   vertical-align: super;
+   }
+   .mw-valign-top > & {
+   vertical-align: top;
+   }
+   .mw-valign-text-top > & {
+   vertical-align: text-top;
+   }
+   .mw-valign-bottom > & {
+   vertical-align: bottom;
+   }
+   .mw-valign-text-bottom > & {
+   vertical-align: text-bottom;
+   }
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56df80a25b43f9084e8cb5e537836ac773732259
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Subramanya Sastry 
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...SendGrid[master]: Define the onAlternateUserMailer() method

[D3r1ck01 (Code Review)]

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

Change subject: Define the onAlternateUserMailer() method
..


Define the onAlternateUserMailer() method

This method sends emails using the SendGrid API using
the API-Key which is defined in the LocalSettings.php file
using the "wgSendGridAPIKey" variable.

Change-Id: If8cd1af23dd04496e583c60a8219d844fe45d5ad
---
M SendGridHooks.php
1 file changed, 22 insertions(+), 1 deletion(-)

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



diff --git a/SendGridHooks.php b/SendGridHooks.php
index 49cbd04..1651120 100644
--- a/SendGridHooks.php
+++ b/SendGridHooks.php
@@ -36,6 +36,27 @@
 * @throws Exception
 */
public static function onAlternateUserMailer( array $headers, array 
$to, MailAddress $from, $subject, $body ) {
-   
+   $conf = RequestContext::getMain()->getConfig();
+
+   $sendgridAPIKey = $conf->get( 'SendGridAPIKey' );
+
+   if ( $sendgridAPIKey == "" ) {
+   throw new MWException( "Please update your 
LocalSettings.php with the correct SendGrid API key." );
+   }
+
+   // Get $to and $from email addresses from the array and 
MailAddress object respectively
+   $from = new SendGrid\Email( null, $from->address );
+   $to = new SendGrid\Email( null, $to[0]->address ); 
+   $body = new SendGrid\Content( "text/plain", $body );
+   $mail = new SendGrid\Mail($from, $subject, $to, $body);
+   $sg = new \SendGrid( $sendgridAPIKey );
+
+   try {
+   $sg->client->mail()->send()->post($mail);
+   } catch ( Exception $e ) {
+   return $e->getMessage();
+   }
+
+   return false;
}
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8cd1af23dd04496e583c60a8219d844fe45d5ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Define the onAlternateUserMailer() method

[D3r1ck01 (Code Review)]

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

Change subject: Define the onAlternateUserMailer() method
..

Define the onAlternateUserMailer() method

This method sends emails using the SendGrid API using
the API-Key which is defined in the LocalSettings.php file
using the "wgSendGridAPIKey" variable.

Change-Id: If8cd1af23dd04496e583c60a8219d844fe45d5ad
---
M SendGridHooks.php
1 file changed, 22 insertions(+), 1 deletion(-)


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

diff --git a/SendGridHooks.php b/SendGridHooks.php
index 49cbd04..1651120 100644
--- a/SendGridHooks.php
+++ b/SendGridHooks.php
@@ -36,6 +36,27 @@
 * @throws Exception
 */
public static function onAlternateUserMailer( array $headers, array 
$to, MailAddress $from, $subject, $body ) {
-   
+   $conf = RequestContext::getMain()->getConfig();
+
+   $sendgridAPIKey = $conf->get( 'SendGridAPIKey' );
+
+   if ( $sendgridAPIKey == "" ) {
+   throw new MWException( "Please update your 
LocalSettings.php with the correct SendGrid API key." );
+   }
+
+   // Get $to and $from email addresses from the array and 
MailAddress object respectively
+   $from = new SendGrid\Email( null, $from->address );
+   $to = new SendGrid\Email( null, $to[0]->address ); 
+   $body = new SendGrid\Content( "text/plain", $body );
+   $mail = new SendGrid\Mail($from, $subject, $to, $body);
+   $sg = new \SendGrid( $sendgridAPIKey );
+
+   try {
+   $sg->client->mail()->send()->post($mail);
+   } catch ( Exception $e ) {
+   return $e->getMessage();
+   }
+
+   return false;
}
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8cd1af23dd04496e583c60a8219d844fe45d5ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Defining Hook and onAlternateUserMailer()

[D3r1ck01 (Code Review)]

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

Change subject: Defining Hook and onAlternateUserMailer()
..


Defining Hook and onAlternateUserMailer()

Hook definition and onAlternateUserMailer() method definition wrapper
to use for sending emails.

Change-Id: I37584979f0f3175e2543c4d33c0cec332b750f08
---
M SendGridHooks.php
1 file changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/SendGridHooks.php b/SendGridHooks.php
index 89b2f7e..49cbd04 100644
--- a/SendGridHooks.php
+++ b/SendGridHooks.php
@@ -23,3 +23,19 @@
  * @ingroup Extensions
 */
 
+class SendGridHooks {
+   /**
+* Send a mail using SendGrid API
+*
+* @param array $headers
+* @param array $to
+* @param MailAddress $from
+* @param string $subject
+* @param string $body
+* @return bool
+* @throws Exception
+*/
+   public static function onAlternateUserMailer( array $headers, array 
$to, MailAddress $from, $subject, $body ) {
+   
+   }
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37584979f0f3175e2543c4d33c0cec332b750f08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Defining Hook and onAlternateUserMailer()

[D3r1ck01 (Code Review)]

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

Change subject: Defining Hook and onAlternateUserMailer()
..

Defining Hook and onAlternateUserMailer()

Hook definition and onAlternateUserMailer() method definition wrapper
to use for sending emails.

Change-Id: I37584979f0f3175e2543c4d33c0cec332b750f08
---
M SendGridHooks.php
1 file changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/SendGridHooks.php b/SendGridHooks.php
index 89b2f7e..49cbd04 100644
--- a/SendGridHooks.php
+++ b/SendGridHooks.php
@@ -23,3 +23,19 @@
  * @ingroup Extensions
 */
 
+class SendGridHooks {
+   /**
+* Send a mail using SendGrid API
+*
+* @param array $headers
+* @param array $to
+* @param MailAddress $from
+* @param string $subject
+* @param string $body
+* @return bool
+* @throws Exception
+*/
+   public static function onAlternateUserMailer( array $headers, array 
$to, MailAddress $from, $subject, $body ) {
+   
+   }
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37584979f0f3175e2543c4d33c0cec332b750f08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.15]: Make workItemCount() smarter for htmlCacheUpdate/refreshLinks

[jenkins-bot (Code Review)]

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

Change subject: Make workItemCount() smarter for htmlCacheUpdate/refreshLinks
..


Make workItemCount() smarter for htmlCacheUpdate/refreshLinks

Do not count jobs that just make subdivide as having any
"work items". This makes $wgJobBackoffThrottling less
overzealous when used to limit these type of jobs.

The main reason to limit htmlCacheUpdate would be for
CDN purge rate limiting. For refreshLinks, it would
mostly be lag, though that is already handled for
leaf jobs and JobRunner itself.

Bug: T173710
Change-Id: Ide831b555e51e3111410929a598efb6c0afc0989
---
M includes/jobqueue/jobs/HTMLCacheUpdateJob.php
M includes/jobqueue/jobs/RefreshLinksJob.php
2 files changed, 14 insertions(+), 2 deletions(-)

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



diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php 
b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index 2d816f9..07d68e7 100644
--- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@ -152,6 +152,12 @@
}
 
public function workItemCount() {
-   return isset( $this->params['pages'] ) ? count( 
$this->params['pages'] ) : 1;
+   if ( !empty( $this->params['recursive'] ) ) {
+   return 0; // nothing actually purged
+   } elseif ( isset( $this->params['pages'] ) ) {
+   return count( $this->params['pages'] );
+   }
+
+   return 1; // one title
}
 }
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php 
b/includes/jobqueue/jobs/RefreshLinksJob.php
index b4ead5d..9f3550f 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -301,6 +301,12 @@
}
 
public function workItemCount() {
-   return isset( $this->params['pages'] ) ? count( 
$this->params['pages'] ) : 1;
+   if ( !empty( $this->params['recursive'] ) ) {
+   return 0; // nothing actually refreshed
+   } elseif ( isset( $this->params['pages'] ) ) {
+   return count( $this->params['pages'] );
+   }
+
+   return 1; // one title
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide831b555e51e3111410929a598efb6c0afc0989
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Aaron Schulz 
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...SendGrid[master]: Add license information to Hook file

[D3r1ck01 (Code Review)]

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

Change subject: Add license information to Hook file
..


Add license information to Hook file

Change-Id: Ie2ab4cffcc7dc9ab13ce33b8c4fc517d2593ff29
---
M SendGridHooks.php
1 file changed, 25 insertions(+), 0 deletions(-)

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



diff --git a/SendGridHooks.php b/SendGridHooks.php
index e69de29..89b2f7e 100644
--- a/SendGridHooks.php
+++ b/SendGridHooks.php
@@ -0,0 +1,25 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Alangi Derick 
+ * @license GPL-2.0+
+ * @ingroup Extensions
+*/
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2ab4cffcc7dc9ab13ce33b8c4fc517d2593ff29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add license information to Hook file

[D3r1ck01 (Code Review)]

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

Change subject: Add license information to Hook file
..

Add license information to Hook file

Change-Id: Ie2ab4cffcc7dc9ab13ce33b8c4fc517d2593ff29
---
M SendGridHooks.php
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SendGrid 
refs/changes/13/373413/1

diff --git a/SendGridHooks.php b/SendGridHooks.php
index e69de29..89b2f7e 100644
--- a/SendGridHooks.php
+++ b/SendGridHooks.php
@@ -0,0 +1,25 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Alangi Derick 
+ * @license GPL-2.0+
+ * @ingroup Extensions
+*/
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2ab4cffcc7dc9ab13ce33b8c4fc517d2593ff29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Define how the extension will be loaded

[D3r1ck01 (Code Review)]

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

Change subject: Define how the extension will be loaded
..


Define how the extension will be loaded

* On more recent mediawiki versions, the extension should
  be loaded via the 'wfLoadExtension()' method and on older
  versions of mediawiki, it should use require.

Change-Id: I9afb81bd937aa39c8670218257eaf02cab8b1cf1
---
M SendGrid.php
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/SendGrid.php b/SendGrid.php
index e69de29..462dd58 100644
--- a/SendGrid.php
+++ b/SendGrid.php
@@ -0,0 +1,13 @@
+https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the SendGrid extension requires MediaWiki 1.25+' 
);
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9afb81bd937aa39c8670218257eaf02cab8b1cf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Define how the extension will be loaded

[D3r1ck01 (Code Review)]

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

Change subject: Define how the extension will be loaded
..

Define how the extension will be loaded

* On more recent mediawiki versions, the extension should
  be loaded via the 'wfLoadExtension()' method and on older
  versions of mediawiki, it should use require.

Change-Id: I9afb81bd937aa39c8670218257eaf02cab8b1cf1
---
M SendGrid.php
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SendGrid 
refs/changes/12/373412/1

diff --git a/SendGrid.php b/SendGrid.php
index e69de29..462dd58 100644
--- a/SendGrid.php
+++ b/SendGrid.php
@@ -0,0 +1,13 @@
+https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the SendGrid extension requires MediaWiki 1.25+' 
);
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9afb81bd937aa39c8670218257eaf02cab8b1cf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add dependencies in composer.json

[D3r1ck01 (Code Review)]

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

Change subject: Add dependencies in composer.json
..


Add dependencies in composer.json

* Add packages needed by the extension included in the
  composer.json file. This will enable the extension to
  use SendGrid's API to send emails.

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

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



diff --git a/composer.json b/composer.json
index e69de29..097771d 100644
--- a/composer.json
+++ b/composer.json
@@ -0,0 +1,20 @@
+{
+"name": "mediawiki/sendgrid",
+"require": {
+"sendgrid/sendgrid": "~6.0",
+"php-http/httplug": "^1.0",
+"php-http/discovery": "^0.8"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"phpunit/phpunit": "~4.6",
+"jakub-onderka/php-console-highlighter": "0.3.2"
+},
+"scripts": {
+"test": [
+"parallel-lint . --exclude vendor"
+]
+},
+"prepend-autoloader": false,
+"optimize-autoloader": true
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f798aa4a31481c13cae2ee35c18b45dec8762b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add dependencies in composer.json

[D3r1ck01 (Code Review)]

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

Change subject: Add dependencies in composer.json
..

Add dependencies in composer.json

* Add packages needed by the extension included in the
  composer.json file. This will enable the extension to
  use SendGrid's API to send emails.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SendGrid 
refs/changes/11/373411/1

diff --git a/composer.json b/composer.json
index e69de29..097771d 100644
--- a/composer.json
+++ b/composer.json
@@ -0,0 +1,20 @@
+{
+"name": "mediawiki/sendgrid",
+"require": {
+"sendgrid/sendgrid": "~6.0",
+"php-http/httplug": "^1.0",
+"php-http/discovery": "^0.8"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"phpunit/phpunit": "~4.6",
+"jakub-onderka/php-console-highlighter": "0.3.2"
+},
+"scripts": {
+"test": [
+"parallel-lint . --exclude vendor"
+]
+},
+"prepend-autoloader": false,
+"optimize-autoloader": true
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f798aa4a31481c13cae2ee35c18b45dec8762b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add Gruntfile, Hook and Setup files for the extension

[D3r1ck01 (Code Review)]

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

Change subject: Add Gruntfile, Hook and Setup files for the extension
..


Add Gruntfile, Hook and Setup files for the extension

* Added a Gruntfile to do some JS-based linting tests

* Hook to be used to send emails will be defined in
  SendGridHooks.php.

* Loading the extension setup in the SendGrid.php based
  on the MW version.

Change-Id: Ibec5fb30cade5fe9ef170bfcd1c7a46c74283a35
---
A Gruntfile.js
A SendGrid.php
A SendGridHooks.php
M package.json
4 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/SendGrid.php b/SendGrid.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/SendGrid.php
diff --git a/SendGridHooks.php b/SendGridHooks.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/SendGridHooks.php
diff --git a/package.json b/package.json
index e69de29..3b4b5f0 100644
--- a/package.json
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibec5fb30cade5fe9ef170bfcd1c7a46c74283a35
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add Gruntfile, Hook and Setup file for the extension

[D3r1ck01 (Code Review)]

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

Change subject: Add Gruntfile, Hook and Setup file for the extension
..

Add Gruntfile, Hook and Setup file for the extension

* Added a Gruntfile to do some JS-based linting tests

* Hook to be used to send emails will be defined in
  SendGridHooks.php.

* Loading the extension setup in the SendGrid.php based
  on the MW version.

Change-Id: Ibec5fb30cade5fe9ef170bfcd1c7a46c74283a35
---
A Gruntfile.js
A SendGrid.php
A SendGridHooks.php
M package.json
4 files changed, 31 insertions(+), 0 deletions(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/SendGrid.php b/SendGrid.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/SendGrid.php
diff --git a/SendGridHooks.php b/SendGridHooks.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/SendGridHooks.php
diff --git a/package.json b/package.json
index e69de29..3b4b5f0 100644
--- a/package.json
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibec5fb30cade5fe9ef170bfcd1c7a46c74283a35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Adding configs to extension.json and i18n

[D3r1ck01 (Code Review)]

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

Change subject: Adding configs to extension.json and i18n
..


Adding configs to extension.json and i18n

* Configs for the SendGrid extension with basic information about
the extension.

* Adding description message to en.json and qqq.json for proper
  description of the application in extension.json.

Change-Id: I204f4fd1de30d8866b02b69ce3064a40b32be666
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 44 insertions(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index e69de29..1cde31d 100644
--- a/extension.json
+++ b/extension.json
@@ -0,0 +1,28 @@
+{
+   "name": "SendGrid",
+   "version": "1.0",
+   "author": [
+   "Alangi Derick"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:SendGrid;,
+   "descriptionmsg": "sendgrid-desc",
+   "license-name": "GPL-2.0+",
+   "AutoloadClasses": {
+   "SendGridHooks": "SendGridHooks.php"
+   },
+   "MessagesDirs": {
+   "SendGrid": [
+   "i18n"
+   ]
+   },
+   "Hooks": {
+   "AlternateUserMailer": [
+   "SendGridHooks::onAlternateUserMailer"
+   ]
+   },
+   "load_composer_autoloader": true,
+   "config": {
+   "SendGridAPIKey": ""
+   },
+   "manifest_version": 1
+}
diff --git a/i18n/en.json b/i18n/en.json
index e69de29..1c802ad 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Alangi Derick"
+   ]
+   },
+   "sendgrid-desc": "Send emails through SendGrid API service from 
Mediawiki"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e69de29..070013e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Alangi Derick"
+   ]
+   },
+   "sendgrid-desc": 
"{{desc|what=extension|name=SendGrid|url=https://www.mediawiki.org/wiki/Extension:SendGrid}};
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I204f4fd1de30d8866b02b69ce3064a40b32be666
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Adding configs to extension.json and i18n

[D3r1ck01 (Code Review)]

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

Change subject: Adding configs to extension.json and i18n
..

Adding configs to extension.json and i18n

* Configs for the SendGrid extension with basic information about
the extension.

* Adding description message to en.json and qqq.json for proper
  description of the application in extension.json.

Change-Id: I204f4fd1de30d8866b02b69ce3064a40b32be666
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 44 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index e69de29..1cde31d 100644
--- a/extension.json
+++ b/extension.json
@@ -0,0 +1,28 @@
+{
+   "name": "SendGrid",
+   "version": "1.0",
+   "author": [
+   "Alangi Derick"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:SendGrid;,
+   "descriptionmsg": "sendgrid-desc",
+   "license-name": "GPL-2.0+",
+   "AutoloadClasses": {
+   "SendGridHooks": "SendGridHooks.php"
+   },
+   "MessagesDirs": {
+   "SendGrid": [
+   "i18n"
+   ]
+   },
+   "Hooks": {
+   "AlternateUserMailer": [
+   "SendGridHooks::onAlternateUserMailer"
+   ]
+   },
+   "load_composer_autoloader": true,
+   "config": {
+   "SendGridAPIKey": ""
+   },
+   "manifest_version": 1
+}
diff --git a/i18n/en.json b/i18n/en.json
index e69de29..1c802ad 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Alangi Derick"
+   ]
+   },
+   "sendgrid-desc": "Send emails through SendGrid API service from 
Mediawiki"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e69de29..070013e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Alangi Derick"
+   ]
+   },
+   "sendgrid-desc": 
"{{desc|what=extension|name=SendGrid|url=https://www.mediawiki.org/wiki/Extension:SendGrid}};
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I204f4fd1de30d8866b02b69ce3064a40b32be666
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Remove duplicate variable initialization

[jenkins-bot (Code Review)]

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

Change subject: Remove duplicate variable initialization
..


Remove duplicate variable initialization

Change-Id: If8fb65d2624dfd877c27ebf1073466446e2699cb
---
M maintenance/generateEquivset.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/maintenance/generateEquivset.php b/maintenance/generateEquivset.php
index 2c946af..687e847 100644
--- a/maintenance/generateEquivset.php
+++ b/maintenance/generateEquivset.php
@@ -71,7 +71,6 @@
 
foreach ( $lines as $line ) {
++$lineNum;
-   $mapToEmpty = false;
 
# Whether the line ends with a nul character
$mapToEmpty = ( strpos( $line, "\0" ) === strlen( $line 
) - 2 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8fb65d2624dfd877c27ebf1073466446e2699cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
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...SendGrid[master]: Skeleton of the SendGrid extension

[D3r1ck01 (Code Review)]

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

Change subject: Skeleton of the SendGrid extension
..


Skeleton of the SendGrid extension

Putting the basic files in place. I18n and configuration
files are set.

Change-Id: I0169a6423c44619c1f8accb527f5e074834cb6ff
---
A .gitignore
A CODE_OF_CONDUCT.md
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
A package.json
7 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..fdabb96
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/node_modules/
+/vendor/
+/composer.lock
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000..d8e5d08
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/composer.json
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/extension.json
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/i18n/en.json
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/i18n/qqq.json
diff --git a/package.json b/package.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/package.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0169a6423c44619c1f8accb527f5e074834cb6ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add SendGrid extension to Jenkins test

[D3r1ck01 (Code Review)]

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

Change subject: Add SendGrid extension to Jenkins test
..

Add SendGrid extension to Jenkins test

Jenkins should automatically run tests when a patch
is submitted to this repository.

Change-Id: I64c27f7989331f6c2ec245dd383e8145e6d12261
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/08/373408/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d9982da..b4ac2cf 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6119,6 +6119,11 @@
  - name: extension-unittests-generic
  - name: mwgate-npm
 
+  - name: mediawiki/extensions/SendGrid
+template:
+  - name: extension-unittests-generic
+  - name: mwgate-npm
+
   - name: mediawiki/extensions/SimpleSAMLphp
 template:
  - name: extension-unittests-generic

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Remove duplicate variable initialization

[MaxSem (Code Review)]

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

Change subject: Remove duplicate variable initialization
..

Remove duplicate variable initialization

Change-Id: If8fb65d2624dfd877c27ebf1073466446e2699cb
---
M maintenance/generateEquivset.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/maintenance/generateEquivset.php b/maintenance/generateEquivset.php
index 2c946af..687e847 100644
--- a/maintenance/generateEquivset.php
+++ b/maintenance/generateEquivset.php
@@ -71,7 +71,6 @@
 
foreach ( $lines as $line ) {
++$lineNum;
-   $mapToEmpty = false;
 
# Whether the line ends with a nul character
$mapToEmpty = ( strpos( $line, "\0" ) === strlen( $line 
) - 2 );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Skeleton of the SendGrid extension

[D3r1ck01 (Code Review)]

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

Change subject: Skeleton of the SendGrid extension
..

Skeleton of the SendGrid extension

Putting the basic files in place. I18n and configuration
files are set.

Change-Id: I0169a6423c44619c1f8accb527f5e074834cb6ff
---
A .gitignore
A CODE_OF_CONDUCT.md
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
A package.json
7 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SendGrid 
refs/changes/06/373406/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..fdabb96
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/node_modules/
+/vendor/
+/composer.lock
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000..d8e5d08
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/composer.json
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/extension.json
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/i18n/en.json
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/i18n/qqq.json
diff --git a/package.json b/package.json
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/package.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0169a6423c44619c1f8accb527f5e074834cb6ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: VisualEditorDataModule: Do not expand templates in plain tex...

[jenkins-bot (Code Review)]

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

Change subject: VisualEditorDataModule: Do not expand templates in plain text 
messages
..


VisualEditorDataModule: Do not expand templates in plain text messages

Changing `->text()` to `->plain()` and some variable
names and comments to match that. This is now the same
as normal ResourceLoader behavior for messages added
via `'messages'` in RL modules.

Also remove a duplicate use of the
'visualeditor-quick-access-characters.json' message.

Bug: T159529
Change-Id: I63593db445433e7da5c71e6800f96daf63054fcf
---
M VisualEditorDataModule.php
M extension.json
2 files changed, 7 insertions(+), 8 deletions(-)

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



diff --git a/VisualEditorDataModule.php b/VisualEditorDataModule.php
index eb7608c..26da3a0 100644
--- a/VisualEditorDataModule.php
+++ b/VisualEditorDataModule.php
@@ -25,12 +25,12 @@
public function getScript( ResourceLoaderContext $context ) {
$msgInfo = $this->getMessageInfo( $context );
$parsedMessages = $msgInfo['parsed'];
-   $textMessages = [];
+   $plainMessages = [];
foreach ( $msgInfo['parse'] as $msgKey => $msgObj ) {
$parsedMessages[ $msgKey ] = $msgObj->parse();
}
-   foreach ( $msgInfo['text'] as $msgKey => $msgObj ) {
-   $textMessages[ $msgKey ] = $msgObj->text();
+   foreach ( $msgInfo['plain'] as $msgKey => $msgObj ) {
+   $plainMessages[ $msgKey ] = $msgObj->plain();
}
 
return 've.init.platform.addParsedMessages(' . 
FormatJson::encode(
@@ -38,7 +38,7 @@
ResourceLoader::inDebugMode()
) . ');'.
've.init.platform.addMessages(' . FormatJson::encode(
-   $textMessages,
+   $plainMessages,
ResourceLoader::inDebugMode()
) . ');';
}
@@ -68,8 +68,8 @@
),
];
 
-   // Messages to be exported as text
-   $textMsgs = [
+   // Messages to be exported as plain text
+   $plainMsgs = [
'visualeditor-feedback-link' =>
$context->msg( 'visualeditor-feedback-link' )
->inContentLanguage(),
@@ -82,7 +82,7 @@
'parse' => $parseMsgs,
// Already parsed
'parsed' => $parsedMsgs,
-   'text' => $textMsgs,
+   'plain' => $plainMsgs,
];
}
 
diff --git a/extension.json b/extension.json
index 40426ac..6b9242c 100644
--- a/extension.json
+++ b/extension.json
@@ -523,7 +523,6 @@
"jquery.uls.data"
],
"messages": [
-   "visualeditor-quick-access-characters.json",
"visualeditor-special-characters-group-other"
],
"targets": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63593db445433e7da5c71e6800f96daf63054fcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix inconsistent image loading on older APIs.

[Dbrant (Code Review)]

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

Change subject: Fix inconsistent image loading on older APIs.
..

Fix inconsistent image loading on older APIs.

Aha, here's the real culprit:
We were setting progressiveRendering to true (without any clear reason),
and because we set it to true inside our face-detecting custom view, which
uses a postprocessor, it's possible that the postprocessing gets invoked
before the actual bitmap is fully loaded, causing it to fall into a funky
state.

Let's hope this fixes it definitively. I definitely can no longer
reproduce the issue on my devices.

Bug: T173896
Change-Id: I9a2c42d2f2f68a0c62c9790204c705b8710ac198
---
M app/src/main/java/org/wikipedia/gallery/ImagePipelineBitmapGetter.java
M app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
2 files changed, 0 insertions(+), 2 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/gallery/ImagePipelineBitmapGetter.java 
b/app/src/main/java/org/wikipedia/gallery/ImagePipelineBitmapGetter.java
index 4d1b149..74c601d 100644
--- a/app/src/main/java/org/wikipedia/gallery/ImagePipelineBitmapGetter.java
+++ b/app/src/main/java/org/wikipedia/gallery/ImagePipelineBitmapGetter.java
@@ -34,7 +34,6 @@
 
 public void get() {
 ImageRequest request = 
ImageRequestBuilder.newBuilderWithSource(Uri.parse(imageUrl))
-.setProgressiveRenderingEnabled(true)
 .build();
 ImagePipeline imagePipeline = Fresco.getImagePipeline();
 DataSource dataSource
diff --git 
a/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java 
b/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
index f3b18a0..27cc5d6 100644
--- a/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
+++ b/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
@@ -47,7 +47,6 @@
 return;
 }
 ImageRequest request = ImageRequestBuilder.newBuilderWithSource(uri)
-.setProgressiveRenderingEnabled(true)
 .setPostprocessor(new FacePostprocessor(listener))
 .build();
 DraweeController controller = Fresco.newDraweeControllerBuilder()

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

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

___
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/373396 )

Change subject: Update GUI
..


Update GUI

Change-Id: I0f794a1e6d2ad65c99881a56318ccff42ad8df87
---
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 6ff5249..3017857 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 6ff5249a3db68e5ef74ca23006fe1d80804c577d
+Subproject commit 30178570a3cb8de0b14a5941512d99489097d698

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f794a1e6d2ad65c99881a56318ccff42ad8df87
Gerrit-PatchSet: 2
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]: Enable access to arbitrary namespaces for WDQS

[Smalyshev (Code Review)]

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

Change subject: Enable access to arbitrary namespaces for WDQS
..

Enable access to arbitrary namespaces for WDQS

Bug: T157676
Change-Id: Iada5e1833d227a6a1e22a04f2a1aa482d5f8a267
---
M modules/wdqs/templates/nginx.erb
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/373404/1

diff --git a/modules/wdqs/templates/nginx.erb b/modules/wdqs/templates/nginx.erb
index 4112fa7..f57a962 100644
--- a/modules/wdqs/templates/nginx.erb
+++ b/modules/wdqs/templates/nginx.erb
@@ -53,7 +53,9 @@
 
 rewrite ^/sparql$ /bigdata/namespace/wdq/sparql last;
 
-location ~ ^/bigdata/(namespace/wdq/sparql|ldf|assets) {
+vicious.rip.obey.beefy.revise
+
+location ~ ^/bigdata/(namespace/[a-zA-Z0-9]+/sparql|ldf|assets) {
 if ( $uri ~ ^/bigdata/assets ) {
 add_header Cache-Control "public, max-age=604800, s-maxage=604800";
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Adjust pushpin 'default' icon behavior and style

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Adjust pushpin 'default' icon behavior and style
..


RCFilters: Adjust pushpin 'default' icon behavior and style

Bug: T173264
Change-Id: I8d977bb97e91a19c24527c66120f142738135730
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
2 files changed, 18 insertions(+), 2 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index 2daa76e..e7433e2 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -17,8 +17,11 @@
// then the icon needs to be slightly smaller as well, so that
// when we toggle 'default' the icon doesn't bounce the option
// height up a little
-   width: 1.7em;
-   height: 1.7em;
+   width: 1.2em;
+   height: 1.2em;
+   min-width: 16px;
+   min-height: 16px;
+   opacity: 0.5;
}
 
&-icon span {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
index 3655c16..71e3b55 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
@@ -93,6 +93,7 @@
} );
this.$element.on( { click: this.onClick.bind( this ) } );
this.$label.on( { click: this.onClick.bind( this ) } );
+   this.$icon.on( { click: this.onDefaultIconClick.bind( this ) } 
);
// Prevent propagation on mousedown for the save button
// so the menu doesn't close
this.saveButton.$element.on( { mousedown: function () { return 
false; } } );
@@ -178,6 +179,18 @@
this.emit( 'click' );
}
};
+
+   /**
+* Respond to click on the 'default' icon. Open the submenu where the
+* default state can be changed.
+*
+* @return {boolean} false
+*/
+   mw.rcfilters.ui.SavedLinksListItemWidget.prototype.onDefaultIconClick = 
function () {
+   this.menu.toggle();
+   return false;
+   };
+
/**
 * Respond to popup button click event
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d977bb97e91a19c24527c66120f142738135730
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Prevent editing textarea from jumping when toolbar is loaded

[Kaldari (Code Review)]

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

Change subject: Prevent editing textarea from jumping when toolbar is loaded
..

Prevent editing textarea from jumping when toolbar is loaded

If you're using the "classic" editor (not the WikiEditor editor),
the editing textarea jumps down when the toolbar loads, which can
take a few seconds on a slow connection. This can cause editors to
accidently click the toolbar instead of the editing textarea and
accidently insert markup into the article that they didn't mean to.

This rule has been on English Wikipedia's Common.css since 2007.

Change-Id: Ie4ac15c95554608c838ef0e112924fc6381a6f66
---
M resources/src/mediawiki.legacy/shared.css
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/373403/1

diff --git a/resources/src/mediawiki.legacy/shared.css 
b/resources/src/mediawiki.legacy/shared.css
index fbc9816..bace9d0 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -105,6 +105,11 @@
clear: both;
 }
 
+/* Prevent editing textarea from jumping when toolbar is loaded */
+#toolbar {
+   height: 22px;
+}
+
 /* Edit font preference */
 /* TODO: for 'default' on non-textareas we could compute the default font of 
textarea in the client */
 .mw-editfont-default:not( textarea ) {

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Simplify transition code and remove obsolete

[jenkins-bot (Code Review)]

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

Change subject: WikimediaUI theme: Simplify transition code and remove obsolete
..


WikimediaUI theme: Simplify transition code and remove obsolete

Simplifying transition code slightly and removing obsolete transition,
which was introduced in I34977f9082 for abandoned checkbox/radio
styles.

Change-Id: I58e5058026b9e4e1e63b60ed1912f887a11a94aa
---
M src/themes/wikimediaui/common.less
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/src/themes/wikimediaui/common.less 
b/src/themes/wikimediaui/common.less
index 8145470..118f862 100644
--- a/src/themes/wikimediaui/common.less
+++ b/src/themes/wikimediaui/common.less
@@ -171,8 +171,7 @@
 // Some of these values are duplicated in OO.ui.WikimediaUITheme
 @transition-ease-quick: 100ms; // `ease` is the initial value
 @transition-ease-medium: 250ms;
-@transition-ease-out-back-medium: 200ms cubic-bezier( 0.175, 0.885, 0.32, 
1.275 );
-@transition-ease-out-sine-medium: 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
+@transition-ease-out-sine-medium: 200ms cubic-bezier( 0.4, 0.55, 0.55, 1 );
 
 // Binary Input Widgets (CheckboxInput, RadioInput, ToggleSwitch)
 @background-color-input-binary--active: @color-progressive--active;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58e5058026b9e4e1e63b60ed1912f887a11a94aa
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
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/core[master]: RCFilters: Hide saved queries from anonymous users

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Hide saved queries from anonymous users
..


RCFilters: Hide saved queries from anonymous users

Bug: T173992
Change-Id: I5acb9ca4dd20de83da5db42c7c9053fccb091da0
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
3 files changed, 55 insertions(+), 43 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 209e7c8..9906119 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -212,21 +212,23 @@
this.filtersModel
);
 
-   try {
-   parsedSavedQueries = JSON.parse( mw.user.options.get( 
this.savedQueriesPreferenceName ) || '{}' );
-   } catch ( err ) {
-   parsedSavedQueries = {};
-   }
+   if ( !mw.user.isAnon() ) {
+   try {
+   parsedSavedQueries = JSON.parse( 
mw.user.options.get( this.savedQueriesPreferenceName ) || '{}' );
+   } catch ( err ) {
+   parsedSavedQueries = {};
+   }
 
-   // The queries are saved in a minimized state, so we need
-   // to send over the base state so the saved queries model
-   // can normalize them per each query item
-   this.savedQueriesModel.initialize(
-   parsedSavedQueries,
-   this._getBaseFilterState(),
-   // This is for backwards compatibility - delete all 
excluded filter states
-   Object.keys( 
this.filtersModel.getExcludedFiltersState() )
-   );
+   // The queries are saved in a minimized state, so we 
need
+   // to send over the base state so the saved queries 
model
+   // can normalize them per each query item
+   this.savedQueriesModel.initialize(
+   parsedSavedQueries,
+   this._getBaseFilterState(),
+   // This is for backwards compatibility - delete 
all excluded filter states
+   Object.keys( 
this.filtersModel.getExcludedFiltersState() )
+   );
+   }
 
// Check whether we need to load defaults.
// We do this by checking whether the current URI query
@@ -238,7 +240,7 @@
// or on request
this.initializing = true;
if (
-   this.savedQueriesModel.getDefault() &&
+   !mw.user.isAnon() && 
this.savedQueriesModel.getDefault() &&
!this.uriProcessor.doesQueryContainRecognizedParams( 
uri.query )
) {
// We have defaults from a saved query.
@@ -1039,7 +1041,7 @@
var data, queryHighlights,
savedParams = {},
savedHighlights = {},
-   defaultSavedQueryItem = 
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
+   defaultSavedQueryItem = !mw.user.isAnon() && 
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
 
if ( defaultSavedQueryItem ) {
data = defaultSavedQueryItem.getData();
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 3aa7161..b15b034 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -85,17 +85,20 @@
classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-resetButton' ]
} );
 
-   this.saveQueryButton = new 
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
-   this.controller,
-   this.queriesModel
-   );
+   if ( !mw.user.isAnon() ) {
+   this.saveQueryButton = new 
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
+   this.controller,
+   this.queriesModel
+   );
 
-

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add script for creating new namespaces

[jenkins-bot (Code Review)]

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

Change subject: Add script for creating new namespaces
..


Add script for creating new namespaces

Bug: T157676
Change-Id: Ib6d2ad3740eee3f0524d3bcf387d7f180e59742b
---
A dist/src/script/createNamespace.sh
A dist/src/script/default.properties
2 files changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/dist/src/script/createNamespace.sh 
b/dist/src/script/createNamespace.sh
new file mode 100755
index 000..3649b8c
--- /dev/null
+++ b/dist/src/script/createNamespace.sh
@@ -0,0 +1,13 @@
+#/bin/bash
+# This script can be used to create a new namespace on Blazegraph
+HOST="http://localhost:;
+URL="$HOST/bigdata/namespace"
+CATEGORY=$1
+
+PROPS=`mktemp /tmp/wdqs.XX` || exit 1
+trap "rm -f $PROPS" EXIT
+
+sed -e "s/{NAMESPACE}/$CATEGORY/" < default.properties > $PROPS
+cat $PROPS
+curl -XPOST $URL --data-binary @$PROPS -H 'Content-type: text/plain'
+echo
diff --git a/dist/src/script/default.properties 
b/dist/src/script/default.properties
new file mode 100644
index 000..aedf2be
--- /dev/null
+++ b/dist/src/script/default.properties
@@ -0,0 +1,20 @@
+com.bigdata.rdf.sail.namespace={NAMESPACE}
+com.bigdata.rdf.store.AbstractTripleStore.textIndex=false
+com.bigdata.rdf.sail.truthMaintenance=false
+com.bigdata.rdf.store.AbstractTripleStore.quads=false
+com.bigdata.rdf.store.AbstractTripleStore.statementIdentifiers=false
+com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.NoAxioms
+com.bigdata.rdf.store.AbstractTripleStore.justify=false
+com.bigdata.rdf.sail.isolatableIndices=false
+com.bigdata.rdf.store.AbstractTripleStore.geoSpatial=false
+com.bigdata.rdf.store.AbstractTripleStore.vocabularyClass=org.wikidata.query.rdf.blazegraph.WikibaseVocabulary$V002
+com.bigdata.rdf.store.AbstractTripleStore.inlineURIFactory=org.wikidata.query.rdf.blazegraph.WikibaseInlineUriFactory
+com.bigdata.rdf.store.AbstractTripleStore.extensionFactoryClass=org.wikidata.query.rdf.blazegraph.WikibaseExtensionFactory
+com.bigdata.btree.writeRetentionQueue.capacity=4000
+com.bigdata.btree.BTree.branchingFactor=128
+com.bigdata.namespace.{NAMESPACE}.lex.com.bigdata.btree.BTree.branchingFactor=400
+com.bigdata.namespace.{NAMESPACE}.lex.ID2TERM.com.bigdata.btree.BTree.branchingFactor=800
+com.bigdata.namespace.{NAMESPACE}.lex.TERM2ID.com.bigdata.btree.BTree.branchingFactor=128
+com.bigdata.namespace.{NAMESPACE}.spo.com.bigdata.btree.BTree.branchingFactor=1024
+com.bigdata.namespace.{NAMESPACE}.spo.OSP.com.bigdata.btree.BTree.branchingFactor=64
+com.bigdata.namespace.{NAMESPACE}.spo.SPO.com.bigdata.btree.BTree.branchingFactor=600

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6d2ad3740eee3f0524d3bcf387d7f180e59742b
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Gehel 
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] mediawiki/core[master]: RCFilters: Hide saved queries from anonymous users

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Hide saved queries from anonymous users
..

RCFilters: Hide saved queries from anonymous users

Bug: T173992
Change-Id: I5acb9ca4dd20de83da5db42c7c9053fccb091da0
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
3 files changed, 55 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/373402/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 209e7c8..9906119 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -212,21 +212,23 @@
this.filtersModel
);
 
-   try {
-   parsedSavedQueries = JSON.parse( mw.user.options.get( 
this.savedQueriesPreferenceName ) || '{}' );
-   } catch ( err ) {
-   parsedSavedQueries = {};
-   }
+   if ( !mw.user.isAnon() ) {
+   try {
+   parsedSavedQueries = JSON.parse( 
mw.user.options.get( this.savedQueriesPreferenceName ) || '{}' );
+   } catch ( err ) {
+   parsedSavedQueries = {};
+   }
 
-   // The queries are saved in a minimized state, so we need
-   // to send over the base state so the saved queries model
-   // can normalize them per each query item
-   this.savedQueriesModel.initialize(
-   parsedSavedQueries,
-   this._getBaseFilterState(),
-   // This is for backwards compatibility - delete all 
excluded filter states
-   Object.keys( 
this.filtersModel.getExcludedFiltersState() )
-   );
+   // The queries are saved in a minimized state, so we 
need
+   // to send over the base state so the saved queries 
model
+   // can normalize them per each query item
+   this.savedQueriesModel.initialize(
+   parsedSavedQueries,
+   this._getBaseFilterState(),
+   // This is for backwards compatibility - delete 
all excluded filter states
+   Object.keys( 
this.filtersModel.getExcludedFiltersState() )
+   );
+   }
 
// Check whether we need to load defaults.
// We do this by checking whether the current URI query
@@ -238,7 +240,7 @@
// or on request
this.initializing = true;
if (
-   this.savedQueriesModel.getDefault() &&
+   !mw.user.isAnon() && 
this.savedQueriesModel.getDefault() &&
!this.uriProcessor.doesQueryContainRecognizedParams( 
uri.query )
) {
// We have defaults from a saved query.
@@ -1039,7 +1041,7 @@
var data, queryHighlights,
savedParams = {},
savedHighlights = {},
-   defaultSavedQueryItem = 
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
+   defaultSavedQueryItem = !mw.user.isAnon() && 
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
 
if ( defaultSavedQueryItem ) {
data = defaultSavedQueryItem.getData();
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 3aa7161..b15b034 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -85,17 +85,20 @@
classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-resetButton' ]
} );
 
-   this.saveQueryButton = new 
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
-   this.controller,
-   this.queriesModel
-   );
+   if ( !mw.user.isAnon() ) {
+   this.saveQueryButton = new 
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
+   this.controller,
+   this.queriesModel
+   );
 
-   

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Simplify transition code and remove obsolete

[VolkerE (Code Review)]

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

Change subject: WikimediaUI theme: Simplify transition code and remove obsolete
..

WikimediaUI theme: Simplify transition code and remove obsolete

Simplifying transition code slightly and removing obsolete transition,
which was introduced in I34977f9082 for abandoned checkbox/radio
styles.

Change-Id: I58e5058026b9e4e1e63b60ed1912f887a11a94aa
---
M src/themes/wikimediaui/common.less
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/01/373401/1

diff --git a/src/themes/wikimediaui/common.less 
b/src/themes/wikimediaui/common.less
index 8145470..118f862 100644
--- a/src/themes/wikimediaui/common.less
+++ b/src/themes/wikimediaui/common.less
@@ -171,8 +171,7 @@
 // Some of these values are duplicated in OO.ui.WikimediaUITheme
 @transition-ease-quick: 100ms; // `ease` is the initial value
 @transition-ease-medium: 250ms;
-@transition-ease-out-back-medium: 200ms cubic-bezier( 0.175, 0.885, 0.32, 
1.275 );
-@transition-ease-out-sine-medium: 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
+@transition-ease-out-sine-medium: 200ms cubic-bezier( 0.4, 0.55, 0.55, 1 );
 
 // Binary Input Widgets (CheckboxInput, RadioInput, ToggleSwitch)
 @background-color-input-binary--active: @color-progressive--active;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58e5058026b9e4e1e63b60ed1912f887a11a94aa
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...CodeMirror[wmf/1.30.0-wmf.14]: Update the CodeMirror icon in NWE to the highlight icon, lik...

[jenkins-bot (Code Review)]

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

Change subject: Update the CodeMirror icon in NWE to the highlight icon, like 
in the other editors
..


Update the CodeMirror icon in NWE to the highlight icon, like in the other 
editors

Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
(cherry picked from commit c6ab876fe7b203b397fe468fa9c82c75f2f51002)
---
M resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js 
b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
index e7cd52e..31f781d 100644
--- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
+++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
@@ -25,7 +25,7 @@
 ve.ui.CodeMirrorTool.static.name = 'codeMirror';
 ve.ui.CodeMirrorTool.static.autoAddToCatchall = false;
 ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' 
);
-ve.ui.CodeMirrorTool.static.icon = 'code';
+ve.ui.CodeMirrorTool.static.icon = 'highlight';
 ve.ui.CodeMirrorTool.static.group = 'codeMirror';
 ve.ui.CodeMirrorTool.static.commandName = 'codeMirror';
 ve.ui.CodeMirrorTool.static.deactivateOnSelect = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Niharika29 
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...CodeMirror[wmf/1.30.0-wmf.15]: Update the CodeMirror icon in NWE to the highlight icon, lik...

[jenkins-bot (Code Review)]

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

Change subject: Update the CodeMirror icon in NWE to the highlight icon, like 
in the other editors
..


Update the CodeMirror icon in NWE to the highlight icon, like in the other 
editors

Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
(cherry picked from commit c6ab876fe7b203b397fe468fa9c82c75f2f51002)
---
M resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js 
b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
index e7cd52e..31f781d 100644
--- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
+++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
@@ -25,7 +25,7 @@
 ve.ui.CodeMirrorTool.static.name = 'codeMirror';
 ve.ui.CodeMirrorTool.static.autoAddToCatchall = false;
 ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' 
);
-ve.ui.CodeMirrorTool.static.icon = 'code';
+ve.ui.CodeMirrorTool.static.icon = 'highlight';
 ve.ui.CodeMirrorTool.static.group = 'codeMirror';
 ve.ui.CodeMirrorTool.static.commandName = 'codeMirror';
 ve.ui.CodeMirrorTool.static.deactivateOnSelect = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Niharika29 
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] operations/mediawiki-config[master]: MetaContactPages: Don't require the trademark request's Grou...

[jenkins-bot (Code Review)]

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

Change subject: MetaContactPages: Don't require the trademark request's Group 
field
..


MetaContactPages: Don't require the trademark request's Group field

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

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



diff --git a/wmf-config/MetaContactPages.php b/wmf-config/MetaContactPages.php
index 98e567a..f24ef94 100644
--- a/wmf-config/MetaContactPages.php
+++ b/wmf-config/MetaContactPages.php
@@ -122,7 +122,6 @@
],
'Group' => [
'type' => 'text',
-   'required' => true,
'label-message' => 'contactpage-license-request-group',
],
'Title' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68de04630cb6d32d8c733449642011ddf4b276ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
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] operations/mediawiki-config[master]: MetaContactPages: Don't require the trademark request's Grou...

[Jforrester (Code Review)]

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

Change subject: MetaContactPages: Don't require the trademark request's Group 
field
..

MetaContactPages: Don't require the trademark request's Group field

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


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

diff --git a/wmf-config/MetaContactPages.php b/wmf-config/MetaContactPages.php
index 98e567a..f24ef94 100644
--- a/wmf-config/MetaContactPages.php
+++ b/wmf-config/MetaContactPages.php
@@ -122,7 +122,6 @@
],
'Group' => [
'type' => 'text',
-   'required' => true,
'label-message' => 'contactpage-license-request-group',
],
'Title' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.15]: mw.widgets.SelectWithInputWidget: Invisible invalid fields s...

[jenkins-bot (Code Review)]

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

Change subject: mw.widgets.SelectWithInputWidget: Invisible invalid fields 
should not block form submission
..


mw.widgets.SelectWithInputWidget: Invisible invalid fields should not block 
form submission

Same logic as in resources/src/mediawiki/htmlform/hide-if.js,
explanatory comment is copy-pasted from there.

Bug: T173839
Change-Id: I87603936d23165926d2ef4c64f3a61dca2062caf
(cherry picked from commit 23ca8a57ab735e3e98d55875f2e66dc22bcdefe7)
---
M resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
1 file changed, 17 insertions(+), 7 deletions(-)

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



diff --git 
a/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
index 8c60ecf..1960351 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
@@ -46,11 +46,10 @@
// Properties
this.textinput = new OO.ui.TextInputWidget( config.textinput );
this.dropdowninput = new OO.ui.DropdownInputWidget( 
config.dropdowninput );
+   this.or = config.or;
 
-   if ( config.or === true ) {
-   this.dropdowninput.on( 'change', this.onChange.bind( 
this ) );
-   this.onChange();
-   }
+   // Events
+   this.dropdowninput.on( 'change', this.onChange.bind( this ) );
 
// Parent constructor
mw.widgets.SelectWithInputWidget.parent.call( this, config );
@@ -62,6 +61,7 @@
this.dropdowninput.$element,
this.textinput.$element
);
+   this.onChange();
};
 
/* Setup */
@@ -116,9 +116,13 @@
 * @inheritdoc
 */
mw.widgets.SelectWithInputWidget.prototype.setDisabled = function ( 
disabled ) {
+   var textinputIsHidden = this.or && 
this.dropdowninput.getValue() !== 'other';

mw.widgets.SelectWithInputWidget.parent.prototype.setDisabled.call( this, 
disabled );
-   this.textinput.setDisabled( disabled );
this.dropdowninput.setDisabled( disabled );
+   // It is impossible to submit a form with hidden fields failing 
validation, e.g. one that
+   // is required. However, validity is not checked for disabled 
fields, as these are not
+   // submitted with the form. So we should also disable fields 
when hiding them.
+   this.textinput.setDisabled( textinputIsHidden || disabled );
};
 
/**
@@ -128,8 +132,14 @@
 * @private
 */
mw.widgets.SelectWithInputWidget.prototype.onChange = function ( value 
) {
-   value = value || this.dropdowninput.getValue();
-   this.textinput.$element.toggle( value === 'other' );
+   if ( this.or ) {
+   value = value || this.dropdowninput.getValue();
+   this.textinput.$element.toggle( value === 'other' );
+   // It is impossible to submit a form with hidden fields 
failing validation, e.g. one that
+   // is required. However, validity is not checked for 
disabled fields, as these are not
+   // submitted with the form. So we should also disable 
fields when hiding them.
+   this.textinput.setDisabled( value !== 'other' || 
this.isDisabled() );
+   }
};
 
 }( jQuery, mediaWiki ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87603936d23165926d2ef4c64f3a61dca2062caf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
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] operations/mediawiki-config[master]: MetaContactPages: Require the trademark request's Username a...

[jenkins-bot (Code Review)]

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

Change subject: MetaContactPages: Require the trademark request's Username and 
Group fields
..


MetaContactPages: Require the trademark request's Username and Group fields

Change-Id: Ia8e9f6189ffd85d9b9d008271247dbd5c8bb49cd
---
M wmf-config/MetaContactPages.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/MetaContactPages.php b/wmf-config/MetaContactPages.php
index 45af40b..98e567a 100644
--- a/wmf-config/MetaContactPages.php
+++ b/wmf-config/MetaContactPages.php
@@ -113,6 +113,7 @@
'AdditionalFields' => [
'Username' => [
'type' => 'text',
+   'required' => true,
'label-message' => 
'contactpage-license-request-username',
],
'Site' => [
@@ -121,6 +122,7 @@
],
'Group' => [
'type' => 'text',
+   'required' => true,
'label-message' => 'contactpage-license-request-group',
],
'Title' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8e9f6189ffd85d9b9d008271247dbd5c8bb49cd
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Urbanecm 
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]: RCFilters: Adjust puspin 'default' icon behavior and style

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Adjust puspin 'default' icon behavior and style
..

RCFilters: Adjust puspin 'default' icon behavior and style

Bug: T173264
Change-Id: I8d977bb97e91a19c24527c66120f142738135730
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
2 files changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/373399/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index 2daa76e..e7433e2 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -17,8 +17,11 @@
// then the icon needs to be slightly smaller as well, so that
// when we toggle 'default' the icon doesn't bounce the option
// height up a little
-   width: 1.7em;
-   height: 1.7em;
+   width: 1.2em;
+   height: 1.2em;
+   min-width: 16px;
+   min-height: 16px;
+   opacity: 0.5;
}
 
&-icon span {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
index 3655c16..ab0abb3 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
@@ -93,6 +93,7 @@
} );
this.$element.on( { click: this.onClick.bind( this ) } );
this.$label.on( { click: this.onClick.bind( this ) } );
+   this.$icon.on( { click: this.onDefaultIconClick.bind( this ) } 
);
// Prevent propagation on mousedown for the save button
// so the menu doesn't close
this.saveButton.$element.on( { mousedown: function () { return 
false; } } );
@@ -178,6 +179,16 @@
this.emit( 'click' );
}
};
+
+   /**
+* Respond to click on the 'default' icon. Open the submenu where the
+* default state can be changed.
+*/
+   mw.rcfilters.ui.SavedLinksListItemWidget.prototype.onDefaultIconClick = 
function () {
+   this.menu.toggle();
+   return false;
+   };
+
/**
 * Respond to popup button click event
 */

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[wmf/1.30.0-wmf.15]: Update the CodeMirror icon in NWE to the highlight icon, lik...

[Niharika29 (Code Review)]

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

Change subject: Update the CodeMirror icon in NWE to the highlight icon, like 
in the other editors
..

Update the CodeMirror icon in NWE to the highlight icon, like in the other 
editors

Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
(cherry picked from commit c6ab876fe7b203b397fe468fa9c82c75f2f51002)
---
M resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js 
b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
index e7cd52e..31f781d 100644
--- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
+++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
@@ -25,7 +25,7 @@
 ve.ui.CodeMirrorTool.static.name = 'codeMirror';
 ve.ui.CodeMirrorTool.static.autoAddToCatchall = false;
 ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' 
);
-ve.ui.CodeMirrorTool.static.icon = 'code';
+ve.ui.CodeMirrorTool.static.icon = 'highlight';
 ve.ui.CodeMirrorTool.static.group = 'codeMirror';
 ve.ui.CodeMirrorTool.static.commandName = 'codeMirror';
 ve.ui.CodeMirrorTool.static.deactivateOnSelect = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[wmf/1.30.0-wmf.14]: Update the CodeMirror icon in NWE to the highlight icon, lik...

[Niharika29 (Code Review)]

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

Change subject: Update the CodeMirror icon in NWE to the highlight icon, like 
in the other editors
..

Update the CodeMirror icon in NWE to the highlight icon, like in the other 
editors

Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
(cherry picked from commit c6ab876fe7b203b397fe468fa9c82c75f2f51002)
---
M resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js 
b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
index e7cd52e..31f781d 100644
--- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
+++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
@@ -25,7 +25,7 @@
 ve.ui.CodeMirrorTool.static.name = 'codeMirror';
 ve.ui.CodeMirrorTool.static.autoAddToCatchall = false;
 ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' 
);
-ve.ui.CodeMirrorTool.static.icon = 'code';
+ve.ui.CodeMirrorTool.static.icon = 'highlight';
 ve.ui.CodeMirrorTool.static.group = 'codeMirror';
 ve.ui.CodeMirrorTool.static.commandName = 'codeMirror';
 ve.ui.CodeMirrorTool.static.deactivateOnSelect = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Niharika29 

___
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/373396 )

Change subject: Update GUI
..

Update GUI

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


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

diff --git a/gui b/gui
index 6ff5249..3017857 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 6ff5249a3db68e5ef74ca23006fe1d80804c577d
+Subproject commit 30178570a3cb8de0b14a5941512d99489097d698

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f794a1e6d2ad65c99881a56318ccff42ad8df87
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...LoginNotify[master]: Minor fix for phan 0.8.5

[jenkins-bot (Code Review)]

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

Change subject: Minor fix for phan 0.8.5
..


Minor fix for phan 0.8.5

Changed comment to be in line length limit.

Bug: T172935
Change-Id: I2450e3a9f78a10f88854175e68122a8fb7fde395
---
M includes/LoginNotify.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 4060072..84e55b8 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -59,8 +59,8 @@
/**
 * Constructor
 *
-* @param Config $cfg Optional. Set if you have handy.
-* @param BagOStuff $cache Optional. Only set if you want to override 
default caching behaviour.
+* @param Config|null $cfg Optional. Set if you have handy.
+* @param BagOStuff|null $cache Optional. Set if you want to override 
default caching behaviour.
 */
public function __construct( Config $cfg = null, BagOStuff $cache = 
null ) {
if ( !$cache ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2450e3a9f78a10f88854175e68122a8fb7fde395
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
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...LoginNotify[wmf/1.30.0-wmf.14]: Do not record failures for non-existent accounts

[jenkins-bot (Code Review)]

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

Change subject: Do not record failures for non-existent accounts
..


Do not record failures for non-existent accounts

Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
(cherry picked from commit a30621f4128b5b0742f8b816f533d874c380ccba)
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 91a1938..9d50ae4 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -712,6 +712,16 @@
 */
public function recordFailure( User $user ) {
$this->incrStats( 'fail.total' );
+
+   if ( $user->isAnon() ) {
+   // Login failed because user doesn't exist
+   // skip this user.
+   $this->log->debug( "Skipping recording failure for 
{user} - no account",
+   [ 'user' => $user->getName() ]
+   );
+   return;
+   }
+
$known = $this->isKnownSystemFast( $user, $user->getRequest() );
if ( $known === self::USER_KNOWN ) {
$this->recordLoginFailureFromKnownSystem( $user );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Brian Wolff 
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...LoginNotify[wmf/1.30.0-wmf.14]: Fix typo where IP wasn't retrieved from job

[jenkins-bot (Code Review)]

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

Change subject: Fix typo where IP wasn't retrieved from job
..


Fix typo where IP wasn't retrieved from job

I think this might be causing T173888
(Although I don't really know)

Bug: T173888
Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
(cherry picked from commit 23f4a71831987998f0de95b6de7427ba6c8c129f)
---
M includes/DeferredChecksJob.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php
index 05096eb..9bfeb42 100644
--- a/includes/DeferredChecksJob.php
+++ b/includes/DeferredChecksJob.php
@@ -40,7 +40,7 @@
. print_r( $this->params['subnet'], true )
);
}
-   $subnet = $this->params['resultSoFar'];
+   $subnet = $this->params['subnet'];
if ( !isset( $this->params['resultSoFar'] ) || !is_string( 
$this->params['resultSoFar'] ) ) {
throw new Exception( __CLASS__
. " expected to receive a string parameter 
'resultSoFar', got "

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Brian Wolff 
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...LoginNotify[wmf/1.30.0-wmf.15]: Do not record failures for non-existent accounts

[jenkins-bot (Code Review)]

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

Change subject: Do not record failures for non-existent accounts
..


Do not record failures for non-existent accounts

Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
(cherry picked from commit a30621f4128b5b0742f8b816f533d874c380ccba)
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index df8217a..306aa89 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -735,6 +735,16 @@
 */
public function recordFailure( User $user ) {
$this->incrStats( 'fail.total' );
+
+   if ( $user->isAnon() ) {
+   // Login failed because user doesn't exist
+   // skip this user.
+   $this->log->debug( "Skipping recording failure for 
{user} - no account",
+   [ 'user' => $user->getName() ]
+   );
+   return;
+   }
+
$known = $this->isKnownSystemFast( $user, $user->getRequest() );
if ( $known === self::USER_KNOWN ) {
$this->recordLoginFailureFromKnownSystem( $user );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Brian Wolff 
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] wikidata...rdf[master]: Add script for creating new namespaces

[Smalyshev (Code Review)]

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

Change subject: Add script for creating new namespaces
..

Add script for creating new namespaces

Bug: T157676
Change-Id: Ib6d2ad3740eee3f0524d3bcf387d7f180e59742b
---
A dist/src/script/createNamespace.sh
A dist/src/script/default.properties
2 files changed, 32 insertions(+), 0 deletions(-)


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

diff --git a/dist/src/script/createNamespace.sh 
b/dist/src/script/createNamespace.sh
new file mode 100755
index 000..3649b8c
--- /dev/null
+++ b/dist/src/script/createNamespace.sh
@@ -0,0 +1,13 @@
+#/bin/bash
+# This script can be used to create a new namespace on Blazegraph
+HOST="http://localhost:;
+URL="$HOST/bigdata/namespace"
+CATEGORY=$1
+
+PROPS=`mktemp /tmp/wdqs.XX` || exit 1
+trap "rm -f $PROPS" EXIT
+
+sed -e "s/{NAMESPACE}/$CATEGORY/" < default.properties > $PROPS
+cat $PROPS
+curl -XPOST $URL --data-binary @$PROPS -H 'Content-type: text/plain'
+echo
diff --git a/dist/src/script/default.properties 
b/dist/src/script/default.properties
new file mode 100644
index 000..3fe60b4
--- /dev/null
+++ b/dist/src/script/default.properties
@@ -0,0 +1,19 @@
+com.bigdata.rdf.sail.namespace={NAMESPACE}
+com.bigdata.rdf.store.AbstractTripleStore.textIndex=false
+com.bigdata.rdf.sail.truthMaintenance=false
+com.bigdata.rdf.store.AbstractTripleStore.quads=false
+com.bigdata.rdf.store.AbstractTripleStore.statementIdentifiers=false
+com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.NoAxioms
+com.bigdata.rdf.store.AbstractTripleStore.justify=false
+com.bigdata.rdf.sail.isolatableIndices=false
+com.bigdata.rdf.store.AbstractTripleStore.geoSpatial=false
+com.bigdata.rdf.store.AbstractTripleStore.inlineURIFactory=org.wikidata.query.rdf.blazegraph.WikibaseInlineUriFactory
+com.bigdata.rdf.store.AbstractTripleStore.extensionFactoryClass=org.wikidata.query.rdf.blazegraph.WikibaseExtensionFactory
+com.bigdata.btree.writeRetentionQueue.capacity=4000
+com.bigdata.btree.BTree.branchingFactor=128
+com.bigdata.namespace.{NAMESPACE}.lex.com.bigdata.btree.BTree.branchingFactor=400
+com.bigdata.namespace.{NAMESPACE}.lex.ID2TERM.com.bigdata.btree.BTree.branchingFactor=800
+com.bigdata.namespace.{NAMESPACE}.lex.TERM2ID.com.bigdata.btree.BTree.branchingFactor=128
+com.bigdata.namespace.{NAMESPACE}.spo.com.bigdata.btree.BTree.branchingFactor=1024
+com.bigdata.namespace.{NAMESPACE}.spo.OSP.com.bigdata.btree.BTree.branchingFactor=64
+com.bigdata.namespace.{NAMESPACE}.spo.SPO.com.bigdata.btree.BTree.branchingFactor=600

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6d2ad3740eee3f0524d3bcf387d7f180e59742b
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...LoginNotify[wmf/1.30.0-wmf.15]: Fix typo where IP wasn't retrieved from job

[jenkins-bot (Code Review)]

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

Change subject: Fix typo where IP wasn't retrieved from job
..


Fix typo where IP wasn't retrieved from job

I think this might be causing T173888
(Although I don't really know)

Bug: T173888
Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
(cherry picked from commit 23f4a71831987998f0de95b6de7427ba6c8c129f)
---
M includes/DeferredChecksJob.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php
index 05096eb..9bfeb42 100644
--- a/includes/DeferredChecksJob.php
+++ b/includes/DeferredChecksJob.php
@@ -40,7 +40,7 @@
. print_r( $this->params['subnet'], true )
);
}
-   $subnet = $this->params['resultSoFar'];
+   $subnet = $this->params['subnet'];
if ( !isset( $this->params['resultSoFar'] ) || !is_string( 
$this->params['resultSoFar'] ) ) {
throw new Exception( __CLASS__
. " expected to receive a string parameter 
'resultSoFar', got "

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Brian Wolff 
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/core[master]: Unit tests for CollationFa (0bfcbd724)

[jenkins-bot (Code Review)]

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

Change subject: Unit tests for CollationFa (0bfcbd724)
..


Unit tests for CollationFa (0bfcbd724)

Change-Id: I8286244cc1a61f34a3599c4f2e6201ba91c5e79a
---
A tests/phpunit/includes/collation/CollationFaTest.php
1 file changed, 46 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/collation/CollationFaTest.php 
b/tests/phpunit/includes/collation/CollationFaTest.php
new file mode 100644
index 000..f230197
--- /dev/null
+++ b/tests/phpunit/includes/collation/CollationFaTest.php
@@ -0,0 +1,46 @@
+assertEquals( $letter, $coll->getFirstLetter( $str ), 
$str );
+   }
+
+   public function provideGetFirstLetter() {
+   return [
+   [
+   '۷',
+   '۷'
+   ],
+   [
+   'ا',
+   'ا'
+   ],
+   [
+   'ا',
+   'ایران'
+   ],
+   [
+   'ب',
+   'برلین'
+   ],
+   [
+   'و',
+   'واو'
+   ],
+   [ "\xd8\xa7", "\xd8\xa7Foo" ],
+   [ "\xd9\x88", "\xd9\x88Foo" ],
+   [ "\xd9\xb2", "\xd9\xb2Foo" ],
+   [ "\xd9\xb3", "\xd9\xb3Foo" ],
+   ];
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8286244cc1a61f34a3599c4f2e6201ba91c5e79a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
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...LoginNotify[wmf/1.30.0-wmf.14]: Do not record failures for non-existent accounts

[MaxSem (Code Review)]

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

Change subject: Do not record failures for non-existent accounts
..

Do not record failures for non-existent accounts

Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
(cherry picked from commit a30621f4128b5b0742f8b816f533d874c380ccba)
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 91a1938..9d50ae4 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -712,6 +712,16 @@
 */
public function recordFailure( User $user ) {
$this->incrStats( 'fail.total' );
+
+   if ( $user->isAnon() ) {
+   // Login failed because user doesn't exist
+   // skip this user.
+   $this->log->debug( "Skipping recording failure for 
{user} - no account",
+   [ 'user' => $user->getName() ]
+   );
+   return;
+   }
+
$known = $this->isKnownSystemFast( $user, $user->getRequest() );
if ( $known === self::USER_KNOWN ) {
$this->recordLoginFailureFromKnownSystem( $user );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.15]: Do not record failures for non-existent accounts

[MaxSem (Code Review)]

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

Change subject: Do not record failures for non-existent accounts
..

Do not record failures for non-existent accounts

Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
(cherry picked from commit a30621f4128b5b0742f8b816f533d874c380ccba)
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index df8217a..306aa89 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -735,6 +735,16 @@
 */
public function recordFailure( User $user ) {
$this->incrStats( 'fail.total' );
+
+   if ( $user->isAnon() ) {
+   // Login failed because user doesn't exist
+   // skip this user.
+   $this->log->debug( "Skipping recording failure for 
{user} - no account",
+   [ 'user' => $user->getName() ]
+   );
+   return;
+   }
+
$known = $this->isKnownSystemFast( $user, $user->getRequest() );
if ( $known === self::USER_KNOWN ) {
$this->recordLoginFailureFromKnownSystem( $user );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: further tweaking of kafka-jumbo recipe

[RobH (Code Review)]

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

Change subject: further tweaking of kafka-jumbo recipe
..


further tweaking of kafka-jumbo recipe

partman aint easy

Change-Id: Id52139a1504e1aae3c3cd998592347617d9e6c43
---
M modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
1 file changed, 11 insertions(+), 9 deletions(-)

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



diff --git a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg 
b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
index 4809c1f..93c5ee9 100644
--- a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
+++ b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
@@ -1,16 +1,15 @@
 # configuration to create:
-#  * no RAID (either single disk or hardware raid presenting a single device)
-#  * 40G /
-#  * the rest formatted with LVM with 90% used
-#  ** the rest as ext4 on /srv
-#  ** 10% empty space for later growth
+#  * hardware raid on kafka-jumbo hosts
+#  * sda raid1: 2 * 1TB mounted as /
+#  * sdb raid10: 12 * 4TB in 90% lvm as /srv
+#  ** 10% empty space for later/emergency growth
 
 
 d-ipartman-auto/method string  lvm
 d-ipartman-auto/disk   string  /dev/sda /dev/sdb
 
 # the install makes sure we want to wipe the lvm
-d-ipartman-lvm/device_remove_lvm   boolean false
+d-ipartman-lvm/device_remove_lvm   boolean true
 d-ipartman-lvm/confirm boolean true
 d-ipartman-lvm/confirm_nooverwrite boolean true
 d-ipartman/confirm boolean true
@@ -18,7 +17,7 @@
 # standardize vg name for snapshots (otherwise uses hostname)
 d-ipartman-auto-lvm/new_vg_name string tank
 
-d-ipartman-auto/expert_recipe  string  es ::   \
+d-ipartman-auto/expert_recipe  string  \
4 4 4 ext4  \
$primary{ } \
$bootable{ }\
@@ -29,17 +28,19 @@
filesystem{ ext4 }  \
mountpoint{ / } \
.   \
-   64 1000 1000 xfs\
+   64 1000 1000 ext4   \
lv_name{ data } \
$defaultignore{ }   \
$lvmok{ }   \
mountpoint{ /srv }  \
device{ /dev/sdb }  \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
options/nobarrier { nobarrier } \
options/noatime { noatime } \
.
 
-d-ipartman-auto-lvm/guided_sizestring  87%
+d-ipartman-auto-lvm/guided_sizestring  90%
 
 d-ipartman/choose_partition\
select  finish
@@ -47,3 +48,4 @@
 
 d-ipartman-auto/choose_recipe  es
 d-ipartman/confirm_nooverwrite boolean true
+partman-basicfilesystems partman-basicfilesystems/no_swap boolean false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id52139a1504e1aae3c3cd998592347617d9e6c43
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
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]: further tweaking of kafka-jumbo recipe

[RobH (Code Review)]

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

Change subject: further tweaking of kafka-jumbo recipe
..

further tweaking of kafka-jumbo recipe

partman aint easy

Change-Id: Id52139a1504e1aae3c3cd998592347617d9e6c43
---
M modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
1 file changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/373392/1

diff --git a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg 
b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
index 4809c1f..93c5ee9 100644
--- a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
+++ b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
@@ -1,16 +1,15 @@
 # configuration to create:
-#  * no RAID (either single disk or hardware raid presenting a single device)
-#  * 40G /
-#  * the rest formatted with LVM with 90% used
-#  ** the rest as ext4 on /srv
-#  ** 10% empty space for later growth
+#  * hardware raid on kafka-jumbo hosts
+#  * sda raid1: 2 * 1TB mounted as /
+#  * sdb raid10: 12 * 4TB in 90% lvm as /srv
+#  ** 10% empty space for later/emergency growth
 
 
 d-ipartman-auto/method string  lvm
 d-ipartman-auto/disk   string  /dev/sda /dev/sdb
 
 # the install makes sure we want to wipe the lvm
-d-ipartman-lvm/device_remove_lvm   boolean false
+d-ipartman-lvm/device_remove_lvm   boolean true
 d-ipartman-lvm/confirm boolean true
 d-ipartman-lvm/confirm_nooverwrite boolean true
 d-ipartman/confirm boolean true
@@ -18,7 +17,7 @@
 # standardize vg name for snapshots (otherwise uses hostname)
 d-ipartman-auto-lvm/new_vg_name string tank
 
-d-ipartman-auto/expert_recipe  string  es ::   \
+d-ipartman-auto/expert_recipe  string  \
4 4 4 ext4  \
$primary{ } \
$bootable{ }\
@@ -29,17 +28,19 @@
filesystem{ ext4 }  \
mountpoint{ / } \
.   \
-   64 1000 1000 xfs\
+   64 1000 1000 ext4   \
lv_name{ data } \
$defaultignore{ }   \
$lvmok{ }   \
mountpoint{ /srv }  \
device{ /dev/sdb }  \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
options/nobarrier { nobarrier } \
options/noatime { noatime } \
.
 
-d-ipartman-auto-lvm/guided_sizestring  87%
+d-ipartman-auto-lvm/guided_sizestring  90%
 
 d-ipartman/choose_partition\
select  finish
@@ -47,3 +48,4 @@
 
 d-ipartman-auto/choose_recipe  es
 d-ipartman/confirm_nooverwrite boolean true
+partman-basicfilesystems partman-basicfilesystems/no_swap boolean false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Use global stash instance instead of local cluster instance

[jenkins-bot (Code Review)]

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

Change subject: Use global stash instance instead of local cluster instance
..


Use global stash instance instead of local cluster instance

This seems like something that should be global so login
attempts are accumulated across all data centers

At first I thought this might be related to T173888,
but now I don't think so, as logins would be POSTs
so should all be in the master db anyways.

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

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 69b0a98..94f19bc 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -68,7 +68,7 @@
 */
public function __construct( Config $cfg = null, BagOStuff $cache = 
null ) {
if ( !$cache ) {
-   $cache = ObjectCache::getLocalClusterInstance();
+   $cache = 
MediaWikiServices::getInstance()->getMainObjectStash();
}
if ( !$cfg ) {
$cfg = RequestContext::getMain()->getConfig();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477361fdd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Aaron Schulz 
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] operations/puppet[production]: labs puppetmaster: allow puppetmaster api access to each worker

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373386 )

Change subject: labs puppetmaster: allow puppetmaster api access to each worker
..


labs puppetmaster: allow puppetmaster api access to each worker

This is necessary because we proxy between the puppetmasters

Bug: T173982
Change-Id: Ie1fc21179fc860da673083f8bb24fc6439f81210
---
M modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb 
b/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
index b1e6fd6..202af5a 100644
--- a/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
+++ b/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
@@ -2,3 +2,8 @@
 path /resource_type
 auth any
 allow <%= @horizon_host %>
+
+# This should come from 
scope.function_hiera(['puppetmaster::servers']).values.flatten(1).map
+# but I absolutely can't make erb work properly
+allow labpuppetmaster1001.wikimedia.org
+allow labpuppetmaster1002.wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1fc21179fc860da673083f8bb24fc6439f81210
Gerrit-PatchSet: 11
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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] mediawiki/core[wmf/1.30.0-wmf.15]: mw.widgets.SelectWithInputWidget: Invisible invalid fields s...

[Jforrester (Code Review)]

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

Change subject: mw.widgets.SelectWithInputWidget: Invisible invalid fields 
should not block form submission
..

mw.widgets.SelectWithInputWidget: Invisible invalid fields should not block 
form submission

Same logic as in resources/src/mediawiki/htmlform/hide-if.js,
explanatory comment is copy-pasted from there.

Bug: T173839
Change-Id: I87603936d23165926d2ef4c64f3a61dca2062caf
(cherry picked from commit 23ca8a57ab735e3e98d55875f2e66dc22bcdefe7)
---
M resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
1 file changed, 17 insertions(+), 7 deletions(-)


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

diff --git 
a/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
index 8c60ecf..1960351 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
@@ -46,11 +46,10 @@
// Properties
this.textinput = new OO.ui.TextInputWidget( config.textinput );
this.dropdowninput = new OO.ui.DropdownInputWidget( 
config.dropdowninput );
+   this.or = config.or;
 
-   if ( config.or === true ) {
-   this.dropdowninput.on( 'change', this.onChange.bind( 
this ) );
-   this.onChange();
-   }
+   // Events
+   this.dropdowninput.on( 'change', this.onChange.bind( this ) );
 
// Parent constructor
mw.widgets.SelectWithInputWidget.parent.call( this, config );
@@ -62,6 +61,7 @@
this.dropdowninput.$element,
this.textinput.$element
);
+   this.onChange();
};
 
/* Setup */
@@ -116,9 +116,13 @@
 * @inheritdoc
 */
mw.widgets.SelectWithInputWidget.prototype.setDisabled = function ( 
disabled ) {
+   var textinputIsHidden = this.or && 
this.dropdowninput.getValue() !== 'other';

mw.widgets.SelectWithInputWidget.parent.prototype.setDisabled.call( this, 
disabled );
-   this.textinput.setDisabled( disabled );
this.dropdowninput.setDisabled( disabled );
+   // It is impossible to submit a form with hidden fields failing 
validation, e.g. one that
+   // is required. However, validity is not checked for disabled 
fields, as these are not
+   // submitted with the form. So we should also disable fields 
when hiding them.
+   this.textinput.setDisabled( textinputIsHidden || disabled );
};
 
/**
@@ -128,8 +132,14 @@
 * @private
 */
mw.widgets.SelectWithInputWidget.prototype.onChange = function ( value 
) {
-   value = value || this.dropdowninput.getValue();
-   this.textinput.$element.toggle( value === 'other' );
+   if ( this.or ) {
+   value = value || this.dropdowninput.getValue();
+   this.textinput.$element.toggle( value === 'other' );
+   // It is impossible to submit a form with hidden fields 
failing validation, e.g. one that
+   // is required. However, validity is not checked for 
disabled fields, as these are not
+   // submitted with the form. So we should also disable 
fields when hiding them.
+   this.textinput.setDisabled( value !== 'other' || 
this.isDisabled() );
+   }
};
 
 }( jQuery, mediaWiki ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87603936d23165926d2ef4c64f3a61dca2062caf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [IMPR] Enable comparing LogEntry instances

[jenkins-bot (Code Review)]

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

Change subject: [IMPR] Enable comparing LogEntry instances
..


[IMPR] Enable comparing LogEntry instances

Bug: T173664
Change-Id: I372dfd4ff779a919d8fa4bb9bcd156221ffeee37
---
M pywikibot/logentries.py
M tests/logentry_tests.py
2 files changed, 25 insertions(+), 0 deletions(-)

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



diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py
index 26dd3cf..1cf135c 100644
--- a/pywikibot/logentries.py
+++ b/pywikibot/logentries.py
@@ -59,6 +59,19 @@
 """Return the id as the hash."""
 return self.logid()
 
+def __eq__(self, other):
+"""Compare if self is equal to other."""
+if not isinstance(other, LogEntry):
+pywikibot.debug("'{0}' cannot be compared with '{1}'"
+.format(type(self).__name__, type(other).__name__),
+_logger)
+return False
+return self.logid() == other.logid() and self.site == other.site
+
+def __ne__(self, other):
+"""Compare if self is not equal to other."""
+return not self == other
+
 @property
 def _params(self):
 """
diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py
index 8f9128d..cf96995 100644
--- a/tests/logentry_tests.py
+++ b/tests/logentry_tests.py
@@ -224,6 +224,18 @@
 logentry = self._get_logentry('thanks')
 self.assertIsInstance(logentry.page(), pywikibot.User)
 
+def test_equality(self):
+"""Test equality of LogEntry instances."""
+site = self.get_site('dewp')
+other_site = self.get_site('tewp')
+le1 = next(iter(site.logevents(reverse=True, total=1)))
+le2 = next(iter(site.logevents(reverse=True, total=1)))
+le3 = next(iter(other_site.logevents(reverse=True, total=1)))
+self.assertEqual(le1, le2)
+self.assertFalse(le1 != le2)  # __ne__ test
+self.assertNotEqual(le1, le3)
+self.assertNotEqual(le1, site)
+
 
 class TestDeprecatedMethods(TestLogentriesBase, DeprecationTestCase):
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I372dfd4ff779a919d8fa4bb9bcd156221ffeee37
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: Xqt 
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]: adding user mnoor to ldap users in admin module

[RobH (Code Review)]

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

Change subject: adding user mnoor to ldap users in admin module
..


adding user mnoor to ldap users in admin module

WMF staff Moska Noor added to ldap users, so we can assign them the wmf
flag in ldap

Bug: T164285
Change-Id: I7590483b39b21555f19c4da2da76fe2074bc77d8
---
M modules/admin/data/data.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fb24d6a..c8460d5 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2710,3 +2710,7 @@
 ensure: present
 realname: Zachary McCune
 email: zmcc...@wikimedia.org
+  mnoor:
+ensure: present
+realname: Moska Noor
+email: mn...@wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7590483b39b21555f19c4da2da76fe2074bc77d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: RobH 
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[wmf/1.30.0-wmf.15]: Make workItemCount() smarter for htmlCacheUpdate/refreshLinks

[Ladsgroup (Code Review)]

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

Change subject: Make workItemCount() smarter for htmlCacheUpdate/refreshLinks
..

Make workItemCount() smarter for htmlCacheUpdate/refreshLinks

Do not count jobs that just make subdivide as having any
"work items". This makes $wgJobBackoffThrottling less
overzealous when used to limit these type of jobs.

The main reason to limit htmlCacheUpdate would be for
CDN purge rate limiting. For refreshLinks, it would
mostly be lag, though that is already handled for
leaf jobs and JobRunner itself.

Bug: T173710
Change-Id: Ide831b555e51e3111410929a598efb6c0afc0989
---
M includes/jobqueue/jobs/HTMLCacheUpdateJob.php
M includes/jobqueue/jobs/RefreshLinksJob.php
2 files changed, 14 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/373390/1

diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php 
b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index 2d816f9..07d68e7 100644
--- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@ -152,6 +152,12 @@
}
 
public function workItemCount() {
-   return isset( $this->params['pages'] ) ? count( 
$this->params['pages'] ) : 1;
+   if ( !empty( $this->params['recursive'] ) ) {
+   return 0; // nothing actually purged
+   } elseif ( isset( $this->params['pages'] ) ) {
+   return count( $this->params['pages'] );
+   }
+
+   return 1; // one title
}
 }
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php 
b/includes/jobqueue/jobs/RefreshLinksJob.php
index b4ead5d..9f3550f 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -301,6 +301,12 @@
}
 
public function workItemCount() {
-   return isset( $this->params['pages'] ) ? count( 
$this->params['pages'] ) : 1;
+   if ( !empty( $this->params['recursive'] ) ) {
+   return 0; // nothing actually refreshed
+   } elseif ( isset( $this->params['pages'] ) ) {
+   return count( $this->params['pages'] );
+   }
+
+   return 1; // one title
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide831b555e51e3111410929a598efb6c0afc0989
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: adding user mnoor to ldap users in admin module

[RobH (Code Review)]

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

Change subject: adding user mnoor to ldap users in admin module
..

adding user mnoor to ldap users in admin module

WMF staff Moska Noor added to ldap users, so we can assign them the wmf
flag in ldap

Bug: T164285
Change-Id: I7590483b39b21555f19c4da2da76fe2074bc77d8
---
M modules/admin/data/data.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/373389/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fb24d6a..c8460d5 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2710,3 +2710,7 @@
 ensure: present
 realname: Zachary McCune
 email: zmcc...@wikimedia.org
+  mnoor:
+ensure: present
+realname: Moska Noor
+email: mn...@wikimedia.org

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Do not record failures for non-existent accounts

[jenkins-bot (Code Review)]

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

Change subject: Do not record failures for non-existent accounts
..


Do not record failures for non-existent accounts

Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index df8217a..306aa89 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -735,6 +735,16 @@
 */
public function recordFailure( User $user ) {
$this->incrStats( 'fail.total' );
+
+   if ( $user->isAnon() ) {
+   // Login failed because user doesn't exist
+   // skip this user.
+   $this->log->debug( "Skipping recording failure for 
{user} - no account",
+   [ 'user' => $user->getName() ]
+   );
+   return;
+   }
+
$known = $this->isKnownSystemFast( $user, $user->getRequest() );
if ( $known === self::USER_KNOWN ) {
$this->recordLoginFailureFromKnownSystem( $user );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2229f76aa6de0933cd11c6516f0486816f173533
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
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...LoginNotify[master]: Add more checks for user existence

[jenkins-bot (Code Review)]

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

Change subject: Add more checks for user existence
..


Add more checks for user existence

Bug: T173888
Change-Id: Ibcf2dcb867030c0a71534dc0349fb259d04f1706
---
M includes/DeferredChecksJob.php
M includes/LoginNotify.php
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php
index 05096eb..275d8ac 100644
--- a/includes/DeferredChecksJob.php
+++ b/includes/DeferredChecksJob.php
@@ -31,7 +31,7 @@
$checkType = $this->params['checkType'];
$userId = $this->params['userId'];
$user = User::newFromId( $userId );
-   if ( !$user ) {
+   if ( !$user || $user->isAnon() ) {
throw new Exception( "Can't find user for user id=" . 
print_r( $userId, true ) );
}
if ( !isset( $this->params['subnet'] ) || !is_string( 
$this->params['subnet'] ) ) {
diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index df8217a..baec0a6 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -17,6 +17,7 @@
 use JobSpecification;
 use MediaWiki\MediaWikiServices;
 use WebRequest;
+use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\Database;
 use Exception;
 use IP;
@@ -216,6 +217,8 @@
 * @return string One of USER_* constants
 */
private function checkUserAllWikis( User $user, $subnet ) {
+   Assert::parameter( $user->isLoggedIn(), '$user', 'User must be 
logged in' );
+
if ( !$this->config->get( 'LoginNotifyCheckKnownIPs' )
|| !class_exists( 'CheckUser' )
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcf2dcb867030c0a71534dc0349fb259d04f1706
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
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] oojs/ui[master]: [BREAKING CHANGE] Remove FloatingMenuSelectWidget

[jenkins-bot (Code Review)]

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

Change subject: [BREAKING CHANGE] Remove FloatingMenuSelectWidget
..


[BREAKING CHANGE] Remove FloatingMenuSelectWidget

Following-up to I8bf2661fe2c568d0a5ae88c8fe11e30ee0e3aff2 –
deprecated in v0.21.3. Use MenuSelectWidget instead.

Change-Id: I18cf123025500a28e7e7d6938fde4260c533943f
---
M build/modules.yaml
M src/styles/core.less
M src/styles/empty-theme.less
D src/styles/widgets/FloatingMenuSelectWidget.less
M src/themes/apex/widgets.less
M src/themes/blank/widgets.less
M src/themes/wikimediaui/widgets.less
D src/widgets/FloatingMenuSelectWidget.js
8 files changed, 0 insertions(+), 59 deletions(-)

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



diff --git a/build/modules.yaml b/build/modules.yaml
index bd8f47a..f7c172d 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -63,8 +63,6 @@
"src/widgets/MultiselectWidget.js",
"src/widgets/CheckboxMultioptionWidget.js",
"src/widgets/CheckboxMultiselectWidget.js",
-   # ComboBoxInputWidget
-   "src/widgets/FloatingMenuSelectWidget.js",
# ProgressBarWidget
"src/widgets/ProgressBarWidget.js",
 
diff --git a/src/styles/core.less b/src/styles/core.less
index 21f86dd..211e06e 100644
--- a/src/styles/core.less
+++ b/src/styles/core.less
@@ -50,7 +50,6 @@
 @import 'widgets/MenuSelectWidget.less';
 @import 'widgets/MenuOptionWidget.less';
 @import 'widgets/MenuSectionOptionWidget.less';
-@import 'widgets/FloatingMenuSelectWidget.less';
 @import 'widgets/DropdownWidget.less';
 @import 'widgets/ComboBoxInputWidget.less';
 @import 'widgets/MultiselectWidget.less';
diff --git a/src/styles/empty-theme.less b/src/styles/empty-theme.less
index 74b36e5..e03a9fe 100644
--- a/src/styles/empty-theme.less
+++ b/src/styles/empty-theme.less
@@ -95,7 +95,6 @@
 .theme-oo-ui-buttonSelectWidget () {}
 .theme-oo-ui-radioSelectWidget () {}
 .theme-oo-ui-menuSelectWidget () {}
-.theme-oo-ui-floatingMenuSelectWidget () {}
 .theme-oo-ui-outlineSelectWidget () {}
 .theme-oo-ui-tabSelectWidget () {}
 .theme-oo-ui-numberInputWidget () {}
diff --git a/src/styles/widgets/FloatingMenuSelectWidget.less 
b/src/styles/widgets/FloatingMenuSelectWidget.less
deleted file mode 100644
index b669ecc..000
--- a/src/styles/widgets/FloatingMenuSelectWidget.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import '../common';
-
-.oo-ui-floatingMenuSelectWidget {
-   .theme-oo-ui-floatingMenuSelectWidget();
-}
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 532813f..ea8f67a 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -479,8 +479,6 @@
}
 }
 
-.theme-oo-ui-floatingMenuSelectWidget () {}
-
 .theme-oo-ui-iconWidget () {
line-height: 2.5em;
 
diff --git a/src/themes/blank/widgets.less b/src/themes/blank/widgets.less
index 882261e..b7fd85d 100644
--- a/src/themes/blank/widgets.less
+++ b/src/themes/blank/widgets.less
@@ -34,8 +34,6 @@
 
 .theme-oo-ui-dropdownInputWidget () {}
 
-.theme-oo-ui-floatingMenuSelectWidget () {}
-
 .theme-oo-ui-iconWidget () {}
 
 .theme-oo-ui-indicatorWidget () {}
diff --git a/src/themes/wikimediaui/widgets.less 
b/src/themes/wikimediaui/widgets.less
index f30e757..4a9bed7 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -740,8 +740,6 @@
}
 }
 
-.theme-oo-ui-floatingMenuSelectWidget () {}
-
 .theme-oo-ui-iconWidget () {
line-height: 2.5;
 
diff --git a/src/widgets/FloatingMenuSelectWidget.js 
b/src/widgets/FloatingMenuSelectWidget.js
deleted file mode 100644
index cc347ae..000
--- a/src/widgets/FloatingMenuSelectWidget.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * FloatingMenuSelectWidget was a menu that would stick under a specified
- * container, even when it is inserted elsewhere in the document.
- * This functionality is now included in MenuSelectWidget, and 
FloatingMenuSelectWidget
- * is preserved for backwards-compatibility.
- *
- * @class
- * @extends OO.ui.MenuSelectWidget
- * @deprecated since v0.21.3, use MenuSelectWidget instead.
- *
- * @constructor
- * @param {OO.ui.Widget} [inputWidget] Widget to provide the menu for.
- *   Deprecated, omit this parameter and specify `$container` instead.
- * @param {Object} [config] Configuration options
- * @cfg {jQuery} [$container=inputWidget.$element] Element to render menu under
- */
-OO.ui.FloatingMenuSelectWidget = function OoUiFloatingMenuSelectWidget( 
inputWidget, config ) {
-   OO.ui.warnDeprecation( 'FloatingMenuSelectWidget is deprecated. Use the 
MenuSelectWidget instead.' );
-
-   // Allow 'inputWidget' parameter and config for backwards compatibility
-   if ( OO.isPlainObject( inputWidget ) && config === 

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.14]: Fix typo where IP wasn't retrieved from job

[Niharika29 (Code Review)]

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

Change subject: Fix typo where IP wasn't retrieved from job
..

Fix typo where IP wasn't retrieved from job

I think this might be causing T173888
(Although I don't really know)

Bug: T173888
Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
(cherry picked from commit 23f4a71831987998f0de95b6de7427ba6c8c129f)
---
M includes/DeferredChecksJob.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php
index 05096eb..9bfeb42 100644
--- a/includes/DeferredChecksJob.php
+++ b/includes/DeferredChecksJob.php
@@ -40,7 +40,7 @@
. print_r( $this->params['subnet'], true )
);
}
-   $subnet = $this->params['resultSoFar'];
+   $subnet = $this->params['subnet'];
if ( !isset( $this->params['resultSoFar'] ) || !is_string( 
$this->params['resultSoFar'] ) ) {
throw new Exception( __CLASS__
. " expected to receive a string parameter 
'resultSoFar', got "

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.15]: Fix typo where IP wasn't retrieved from job

[Niharika29 (Code Review)]

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

Change subject: Fix typo where IP wasn't retrieved from job
..

Fix typo where IP wasn't retrieved from job

I think this might be causing T173888
(Although I don't really know)

Bug: T173888
Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
(cherry picked from commit 23f4a71831987998f0de95b6de7427ba6c8c129f)
---
M includes/DeferredChecksJob.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php
index 05096eb..9bfeb42 100644
--- a/includes/DeferredChecksJob.php
+++ b/includes/DeferredChecksJob.php
@@ -40,7 +40,7 @@
. print_r( $this->params['subnet'], true )
);
}
-   $subnet = $this->params['resultSoFar'];
+   $subnet = $this->params['subnet'];
if ( !isset( $this->params['resultSoFar'] ) || !is_string( 
$this->params['resultSoFar'] ) ) {
throw new Exception( __CLASS__
. " expected to receive a string parameter 
'resultSoFar', got "

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmaster: allow puppetmaster api access to each worker

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373386 )

Change subject: labs puppetmaster: allow puppetmaster api access to each worker
..

labs puppetmaster: allow puppetmaster api access to each worker

This is necessary because we proxy between the puppetmasters

Change-Id: Ie1fc21179fc860da673083f8bb24fc6439f81210
---
M modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/373386/1

diff --git a/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb 
b/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
index b1e6fd6..3e554a9 100644
--- a/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
+++ b/modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
@@ -2,3 +2,6 @@
 path /resource_type
 auth any
 allow <%= @horizon_host %>
+<%= scope.function_hiera([\'puppetmaster::servers\']).values.flatten(1).each 
do |worker| %>
+allow <%= worker %>
+<%end%>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1fc21179fc860da673083f8bb24fc6439f81210
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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