date:20170906

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

2017-09-06 Thread Eileen (Code Review)

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

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

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

dbc06186f9174613d3971a7bcc6734c5a42105c2 Submodule commit

e4bcc74 Revert Temporarily hack out cache clearing, for test purposes only

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/376474/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ce0a8e352019b1d6fdf52ee1d0da1aff980e3d3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule commit

2017-09-06 Thread Eileen (Code Review)

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

Change subject: Submodule commit
..


Submodule commit

e4bcc74 Revert Temporarily hack out cache clearing, for test purposes only

Change-Id: I27d6fac9dc4a2a3c090ae2a13c01ca85ddae47bd
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index 62a0adb..e4bcc74 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 62a0adbda0d4d7326c58a7ee326ec7c7e11344c8
+Subproject commit e4bcc740d7f9984b01606f28c514dc1daa239f4b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27d6fac9dc4a2a3c090ae2a13c01ca85ddae47bd
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RecentActivityFeed[master]: Replace deprecated jQuery functions

2017-09-06 Thread Fomafix (Code Review)

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

Change subject: Replace deprecated jQuery functions
..

Replace deprecated jQuery functions

* Replace .unbind(...) by .off(...)
* Replace $(document).ready(...) by $(...)

Change-Id: Id57cf011f926727a360f6ced3d3ce7db161bffcd
---
M modules/ext.inlinediff.js
1 file changed, 6 insertions(+), 7 deletions(-)


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

diff --git a/modules/ext.inlinediff.js b/modules/ext.inlinediff.js
index 7c2a95c..d2db347 100644
--- a/modules/ext.inlinediff.js
+++ b/modules/ext.inlinediff.js
@@ -105,7 +105,7 @@
}
newTable.id = button.id + "display";
 
-   $(button).unbind("click");
+   $(button).off("click");
if (typeof inlineDiffBigUI === "undefined") {
$(button).html(' 
[' + hideText + '] ');
$(button).click(function() {
@@ -128,7 +128,7 @@
 function showEditInspection(button) {
$("#" + button.id + "display").css("display", "");
$(button).attr("value", "Hide edit");
-   $(button).unbind("click");
+   $(button).off("click");
$(button).click(function() {
return hideEditInspection(this);
});
@@ -138,7 +138,7 @@
 function hideEditInspection(button) {
$("#" + button.id + "display").css("display", "none");
$(button).attr("value", "Show edit");
-   $(button).unbind("click");
+   $(button).off("click");
$(button).click(function() {
return showEditInspection(this);
});
@@ -148,7 +148,7 @@
 function showSmallEditInspection(button) {
$("#" + button.id + "display").css("display", "");
$(button).html(' [' + hideText + '] 
');
-   $(button).unbind("click");
+   $(button).off("click");
$(button).click(function() {
return hideSmallEditInspection(this);
});
@@ -158,13 +158,12 @@
 function hideSmallEditInspection(button) {
$("#" + button.id + "display").css("display", "none");
$(button).html(' [' + showText + '] 
');
-   $(button).unbind("click");
+   $(button).off("click");
$(button).click(function() {
return showSmallEditInspection(this);
});
return false;
 }
 
-$(document).ready(addWatchlistInspectionBoxes);
-//  $(document).ready(alert);
+$(addWatchlistInspectionBoxes);
 })(window.jQuery);
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id57cf011f926727a360f6ced3d3ce7db161bffcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RecentActivityFeed
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Improve copyright file

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Improve copyright file
..


Improve copyright file

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

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



diff --git a/debian/copyright b/debian/copyright
index 7ca00a3..2f1c7ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -217,7 +217,7 @@
 License: Expat or GPL-2.0
 
 Files: resources/lib/jquery/jquery3.js
-Coyright: JS Foundation and ther contributors
+Copyright: JS Foundation and ther contributors
 License: Expat
 
 Files: resources/lib/jquery.chosen/*
@@ -433,7 +433,7 @@
 License: Expat
 
 Files: vendor/stil/gd-text/*
-Copyright: FIXME
+Copyright: Przemysław Ryciuk
 License: Expat
 
 Files: vendor/symfony/process/*
@@ -481,7 +481,7 @@
 Copyright: 2015, Ori Livneh 
 License: Expat
 
-File: vendor/wikimedia/remex-html/*
+Files: vendor/wikimedia/remex-html/*
 Copyright: 2016 Wikimedia Foundation
 License: Expat
 
@@ -861,27 +861,6 @@
  On Debian systems, the full text of the Apache-2.0 license
  can be found in the file
  `/usr/share/common-licenses/Apache-2.0`.
-
-License: GPL-3.0
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 3 of the License.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3`.
 
 License: CC-BY-3.0
  Creative Commons Legal Code
@@ -1563,11 +1542,6 @@
  this trademark restriction does not form part of the License.
  .
  Creative Commons may be contacted at https://creativecommons.org/.
-
-License: PD
- Public Domain.
- .
- NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
 
 License: LGPL-2.1
  This library is free software; you can redistribute it and/or

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7196fba288bfae3f89125fc4e186c7f6075600d5
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/rules related to permissions

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Update debian/rules related to permissions
..


Update debian/rules related to permissions

Change-Id: I3e6c16a48a7094f4e043fc0c708b2c3d472afcaf
---
M debian/rules
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/debian/rules b/debian/rules
index f92ed29..78a3564 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,21 +7,20 @@
 override_dh_install:
dh_install
# Now some tidying up is required
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/includes/api/ApiSetPageLanguage.php
+   chmod a-x debian/mediawiki/usr/share/mediawiki/maintenance/addSite.php
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/skins/Vector/variables.less
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail/tests/bug17178.phpt
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail/tests/bug17317.phpt
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/xmail.dtd
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/Mail/mimePart.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/Mail/mimeDecode.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/xmail.xsl
-   # Fixed upstream already: https://gerrit.wikimedia.org/r/347519
-   chmod a-x 
debian/mediawiki/usr/share/mediawiki/includes/specials/SpecialNewpages.php
-   # These were fixed upstream already: 
https://github.com/liuggio/statsd-php-client/pull/52
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/src/Liuggio/StatsdClient/Entity/StatsdData.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/tests/Liuggio/StatsdClient/StatsdDataFactoryTest.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/src/Liuggio/StatsdClient/Entity/StatsdDataInterface.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/tests/Liuggio/StatsdClient/Entity/StatsdDataTest.php
-   # Submitted upstream: https://github.com/oyejorge/less.php/pull/325
-   chmod a+x 
debian/mediawiki/usr/share/mediawiki/vendor/oyejorge/less.php/bin/lessc
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/oyejorge/less.php/lib/Less/Less.php.combine
 
find debian/mediawiki/usr/share/mediawiki -maxdepth 1 -mindepth 1 | 
grep -v "\(LocalSettings.php\|debian-scripts\|images\|extensions\|config\)" | \
while read i; do \
@@ -45,6 +44,7 @@
dh_link usr/share/mediawiki/extensions-core/"$$coreextension" \
var/lib/mediawiki/extensions/"$$coreextension"; \
done
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/extensions-core/ConfirmEdit/i18n/en.json
# includes/libs is provided by mediawiki-classes
rm -rf debian/mediawiki/usr/share/mediawiki/includes/libs
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e6c16a48a7094f4e043fc0c708b2c3d472afcaf
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]: Improve copyright file

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Improve copyright file
..

Improve copyright file

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/64/376464/1

diff --git a/debian/copyright b/debian/copyright
index 7ca00a3..2f1c7ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -217,7 +217,7 @@
 License: Expat or GPL-2.0
 
 Files: resources/lib/jquery/jquery3.js
-Coyright: JS Foundation and ther contributors
+Copyright: JS Foundation and ther contributors
 License: Expat
 
 Files: resources/lib/jquery.chosen/*
@@ -433,7 +433,7 @@
 License: Expat
 
 Files: vendor/stil/gd-text/*
-Copyright: FIXME
+Copyright: Przemysław Ryciuk
 License: Expat
 
 Files: vendor/symfony/process/*
@@ -481,7 +481,7 @@
 Copyright: 2015, Ori Livneh 
 License: Expat
 
-File: vendor/wikimedia/remex-html/*
+Files: vendor/wikimedia/remex-html/*
 Copyright: 2016 Wikimedia Foundation
 License: Expat
 
@@ -861,27 +861,6 @@
  On Debian systems, the full text of the Apache-2.0 license
  can be found in the file
  `/usr/share/common-licenses/Apache-2.0`.
-
-License: GPL-3.0
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 3 of the License.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3`.
 
 License: CC-BY-3.0
  Creative Commons Legal Code
@@ -1563,11 +1542,6 @@
  this trademark restriction does not form part of the License.
  .
  Creative Commons may be contacted at https://creativecommons.org/.
-
-License: PD
- Public Domain.
- .
- NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
 
 License: LGPL-2.1
  This library is free software; you can redistribute it and/or

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7196fba288bfae3f89125fc4e186c7f6075600d5
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/rules related to permissions

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Update debian/rules related to permissions
..

Update debian/rules related to permissions

Change-Id: I3e6c16a48a7094f4e043fc0c708b2c3d472afcaf
---
M debian/rules
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/63/376463/1

diff --git a/debian/rules b/debian/rules
index f92ed29..78a3564 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,21 +7,20 @@
 override_dh_install:
dh_install
# Now some tidying up is required
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/includes/api/ApiSetPageLanguage.php
+   chmod a-x debian/mediawiki/usr/share/mediawiki/maintenance/addSite.php
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/skins/Vector/variables.less
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail/tests/bug17178.phpt
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail/tests/bug17317.phpt
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/xmail.dtd
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/Mail/mimePart.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/Mail/mimeDecode.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/pear/mail_mime-decode/xmail.xsl
-   # Fixed upstream already: https://gerrit.wikimedia.org/r/347519
-   chmod a-x 
debian/mediawiki/usr/share/mediawiki/includes/specials/SpecialNewpages.php
-   # These were fixed upstream already: 
https://github.com/liuggio/statsd-php-client/pull/52
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/src/Liuggio/StatsdClient/Entity/StatsdData.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/tests/Liuggio/StatsdClient/StatsdDataFactoryTest.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/src/Liuggio/StatsdClient/Entity/StatsdDataInterface.php
chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/liuggio/statsd-php-client/tests/Liuggio/StatsdClient/Entity/StatsdDataTest.php
-   # Submitted upstream: https://github.com/oyejorge/less.php/pull/325
-   chmod a+x 
debian/mediawiki/usr/share/mediawiki/vendor/oyejorge/less.php/bin/lessc
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/vendor/oyejorge/less.php/lib/Less/Less.php.combine
 
find debian/mediawiki/usr/share/mediawiki -maxdepth 1 -mindepth 1 | 
grep -v "\(LocalSettings.php\|debian-scripts\|images\|extensions\|config\)" | \
while read i; do \
@@ -45,6 +44,7 @@
dh_link usr/share/mediawiki/extensions-core/"$$coreextension" \
var/lib/mediawiki/extensions/"$$coreextension"; \
done
+   chmod a-x 
debian/mediawiki/usr/share/mediawiki/extensions-core/ConfirmEdit/i18n/en.json
# includes/libs is provided by mediawiki-classes
rm -rf debian/mediawiki/usr/share/mediawiki/includes/libs
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e6c16a48a7094f4e043fc0c708b2c3d472afcaf
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] wikimedia...civicrm[master]: Revert "Temporarily hack out cache clearing, for test purpos...

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Temporarily hack out cache clearing, for test purposes 
only"
..


Revert "Temporarily hack out cache clearing, for test purposes only"

This reverts commit 62a0adbda0d4d7326c58a7ee326ec7c7e11344c8.

Change-Id: I15fe190e8b78a0ea9057424f23e49a617eeda690
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
3 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 90030e5..e1e989c 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -142,7 +142,6 @@
* Deletes all the cache entries.
*/
   public static function resetCache() {
-return;
 // reset any static caching
 self::$_cache = NULL;
 
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index e9089ca..0460b22 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -980,7 +980,7 @@
* @param bool $isTrashed
*/
   public static function updateContactCache($contactID, $isTrashed = FALSE) {
-return;
+
 if ($isTrashed) {
   CRM_Contact_BAO_GroupContactCache::removeContact($contactID);
   // This has been moved to here from CRM_Contact_BAO_Contact_Permission 
as that was causing
diff --git a/CRM/Contact/BAO/GroupContactCache.php 
b/CRM/Contact/BAO/GroupContactCache.php
index 420ba49..e0d041a 100644
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -306,7 +306,6 @@
*   run the function exactly once for all groups.
*/
   public static function remove($groupID = NULL, $onceOnly = TRUE) {
-return;
 static $invoked = FALSE;
 
 // typically this needs to happy only once per instance
@@ -499,7 +498,6 @@
* ideal.
*/
   public static function opportunisticCacheFlush() {
-return;
 if (Civi::settings()->get('smart_group_cache_refresh_mode') == 
'opportunistic') {
   self::flushCaches();
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15fe190e8b78a0ea9057424f23e49a617eeda690
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
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...PageForms[master]: date input for spreadsheet display - based on a patch by Bal...

2017-09-06 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376452 )

Change subject: date input for spreadsheet display - based on a patch by 
Balabky9
..


date input for spreadsheet display - based on a patch by Balabky9

Also made some unrelated small fixes to PF_jsGrid.js.

Change-Id: I04319040853e5037342407efc81f40c4c5fddf69
---
M includes/PF_FormPrinter.php
M includes/PF_Hooks.php
M libs/PF_jsGrid.js
3 files changed, 146 insertions(+), 11 deletions(-)

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



diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index cd29a1e..7b4db18 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -466,6 +466,8 @@
$gridParamValues['type'] = 'textarea';
} elseif ( $inputType == 'checkbox' ) {
$gridParamValues['type'] = 'checkbox';
+   } elseif ( $inputType == 'date' ) {
+   $gridParamValues['type'] = 'date';
} elseif ( ( $possibleValues = 
$formField->getPossibleValues() ) != null ) {
array_unshift( $possibleValues, '' );
$completePossibleValues = array();
diff --git a/includes/PF_Hooks.php b/includes/PF_Hooks.php
index b4d6ce2..67e6c17 100644
--- a/includes/PF_Hooks.php
+++ b/includes/PF_Hooks.php
@@ -157,6 +157,7 @@
global $wgPageFormsGridValues, $wgPageFormsGridParams;
global $wgPageFormsShowOnSelect, $wgPageFormsScriptPath;
global $edgValues, $wgPageFormsEDSettings;
+   global $wgAmericanDates;
//global $wgPageFormsInitJSFunctions, 
$wgPageFormsValidationJSFunctions;
 
$vars['wgPageFormsAutocompleteValues'] = 
$wgPageFormsAutocompleteValues;
@@ -170,6 +171,7 @@
$vars['wgPageFormsScriptPath'] = $wgPageFormsScriptPath;
$vars['edgValues'] = $edgValues;
$vars['wgPageFormsEDSettings'] = $wgPageFormsEDSettings;
+   $vars['wgAmericanDates'] = $wgAmericanDates;
//$vars['wgPageFormsInitJSFunctions'] = 
$wgPageFormsInitJSFunctions;
//$vars['wgPageFormsValidationJSFunctions'] = 
$wgPageFormsValidationJSFunctions;
 
diff --git a/libs/PF_jsGrid.js b/libs/PF_jsGrid.js
index 5ce6757..0d4b43c 100644
--- a/libs/PF_jsGrid.js
+++ b/libs/PF_jsGrid.js
@@ -2,21 +2,150 @@
  * Code to integrate the pfGrid JavaScript library into Page Forms.
  *
  * @author Yaron Koren
+ * @author Balabky9
  */
-/* global wgPageFormsGridParams, wgPageFormsGridValues */
+/* global jsGrid, mw */
+(function(jsGrid, $, undefined) {
+   /**
+* The following code handles the 'date' input type within the 
grid.
+* insertTemplate preprocesses the value and returns it to the 
grid cell to display;
+* editTemplate/insertTemplate generate the edition/insertion 
forms;
+* editValue/insertValue is in charge of putting the final 
values into the grid.
+*/
+
+   // Global variables to store edit and insert values to be used
+   // by the editValue and insertValue functions to put them into
+   // the date field.
+   var Global_Edit_day_of_month;
+   var Global_Edit_month;
+   var Global_Edit_year;
+   var Global_Insert_day_of_month;
+   var Global_Insert_month;
+   var Global_Insert_year;
+
+   // Create month selector dropdown.
+   function buildSelect( currentMonth ) {
+   var monthNames = mw.config.get('wgMonthNamesShort');
+   var str = '';
+   for (var val=1; val<=12; val++) {
+   var val2;
+   if (val < 10) { //Adds a leading 0 to single 
digit months, ex 01 instead of 1.
+   val2 = "0" + val;
+   } else {
+   val2 = val;
+   }
+   var option = '' + 
monthNames[val] + '';
+   str += option;
+   }
+   str += '';
+   return str;
+   }
+
+   var PFDateField = function(config) {
+   jsGrid.Field.call(this, config);
+   };
+
+   PFDateField.prototype = new jsGrid.Field({
+   sorter: function(date1, date2) {
+   return new Date(date1) - new Date(date2);
+   },
+
+   itemTemplate: function(value) {
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule commit

2017-09-06 Thread Eileen (Code Review)

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

Change subject: Submodule commit
..

Submodule commit

e4bcc74 Revert Temporarily hack out cache clearing, for test purposes only

Change-Id: I27d6fac9dc4a2a3c090ae2a13c01ca85ddae47bd
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/62/376462/1

diff --git a/civicrm b/civicrm
index 62a0adb..e4bcc74 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 62a0adbda0d4d7326c58a7ee326ec7c7e11344c8
+Subproject commit e4bcc740d7f9984b01606f28c514dc1daa239f4b

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Revert "Temporarily hack out cache clearing, for test purpos...

2017-09-06 Thread Eileen (Code Review)

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

Change subject: Revert "Temporarily hack out cache clearing, for test purposes 
only"
..

Revert "Temporarily hack out cache clearing, for test purposes only"

This reverts commit 62a0adbda0d4d7326c58a7ee326ec7c7e11344c8.

Change-Id: I15fe190e8b78a0ea9057424f23e49a617eeda690
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
3 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/61/376461/1

diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 90030e5..e1e989c 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -142,7 +142,6 @@
* Deletes all the cache entries.
*/
   public static function resetCache() {
-return;
 // reset any static caching
 self::$_cache = NULL;
 
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index e9089ca..0460b22 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -980,7 +980,7 @@
* @param bool $isTrashed
*/
   public static function updateContactCache($contactID, $isTrashed = FALSE) {
-return;
+
 if ($isTrashed) {
   CRM_Contact_BAO_GroupContactCache::removeContact($contactID);
   // This has been moved to here from CRM_Contact_BAO_Contact_Permission 
as that was causing
diff --git a/CRM/Contact/BAO/GroupContactCache.php 
b/CRM/Contact/BAO/GroupContactCache.php
index 420ba49..e0d041a 100644
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -306,7 +306,6 @@
*   run the function exactly once for all groups.
*/
   public static function remove($groupID = NULL, $onceOnly = TRUE) {
-return;
 static $invoked = FALSE;
 
 // typically this needs to happy only once per instance
@@ -499,7 +498,6 @@
* ideal.
*/
   public static function opportunisticCacheFlush() {
-return;
 if (Civi::settings()->get('smart_group_cache_refresh_mode') == 
'opportunistic') {
   self::flushCaches();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15fe190e8b78a0ea9057424f23e49a617eeda690
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add MusikAnimal to whitelist

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Add MusikAnimal to whitelist
..


Add MusikAnimal to whitelist

He changed his email

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4753337..7c5eff0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -178,6 +178,7 @@
 | moriel@gmail\.com
 | mpaa\.wiki@gmail\.com
 | mhutti1@gmail\.com
+| musikanimal@gmail\.com
 | mtraceur@member\.fsf\.org
 | mwalker@khaosdev\.com
 | mxn@1ec5\.org
@@ -310,6 +311,7 @@
- ^maxsem\.wiki@gmail\.com$
- ^marielle\.volz@gmail\.com$
- ^moriel@gmail\.com # Moriel Schottlender
+   - ^musikanimal@gmail\.com$
- ^mtraceur@member\.fsf\.org$
- ^niharikakohli29@gmail\.com$
- ^niklas\.laxstrom@gmail\.com$

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add MusikAnimal to whitelist

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Add MusikAnimal to whitelist
..

Add MusikAnimal to whitelist

He changed his email

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


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

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4753337..7c5eff0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -178,6 +178,7 @@
 | moriel@gmail\.com
 | mpaa\.wiki@gmail\.com
 | mhutti1@gmail\.com
+| musikanimal@gmail\.com
 | mtraceur@member\.fsf\.org
 | mwalker@khaosdev\.com
 | mxn@1ec5\.org
@@ -310,6 +311,7 @@
- ^maxsem\.wiki@gmail\.com$
- ^marielle\.volz@gmail\.com$
- ^moriel@gmail\.com # Moriel Schottlender
+   - ^musikanimal@gmail\.com$
- ^mtraceur@member\.fsf\.org$
- ^niharikakohli29@gmail\.com$
- ^niklas\.laxstrom@gmail\.com$

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

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

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

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

2017-09-06 Thread jenkins-bot (Code Review)

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

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


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

+ fd78777e7fc3edb41baa74fbc179a713152c1a38 Delete half-baked Silverpop import 
code
+ 1f79f4ff4aac24371b5b482084d0cefaab51567e Resolve diacritic merge conflicts.
+ 8c5e76b1805a8435b956e48784692fc159738e62 Do not save 0 or other invalid 
values to city field.
+ 58f7a315df44a521aedd8d337e3dda9f7b6b4cc5 Submodule commit

Submodule commit

62a0adb Temporarily hack out cache clearing, for test purposes only
7a4fdf9 Fix spelling error.
1f5af85 Follow patch from QA on find duplicates task
245b870 Remove auto limit of 25

Change-Id: If13e893b4a2f8d84428277e2b30d72aed25caf65
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M sites/all/modules/wmf_communication/wmf_communication.info
3 files changed, 0 insertions(+), 1,638 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index 1ed9ccb..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<<< HEAD   (764bfe Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-callAPISuccess('Contact', 'create', array(
-  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
-  }
-
-  public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name = 
'Mouse'");
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   */
-  public function testAddressImportVoidData() {
-$msg = array(
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-  /**
-   * Test creating an address not use void data.
-   *
-   * @dataProvider getVoidValues
-   *
-   * @param string $voidValue
-   */
-  public function testAddressImportSkipVoidData($voidValue) {
-$msg = array(
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'really cool place',
-  'postal_code' => $voidValue,
-  'city' => $voidValue,
-  'country' => 'US',
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$address = $this->callAPISuccessGetSingle('Address',  array('contact_id' 
=> $contribution['contact_id']));
-$this->assertTrue(!isset($address['city']));
-$this->assertTrue(!isset($address['postal_code']));
-  }
-
-  /**
-   * Get values which should not be stored to the DB.
-   *
-   * @return array
-   */
-  public function getVoidValues() {
-return array(
-  array('0'),
-  array(0),
-  array('NoCity'),
-  array('City/Town'),
-);
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   *
-   * In this case the contact already exists.
-   */
-  public function testAddressImportVoidDataContactExists() {
-$msg = array(
-  'contact_id' => $this->contactID,
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-}
->>> BRANCH (58f7a3 Submodule commit)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index

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

2017-09-06 Thread Eileen (Code Review)

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

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

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

+ fd78777e7fc3edb41baa74fbc179a713152c1a38 Delete half-baked Silverpop import 
code
+ 1f79f4ff4aac24371b5b482084d0cefaab51567e Resolve diacritic merge conflicts.
+ 8c5e76b1805a8435b956e48784692fc159738e62 Do not save 0 or other invalid 
values to city field.
+ 58f7a315df44a521aedd8d337e3dda9f7b6b4cc5 Submodule commit

Submodule commit

62a0adb Temporarily hack out cache clearing, for test purposes only
7a4fdf9 Fix spelling error.
1f5af85 Follow patch from QA on find duplicates task
245b870 Remove auto limit of 25

Change-Id: If13e893b4a2f8d84428277e2b30d72aed25caf65
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M sites/all/modules/wmf_communication/wmf_communication.info
3 files changed, 0 insertions(+), 1,638 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/59/376459/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index 1ed9ccb..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<<< HEAD   (764bfe Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-callAPISuccess('Contact', 'create', array(
-  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
-  }
-
-  public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name = 
'Mouse'");
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   */
-  public function testAddressImportVoidData() {
-$msg = array(
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-  /**
-   * Test creating an address not use void data.
-   *
-   * @dataProvider getVoidValues
-   *
-   * @param string $voidValue
-   */
-  public function testAddressImportSkipVoidData($voidValue) {
-$msg = array(
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'really cool place',
-  'postal_code' => $voidValue,
-  'city' => $voidValue,
-  'country' => 'US',
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$address = $this->callAPISuccessGetSingle('Address',  array('contact_id' 
=> $contribution['contact_id']));
-$this->assertTrue(!isset($address['city']));
-$this->assertTrue(!isset($address['postal_code']));
-  }
-
-  /**
-   * Get values which should not be stored to the DB.
-   *
-   * @return array
-   */
-  public function getVoidValues() {
-return array(
-  array('0'),
-  array(0),
-  array('NoCity'),
-  array('City/Town'),
-);
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   *
-   * In this case the contact already exists.
-   */
-  public function testAddressImportVoidDataContactExists() {
-$msg = array(
-  'contact_id' => $this->contactID,
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-}
->>> BRANCH (58f7a3 Submodule commit)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ContribsPager: Check if target is an IP range outside foreac...

2017-09-06 Thread MusikAnimal (Code Review)

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

Change subject: ContribsPager: Check if target is an IP range outside foreach 
loop
..

ContribsPager: Check if target is an IP range outside foreach loop

Follow up to https://gerrit.wikimedia.org/r/#/c/376449/

Change-Id: I5151c10569a92805f79b59f68f9c57c451dc4598
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/376458/1

diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index 31ea810..979460c 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -384,6 +384,7 @@
$parentRevIds = [];
$this->mParentLens = [];
$batch = new LinkBatch();
+   $isIpRange = $this->isQueryableRange( $this->target );
# Give some pointers to make (last) links
foreach ( $this->mResult as $row ) {
if ( isset( $row->rev_parent_id ) && 
$row->rev_parent_id ) {
@@ -394,7 +395,7 @@
if ( $this->contribs === 'newbie' ) { // 
multiple users
$batch->add( NS_USER, $row->user_name );
$batch->add( NS_USER_TALK, 
$row->user_name );
-   } elseif ( $this->isQueryableRange( 
$this->target ) ) {
+   } elseif ( $isIpRange ) {
// If this is an IP range, batch the 
IP's talk page
$batch->add( NS_USER_TALK, 
$row->rev_user_text );
}

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule commit

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Submodule commit
..


Submodule commit

62a0adb Temporarily hack out cache clearing, for test purposes only
7a4fdf9 Fix spelling error.
1f5af85 Follow patch from QA on find duplicates task
245b870 Remove auto limit of 25

Change-Id: If2da66da02c048ac073ea3eda96b026817513d59
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index 301e422..62a0adb 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 301e42296e75fd4a00a37c80973e1b39aefde137
+Subproject commit 62a0adbda0d4d7326c58a7ee326ec7c7e11344c8

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ContribsPager: Batch page existence lookup for IP range cont...

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: ContribsPager: Batch page existence lookup for IP range 
contributions
..


ContribsPager: Batch page existence lookup for IP range contributions

When looking up contributions for a range of IP addresses, include the
IP's talk page in page existence lookup batch so it doesn't get looked
up individually.

Change-Id: I5151c10569a92805f79b59f68f9c57c451dc4597
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index 4296b78..31ea810 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -394,6 +394,9 @@
if ( $this->contribs === 'newbie' ) { // 
multiple users
$batch->add( NS_USER, $row->user_name );
$batch->add( NS_USER_TALK, 
$row->user_name );
+   } elseif ( $this->isQueryableRange( 
$this->target ) ) {
+   // If this is an IP range, batch the 
IP's talk page
+   $batch->add( NS_USER_TALK, 
$row->rev_user_text );
}
$batch->add( $row->page_namespace, 
$row->page_title );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5151c10569a92805f79b59f68f9c57c451dc4597
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Temporarily hack out cache clearing, for test purposes only

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Temporarily hack out cache clearing, for test purposes only
..


Temporarily hack out cache clearing, for test purposes only

Change-Id: I9c175939e3ab2d36b24d71080e7624fc3c3a94d7
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
3 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index e1e989c..90030e5 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -142,6 +142,7 @@
* Deletes all the cache entries.
*/
   public static function resetCache() {
+return;
 // reset any static caching
 self::$_cache = NULL;
 
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 0460b22..e9089ca 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -980,7 +980,7 @@
* @param bool $isTrashed
*/
   public static function updateContactCache($contactID, $isTrashed = FALSE) {
-
+return;
 if ($isTrashed) {
   CRM_Contact_BAO_GroupContactCache::removeContact($contactID);
   // This has been moved to here from CRM_Contact_BAO_Contact_Permission 
as that was causing
diff --git a/CRM/Contact/BAO/GroupContactCache.php 
b/CRM/Contact/BAO/GroupContactCache.php
index e0d041a..420ba49 100644
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -306,6 +306,7 @@
*   run the function exactly once for all groups.
*/
   public static function remove($groupID = NULL, $onceOnly = TRUE) {
+return;
 static $invoked = FALSE;
 
 // typically this needs to happy only once per instance
@@ -498,6 +499,7 @@
* ideal.
*/
   public static function opportunisticCacheFlush() {
+return;
 if (Civi::settings()->get('smart_group_cache_refresh_mode') == 
'opportunistic') {
   self::flushCaches();
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c175939e3ab2d36b24d71080e7624fc3c3a94d7
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule commit

2017-09-06 Thread Eileen (Code Review)

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

Change subject: Submodule commit
..

Submodule commit

62a0adb Temporarily hack out cache clearing, for test purposes only
7a4fdf9 Fix spelling error.
1f5af85 Follow patch from QA on find duplicates task
245b870 Remove auto limit of 25

Change-Id: If2da66da02c048ac073ea3eda96b026817513d59
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/57/376457/1

diff --git a/civicrm b/civicrm
index 301e422..62a0adb 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 301e42296e75fd4a00a37c80973e1b39aefde137
+Subproject commit 62a0adbda0d4d7326c58a7ee326ec7c7e11344c8

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

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

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

[MediaWiki-commits] [Gerrit] integration/commit-message-validator[master]: Use one logic to catch all wrong spellings

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Use one logic to catch all wrong spellings
..


Use one logic to catch all wrong spellings

Instead of having a custom logic for each wrong footer name section, it can
convert the normalized name into the correct spelling once and then check if
the given spelling matches that. Otherwise it shows a generic error.

Change-Id: I954b8808ca5f8a42e022a80817274275f104941b
---
M commit_message_validator/__init__.py
M commit_message_validator/tests/data/co-authored-by_ok.msg
2 files changed, 19 insertions(+), 23 deletions(-)

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



diff --git a/commit_message_validator/__init__.py 
b/commit_message_validator/__init__.py
index 7dfd41a..0b63eb8 100644
--- a/commit_message_validator/__init__.py
+++ b/commit_message_validator/__init__.py
@@ -39,20 +39,21 @@
 RE_CHERRYPICK = re.compile(r'^\(cherry picked from commit [0-9a-fA-F]{40}\)$')
 
 # Header-like lines that we are interested in validating
-FOOTERS = [
-'acked-by',
-'bug',
-'cc',
-'change-id',
-'co-authored-by',
-'depends-on',
-'reported-by',
-'reviewed-by',
-'signed-off-by',
-'suggested-by',
-'tested-by',
-'thanks',
+CORRECT_FOOTERS = [
+'Acked-By',
+'Bug',
+'Cc',
+'Change-Id',
+'Co-Authored-By',
+'Depends-On',
+'Reported-By',
+'Reviewed-by',
+'Signed-off-by',
+'Suggested-By',
+'Tested-by',
+'Thanks',
 ]
+FOOTERS = dict((footer.lower(), footer) for footer in CORRECT_FOOTERS)
 
 BEFORE_CHANGE_ID = [
 'bug',
@@ -149,21 +150,19 @@
 elif not self._in_footers:
 yield "Expected '{0}:' to be in footer".format(name)
 
+correct_name = FOOTERS[normalized_name]
+if correct_name != name:
+yield "Use '{0}:' not '{1}:'".format(correct_name, name)
+
 if normalized_name == 'bug':
-if name != 'Bug':
-yield "Use 'Bug:' not '{0}:'".format(name)
 if not is_valid_bug_id(value):
 yield "Bug: value must be a single phabricator task ID"
 
 elif normalized_name == 'depends-on':
-if name != 'Depends-On':
-yield "Use 'Depends-On:' not '%s:'" % name
 if not is_valid_change_id(value):
 yield "Depends-On: value must be a single Gerrit change id"
 
 elif normalized_name == 'change-id':
-if name != 'Change-Id':
-yield "Use 'Change-Id:' not '%s:'" % name
 if not is_valid_change_id(value):
 yield "Change-Id: value must be a single Gerrit change id"
 if self._first_changeid is not False:
@@ -171,9 +170,6 @@
"{0}".format(self._first_changeid))
 else:
 self._first_changeid = lineno + 1
-
-elif name[0].upper() != name[0]:
-yield "'%s:' must start with a capital letter" % name
 
 if (normalized_name in BEFORE_CHANGE_ID and
 self._first_changeid is not False):
diff --git a/commit_message_validator/tests/data/co-authored-by_ok.msg 
b/commit_message_validator/tests/data/co-authored-by_ok.msg
index 09f916f..fd170bc 100644
--- a/commit_message_validator/tests/data/co-authored-by_ok.msg
+++ b/commit_message_validator/tests/data/co-authored-by_ok.msg
@@ -6,5 +6,5 @@
 display with an 8 character tab leading the line) except in the case of a long
 URL that is embedded in the message.
 
-Co-authored-by: Someone awesome 
+Co-Authored-By: Someone awesome 
 Change-Id: Ifcd397165df1cbf9fa04f2044e1bb33ad7414d8d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I954b8808ca5f8a42e022a80817274275f104941b
Gerrit-PatchSet: 1
Gerrit-Project: integration/commit-message-validator
Gerrit-Branch: master
Gerrit-Owner: XZise 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Document DB_SLAVE as deprecated

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Document DB_SLAVE as deprecated
..


Document DB_SLAVE as deprecated

Change-Id: I50c127b7857b6dbccfd09014d72a130071870fab
---
M RELEASE-NOTES-1.30
M includes/Defines.php
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 0b2faec..f741a4e 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -212,6 +212,7 @@
 * (T157227) bot_password.bp_user, change_tag.ct_log_id, change_tag.ct_rev_id,
   page_restrictions.pr_user, tag_summary.ts_log_id, tag_summary.ts_rev_id and
   user_properties.up_user have all been made unsigned on MySQL.
+* DB_SLAVE is deprecated. DB_REPLICA should be used instead.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/Defines.php b/includes/Defines.php
index 8ac84e5..ca603e7 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -31,6 +31,9 @@
  */
 
 # Obsolete aliases
+/**
+ * @deprecated since 1.28
+ */
 define( 'DB_SLAVE', -1 );
 
 /**@{

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50c127b7857b6dbccfd09014d72a130071870fab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Temporarily hack out cache clearing, for test purposes only

2017-09-06 Thread Eileen (Code Review)

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

Change subject: Temporarily hack out cache clearing, for test purposes only
..

Temporarily hack out cache clearing, for test purposes only

Change-Id: I9c175939e3ab2d36b24d71080e7624fc3c3a94d7
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/56/376456/1

diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index e1e989c..90030e5 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -142,6 +142,7 @@
* Deletes all the cache entries.
*/
   public static function resetCache() {
+return;
 // reset any static caching
 self::$_cache = NULL;
 
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 0460b22..e9089ca 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -980,7 +980,7 @@
* @param bool $isTrashed
*/
   public static function updateContactCache($contactID, $isTrashed = FALSE) {
-
+return;
 if ($isTrashed) {
   CRM_Contact_BAO_GroupContactCache::removeContact($contactID);
   // This has been moved to here from CRM_Contact_BAO_Contact_Permission 
as that was causing
diff --git a/CRM/Contact/BAO/GroupContactCache.php 
b/CRM/Contact/BAO/GroupContactCache.php
index e0d041a..cdd4977 100644
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -306,6 +306,7 @@
*   run the function exactly once for all groups.
*/
   public static function remove($groupID = NULL, $onceOnly = TRUE) {
+return;
 static $invoked = FALSE;
 
 // typically this needs to happy only once per instance

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c175939e3ab2d36b24d71080e7624fc3c3a94d7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Add DB_REPLICA from 1.28+

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Add DB_REPLICA from 1.28+
..

Add DB_REPLICA from 1.28+

This makes it easier for extensions to keep compatibility with 1.27
while migrating to DB_REPLICA.

Change-Id: I1f014ea7432ab7ceda60443f7633b0806a48bf13
---
M includes/Defines.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/376455/1

diff --git a/includes/Defines.php b/includes/Defines.php
index d2b3443..342fc8f 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -43,7 +43,8 @@
  * Valid database indexes
  * Operation-based indexes
  */
-define( 'DB_SLAVE', -1 ); # Read from the slave (or only server)
+define( 'DB_REPLICA', -1 );   # Read from the replica (or only server)
+define( 'DB_SLAVE', -1 ); # Obsolete alias for DB_REPLICA
 define( 'DB_MASTER', -2 );# Write to master (or only server)
 /**@}*/
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Document DB_SLAVE as deprecated

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Document DB_SLAVE as deprecated
..

Document DB_SLAVE as deprecated

Change-Id: I50c127b7857b6dbccfd09014d72a130071870fab
---
M RELEASE-NOTES-1.30
M includes/Defines.php
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/376454/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 0b2faec..f741a4e 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -212,6 +212,7 @@
 * (T157227) bot_password.bp_user, change_tag.ct_log_id, change_tag.ct_rev_id,
   page_restrictions.pr_user, tag_summary.ts_log_id, tag_summary.ts_rev_id and
   user_properties.up_user have all been made unsigned on MySQL.
+* DB_SLAVE is deprecated. DB_REPLICA should be used instead.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/Defines.php b/includes/Defines.php
index 8ac84e5..ca603e7 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -31,6 +31,9 @@
  */
 
 # Obsolete aliases
+/**
+ * @deprecated since 1.28
+ */
 define( 'DB_SLAVE', -1 );
 
 /**@{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50c127b7857b6dbccfd09014d72a130071870fab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...PageForms[master]: date input for spreadsheet display - based on a patch by Bal...

2017-09-06 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376452 )

Change subject: date input for spreadsheet display - based on a patch by 
Balabky9
..

date input for spreadsheet display - based on a patch by Balabky9

Change-Id: I04319040853e5037342407efc81f40c4c5fddf69
---
M includes/PF_FormPrinter.php
M includes/PF_Hooks.php
M libs/PF_jsGrid.js
3 files changed, 166 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/52/376452/3

diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index cd29a1e..7b4db18 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -466,6 +466,8 @@
$gridParamValues['type'] = 'textarea';
} elseif ( $inputType == 'checkbox' ) {
$gridParamValues['type'] = 'checkbox';
+   } elseif ( $inputType == 'date' ) {
+   $gridParamValues['type'] = 'date';
} elseif ( ( $possibleValues = 
$formField->getPossibleValues() ) != null ) {
array_unshift( $possibleValues, '' );
$completePossibleValues = array();
diff --git a/includes/PF_Hooks.php b/includes/PF_Hooks.php
index b4d6ce2..67e6c17 100644
--- a/includes/PF_Hooks.php
+++ b/includes/PF_Hooks.php
@@ -157,6 +157,7 @@
global $wgPageFormsGridValues, $wgPageFormsGridParams;
global $wgPageFormsShowOnSelect, $wgPageFormsScriptPath;
global $edgValues, $wgPageFormsEDSettings;
+   global $wgAmericanDates;
//global $wgPageFormsInitJSFunctions, 
$wgPageFormsValidationJSFunctions;
 
$vars['wgPageFormsAutocompleteValues'] = 
$wgPageFormsAutocompleteValues;
@@ -170,6 +171,7 @@
$vars['wgPageFormsScriptPath'] = $wgPageFormsScriptPath;
$vars['edgValues'] = $edgValues;
$vars['wgPageFormsEDSettings'] = $wgPageFormsEDSettings;
+   $vars['wgAmericanDates'] = $wgAmericanDates;
//$vars['wgPageFormsInitJSFunctions'] = 
$wgPageFormsInitJSFunctions;
//$vars['wgPageFormsValidationJSFunctions'] = 
$wgPageFormsValidationJSFunctions;
 
diff --git a/libs/PF_jsGrid.js b/libs/PF_jsGrid.js
index 5ce6757..bffa20a 100644
--- a/libs/PF_jsGrid.js
+++ b/libs/PF_jsGrid.js
@@ -2,8 +2,167 @@
  * Code to integrate the pfGrid JavaScript library into Page Forms.
  *
  * @author Yaron Koren
+ * @author Balabky9
  */
 /* global wgPageFormsGridParams, wgPageFormsGridValues */
+(function(jsGrid, $, undefined) {
+   /**
+* The following code handles the 'date' input type within the 
grid.
+* insertTemplate preprocesses the value and returns it to the 
grid cell to display;
+* editTemplate/insertTemplate generate the edition/insertion 
forms;
+* editValue/insertValue is in charge of putting the final 
values into the grid.
+*/
+
+   // Global variables to store edit and insert values to be used
+   // by the editValue and insertValue functions to put them into
+   // the date field.
+   var Global_Edit_day_of_month;
+   var Global_Edit_month;
+   var Global_Edit_year;
+   var Global_Insert_day_of_month;
+   var Global_Insert_month;
+   var Global_Insert_year;
+
+   // Create month selector dropdown.
+   function buildSelect( currentMonth ) {
+   var i18n_month_obj = mw.config.get(wgMonthNamesShort);
+   // Convert it to an array with key value pairs.
+   var i18n_month_array = $.map(i18n_month_obj, 
function(value, index) {
+   return index;
+   });
+   var str = '';
+   for (val=1; val<=12; val++) {
+   if (val < 10) { //Adds a leading 0 to single 
digit months, ex 01 instead of 1.
+   var val2 = "0" + val;
+   } else {
+   var val2 = val;
+   }
+   var option = '' + 
i18n_month_array[val] + '';
+   str += option;
+   }
+   str += '';
+   return str;
+   }
+
+   var MyDateField = function(config) {
+   jsGrid.Field.call(this, config);
+   };
+
+   MyDateField.prototype = new jsGrid.Field({
+   sorter: function(date1, date2) {
+   return new

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DONOTMERGE] build: Use stylelint-declaration-use-variable p...

2017-09-06 Thread VolkerE (Code Review)

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

Change subject: [DONOTMERGE] build: Use stylelint-declaration-use-variable 
plugin
..

[DONOTMERGE] build: Use stylelint-declaration-use-variable plugin

Using 'stylelint-declaration-use-variable', which sounds like a good
idea, but:
- doesn't seem actively maintained,
- you can't declare which var to use when, so there are false warnings
on values like `1` for property `z-index` instead of `opacity` or
`border-color` asked on `background-color`

Change-Id: I32259f04e81f44b968a6b397d1f7e7d8c1075c03
---
M .stylelintrc
M package.json
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/53/376453/1

diff --git a/.stylelintrc b/.stylelintrc
index 06a77ac..0b0cee8 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,9 +1,13 @@
 {
"extends": "stylelint-config-wikimedia",
+   "plugins": [
+   "stylelint-declaration-use-variable"
+   ],
"rules": {
"at-rule-empty-line-before": null,
"block-closing-brace-space-after": null,
"block-no-empty": null,
-   "no-descending-specificity": null
+   "no-descending-specificity": null,
+   "sh-waqar/declaration-use-variable": [["/color/", "z-index", 
"font-size"]]
}
 }
diff --git a/package.json b/package.json
index 808e454..6152638 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
   "dependencies": {
 "jquery": "3.2.1",
 "oojs": "2.1.0",
+"stylelint-declaration-use-variable": "^1.6.0",
 "wikimedia-ui-base": "0.9.2"
   },
   "devDependencies": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32259f04e81f44b968a6b397d1f7e7d8c1075c03
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] operations/puppet[production]: Gerrit: Set autoMigrate so that changes are stored in both ...

2017-09-06 Thread Dzahn (Code Review)

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

Change subject: Gerrit: Set  autoMigrate so that changes are stored in both 
reviewdb and notedb
..


Gerrit: Set  autoMigrate so that changes are stored in both reviewdb and notedb

This will allow us to do this whilst online so no downtime required.
This is required for gerrit 3.x which will remove support for online migration.

See doc at
https://gerrit-review.googlesource.com/Documentation/note-db.html#migration

Note: Requires us to first migrate to 2.15 before merging this.

Change-Id: Id2486db96c069d33f58c98504004a431eda5faf7
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 95cbce9..53ae6c1 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -146,6 +146,8 @@
 safe = true
 [mimetype "text/x-php"]
 safe = true
+[noteDb "changes"]
+autoMigrate = true
 [pack]
 deltacompression = true
 [receive]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2486db96c069d33f58c98504004a431eda5faf7
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: include mediawiki::packages::php5

2017-09-06 Thread Dzahn (Code Review)

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

Change subject: contint: include mediawiki::packages::php5
..


contint: include mediawiki::packages::php5

mediawiki::packages::php5 is added on the CI images but that does not
reflect in the contint module.

Change-Id: Ifa7107e1d524fb93ad8287d32d4ffd2f35d2ce78
---
M modules/contint/manifests/packages/php.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/contint/manifests/packages/php.pp 
b/modules/contint/manifests/packages/php.pp
index 2be196d..bbfa9a2 100644
--- a/modules/contint/manifests/packages/php.pp
+++ b/modules/contint/manifests/packages/php.pp
@@ -1,6 +1,8 @@
 # == Class contint::packages::php
 class contint::packages::php {
 
+include ::mediawiki::packages::php5
+
 require_package( [
 'php5-dev',  # phpize
 'php5-ldap',  # OpenStackManager/LdapAuthentication T125158

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa7107e1d524fb93ad8287d32d4ffd2f35d2ce78
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ContribsPager: Don't call non-static function statically

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: ContribsPager: Don't call non-static function statically
..


ContribsPager: Don't call non-static function statically

Change-Id: Ic0753e96009f65f1599c9952784c52034b4ec096
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index 7d0a9df..4296b78 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -371,7 +371,7 @@
 * @return string Name of field
 */
public function getIndexField() {
-   if ( self::isQueryableRange( $this->target ) ) {
+   if ( $this->isQueryableRange( $this->target ) ) {
return 'ipc_rev_timestamp';
} else {
return 'rev_timestamp';
@@ -546,7 +546,7 @@
# When querying for an IP range, we want to always show 
user and user talk links.
$userlink = '';
if ( ( $this->contribs == 'newbie' && !$rev->isDeleted( 
Revision::DELETED_USER ) )
-   || self::isQueryableRange( $this->target ) ) {
+   || $this->isQueryableRange( $this->target ) ) {
$userlink = ' . . ' . $lang->getDirMark()
. Linker::userLink( $rev->getUser(), 
$rev->getUserText() );
$userlink .= ' ' . $this->msg( 'parentheses' 
)->rawParams(

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix dashboard card styles

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix dashboard card styles
..


Fix dashboard card styles

- Fix font size for statistics labels
inside sidebar statistics card.
- Adjust color of the bars in sidebar chart.
- Add shadows to cards and lists

Bug: T158646
Change-Id: Ifddaf07b33c65619ca7c9acece32a87666805198
---
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/widgets/common/ext.cx.common.less
M modules/widgets/translator/ext.cx.translator.js
M modules/widgets/translator/ext.cx.translator.less
7 files changed, 29 insertions(+), 8 deletions(-)

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



diff --git a/modules/dashboard/styles/ext.cx.dashboard.less 
b/modules/dashboard/styles/ext.cx.dashboard.less
index e5f0f4f..8776d4f 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -91,6 +91,7 @@
background-color: #fff;
border-radius: @borderRadius;
padding: 16px;
+   .box-shadow-card;
font-size: 16px;
 
&-title {
@@ -120,6 +121,7 @@
.mw-ui-two-thirds;
 
background-color: @colorGray14;
+   margin-bottom: 48px;
padding: 0 @translationlist-container-padding-right 0 0;
 }
 
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index cb0a1bc..499db51 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -27,7 +27,6 @@
 }
 
 .cx-tlitem:last-child {
-   margin-bottom: 48px;
border-radius: 0 0 @borderRadius @borderRadius;
 }
 
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index 2e5c104..c1a08c4 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -3,16 +3,22 @@
 @import 'mediawiki.mixins';
 
 .cx-suggestionlist {
-   .mw-ui-item;
.mw-ui-one-whole;
-   padding: 0;
+
margin-bottom: 10px;
+   padding: 0;
+   .box-shadow-card;
 }
 
 .cx-suggestionlist__public {
-   .mw-ui-item;
-   padding: 0;
+   .mw-ui-one-whole;
+
margin: 0;
+   padding: 0;
+
+   .cx-suggestionlist__header {
+   .box-shadow-card;
+   }
 }
 
 .cx-suggestionlist__personal {
@@ -69,10 +75,11 @@
 
 .cx-suggestionlist__refresh {
color: @colorProgressive;
-   margin: -10px 0 48px 0;
+   margin-top: -10px;
border-width: 1px 0;
border-radius: 0 0 @borderRadius @borderRadius;
padding: 20px;
+   .box-shadow-card;
font-weight: bold;
 
&:before {
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less 
b/modules/dashboard/styles/ext.cx.translationlist.less
index 27b6f17..0e64a06 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -2,6 +2,13 @@
 @import 'ext.cx.lists.common.less';
 @import 'mediawiki.mixins';
 
+.cx-translationlist {
+   .mw-ui-one-whole;
+
+   padding: 0;
+   .box-shadow-card;
+}
+
 .cx-tlitem {
&.cx-translation-deleted {
opacity: 0.5;
diff --git a/modules/widgets/common/ext.cx.common.less 
b/modules/widgets/common/ext.cx.common.less
index a6f56de..dad9137 100644
--- a/modules/widgets/common/ext.cx.common.less
+++ b/modules/widgets/common/ext.cx.common.less
@@ -11,6 +11,10 @@
 @gray-lighter: #f8f9fa;
 @white: #fff;
 
+.box-shadow-card() {
+   .box-shadow( 0 1px 1px rgba( 0, 0, 0, 0.15 ) );
+}
+
 .cx-widget {
.mw-ui-grid;
color: @gray-darker;
diff --git a/modules/widgets/translator/ext.cx.translator.js 
b/modules/widgets/translator/ext.cx.translator.js
index 7235961..063acd9 100644
--- a/modules/widgets/translator/ext.cx.translator.js
+++ b/modules/widgets/translator/ext.cx.translator.js
@@ -133,7 +133,7 @@
.text( monthCount );
 
for ( i = 0; i < numOfColors - 1; i++ ) {
-   colors.push( '#c8ccd1' );
+   colors.push( '#a2a9b1' );
}
colors.push( '#36c' );
 
diff --git a/modules/widgets/translator/ext.cx.translator.less 
b/modules/widgets/translator/ext.cx.translator.less
index d918223..96eb363 100644
--- a/modules/widgets/translator/ext.cx.translator.less
+++ b/modules/widgets/translator/ext.cx.translator.less
@@ -8,6 +8,7 @@
margin-bottom: 1em;
border-radius: @borderRadius;
padding: 1em;
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [POC] Geo IP integration

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: [POC] Geo IP integration
..

[POC] Geo IP integration

Proof of concept demonstrating how we could integrate GeoLite2 databases
into MediaWiki.

Change-Id: I9650091f367517566c9b7c3cedae746ebdb3d4f8
---
M composer.json
M includes/DefaultSettings.php
A includes/GeoIPLookup.php
M includes/ServiceWiring.php
4 files changed, 126 insertions(+), 1 deletion(-)


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

diff --git a/composer.json b/composer.json
index dd7567c..232a420 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,8 @@
"wikimedia/timestamp": "1.0.0",
"wikimedia/wait-condition-loop": "1.0.1",
"wikimedia/wrappedstring": "2.2.0",
-   "zordius/lightncandy": "0.23"
+   "zordius/lightncandy": "0.23",
+   "geoip2/geoip2": "^2.6"
},
"require-dev": {
"composer/spdx-licenses": "1.1.4",
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf8e089..0a5dfd6 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8783,6 +8783,19 @@
 $wgCommentTableSchemaMigrationStage = MIGRATION_OLD;
 
 /**
+ * Directory where GeoIP databases can be found,
+ * These files should be named:
+ * - GeoLite2-ASN.mmdb
+ * - GeoLite2-City.mmdb
+ *
+ * Setting to false disables all GeoIP features
+ *
+ * @since 1.30
+ * @var string|bool
+ */
+$wgGeoIPDataDirectory = false;
+
+/**
  * For really cool vim folding this needs to be at the end:
  * vim: foldmarker=@{,@} foldmethod=marker
  * @}
diff --git a/includes/GeoIPLookup.php b/includes/GeoIPLookup.php
new file mode 100644
index 000..86b06a7
--- /dev/null
+++ b/includes/GeoIPLookup.php
@@ -0,0 +1,100 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+
+namespace MediaWiki;
+
+use GeoIp2\Database\Reader;
+use GeoIp2\Exception\AddressNotFoundException;
+use GeoIp2\Model\Asn;
+use GeoIp2\Model\City;
+
+/**
+ * Wrapper around GeoIP2 libraries
+ *
+ * @since 1.30
+ */
+class GeoIPLookup {
+
+   /**
+* Directory where data files are
+*
+* @var string
+*/
+   private $dataDirectory;
+
+   /**
+* @var Reader|null
+*/
+   private $cityDb;
+
+   /**
+* @var Reader|null
+*/
+   private $asnDb;
+
+   public static function isEnabled() {
+   global $wgGeoIPDataDirectory;
+   return $wgGeoIPDataDirectory !== false && class_exists( 
Reader::class );
+   }
+
+   /**
+* @param string $dataDirectory Directory where data files are or false 
if disabled
+*/
+   public function __construct( $dataDirectory ) {
+   $this->dataDirectory = $dataDirectory;
+   }
+
+   /**
+* Get an IP address's city information
+*
+* @param string $ip IP address
+* @return bool|City false if address wasn't found in the database
+*/
+   public function getCityInfo( $ip ) {
+   if ( !$this->cityDb ) {
+   $this->cityDb = new Reader( 
"{$this->dataDirectory}/GeoLite2-City.mmdb" );
+   }
+
+   try {
+   return $this->cityDb->city( $ip );
+   } catch ( AddressNotFoundException $e ) {
+   return false;
+   }
+   }
+
+   /**
+* Get an IP address's ASN information
+*
+* @param string $ip IP address
+* @return bool|Asn false if the address wasn't found in the database
+*/
+   public function getASNInfo( $ip ) {
+   if ( !$this->asnDb ) {
+   $this->asnDb = new Reader( 
"{$this->dataDirectory}/GeoLite2-ASN.mmdb" );
+   }
+
+   try {
+   return $this->asnDb->asn( $ip );
+   } catch ( AddressNotFoundException $e ) {
+   return false;
+   }
+   }
+}
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index d048007..06ff947 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -37,6 +37,7 @@
  *  MediaWiki code base.
  */
 
+use MediaWiki\GeoIPLookup;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
@@ -428,6 +429,16 @@
);
},
 
+   'GeoIPLookup' => function ( MediaWikiServices $services ) {
+   if ( !GeoIPLookup::isEnabled() ) {
+   throw new RuntimeException( "GeoIPLookup is disabled" );
+   }
+
+   return new GeoIPLookup(
+   $services->getMainConfig()->get( 'GeoIPDataDirectory' )
+   );
+   },
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Block vandalism IP that repeatedly added commen...

2017-09-06 Thread Dzahn (Code Review)

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

Change subject: Phabricator: Block vandalism IP that repeatedly added comments 
/ uploaded files
..


Phabricator: Block vandalism IP that repeatedly added comments / uploaded files

Change-Id: I42707bdbf081257f1b96125d4c56da3a8f9eb694
---
M modules/phabricator/files/apache/phabbanlist.conf
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/phabricator/files/apache/phabbanlist.conf 
b/modules/phabricator/files/apache/phabbanlist.conf
index 082d406..e9cd136 100644
--- a/modules/phabricator/files/apache/phabbanlist.conf
+++ b/modules/phabricator/files/apache/phabbanlist.conf
@@ -64,3 +64,6 @@
 Require not ip 160.160.0.0/12
 Require not ip 196.64.0.0/11
 Require not ip 197.128.0.0/14
+
+# vandalism in 07-08/2017
+Require not ip 220.134.46.118

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42707bdbf081257f1b96125d4c56da3a8f9eb694
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aklapper 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix CurrencyRates class in exchange_rates module

2017-09-06 Thread Ejegg (Code Review)

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

Change subject: Fix CurrencyRates class in exchange_rates module
..

Fix CurrencyRates class in exchange_rates module

Change-Id: I170aebf170c26c914b3461ef36e327f8faafed5b
---
M sites/all/modules/exchange_rates/exchange_rates.module
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/50/376450/1

diff --git a/sites/all/modules/exchange_rates/exchange_rates.module 
b/sites/all/modules/exchange_rates/exchange_rates.module
index 17a3d35..59d07d4 100644
--- a/sites/all/modules/exchange_rates/exchange_rates.module
+++ b/sites/all/modules/exchange_rates/exchange_rates.module
@@ -3,6 +3,7 @@
 use exchange_rates\OandaRetriever;
 use exchange_rates\EcbRetriever;
 use exchange_rates\ExchangeRateUpdateException;
+use SmashPig\PaymentData\ReferenceData\CurrencyRates;
 
 function exchange_rates_menu() {
   $items = array();

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ContribsPager: Don't call non-static function statically

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: ContribsPager: Don't call non-static function statically
..

ContribsPager: Don't call non-static function statically

Change-Id: Ic0753e96009f65f1599c9952784c52034b4ec096
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/376448/1

diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index 7d0a9df..4296b78 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -371,7 +371,7 @@
 * @return string Name of field
 */
public function getIndexField() {
-   if ( self::isQueryableRange( $this->target ) ) {
+   if ( $this->isQueryableRange( $this->target ) ) {
return 'ipc_rev_timestamp';
} else {
return 'rev_timestamp';
@@ -546,7 +546,7 @@
# When querying for an IP range, we want to always show 
user and user talk links.
$userlink = '';
if ( ( $this->contribs == 'newbie' && !$rev->isDeleted( 
Revision::DELETED_USER ) )
-   || self::isQueryableRange( $this->target ) ) {
+   || $this->isQueryableRange( $this->target ) ) {
$userlink = ' . . ' . $lang->getDirMark()
. Linker::userLink( $rev->getUser(), 
$rev->getUserText() );
$userlink .= ' ' . $this->msg( 'parentheses' 
)->rawParams(

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ContribsPager: Batch page existence lookup for IP range cont...

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: ContribsPager: Batch page existence lookup for IP range 
contributions
..

ContribsPager: Batch page existence lookup for IP range contributions

When looking up contributions for a range of IP addresses, include the
IP's talk page in page existence lookup batch so it doesn't get looked
up individually.

Change-Id: I5151c10569a92805f79b59f68f9c57c451dc4597
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/49/376449/1

diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index 4296b78..31ea810 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -394,6 +394,9 @@
if ( $this->contribs === 'newbie' ) { // 
multiple users
$batch->add( NS_USER, $row->user_name );
$batch->add( NS_USER_TALK, 
$row->user_name );
+   } elseif ( $this->isQueryableRange( 
$this->target ) ) {
+   // If this is an IP range, batch the 
IP's talk page
+   $batch->add( NS_USER_TALK, 
$row->rev_user_text );
}
$batch->add( $row->page_namespace, 
$row->page_title );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5151c10569a92805f79b59f68f9c57c451dc4597
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] operations/puppet[production]: jsbench: Prep osmium for decom and remove 've' and 'jsbench'...

2017-09-06 Thread Dzahn (Code Review)

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

Change subject: jsbench: Prep osmium for decom and remove 've' and 'jsbench' 
roles
..


jsbench: Prep osmium for decom and remove 've' and 'jsbench' roles

The 've' and 'jsbench' roles are no longer used.

Prepare osmium for decom.

Bug: T175093
Change-Id: I99356298ba12d574d84528306e9dbc33c270873c
---
M manifests/site.pp
D modules/role/files/jsbench/benchmarks/README
D modules/role/files/jsbench/benchmarks/ve.js
D modules/role/files/jsbench/devwiki.conf
D modules/role/files/jsbench/jsbench
D modules/role/files/jsbench/systemd
D modules/role/files/jsbench/upstart
D modules/role/files/ve/devwiki.conf
D modules/role/files/ve/vb
D modules/role/manifests/jsbench.pp
D modules/role/manifests/ve.pp
11 files changed, 2 insertions(+), 751 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 4d62b1c..0466759 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1918,11 +1918,9 @@
 include ::standard
 }
 
-# VisualEditor performance testing rig
+# To be decommissioned in T175093
 node 'osmium.eqiad.wmnet' {
-role(ve)
-include ::standard
-include ::base::firewall
+role(spare::system)
 }
 
 # oxygen runs a kafkatee instance that consumes webrequest from Kafka
diff --git a/modules/role/files/jsbench/benchmarks/README 
b/modules/role/files/jsbench/benchmarks/README
deleted file mode 100644
index 85bd91b..000
--- a/modules/role/files/jsbench/benchmarks/README
+++ /dev/null
@@ -1,6 +0,0 @@
-A benchmark is a piece of Javascript that can be run with the
-  jsbench --benchmark  
-command. The script will be executed when the browser opens the page.
-It needs to contain a console.profile and a console.profileEnd call;
-otherwise it can be arbitrary. The output of the profileEnd call will be
-returned by jsbench.
diff --git a/modules/role/files/jsbench/benchmarks/ve.js 
b/modules/role/files/jsbench/benchmarks/ve.js
deleted file mode 100644
index fb7b43e..000
--- a/modules/role/files/jsbench/benchmarks/ve.js
+++ /dev/null
@@ -1,23 +0,0 @@
-window.onload = function () {
-   var stage = jsbench.stage;
-   ve.trackSubscribe( 'trace.' + stage + '.', function ( topic ) {
-   switch ( topic.split( '.' ).pop() ) {
-   case 'enter':
-   console.profile( stage );
-   break;
-   case 'exit':
-   console.profileEnd( stage );
-   break;
-   }
-   } );
-
-   // Don't show the welcome dialog.
-   localStorage.clear()
-   localStorage.setItem( 've-beta-welcome-dialog', 1 );
-
-   // Wait 200ms for any load handlers to run, then start VE.
-   setTimeout( function () {
-   mw.libs.ve.onEditTabClick( { preventDefault: $.noop } );
-   }, 200 );
-};
-
diff --git a/modules/role/files/jsbench/devwiki.conf 
b/modules/role/files/jsbench/devwiki.conf
deleted file mode 100644
index 67bcfac..000
--- a/modules/role/files/jsbench/devwiki.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-
-ServerName osmium
-DocumentRoot /var/www
-
-
-Options FollowSymLinks
-AllowOverride None
-
-
-
-Require all granted
-
-
-
-Require all granted
-
-
-
-Require all granted
-
-
-AllowEncodedSlashes on
-RewriteEngine On
-
-Alias /images "/srv/images"
-
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/var/www/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  fcgi://127.0.0.1:9000/var/www/w/$1 
retry=0
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/var/www/w/index.php  [P]
-
diff --git a/modules/role/files/jsbench/jsbench 
b/modules/role/files/jsbench/jsbench
deleted file mode 100755
index f58e282..000
--- a/modules/role/files/jsbench/jsbench
+++ /dev/null
@@ -1,455 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-  jsbench - Javascript performance benchmarking tool
-  ~~
-
-  Usage: jsbench [OPTIONS] URL
-   -h, --helpshow this help message and exit
-   --verbose log verbosely
-   --benchmark-file FILE benchmark file (default: standard input)
-   --host HOST   Chromium host (default: localhost)
-   --port PORT   Chromium port (default: 9222)
-   --repeat Ntimes to repeat (default: 5)
-   --warmups N   number of warm-up runs (default: 3)
-   --write-profile-data  save profiling data as .cpuprofile files.
-   --display DISPLAY set device display metrics to WIDTHxHEIGHT or
- WIDTHxHEIGHT*SCALE_FACTOR
-   --disable-cache   disable network cache
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webperf: Decom webperf::ve service

2017-09-06 Thread Dzahn (Code Review)

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

Change subject: webperf: Decom webperf::ve service
..


webperf: Decom webperf::ve service

Bug: T175083
Change-Id: I76bf0e43d700120551f79013a2a6dd7394ab63be
---
M modules/role/manifests/webperf.pp
D modules/webperf/files/ve.py
D modules/webperf/files/ve_expected.txt
D modules/webperf/files/ve_fixture.yaml
D modules/webperf/manifests/ve.pp
D modules/webperf/templates/ve.systemd.erb
6 files changed, 0 insertions(+), 216 deletions(-)

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



diff --git a/modules/role/manifests/webperf.pp 
b/modules/role/manifests/webperf.pp
index ab0d806..80b8388 100644
--- a/modules/role/manifests/webperf.pp
+++ b/modules/role/manifests/webperf.pp
@@ -31,12 +31,4 @@
 statsd_host   => $statsd_host,
 statsd_port   => $statsd_port,
 }
-
-# Report VisualEditor performance measurements to Graphite.
-# See 
-class { '::webperf::ve':
-kafka_brokers => $kafka_brokers,
-statsd_host   => $statsd_host,
-statsd_port   => $statsd_port,
-}
 }
diff --git a/modules/webperf/files/ve.py b/modules/webperf/files/ve.py
deleted file mode 100644
index c8318e5..000
--- a/modules/webperf/files/ve.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-import sys
-reload(sys)
-sys.setdefaultencoding("utf-8")
-
-import argparse
-import json
-import socket
-import unittest
-import yaml
-
-from kafka import KafkaConsumer
-
-
-def handle_edit(meta):
-event = meta['event']
-if event['editor'] == 'visualeditor':
-action = event['action']
-if action == 'saveSuccess':
-metric = 'save'
-elif action == 'ready':
-metric = 'load'
-else:
-return
-timing = int(event['action.%s.timing' % action])
-# Log values between 0.1s an 100s (1.6min) only
-if timing < 100 or timing > 10:
-return
-return 'VisualEditor.%s:%s|ms' % (metric, timing)
-
-
-if __name__ == '__main__':
-ap = argparse.ArgumentParser(description='Send VisualEditor PerfData to 
StatsD')
-ap.add_argument('--brokers', required=True,
-help='Comma-separated list of kafka brokers')
-ap.add_argument('--consumer-group', required=True,
-help='Consumer group to register with Kafka')
-ap.add_argument('--statsd-host', default='localhost',
-type=socket.gethostbyname)
-ap.add_argument('--statsd-port', default=8125, type=int)
-args = ap.parse_args()
-
-addr = args.statsd_host, args.statsd_port
-sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-
-kafka_bootstrap_servers = tuple(args.brokers.split(','))
-kafka_topic = 'eventlogging_Edit'
-kafka_consumer_timeout_seconds = 600
-consumer = KafkaConsumer(
-kafka_topic,
-bootstrap_servers=kafka_bootstrap_servers,
-group_id=args.consumer_group,
-auto_offset_reset='latest',
-enable_auto_commit=False,
-consumer_timeout_ms=kafka_consumer_timeout_seconds * 1000
-)
-
-try:
-for message in consumer:
-meta = json.loads(message.value)
-try:
-stat = handle_edit(meta)
-if stat is not None:
-sock.sendto(stat.encode('utf-8'), addr)
-except (ValueError, KeyError):
-continue
-# If we reach this line, consumer_timeout_ms elapsed without events
-raise RuntimeError('No messages received in %d seconds.' % 
kafka_consumer_timeout_seconds)
-finally:
-consumer.close()
-
-
-# # Tests ##
-# To run:
-#   python -m unittest ve
-#
-class TestVePerfData(unittest.TestCase):
-def test_handler(self):
-with open('ve_fixture.yaml') as fixture_file:
-fixture = yaml.safe_load(fixture_file)
-actual = []
-for meta in fixture:
-stat = handle_edit(meta)
-if stat is not None:
-actual.append(stat)
-with open('ve_expected.txt') as expected_file:
-self.assertItemsEqual(
-actual,
-expected_file.read().splitlines()
-)
diff --git a/modules/webperf/files/ve_expected.txt 
b/modules/webperf/files/ve_expected.txt
deleted file mode 100644
index f5ed936..000
--- a/modules/webperf/files/ve_expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-VisualEditor.load:1955|ms
-VisualEditor.load:33097|ms
-VisualEditor.load:3077|ms
-VisualEditor.load:2963|ms
-VisualEditor.load:1769|ms
-VisualEditor.save:14379|ms
-VisualEditor.load:1067|ms
-VisualEditor.load:9615|ms
-VisualEditor.load:2391|ms
-VisualEditor.load:16085|ms

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Silence execs in ores/ores_service roles

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Silence execs in ores/ores_service roles
..


Silence execs in ores/ores_service roles

Fixes some execs resources which ran all the time and spammed
vagrant provision output.

Change-Id: Ia69bb7a55a84f336562a1e389c06089419fa9f61
---
M puppet/modules/ores/manifests/init.pp
M puppet/modules/role/manifests/ores.pp
2 files changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/puppet/modules/ores/manifests/init.pp 
b/puppet/modules/ores/manifests/init.pp
index fa37eb3..08f247e 100644
--- a/puppet/modules/ores/manifests/init.pp
+++ b/puppet/modules/ores/manifests/init.pp
@@ -42,9 +42,10 @@
 #FIXME this should happen as part of normal dependency management but for 
some reason it doesn't
 # pylru probably needs to be fixed in the revscoring pakcage, redis in ores
 exec { 'pip_install_revscoring_dependencies_hack':
-command => "curl 
https://raw.githubusercontent.com/wiki-ai/revscoring/master/requirements.txt | 
${deploy_dir}/bin/pip install pylru redis -r /dev/stdin",
-cwd => $deploy_dir,
-require => Virtualenv::Package['ores'],
+command => "curl 
https://raw.githubusercontent.com/wiki-ai/revscoring/master/requirements.txt | 
${deploy_dir}/bin/pip install pylru redis -r /dev/stdin",
+cwd => $deploy_dir,
+subscribe   => Virtualenv::Package['ores'],
+refreshonly => true,
 }
 $repo_dir = "${deploy_dir}/src/ores"
 
diff --git a/puppet/modules/role/manifests/ores.pp 
b/puppet/modules/role/manifests/ores.pp
index b51b052..8651e0e 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -5,6 +5,7 @@
 #
 class role::ores {
 include ::role::betafeatures
+include ::mysql
 
 mediawiki::extension { 'ORES':
 needs_update => true,
@@ -26,7 +27,7 @@
 
 mediawiki::maintenance { 'check ORES model versions':
 command => '/usr/local/bin/mwscript 
extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki',
-unless  => '/usr/bin/mysql -e "select * from ores_model" wiki | 
/bin/grep -q "damaging"',
+unless  => "/usr/bin/mysql -u root -p${::mysql::root_password} -e 
'select * from ores_model' wiki | /bin/grep -q 'damaging'",
 require => Mediawiki::Extension['ORES'],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia69bb7a55a84f336562a1e389c06089419fa9f61
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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/vagrant[master]: Use local ORES service when both ores and ores_services role...

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Use local ORES service when both ores and ores_services roles 
are enabled
..


Use local ORES service when both ores and ores_services roles are enabled

Enables 'damaging' score for which the local service will give random
results.

Depends on https://github.com/wiki-ai/ores/pull/199

Also fixes some unrelated copypaste errors in the ores role and adds some
missing dependencies.

Bug: T159105
Change-Id: I2ea694c745f2c3e2f636ee76f839393f89107633
---
M puppet/modules/ores/manifests/init.pp
M puppet/modules/role/manifests/ores.pp
M puppet/modules/role/manifests/ores_service.pp
M puppet/modules/wikilabels/manifests/init.pp
4 files changed, 53 insertions(+), 3 deletions(-)

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



diff --git a/puppet/modules/ores/manifests/init.pp 
b/puppet/modules/ores/manifests/init.pp
index cf84dde..fa37eb3 100644
--- a/puppet/modules/ores/manifests/init.pp
+++ b/puppet/modules/ores/manifests/init.pp
@@ -69,9 +69,10 @@
 ensure => present,
 service_params => {
 require   => [
-VirtualEnv::Package['wikilabels'],
+VirtualEnv::Package['ores'],
+Class['mediawiki::ready_service'],
 Exec['pip_install_revscoring_dependencies_hack'],
-Apache::Site['wikilabels'],
+Apache::Site['ores'],
 ],
 subscribe => [
 File[$cfg_file],
@@ -83,6 +84,7 @@
 service_params => {
 require   => [
 VirtualEnv::Package['ores'],
+Class['mediawiki::ready_service'],
 Exec['pip_install_revscoring_dependencies_hack'],
 Apache::Site['ores'],
 ],
diff --git a/puppet/modules/role/manifests/ores.pp 
b/puppet/modules/role/manifests/ores.pp
index 1bd7069..b51b052 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -27,6 +27,13 @@
 mediawiki::maintenance { 'check ORES model versions':
 command => '/usr/local/bin/mwscript 
extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki',
 unless  => '/usr/bin/mysql -e "select * from ores_model" wiki | 
/bin/grep -q "damaging"',
-require => Mediawiki::Extension['ORES']
+require => Mediawiki::Extension['ORES'],
 }
+
+# Ensure that the maintenance script does not run before the API is alive,
+# when ORES is installed locally via role::ores_service.
+# This is pretty horrible but seems to be the only way of avoiding cycles.
+Systemd::Service<| title == 'ores-wsgi' or title == 'ores-celery' |>
+->
+Mediawiki::Maintenance['check ORES model versions']
 }
diff --git a/puppet/modules/role/manifests/ores_service.pp 
b/puppet/modules/role/manifests/ores_service.pp
index d223abf..f5d646b 100644
--- a/puppet/modules/role/manifests/ores_service.pp
+++ b/puppet/modules/role/manifests/ores_service.pp
@@ -5,6 +5,46 @@
 include ::ores
 
 $ores_hostname = $::ores::vhost_name
+
+# when role::ores is also enabled, make it use the local service
+mediawiki::settings { 'ORES service':
+values   => {
+wgOresBaseUrl   => "http://localhost:${::ores::port}/;,
+wgOresWikiId=> 'wiki',
+wgOresModels=> {
+damaging  => true,
+goodfaith => false,
+reverted  => false,
+wp10  => false,
+},
+# the mock scorer used by the local service cannot
+# provide recall stats so dynamic threshold configuration
+# would cause score fetches to silently fail. Use a
+# constant dummy configuration instead.
+wgOresFiltersThresholds => {
+damaging => {
+likelygood=> {
+min => 0,
+max => 0.3,
+},
+maybebad  => {
+min => 0.2,
+max => 1,
+},
+likelybad => {
+min => 0.5,
+max => 1,
+},
+verylikelybad => {
+min => 0.8,
+max => 1,
+},
+},
+},
+},
+priority => 20,
+}
+
 mediawiki::import::text { 'VagrantRoleOresService':
 content => 
template('role/ores_service/VagrantRoleOresService.wiki.erb'),
 }
diff --git a/puppet/modules/wikilabels/manifests/init.pp 
b/puppet/modules/wikilabels/manifests/init.pp
index 8e73747..e5642f3 100644
--- a/puppet/modules/wikilabels/manifests/init.pp
+++

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (834fd702f)

2017-09-06 Thread jenkins-bot (Code Review)

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

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


Update VE core submodule to master (834fd702f)

New changes:
86bd6c879 Localisation updates from https://translatewiki.net.
6d7a4cef0 Update OOjs UI to v0.23.0
37d1512a7 TransactionProcessor: modify DM tree branches instead of rebuilding 
them

Bug: T162762
Bug: T166041
Bug: T167027
Change-Id: Idfaa990dd940e26d7d572513220282bc97ca65fa
---
M .jsduck/categories.json
M .jsduck/eg-iframe.html
M VisualEditor.hooks.php
M extension.json
M lib/ve
5 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index c21ffab..81ebb36 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -116,6 +116,8 @@
"ve.dm.*Selection",
"ve.dm.Transaction",
"ve.dm.TransactionBuilder",
+   "ve.dm.TreeCursor",
+   "ve.dm.TreeModifier",
"ve.dm.TransactionProcessor",
"ve.dm.TransactionProcessor.*",
"ve.dm.*Annotation",
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 3810d19..a203540 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -201,6 +201,8 @@



+   
+   



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index d4713a5..290bb5c 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -959,6 +959,7 @@
'lib/ve/tests/dm/ve.dm.LinearData.test.js',
'lib/ve/tests/dm/ve.dm.Transaction.test.js',

'lib/ve/tests/dm/ve.dm.TransactionBuilder.test.js',
+   'lib/ve/tests/dm/ve.dm.TreeModifier.test.js',

'lib/ve/tests/dm/ve.dm.TransactionProcessor.test.js',
'lib/ve/tests/dm/ve.dm.APIResultsQueue.test.js',
'lib/ve/tests/dm/ve.dm.Surface.test.js',
diff --git a/extension.json b/extension.json
index 48dd515..fa3cc77 100644
--- a/extension.json
+++ b/extension.json
@@ -609,6 +609,8 @@
"lib/ve/src/dm/ve.dm.TransactionProcessor.js",
"lib/ve/src/dm/ve.dm.Transaction.js",
"lib/ve/src/dm/ve.dm.TransactionBuilder.js",
+   "lib/ve/src/dm/ve.dm.TreeCursor.js",
+   "lib/ve/src/dm/ve.dm.TreeModifier.js",
"lib/ve/src/dm/ve.dm.Selection.js",
"lib/ve/src/dm/ve.dm.Surface.js",
"lib/ve/src/dm/ve.dm.SurfaceFragment.js",
diff --git a/lib/ve b/lib/ve
index 7a88295..834fd70 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 7a88295090507dec989f406d7364a091d38034b4
+Subproject commit 834fd702fec544913f38339f7bd7ee1966f151e0

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: [WIP] WorkflowLoaderFactory: Don't crash for negative namesp...

2017-09-06 Thread Catrope (Code Review)

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

Change subject: [WIP] WorkflowLoaderFactory: Don't crash for negative namespace 
titles
..

[WIP] WorkflowLoaderFactory: Don't crash for negative namespace titles

I can't test this locally because Vagrant isn't playing ball

Bug: T175085
Change-Id: I91d49f708c30f936ff01455e5e00ff50c9768001
---
M includes/WorkflowLoaderFactory.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/WorkflowLoaderFactory.php 
b/includes/WorkflowLoaderFactory.php
index 47ea19c..921c172 100644
--- a/includes/WorkflowLoaderFactory.php
+++ b/includes/WorkflowLoaderFactory.php
@@ -71,7 +71,7 @@
if ( $pageTitle->getNamespace() === NS_TOPIC ) {
// topic page: workflow UUID is page title
$workflowId = self::uuidFromTitle( $pageTitle );
-   } else {
+   } else if ( $pageTitle->getNamespace() >= 0 ) {
// board page: workflow UUID is inside content 
model
$page = \WikiPage::factory( $pageTitle );
$content = $page->getContent();

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Configure CirrusSearch human relevance survey

2017-09-06 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374655 )

Change subject: Configure CirrusSearch human relevance survey
..


Configure CirrusSearch human relevance survey

Adds configuration for the CirrusSearch human relevance
survey with a target of 1k impressions per week per
unique (query, article).

Depends-On: I7ae522155e67610d25b5857d7b3918559bce8bc7
Bug: T174106
Change-Id: I272c69e5a3bb6e833fca59282142d6b237fd9e60
---
M wmf-config/CirrusSearch-common.php
A wmf-config/CirrusSearch-rel-survey.php
M wmf-config/InitialiseSettings.php
3 files changed, 18,992 insertions(+), 0 deletions(-)

Approvals:
  20after4: Looks good to me, approved
  jenkins-bot: Verified
  DCausse: Looks good to me, but someone else must approve




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I272c69e5a3bb6e833fca59282142d6b237fd9e60
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: DCausse 
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...WikimediaEvents[wmf/1.30.0-wmf.17]: Encode human search relevance survey into html output

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Encode human search relevance survey into html output
..


Encode human search relevance survey into html output

Moves the search relevance configuration from javascript into php
configuration so it can be run on a larger number of pages without
exploding the size of javascript delivered to everyone with all
that config.

The downside of this approach is that because the config is cached
into the page html any updates have to work their way through varnish
caching. For the initial test this should be fine as we can purge the
relevant pages over some small time period. In the future when we are
doing larger scale collection we just have to keep in mind that
configuration changes take around 7 days to propogate.

Bug: T174387
Change-Id: I7ae522155e67610d25b5857d7b3918559bce8bc7
(cherry picked from commit e722fe1a9b0d41c3597f9f9326e7fc6f0e1cd9c6)
---
M WikimediaEventsHooks.php
M extension.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
3 files changed, 35 insertions(+), 220 deletions(-)

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



diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 0d8b7e5..709eb12 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -644,4 +644,14 @@
);
}
 
+   public static function onMakeGlobalVariablesScript( array &$vars, 
OutputPage $out ) {
+   global $wgWMESearchRelevancePages;
+   if ( $vars['wgAction'] === 'view' ) {
+   $articleId = $out->getTitle()->getArticleID();
+   if ( isset( $wgWMESearchRelevancePages[$articleId] ) ) {
+   $vars['wgWMESearchRelevancePages'] = 
$wgWMESearchRelevancePages[$articleId];
+   }
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 63a8487..db369ac 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,9 @@
],
"ChangesListSpecialPageStructuredFilters": [

"WikimediaEventsHooks::onChangesListSpecialPageStructuredFilters"
+   ],
+   "MakeGlobalVariablesScript": [
+   "WikimediaEventsHooks::onMakeGlobalVariablesScript"
]
},
"MessagesDirs": {
@@ -167,7 +170,8 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js",
+   
"ext.wikimediaEvents.humanSearchRelevance.js"
],
"minerva": []
},
@@ -219,7 +223,10 @@
"config": {
"WMEReadingDepthSamplingRate": 0.005,
"WMEReadingDepthEnabled": false,
-   "WMEStatsdBaseUri": false
+   "WMEStatsdBaseUri": false,
+   "WMESearchRelevancePages": {
+   "_merge_strategy": "array_plus"
+   }
},
"manifest_version": 1
 }
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index 7ac..5ee8fb2 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -1,10 +1,15 @@
 ( function ( mw, $, undefined ) {
'use strict';
 
-   function oneIn( populationSize ) {
+   function sample( acceptPercentage ) {
var rand = mw.user.generateRandomSessionId(),
+   // take the first 52 bits of the rand value to match js
+   // integer precision
parsed = parseInt( rand.slice( 0, 13 ), 16 );
-   return parsed % populationSize === 0;
+   if ( acceptPercentage >= 1 ) {
+   return true;
+   }
+   return parsed / Math.pow( 2, 52 ) < acceptPercentage;
}
 
function chooseOne( options ) {
@@ -14,228 +19,23 @@
return options[ Math.floor( parsed / step ) ];
}
 
-   // Only accept enwiki, NS_MAIN for MVP feasability test
-   if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ||
-   mw.config.get( 'wgDBname' ) !== 'enwiki'
-   ) {
+   // Page is not part of this test
+   if ( !mw.config.exists( 'wgWMESearchRelevancePages' ) ) {
return;
}
 
-   // For the MVP we are simply hardcoding the list of queries and 
articles.
-   // If the MVP shows to return data that isn't complete junk this will be
-   //

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.16]: Encode human search relevance survey into html output

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Encode human search relevance survey into html output
..


Encode human search relevance survey into html output

Moves the search relevance configuration from javascript into php
configuration so it can be run on a larger number of pages without
exploding the size of javascript delivered to everyone with all
that config.

The downside of this approach is that because the config is cached
into the page html any updates have to work their way through varnish
caching. For the initial test this should be fine as we can purge the
relevant pages over some small time period. In the future when we are
doing larger scale collection we just have to keep in mind that
configuration changes take around 7 days to propogate.

Bug: T174387
Change-Id: I7ae522155e67610d25b5857d7b3918559bce8bc7
(cherry picked from commit e722fe1a9b0d41c3597f9f9326e7fc6f0e1cd9c6)
---
M WikimediaEventsHooks.php
M extension.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
3 files changed, 35 insertions(+), 220 deletions(-)

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



diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 0d8b7e5..709eb12 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -644,4 +644,14 @@
);
}
 
+   public static function onMakeGlobalVariablesScript( array &$vars, 
OutputPage $out ) {
+   global $wgWMESearchRelevancePages;
+   if ( $vars['wgAction'] === 'view' ) {
+   $articleId = $out->getTitle()->getArticleID();
+   if ( isset( $wgWMESearchRelevancePages[$articleId] ) ) {
+   $vars['wgWMESearchRelevancePages'] = 
$wgWMESearchRelevancePages[$articleId];
+   }
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 63a8487..db369ac 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,9 @@
],
"ChangesListSpecialPageStructuredFilters": [

"WikimediaEventsHooks::onChangesListSpecialPageStructuredFilters"
+   ],
+   "MakeGlobalVariablesScript": [
+   "WikimediaEventsHooks::onMakeGlobalVariablesScript"
]
},
"MessagesDirs": {
@@ -167,7 +170,8 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js",
+   
"ext.wikimediaEvents.humanSearchRelevance.js"
],
"minerva": []
},
@@ -219,7 +223,10 @@
"config": {
"WMEReadingDepthSamplingRate": 0.005,
"WMEReadingDepthEnabled": false,
-   "WMEStatsdBaseUri": false
+   "WMEStatsdBaseUri": false,
+   "WMESearchRelevancePages": {
+   "_merge_strategy": "array_plus"
+   }
},
"manifest_version": 1
 }
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index 7ac..5ee8fb2 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -1,10 +1,15 @@
 ( function ( mw, $, undefined ) {
'use strict';
 
-   function oneIn( populationSize ) {
+   function sample( acceptPercentage ) {
var rand = mw.user.generateRandomSessionId(),
+   // take the first 52 bits of the rand value to match js
+   // integer precision
parsed = parseInt( rand.slice( 0, 13 ), 16 );
-   return parsed % populationSize === 0;
+   if ( acceptPercentage >= 1 ) {
+   return true;
+   }
+   return parsed / Math.pow( 2, 52 ) < acceptPercentage;
}
 
function chooseOne( options ) {
@@ -14,228 +19,23 @@
return options[ Math.floor( parsed / step ) ];
}
 
-   // Only accept enwiki, NS_MAIN for MVP feasability test
-   if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ||
-   mw.config.get( 'wgDBname' ) !== 'enwiki'
-   ) {
+   // Page is not part of this test
+   if ( !mw.config.exists( 'wgWMESearchRelevancePages' ) ) {
return;
}
 
-   // For the MVP we are simply hardcoding the list of queries and 
articles.
-   // If the MVP shows to return data that isn't complete junk this will be
-   //

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add subpageof keyword

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Add subpageof keyword
..


Add subpageof keyword

It's a specialized version of the prefix keywork to find subpages.
It does not have the limitation of prefix:
- non-greedy
- does not try to handle namespace
- search on redirects

NOTE: The keyword is subpageof, but could be changed to something else.
(feel free to amend the patch).

If reusing the prefix elastic field is not sufficient we'll have to dig
into more dedicated field.

Bug: T159321
Change-Id: Ic1489b00b6179d60d662cd6645d54ba3428343d9
---
M autoload.php
A includes/Query/SubPageOf.php
M includes/Searcher.php
A tests/unit/fixtures/searchText/subpageof_001.default.expected
A tests/unit/fixtures/searchText/subpageof_001.fullyfeatured-interwiki.expected
A tests/unit/fixtures/searchText/subpageof_001.fullyfeatured.expected
A tests/unit/fixtures/searchText/subpageof_001.query
7 files changed, 1,392 insertions(+), 0 deletions(-)

Approvals:
  Smalyshev: Looks good to me, but someone else must approve
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve



diff --git a/autoload.php b/autoload.php
index 6b8cdda..2e72740 100644
--- a/autoload.php
+++ b/autoload.php
@@ -135,6 +135,7 @@
'CirrusSearch\\Query\\RegexInSourceFeature' => __DIR__ . 
'/includes/Query/RegexInSourceFeature.php',
'CirrusSearch\\Query\\SimpleInSourceFeature' => __DIR__ . 
'/includes/Query/SimpleInSourceFeature.php',
'CirrusSearch\\Query\\SimpleKeywordFeature' => __DIR__ . 
'/includes/Query/SimpleKeywordFeature.php',
+   'CirrusSearch\\Query\\SubPageOfFeature' => __DIR__ . 
'/includes/Query/SubPageOf.php',
'CirrusSearch\\RequestLog' => __DIR__ . '/includes/RequestLog.php',
'CirrusSearch\\RequestLogger' => __DIR__ . 
'/includes/RequestLogger.php',
'CirrusSearch\\RescoreProfiles' => __DIR__ . 
'/profiles/RescoreProfiles.php',
diff --git a/includes/Query/SubPageOf.php b/includes/Query/SubPageOf.php
new file mode 100644
index 000..04fdf4c
--- /dev/null
+++ b/includes/Query/SubPageOf.php
@@ -0,0 +1,44 @@
+setFields( [ 'title.prefix', 'redirect.title.prefix' ] 
);
+   $query->setQuery( $value );
+   return [ $query, false ];
+   }
+}
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 766cb38..74d69cb 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -351,6 +351,8 @@
new Query\FileNumericFeature(),
// Content model feature
new Query\ContentModelFeature(),
+   // subpageof keyword
+   new Query\SubPageOfFeature(),
];
 
$extraFeatures = [];
diff --git a/tests/unit/fixtures/searchText/subpageof_001.default.expected 
b/tests/unit/fixtures/searchText/subpageof_001.default.expected
new file mode 100644
index 000..2fd4d6c
--- /dev/null
+++ b/tests/unit/fixtures/searchText/subpageof_001.default.expected
@@ -0,0 +1,220 @@
+{
+"description": "full_text search for 'subpageof:\"parent page\"'",
+"options": {
+"search_type": "dfs_query_then_fetch",
+"timeout": "20s"
+},
+"params": {
+"search_type": "dfs_query_then_fetch",
+"timeout": "20s"
+},
+"query": {
+"_source": [
+"namespace",
+"namespace_text",
+"redirect.*",
+"text_bytes",
+"timestamp",
+"title",
+"wiki"
+],
+"highlight": {
+"fields": {
+"auxiliary_text": {
+"fragment_size": 150,
+"fragmenter": "scan",
+"matched_fields": [
+"auxiliary_text",
+"auxiliary_text.plain"
+],
+"number_of_fragments": 1,
+"options": {
+"boost_before": {
+"20": 2,
+"50": 1.8,
+"200": 1.5,
+"1000": 1.2
+},
+"max_fragments_scored": 5000,
+"skip_if_last_matched": true,
+"top_scoring": true
+},
+"type": "experimental"
+},
+"category": {
+"fragmenter": "none",
+"matched_fields": [
+"category",
+"category.plain"
+],
+"number_of_fragments": 1,
+"options": {
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: Fix bug in dl-dt list output generation

2017-09-06 Thread Subramanya Sastry (Code Review)

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

Change subject: WIP: Fix bug in dl-dt list output generation
..

WIP: Fix bug in dl-dt list output generation

* Tidy was hiding this bug so far
* TODO: Add new tests, verify.

Bug: T175099
Change-Id: I6d5b225b82cecf9a43f23837ed8ec359b31aadad
---
M includes/parser/BlockLevelPass.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/376446/1

diff --git a/includes/parser/BlockLevelPass.php 
b/includes/parser/BlockLevelPass.php
index 599fbf6..35f0805 100644
--- a/includes/parser/BlockLevelPass.php
+++ b/includes/parser/BlockLevelPass.php
@@ -257,6 +257,11 @@
$output .= $this->nextItem( 
$prefix[$commonPrefixLength - 1] );
}
 
+   # Close an open  if we have a  (":") 
starting on this line
+   if ( $this->DTopen && substr( $prefix, 
$commonPrefixLength - 1, 1) === ':' ) {
+   $output .= $this->nextItem( ':' );
+   }
+
# Open prefixes where appropriate.
if ( $lastPrefix && $prefixLength > 
$commonPrefixLength ) {
$output .= "\n";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d5b225b82cecf9a43f23837ed8ec359b31aadad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...WikimediaEvents[wmf/1.30.0-wmf.16]: Encode human search relevance survey into html output

2017-09-06 Thread EBernhardson (Code Review)

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

Change subject: Encode human search relevance survey into html output
..

Encode human search relevance survey into html output

Moves the search relevance configuration from javascript into php
configuration so it can be run on a larger number of pages without
exploding the size of javascript delivered to everyone with all
that config.

The downside of this approach is that because the config is cached
into the page html any updates have to work their way through varnish
caching. For the initial test this should be fine as we can purge the
relevant pages over some small time period. In the future when we are
doing larger scale collection we just have to keep in mind that
configuration changes take around 7 days to propogate.

Bug: T174387
Change-Id: I7ae522155e67610d25b5857d7b3918559bce8bc7
(cherry picked from commit e722fe1a9b0d41c3597f9f9326e7fc6f0e1cd9c6)
---
M WikimediaEventsHooks.php
M extension.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
3 files changed, 35 insertions(+), 220 deletions(-)


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

diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 0d8b7e5..709eb12 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -644,4 +644,14 @@
);
}
 
+   public static function onMakeGlobalVariablesScript( array &$vars, 
OutputPage $out ) {
+   global $wgWMESearchRelevancePages;
+   if ( $vars['wgAction'] === 'view' ) {
+   $articleId = $out->getTitle()->getArticleID();
+   if ( isset( $wgWMESearchRelevancePages[$articleId] ) ) {
+   $vars['wgWMESearchRelevancePages'] = 
$wgWMESearchRelevancePages[$articleId];
+   }
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 63a8487..db369ac 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,9 @@
],
"ChangesListSpecialPageStructuredFilters": [

"WikimediaEventsHooks::onChangesListSpecialPageStructuredFilters"
+   ],
+   "MakeGlobalVariablesScript": [
+   "WikimediaEventsHooks::onMakeGlobalVariablesScript"
]
},
"MessagesDirs": {
@@ -167,7 +170,8 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js",
+   
"ext.wikimediaEvents.humanSearchRelevance.js"
],
"minerva": []
},
@@ -219,7 +223,10 @@
"config": {
"WMEReadingDepthSamplingRate": 0.005,
"WMEReadingDepthEnabled": false,
-   "WMEStatsdBaseUri": false
+   "WMEStatsdBaseUri": false,
+   "WMESearchRelevancePages": {
+   "_merge_strategy": "array_plus"
+   }
},
"manifest_version": 1
 }
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index 7ac..5ee8fb2 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -1,10 +1,15 @@
 ( function ( mw, $, undefined ) {
'use strict';
 
-   function oneIn( populationSize ) {
+   function sample( acceptPercentage ) {
var rand = mw.user.generateRandomSessionId(),
+   // take the first 52 bits of the rand value to match js
+   // integer precision
parsed = parseInt( rand.slice( 0, 13 ), 16 );
-   return parsed % populationSize === 0;
+   if ( acceptPercentage >= 1 ) {
+   return true;
+   }
+   return parsed / Math.pow( 2, 52 ) < acceptPercentage;
}
 
function chooseOne( options ) {
@@ -14,228 +19,23 @@
return options[ Math.floor( parsed / step ) ];
}
 
-   // Only accept enwiki, NS_MAIN for MVP feasability test
-   if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ||
-   mw.config.get( 'wgDBname' ) !== 'enwiki'
-   ) {
+   // Page is not part of this test
+   if ( !mw.config.exists( 'wgWMESearchRelevancePages' ) ) {
return;
}
 
-   // For the MVP we are simply hardcoding the list of queries and 
articles.
-   // If the MVP shows to return data that isn't complete

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.17]: Encode human search relevance survey into html output

2017-09-06 Thread EBernhardson (Code Review)

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

Change subject: Encode human search relevance survey into html output
..

Encode human search relevance survey into html output

Moves the search relevance configuration from javascript into php
configuration so it can be run on a larger number of pages without
exploding the size of javascript delivered to everyone with all
that config.

The downside of this approach is that because the config is cached
into the page html any updates have to work their way through varnish
caching. For the initial test this should be fine as we can purge the
relevant pages over some small time period. In the future when we are
doing larger scale collection we just have to keep in mind that
configuration changes take around 7 days to propogate.

Bug: T174387
Change-Id: I7ae522155e67610d25b5857d7b3918559bce8bc7
(cherry picked from commit e722fe1a9b0d41c3597f9f9326e7fc6f0e1cd9c6)
---
M WikimediaEventsHooks.php
M extension.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
3 files changed, 35 insertions(+), 220 deletions(-)


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

diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 0d8b7e5..709eb12 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -644,4 +644,14 @@
);
}
 
+   public static function onMakeGlobalVariablesScript( array &$vars, 
OutputPage $out ) {
+   global $wgWMESearchRelevancePages;
+   if ( $vars['wgAction'] === 'view' ) {
+   $articleId = $out->getTitle()->getArticleID();
+   if ( isset( $wgWMESearchRelevancePages[$articleId] ) ) {
+   $vars['wgWMESearchRelevancePages'] = 
$wgWMESearchRelevancePages[$articleId];
+   }
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 63a8487..db369ac 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,9 @@
],
"ChangesListSpecialPageStructuredFilters": [

"WikimediaEventsHooks::onChangesListSpecialPageStructuredFilters"
+   ],
+   "MakeGlobalVariablesScript": [
+   "WikimediaEventsHooks::onMakeGlobalVariablesScript"
]
},
"MessagesDirs": {
@@ -167,7 +170,8 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js",
+   
"ext.wikimediaEvents.humanSearchRelevance.js"
],
"minerva": []
},
@@ -219,7 +223,10 @@
"config": {
"WMEReadingDepthSamplingRate": 0.005,
"WMEReadingDepthEnabled": false,
-   "WMEStatsdBaseUri": false
+   "WMEStatsdBaseUri": false,
+   "WMESearchRelevancePages": {
+   "_merge_strategy": "array_plus"
+   }
},
"manifest_version": 1
 }
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index 7ac..5ee8fb2 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -1,10 +1,15 @@
 ( function ( mw, $, undefined ) {
'use strict';
 
-   function oneIn( populationSize ) {
+   function sample( acceptPercentage ) {
var rand = mw.user.generateRandomSessionId(),
+   // take the first 52 bits of the rand value to match js
+   // integer precision
parsed = parseInt( rand.slice( 0, 13 ), 16 );
-   return parsed % populationSize === 0;
+   if ( acceptPercentage >= 1 ) {
+   return true;
+   }
+   return parsed / Math.pow( 2, 52 ) < acceptPercentage;
}
 
function chooseOne( options ) {
@@ -14,228 +19,23 @@
return options[ Math.floor( parsed / step ) ];
}
 
-   // Only accept enwiki, NS_MAIN for MVP feasability test
-   if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ||
-   mw.config.get( 'wgDBname' ) !== 'enwiki'
-   ) {
+   // Page is not part of this test
+   if ( !mw.config.exists( 'wgWMESearchRelevancePages' ) ) {
return;
}
 
-   // For the MVP we are simply hardcoding the list of queries and 
articles.
-   // If the MVP shows to return data that isn't complete

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Sync parserTests with core

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Sync parserTests with core
..


Sync parserTests with core

From core commit c808d0aefad544910ce3cb18daaac291749cf744.

A few additions to the blacklist which should probably be removed
by adding appropriate html/parsoid clauses.

Change-Id: I2b3ebc4326dedb647380048ad91447db3b5244d3
---
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
3 files changed, 204 insertions(+), 2 deletions(-)

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



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 0acc152..5ab429e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -211,6 +211,7 @@
 add("wt2html", "Special parser function", "Parser
 function implementation for pf_special missing in Parsoid.\nParser
 function implementation for pf_special missing in Parsoid.\nParser
 function implementation for pf_special missing in Parsoid.");
 add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
 add("wt2html", "Empty table rows go away", "\n Hello\n 
there\n\n\n");
+add("wt2html", "Validating that  isn't eaten by tidy (T167349)", "\n<html><style>.foo::before { 
content: \"<foo>\"; }</style></html>\n<html><style 
data-mw-foobar=\"baz\">.foo::after { content: \"<bar>\"; 
}</style></html>
\n");
 
 
 // Blacklist for wt2wt
@@ -472,6 +473,7 @@
 add("html2html", "T73074: More fostering fun", "\n
");
 add("html2html", "Image: upright option (parsoid)", "caption
\ncaption
\n

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Set base url for commitlink

2017-09-06 Thread Dzahn (Code Review)

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

Change subject: Gerrit: Set base url for commitlink
..


Gerrit: Set base url for commitlink

This is needed so that these will work in polygerrit.

Change-Id: I9d572ab932fb811c2616bc8db3142f298acf3a3b
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  Chad: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 92881fc..95cbce9 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -30,7 +30,7 @@
 link = https://bugzilla.wikimedia.org/$1
 [commentlink "changeid"]
 match = \\b(I[0-9a-f]{7,40})\\b
-link = "#/q/$1"
+link = "<%= @url %>/#/q/$1"
 [commentlink "ci-test-result"]
 match = ([^ ]+) (https://integration\\.wikimedia\\.org/ci/[a-zA-Z0-9/_.-]+\; 
target=\"_blank\" rel=\"nofollow\">)[^<]+ : ([a-zA-Z_]+)([^<]*)
 html = $2$1 $3$4
@@ -39,7 +39,7 @@
 link = https://phabricator.wikimedia.org/rSVN$1
 [commentlink "commit"]
 match = (^|\\s|[:,!?\\(\\[\\{])([0-9a-f]{7,40})\\b
-html = "$1$2"
+html = "$1/#/q/$2\">$2"
 [commentlink "cve"]
 match = \\b(CVE\\-\\d{4}\\-\\d+)\\b
 link = https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d572ab932fb811c2616bc8db3142f298acf3a3b
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Try fixing ACW setup

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Try fixing ACW setup
..


Try fixing ACW setup

* Remove superfuluous wfLoadExtension() from CS-labs.php
* Move config to IS-labs.php

Change-Id: I5131eb0b1cf3b074f8881308bff8fcfa66104adc
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 11 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 58abd0d..6feaf4d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -336,13 +336,6 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
-if ( $wmgUseArticleCreationWorkflow ) {
-   wfLoadExtension( 'ArticleCreationWorkflow' );
-   $wgArticleCreationWorkflows = [
-   [ 'namespaces' => [ 0 ], 'excludeRight' => 'autoconfirmed' ]
-   ]; // NS_MAIN is namespace 0
-}
-
 $wgStructuredChangeFiltersEnableExperimentalViews = true;
 $wgStructuredChangeFiltersEnableLiveUpdate = true;
 
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6923927..93c601d 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -471,7 +471,17 @@
],
 
'wmgUseArticleCreationWorkflow' => [
-   'default' => true,
+   'default' => false,
+   'enwiki' => true,
+   ],
+
+   'wgArticleCreationWorkflows' => [
+   'default' => [
+   [
+   'namespaces' => [ 0 ],
+   'excludeRight' => 'autoconfirmed'
+   ],
+   ],
],
 
// Ensure ?action=credits isn't break and allow to work

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5131eb0b1cf3b074f8881308bff8fcfa66104adc
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
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] operations/mediawiki-config[master]: Try fixing ACW setup

2017-09-06 Thread MaxSem (Code Review)

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

Change subject: Try fixing ACW setup
..

Try fixing ACW setup

* Remove superfuluous wfLoadExtension() from CS-labs.php
* Move config to IS-labs.php

Change-Id: I5131eb0b1cf3b074f8881308bff8fcfa66104adc
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 11 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 58abd0d..6feaf4d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -336,13 +336,6 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
-if ( $wmgUseArticleCreationWorkflow ) {
-   wfLoadExtension( 'ArticleCreationWorkflow' );
-   $wgArticleCreationWorkflows = [
-   [ 'namespaces' => [ 0 ], 'excludeRight' => 'autoconfirmed' ]
-   ]; // NS_MAIN is namespace 0
-}
-
 $wgStructuredChangeFiltersEnableExperimentalViews = true;
 $wgStructuredChangeFiltersEnableLiveUpdate = true;
 
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6923927..147dfeb 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -471,9 +471,19 @@
],
 
'wmgUseArticleCreationWorkflow' => [
-   'default' => true,
+   'default' => false,
+   'enwiki' => true,
],
 
+   'wgArticleCreationWorkflows' => [
+   'default' => [
+   [
+   'namespaces' => [ 0 ],
+   'excludeRight' => 'autoconfirmed'
+   ],
+   ],
+   ]
+
// Ensure ?action=credits isn't break and allow to work
// to cache this information. See T130820.
'wgMaxCredits' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5131eb0b1cf3b074f8881308bff8fcfa66104adc
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] operations...gerrit[master]: Use keyholder_key in scap/scap.cfg

2017-09-06 Thread Chad (Code Review)

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

Change subject: Use keyholder_key in scap/scap.cfg
..


Use keyholder_key in scap/scap.cfg

Change-Id: I8a0d512b778b09848f900c7c982547de8409a9dd
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/scap/scap.cfg b/scap/scap.cfg
index 72d5c8b..884ae54 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -3,3 +3,4 @@
 ssh_user: gerrit2
 dsh_targets: /srv/deployment/gerrit/gerrit/scap/targets
 git_fat: True
+keyholder_key: gerrit

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a0d512b778b09848f900c7c982547de8409a9dd
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/gerrit
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Thcipriani 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Disable edit section links in preview

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Disable edit section links in preview
..


Disable edit section links in preview

They're confusing and could users to lose data they've entered if
clicked on.

Bug: T129692
Change-Id: I93de31edce0c6fec375e147040f460b816459f5b
---
M resources/ext.wikiLove.core.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/ext.wikiLove.core.js b/resources/ext.wikiLove.core.js
index 7b1f1b2..bc5f8c5 100644
--- a/resources/ext.wikiLove.core.js
+++ b/resources/ext.wikiLove.core.js
@@ -565,6 +565,7 @@
'contentmodel': 'wikitext',
'text': wikitext,
'prop': 'text',
+   'disableeditsection': true,
'pst': true
} )
.done( function ( data ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93de31edce0c6fec375e147040f460b816459f5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Catrope 
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]: openstack: preserve limiting SSH listen IP for nova network ...

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: preserve limiting SSH listen IP for nova network host
..

openstack: preserve limiting SSH listen IP for nova network host

Bug: T171494
Change-Id: Icfeaa72e699a59fb9bb3a9c7f5e872295d0060ab
---
M hieradata/role/eqiad/wmcs/openstack/main/net.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/376442/1

diff --git a/hieradata/role/eqiad/wmcs/openstack/main/net.yaml 
b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
index 5e28f15..e6a9675 100644
--- a/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
+++ b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
@@ -7,3 +7,8 @@
 debdeploy::grains:
   debdeploy-nova-api:
 value: standard
+
+# routing and nat host with lots of addresses
+# lock down SSH to administrative IP only
+profile::base::ssh_server_settings:
+  listen_address: "%{::ipaddress}"

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: preserve limiting SSH listen IP for nova network ...

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: preserve limiting SSH listen IP for nova network host
..


openstack: preserve limiting SSH listen IP for nova network host

Bug: T171494
Change-Id: Icfeaa72e699a59fb9bb3a9c7f5e872295d0060ab
---
M hieradata/role/eqiad/wmcs/openstack/main/net.yaml
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/eqiad/wmcs/openstack/main/net.yaml 
b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
index 5e28f15..e6a9675 100644
--- a/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
+++ b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
@@ -7,3 +7,8 @@
 debdeploy::grains:
   debdeploy-nova-api:
 value: standard
+
+# routing and nat host with lots of addresses
+# lock down SSH to administrative IP only
+profile::base::ssh_server_settings:
+  listen_address: "%{::ipaddress}"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfeaa72e699a59fb9bb3a9c7f5e872295d0060ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
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]: [WIP] Fix link prefix/suffixes around Category and Language ...

2017-09-06 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376441 )

Change subject: [WIP] Fix link prefix/suffixes around Category and Language 
links (take 2).
..

[WIP] Fix link prefix/suffixes around Category and Language links (take 2).

Previous attempt was I943cd9bec0855d9a326b0b50739d686a29995370, reverted in
e687f2da3eb5be95855d9aafc53a7524dfaefa34 due to T174639.

Bug: T2087
Bug: T10897
Bug: T87753
Bug: T174639
Change-Id: I8228cdd3b80faf899000adb511a983edc454bc76
---
M includes/parser/Parser.php
M tests/parser/parserTests.txt
2 files changed, 61 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/376441/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 988e248..57e627e 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2296,8 +2296,11 @@

$this->mOutput->addLanguageLink( $nt->getFullText() );
}
 
+   /**
+* Strip the whitespace interwiki links 
produce, see T10897
+*/
$s = rtrim( $s . $prefix );
-   $s .= trim( $trail, "\n" ) == '' ? '' : 
$prefix . $trail;
+   $s .= rtrim( $trail, "\n" );
continue;
}
 
@@ -2322,7 +2325,11 @@
continue;
}
} elseif ( $ns == NS_CATEGORY ) {
-   $s = rtrim( $s . "\n" ); # T2087
+   /**
+* Strip the whitespace Category links 
produce, see T2087
+*/
+   $s = rtrim( $s . $prefix ); # T2087, 
T87753
+   $s .= rtrim( $trail, "\n" );
 
if ( $wasblank ) {
$sortkey = 
$this->getDefaultSort();
@@ -2333,11 +2340,6 @@
$sortkey = str_replace( "\n", '', 
$sortkey );
$sortkey = 
$this->getConverterLanguage()->convertCategoryKey( $sortkey );
$this->mOutput->addCategory( 
$nt->getDBkey(), $sortkey );
-
-   /**
-* Strip the whitespace Category links 
produce, see T2087
-*/
-   $s .= trim( $prefix . $trail, "\n" ) == 
'' ? '' : $prefix . $trail;
 
continue;
}
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 3f93793..bd95125 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -16103,6 +16103,44 @@
 !! end
 
 !! test
+9. Categories and newlines: should behave properly with linkprefix (T87753)
+!! options
+language=ar
+!! wikitext
+foo bar
+foo bar
+[[تصنيف:Foo]]
+[[تصنيف:Bar]]
+!! html/php
+foo bar
+foo bar
+
+!! html/parsoid
+foo bar
+foo bar
+
+
+!! end
+
+!! test
+10. No regressions on internal links following category (T174639)
+!! options
+parsoid=wt2html,html2html
+!! wikitext
+[[Category:Foo]]a
+
+[[Foo]]
+!! html/php
+a
+
+Foo
+!! html/parsoid
+a
+
+Foo
+!! end
+
+!! test
 Category links with multiple namespaces
 !! wikitext
 [[Category:Project:Foo]]
@@ -16150,6 +16188,20 @@
 !! end
 
 !! test
+Link prefix/suffixes aren't applied to language links
+!! options
+parsoid=wt2html
+language=is
+!! wikitext
+x[[es:Foo]]y
+!! html/php
+xy
+
+!! html/parsoid
+xhttp://es.wikipedia.org/wiki/Foo; 
data-parsoid=""/>y
+!! end
+
+!! test
 Parsoid: Serialize link to file page with colon escape
 !! options
 parsoid

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8228cdd3b80faf899000adb511a983edc454bc76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Disable edit section links in preview

2017-09-06 Thread Legoktm (Code Review)

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

Change subject: Disable edit section links in preview
..

Disable edit section links in preview

They're confusing and could users to lose data they've entered if
clicked on.

Bug: T129692
Change-Id: I93de31edce0c6fec375e147040f460b816459f5b
---
M resources/ext.wikiLove.core.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/ext.wikiLove.core.js b/resources/ext.wikiLove.core.js
index 7b1f1b2..bc5f8c5 100644
--- a/resources/ext.wikiLove.core.js
+++ b/resources/ext.wikiLove.core.js
@@ -565,6 +565,7 @@
'contentmodel': 'wikitext',
'text': wikitext,
'prop': 'text',
+   'disableeditsection': true,
'pst': true
} )
.done( function ( data ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93de31edce0c6fec375e147040f460b816459f5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
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] operations/puppet[production]: openstack: add nova-fullstack upstart template to openstack2

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: add nova-fullstack upstart template to openstack2
..


openstack: add nova-fullstack upstart template to openstack2

Bug: T171494
Change-Id: I99645ce781c99b9ea14c319a50b1f3bd53e34b44
---
A modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb
1 file changed, 33 insertions(+), 0 deletions(-)

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



diff --git 
a/modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb 
b/modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb
new file mode 100644
index 000..a5ba920
--- /dev/null
+++ b/modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb
@@ -0,0 +1,33 @@
+# nova-fullstack-otest
+
+description "test instance lifecycle (create/setup/delete)"
+author "Chase Pettet cpet...@wikimedia.org"
+
+# When to start the service
+start on runlevel [2345]
+
+# When to stop the service
+stop on runlevel [016]
+
+# respawn the job up to 10 times within a 5 second period.
+# If the job exceeds these values, it will be stopped and
+# marked as failed.
+respawn
+respawn limit 10 60
+
+script
+export OS_USERNAME="osstackcanary"
+export OS_PASSWORD="<%= @password %>"
+/usr/local/sbin/nova-fullstack \
+   --ssh-timeout <%= @ssh_timeout %> \
+   --puppet-timeout <%= @puppet_timeout %> 
\
+   --creation-timeout <%= 
@creation_timeout %> \
+   --interval <%= @interval %> \
+   --max-pool <%= @max_pool %>  \
+   --project admin-monitoring \
+   --prepend fullstackd \
+   --image debian-8.9-jessie \
+   --flavor m1.small \
+   --keyfile <%= @keyfile %> \
+   --statsd statsd.eqiad.wmnet
+end script

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99645ce781c99b9ea14c319a50b1f3bd53e34b44
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
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]: openstack: add nova-fullstack upstart template to openstack2

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: add nova-fullstack upstart template to openstack2
..

openstack: add nova-fullstack upstart template to openstack2

Bug: T171494
Change-Id: I99645ce781c99b9ea14c319a50b1f3bd53e34b44
---
A modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb
1 file changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/376439/1

diff --git 
a/modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb 
b/modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb
new file mode 100644
index 000..a5ba920
--- /dev/null
+++ b/modules/openstack2/templates/initscripts/nova-fullstack.upstart.erb
@@ -0,0 +1,33 @@
+# nova-fullstack-otest
+
+description "test instance lifecycle (create/setup/delete)"
+author "Chase Pettet cpet...@wikimedia.org"
+
+# When to start the service
+start on runlevel [2345]
+
+# When to stop the service
+stop on runlevel [016]
+
+# respawn the job up to 10 times within a 5 second period.
+# If the job exceeds these values, it will be stopped and
+# marked as failed.
+respawn
+respawn limit 10 60
+
+script
+export OS_USERNAME="osstackcanary"
+export OS_PASSWORD="<%= @password %>"
+/usr/local/sbin/nova-fullstack \
+   --ssh-timeout <%= @ssh_timeout %> \
+   --puppet-timeout <%= @puppet_timeout %> 
\
+   --creation-timeout <%= 
@creation_timeout %> \
+   --interval <%= @interval %> \
+   --max-pool <%= @max_pool %>  \
+   --project admin-monitoring \
+   --prepend fullstackd \
+   --image debian-8.9-jessie \
+   --flavor m1.small \
+   --keyfile <%= @keyfile %> \
+   --statsd statsd.eqiad.wmnet
+end script

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Kill upside-down rotation

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Kill upside-down rotation
..


Kill upside-down rotation

Departs from the norm, has no obvious benefit, causes bugs and complaints.

Bug: T171322
Change-Id: I13efdb42e1d3bd1ff4161b76b9f70c6f30c84ab4
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
2 files changed, 0 insertions(+), 11 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index a208649..ec0f070 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -5,7 +5,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -51,12 +50,6 @@
 return true;
 default:
 return false;
-}
-}
-
-protected void requestFullUserOrientation() {
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
 }
 }
 
diff --git 
a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java 
b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
index e5fd1cf..e1ab755 100644
--- a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
@@ -28,10 +28,6 @@
 busMethods = new EventBusMethods();
 WikipediaApp.getInstance().getBus().register(busMethods);
 
-// todo: move this down into subclasses or always support all 
orientations and move this up
-//   to BaseActivity
-requestFullUserOrientation();
-
 setTheme();
 removeSplashBackground();
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Parsoid doesn't support $wgRawHtml==true

2017-09-06 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376438 )

Change subject: Parsoid doesn't support $wgRawHtml==true
..

Parsoid doesn't support $wgRawHtml==true

This tweak to parserTests.txt removes some unnecessary entries from
our test blacklist.

Change-Id: I7ab14281402f3dcc851b1bfa23e591017bc6bca9
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 4 insertions(+), 9 deletions(-)


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

diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 5ab429e..52fddda 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -178,7 +178,6 @@
 add("wt2html", "Width-sized image (using px, no following whitespace)", "");
 add("wt2html", "Width-sized image (using px, with following whitespace - test 
regression from r39467)", "");
 add("wt2html", "Width-sized image (using px, with preceding whitespace - test 
regression from r39467)", "");
-add("wt2html", "HTML with raw HTML ($wgRawHtml==true)", "html>script>alert(1);/script>/html>");
 add("wt2html", "Parents of subpages, one level up, not named", "Subpage_test/L1/L2");
 add("wt2html", "Parents of subpages, two levels up, with lots of extra 
trailing slashes.", "Subpage_test/L1");
 add("wt2html", "RAW magic word", "{{RAW:QUERTY}}");
@@ -211,7 +210,6 @@
 add("wt2html", "Special parser function", "Parser
 function implementation for pf_special missing in Parsoid.\nParser
 function implementation for pf_special missing in Parsoid.\nParser
 function implementation for pf_special missing in Parsoid.");
 add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
 add("wt2html", "Empty table rows go away", "\n Hello\n 
there\n\n\n");
-add("wt2html", "Validating that  isn't eaten by tidy (T167349)", "\n<html><style>.foo::before { 
content: \"<foo>\"; }</style></html>\n<html><style 
data-mw-foobar=\"baz\">.foo::after { content: \"<bar>\"; 
}</style></html>
\n");
 
 
 // Blacklist for wt2wt
@@ -452,7 +450,6 @@
 add("html2html", "Width-sized image (using px, no following whitespace)", "http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\"; 
alt=\"640px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[0,64,null,null]}'/>\n");
 add("html2html", "Width-sized image (using px, with following whitespace - 
test regression from r39467)", "http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\"; 
alt=\"640px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[0,64,null,null]}'/>\n");
 add("html2html", "Width-sized image (using px, with preceding whitespace - 
test regression from r39467)", "http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\"; 
alt=\"640px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[0,64,null,null]}'/>\n");
-add("html2html", "HTML with raw HTML ($wgRawHtml==true)", "<script>alert(1);</script>\n");
 add("html2html", "Parents of subpages, one level up", "[/index.php?title=Subpage_test/L1/L2&action=edit&redlink=1
 L2]\n");
 add("html2html", "Parents of subpages, one level up, not named", "[/index.php?title=Subpage_test/L1/L2&action=edit&redlink=1
 Subpage test/L1/L2]\n");
 add("html2html", "Parents of subpages, two levels up", "[/index.php?title=Subpage_test/L1&action=edit&redlink=1
 L1]2
\n\n[/index.php?title=Subpage_test/L1&action=edit&redlink=1
 L1l]\n");
@@ -473,7 +470,6 @@
 add("html2html", "T73074: More fostering fun", "\n
[MediaWiki-commits] [Gerrit] operations/puppet[production]:	openstack: bare_metal is a hash and set main accordingly


2017-09-06

Thread
Rush (Code Review)
Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376437 )

Change subject: openstack: bare_metal is a hash and set main accordingly
..


openstack: bare_metal is a hash and set main accordingly

Bug: T171494
Change-Id: Ic97757435c1f7b47eda28c7ba673421580927a8d
---
M hieradata/common/profile/openstack/base/nova/network.yaml
M hieradata/eqiad/profile/openstack/main/nova/network.yaml
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/common/profile/openstack/base/nova/network.yaml 
b/hieradata/common/profile/openstack/base/nova/network.yaml
index bfe4c42..94e1b39 100644
--- a/hieradata/common/profile/openstack/base/nova/network.yaml
+++ b/hieradata/common/profile/openstack/base/nova/network.yaml
@@ -1,2 +1,2 @@
-profile::openstack::base::nova::network::labs_metal: []
+profile::openstack::base::nova::network::labs_metal: {}
 profile::openstack::base::nova::network::nova_dnsmasq_aliases: {}
diff --git a/hieradata/eqiad/profile/openstack/main/nova/network.yaml 
b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
index a8da411..2b7edc6 100644
--- a/hieradata/eqiad/profile/openstack/main/nova/network.yaml
+++ b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
@@ -1,4 +1,9 @@
-profile::openstack::main::nova::network::labs_metal: ['10.64.20.12']
+profile::openstack::main::nova::network::labs_metal:
+  promethium:
+'MAC': '90:b1:1c:2d:6f:0c'
+'IPv4': 10.68.16.2
+'project': wikitextexp
+
 profile::openstack::main::nova::network::dns_recursor: 
'labs-recursor0.wikimedia.org'
 profile::openstack::main::nova::network::dns_recursor_secondary: 
'labs-recursor1.wikimedia.org'
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic97757435c1f7b47eda28c7ba673421580927a8d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Rush 
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]:	openstack: bare_metal is a hash and set main accordingly


2017-09-06

Thread
Rush (Code Review)
Rush has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376437 )

Change subject: openstack: bare_metal is a hash and set main accordingly
..

openstack: bare_metal is a hash and set main accordingly

Bug: T171494
Change-Id: Ic97757435c1f7b47eda28c7ba673421580927a8d
---
M hieradata/common/profile/openstack/base/nova/network.yaml
M hieradata/eqiad/profile/openstack/main/nova/network.yaml
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/376437/1

diff --git a/hieradata/common/profile/openstack/base/nova/network.yaml 
b/hieradata/common/profile/openstack/base/nova/network.yaml
index bfe4c42..94e1b39 100644
--- a/hieradata/common/profile/openstack/base/nova/network.yaml
+++ b/hieradata/common/profile/openstack/base/nova/network.yaml
@@ -1,2 +1,2 @@
-profile::openstack::base::nova::network::labs_metal: []
+profile::openstack::base::nova::network::labs_metal: {}
 profile::openstack::base::nova::network::nova_dnsmasq_aliases: {}
diff --git a/hieradata/eqiad/profile/openstack/main/nova/network.yaml 
b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
index a8da411..2b7edc6 100644
--- a/hieradata/eqiad/profile/openstack/main/nova/network.yaml
+++ b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
@@ -1,4 +1,9 @@
-profile::openstack::main::nova::network::labs_metal: ['10.64.20.12']
+profile::openstack::main::nova::network::labs_metal:
+  promethium:
+'MAC': '90:b1:1c:2d:6f:0c'
+'IPv4': 10.68.16.2
+'project': wikitextexp
+
 profile::openstack::main::nova::network::dns_recursor: 
'labs-recursor0.wikimedia.org'
 profile::openstack::main::nova::network::dns_recursor_secondary: 
'labs-recursor1.wikimedia.org'
 

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

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

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



[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]:	Configure ACW for Beta cluster


2017-09-06

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

Change subject: Configure ACW for Beta cluster
..


Configure ACW for Beta cluster

Bug: T175054
Change-Id: I398c5c4337121a8e447cb37366aef86732fb5337
---
M wmf-config/CommonSettings-labs.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 6feaf4d..58abd0d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -336,6 +336,13 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
+if ( $wmgUseArticleCreationWorkflow ) {
+   wfLoadExtension( 'ArticleCreationWorkflow' );
+   $wgArticleCreationWorkflows = [
+   [ 'namespaces' => [ 0 ], 'excludeRight' => 'autoconfirmed' ]
+   ]; // NS_MAIN is namespace 0
+}
+
 $wgStructuredChangeFiltersEnableExperimentalViews = true;
 $wgStructuredChangeFiltersEnableLiveUpdate = true;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I398c5c4337121a8e447cb37366aef86732fb5337
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
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[fundraising/REL1_27]:	Update DonationInterface submodule


2017-09-06

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

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

Change-Id: I7a5b8a8c2bf69db4883202446c9fa6fa6425df53
---
M extensions/DonationInterface
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 39771d8..a44fa65 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit 39771d84e7e88a6a841d6feb3a2ac9b8672bc2bc
+Subproject commit a44fa6558eb078a0a1c3544148bc522635d74678

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a5b8a8c2bf69db4883202446c9fa6fa6425df53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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



[MediaWiki-commits] [Gerrit] operations/puppet[production]: Enable	topic deletion for kafka-jumbo


2017-09-06

Thread
Ottomata (Code Review)
Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376436 )

Change subject: Enable topic deletion for kafka-jumbo
..


Enable topic deletion for kafka-jumbo

Change-Id: I8fc24fbb39f22f1ab0002df18c7fb9d4ef98613d
---
M modules/confluent/manifests/kafka/broker.pp
M modules/confluent/templates/kafka/server.properties.erb
M modules/profile/manifests/kafka/broker.pp
3 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/modules/confluent/manifests/kafka/broker.pp 
b/modules/confluent/manifests/kafka/broker.pp
index 0f025a3..3bb4935 100644
--- a/modules/confluent/manifests/kafka/broker.pp
+++ b/modules/confluent/manifests/kafka/broker.pp
@@ -73,6 +73,9 @@
 #   The default replication factor for automatically created topics.
 #   Default: 1
 #
+# [*delete_topic_enable*]
+#   Enables topic deletion.  Default: undef (false)
+#
 # [*min_insync_replicas*]
 #   When producing with acks=all, this specifiies the number of replicas that 
should be in
 #   a partition's ISR.  If fewer than this are present, the produce request 
will fail.
@@ -233,6 +236,7 @@
 
 $num_partitions  = 1,
 $default_replication_factor  = 1,
+$delete_topic_enable = undef,
 $offsets_topic_replication_factor= undef,
 $min_insync_replicas = 1,
 $replica_lag_time_max_ms = undef,
diff --git a/modules/confluent/templates/kafka/server.properties.erb 
b/modules/confluent/templates/kafka/server.properties.erb
index b289178..9a3e336 100644
--- a/modules/confluent/templates/kafka/server.properties.erb
+++ b/modules/confluent/templates/kafka/server.properties.erb
@@ -105,6 +105,11 @@
 # Default to the number of brokers in this cluster.
 default.replication.factor=<%= @default_replication_factor %>
 
+<% if @delete_topic_enable -%>
+# Enables topic deletion
+delete.topic.enable=<%= @delete_topic_enable %>
+<% end -%>
+
 <% if @offsets_topic_replication_factor -%>
 # The replication factor for the group metadata internal topics 
"__consumer_offsets" and "__transaction_state"
 # For anything other than development testing, a value greater than 1 is 
recommended for to ensure availability such as 3.
diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index e05badf..4d4b183 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -187,6 +187,7 @@
 nofiles_ulimit   => $nofiles_ulimit,
 default_replication_factor   => min(3, $config['brokers']['size']),
 offsets_topic_replication_factor => min(3,  
$config['brokers']['size']),
+delete_topic_enable  => true,
 # TODO: This can be removed once it is a default
 # in ::confluent::kafka module
 inter_broker_protocol_version=> '0.11.0',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fc24fbb39f22f1ab0002df18c7fb9d4ef98613d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
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...parsoid[master]: T175101:	Remove excessive HTML entity encoding


2017-09-06

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

Change subject: T175101: Remove excessive HTML entity encoding
..


T175101: Remove excessive HTML entity encoding

Change-Id: I077218c6bb9b2ddbf2d6d40f2bf8c5dd9527f951
---
M lib/api/apiUtils.js
M lib/utils/Util.js
M tests/mocha/api.js
3 files changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/lib/api/apiUtils.js b/lib/api/apiUtils.js
index 08cf704..c2ac472 100644
--- a/lib/api/apiUtils.js
+++ b/lib/api/apiUtils.js
@@ -74,7 +74,7 @@
// though that's probably offset by setting the header above
body = String(body);
if (!omitEscape) {
-   body = Util.entityEncodeAll(body);
+   body = Util.escapeHtml(body);
}
res.send(body);  // Default string encoding for send is text/html
 };
diff --git a/lib/utils/Util.js b/lib/utils/Util.js
index 755b173..f5664a8 100644
--- a/lib/utils/Util.js
+++ b/lib/utils/Util.js
@@ -1395,6 +1395,10 @@
});
 };
 
+Util.escapeHtml = function(s) {
+   return s.replace(/["'&<>]/g, entities.encodeHTML5);
+};
+
 /** Encode all characters as entity references.  This is done to make
  *  characters safe for wikitext (regardless of whether they are
  *  HTML-safe). */
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index b8d81ec..f8f657e 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -110,13 +110,13 @@
 
it('should return an html error', function(done) {
request(api)
-   .get(mockDomain + '/v3/page/html/Doesnotexist')
+   .get('/v3/page/html/XSS')
.expect(404)
.expect(function(res) {
res.headers['content-type'].should.equal(
'text/html; charset=utf-8'
);
-   Util.decodeEntities(res.text).should.equal('Did 
not find page revisions for Doesnotexist');
+   res.text.should.equal('Invalid domain: img 
src=x onerror=javascript:alert(hi)');
})
.end(done);
});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I077218c6bb9b2ddbf2d6d40f2bf8c5dd9527f951
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Subramanya Sastry 
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	topic deletion for kafka-jumbo


2017-09-06

Thread
Ottomata (Code Review)
Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376436 )

Change subject: Enable topic deletion for kafka-jumbo
..

Enable topic deletion for kafka-jumbo

Change-Id: I8fc24fbb39f22f1ab0002df18c7fb9d4ef98613d
---
M modules/confluent/manifests/kafka/broker.pp
M modules/confluent/templates/kafka/server.properties.erb
M modules/profile/manifests/kafka/broker.pp
3 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/376436/1

diff --git a/modules/confluent/manifests/kafka/broker.pp 
b/modules/confluent/manifests/kafka/broker.pp
index 0f025a3..7270b21 100644
--- a/modules/confluent/manifests/kafka/broker.pp
+++ b/modules/confluent/manifests/kafka/broker.pp
@@ -73,6 +73,9 @@
 #   The default replication factor for automatically created topics.
 #   Default: 1
 #
+# [*delete_topic_enable*]
+#   Enables topic deletion.  Default: false
+#
 # [*min_insync_replicas*]
 #   When producing with acks=all, this specifiies the number of replicas that 
should be in
 #   a partition's ISR.  If fewer than this are present, the produce request 
will fail.
@@ -233,6 +236,7 @@
 
 $num_partitions  = 1,
 $default_replication_factor  = 1,
+$delete_topic_enable = undef,
 $offsets_topic_replication_factor= undef,
 $min_insync_replicas = 1,
 $replica_lag_time_max_ms = undef,
diff --git a/modules/confluent/templates/kafka/server.properties.erb 
b/modules/confluent/templates/kafka/server.properties.erb
index b289178..9a3e336 100644
--- a/modules/confluent/templates/kafka/server.properties.erb
+++ b/modules/confluent/templates/kafka/server.properties.erb
@@ -105,6 +105,11 @@
 # Default to the number of brokers in this cluster.
 default.replication.factor=<%= @default_replication_factor %>
 
+<% if @delete_topic_enable -%>
+# Enables topic deletion
+delete.topic.enable=<%= @delete_topic_enable %>
+<% end -%>
+
 <% if @offsets_topic_replication_factor -%>
 # The replication factor for the group metadata internal topics 
"__consumer_offsets" and "__transaction_state"
 # For anything other than development testing, a value greater than 1 is 
recommended for to ensure availability such as 3.
diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index e05badf..4d4b183 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -187,6 +187,7 @@
 nofiles_ulimit   => $nofiles_ulimit,
 default_replication_factor   => min(3, $config['brokers']['size']),
 offsets_topic_replication_factor => min(3,  
$config['brokers']['size']),
+delete_topic_enable  => true,
 # TODO: This can be removed once it is a default
 # in ::confluent::kafka module
 inter_broker_protocol_version=> '0.11.0',

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

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

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



[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Sync	parserTests with core


2017-09-06

Thread
C. Scott Ananian (Code Review)
C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376435 )

Change subject: Sync parserTests with core
..

Sync parserTests with core

From core commit c808d0aefad544910ce3cb18daaac291749cf744.

A few additions to the blacklist which should probably be removed
by adding appropriate html/parsoid clauses.

Change-Id: I2b3ebc4326dedb647380048ad91447db3b5244d3
---
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
3 files changed, 204 insertions(+), 2 deletions(-)


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

diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 0acc152..5ab429e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -211,6 +211,7 @@
 add("wt2html", "Special parser function", "Parser
 function implementation for pf_special missing in Parsoid.\nParser
 function implementation for pf_special missing in Parsoid.\nParser
 function implementation for pf_special missing in Parsoid.");
 add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
 add("wt2html", "Empty table rows go away", "\n Hello\n 
there\n\n\n");
+add("wt2html", "Validating that  isn't eaten by tidy (T167349)", "\n<html><style>.foo::before { 
content: \"<foo>\"; }</style></html>\n<html><style 
data-mw-foobar=\"baz\">.foo::after { content: \"<bar>\"; 
}</style></html>
\n");
 
 
 // Blacklist for wt2wt
@@ -472,6 +473,7 @@
 add("html2html", "T73074: More fostering fun", "\n

































");
 add("html2html", "Image: upright option (parsoid)", "caption
\ncaption
\n

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 2cb6281

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Update mobileapps to 2cb6281
..


Update mobileapps to 2cb6281

List of changes:
b6396b8 Hygiene: POTD/set content-type header
9fe21a0 Hygiene: Add test for parseSpokenWikipedia
b4e2667 Hygiene: update diff test results
f306722 Allow custom content types
7d1315d Hygiene: rename test parseInfobox.js to parse-infobox-test.js
09254fc Hygiene: rename function pageContentPromise to pageJsonPromise
fa2a0d0 Hygiene: Split up tests for sectioning
f526b06 Add tests for extractLeadIntroduction and fix edge case
448975d Make it easier to run unit tests
cb6c625 Hygiene: Correct summary spec test
ae1a658 Empty tags are omitted from summary output
1652e58 Strip any content in brackets (with a few exceptions)
84fab7c Lead intro provided for pages with only one section
bdcced5 Fix 'year page' identification bug.
48b8d63 Add Portuguese to on this day endpoint.
590ef51 Hygiene: update diff test results
88b7bfc Add read-html route
72f4141 Add scripts to measure payloads
af93b72 Add Russian, Spanish and Arabic to 'On this day' endpoint.
9fe8999 read-html: strip reference list contents
ceaf441 Restrict removal of back links in references to legacy version
63da6a0 Add read-base-html route
3f2fd1a Parenthetical stripping should not be greedy
55df4b5 Response format should be json
061c574 Rename endpoint preview-html to summary
2cb6281 Change summary endpoint Content-Type to JSON
xxx Update node module dependencies

Change-Id: I36060cec54b8ee7a7727787f88cbceade71e8916
---
M node_modules/accepts/index.js
M node_modules/accepts/package.json
M node_modules/core-js/LICENSE
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/fn/array/virtual/iterator.js
M node_modules/core-js/fn/array/virtual/values.js
M node_modules/core-js/fn/string/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/values.js
M node_modules/core-js/library/fn/string/virtual/iterator.js
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_promise-resolve.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_promise-resolve.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/domino/package.json
M node_modules/kad/package.json
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/package.json
M node_modules/msgpack5/dist/msgpack5.js
M node_modules/msgpack5/dist/msgpack5.min.js
M node_modules/msgpack5/package.json
M node_modules/msgpack5/test/levelup-encoding.js
M node_modules/nan/nan.h
M node_modules/nan/nan_converters.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/package.json
A node_modules/parsoid-dom-utils/.jshintignore
A node_modules/parsoid-dom-utils/.jshintrc
A node_modules/parsoid-dom-utils/.npmignore
A node_modules/parsoid-dom-utils/.travis.yml
A node_modules/parsoid-dom-utils/LICENSE
A node_modules/parsoid-dom-utils/index.js
A node_modules/parsoid-dom-utils/lib/content_removal.js
A node_modules/parsoid-dom-utils/lib/section_diff.js
A node_modules/parsoid-dom-utils/lib/sections.js
A node_modules/parsoid-dom-utils/package.json
A node_modules/parsoid-dom-utils/test/section_diff.js
A node_modules/parsoid-dom-utils/test/sections.js
A node_modules/parsoid-dom-utils/test/sections.yaml
M src
59 files changed, 5,680 insertions(+), 3,798 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36060cec54b8ee7a7727787f88cbceade71e8916
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: pass in network_public_ip for nova network

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: pass in network_public_ip for nova network
..


openstack: pass in network_public_ip for nova network

Bug: T171494
Change-Id: Ib83532ae2a38b817ec3bcf87ea085679f26f9af8
---
M modules/profile/manifests/openstack/base/nova/network/service.pp
M modules/profile/manifests/openstack/labtest/nova/network/service.pp
M modules/profile/manifests/openstack/main/nova/network/service.pp
3 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/openstack/base/nova/network/service.pp 
b/modules/profile/manifests/openstack/base/nova/network/service.pp
index 233c4bb..31a25d5 100644
--- a/modules/profile/manifests/openstack/base/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/network/service.pp
@@ -8,7 +8,7 @@
 $network_flat_interface = 
hiera('profile::openstack::base::nova::network_flat_interface'),
 $network_flat_tagged_base_interface = 
hiera('profile::openstack::base::nova::network_flat_tagged_base_interface'),
 $network_flat_interface_vlan = 
hiera('profile::openstack::base::nova::network_flat_interface_vlan'),
-$network_public_ip = 
hiera('profile::openstack::labtestn::nova::network_public_ip'),
+$network_public_ip = 
hiera('profile::openstack::base::nova::network_public_ip'),
 ) {
 
 if ($::fqdn == $nova_network_host) {
diff --git 
a/modules/profile/manifests/openstack/labtest/nova/network/service.pp 
b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
index 4895097..8e44171 100644
--- a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
@@ -6,6 +6,7 @@
 $network_flat_interface = 
hiera('profile::openstack::labtest::nova::network_flat_interface'),
 $network_flat_tagged_base_interface = 
hiera('profile::openstack::labtest::nova::network_flat_tagged_base_interface'),
 $network_flat_interface_vlan = 
hiera('profile::openstack::labtest::nova::network_flat_interface_vlan'),
+$network_public_ip = 
hiera('profile::openstack::labtest::nova::network_public_ip'),
 ) {
 
 require ::profile::openstack::labtest::nova::common
@@ -17,6 +18,7 @@
 network_flat_interface => $network_flat_interface,
 network_flat_tagged_base_interface => 
$network_flat_tagged_base_interface,
 network_flat_interface_vlan=> $network_flat_interface_vlan,
+network_public_ip  => $network_public_ip,
 }
 
 class {'::openstack2::nova::network::monitor':
diff --git a/modules/profile/manifests/openstack/main/nova/network/service.pp 
b/modules/profile/manifests/openstack/main/nova/network/service.pp
index da8671e..7f75f07 100644
--- a/modules/profile/manifests/openstack/main/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/main/nova/network/service.pp
@@ -8,6 +8,7 @@
 $network_flat_interface = 
hiera('profile::openstack::main::nova::network_flat_interface'),
 $network_flat_tagged_base_interface = 
hiera('profile::openstack::main::nova::network_flat_tagged_base_interface'),
 $network_flat_interface_vlan = 
hiera('profile::openstack::main::nova::network_flat_interface_vlan'),
+$network_public_ip = 
hiera('profile::openstack::main::nova::network_public_ip'),
 ) {
 
 require ::profile::openstack::main::nova::common
@@ -21,6 +22,7 @@
 network_flat_interface => $network_flat_interface,
 network_flat_tagged_base_interface => 
$network_flat_tagged_base_interface,
 network_flat_interface_vlan=> $network_flat_interface_vlan,
+network_public_ip  => $network_public_ip,
 }
 
 class {'::openstack2::nova::network::monitor':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib83532ae2a38b817ec3bcf87ea085679f26f9af8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
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[fundraising/REL1_27]: Update DonationInterface submodule

2017-09-06 Thread Ejegg (Code Review)

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

Change subject: Update DonationInterface submodule
..

Update DonationInterface submodule

Change-Id: I7a5b8a8c2bf69db4883202446c9fa6fa6425df53
---
M extensions/DonationInterface
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/376434/1

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 39771d8..a44fa65 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit 39771d84e7e88a6a841d6feb3a2ac9b8672bc2bc
+Subproject commit a44fa6558eb078a0a1c3544148bc522635d74678

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a5b8a8c2bf69db4883202446c9fa6fa6425df53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: pass in network_public_ip for nova network

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: pass in network_public_ip for nova network
..

openstack: pass in network_public_ip for nova network

Bug: T171494
Change-Id: Ib83532ae2a38b817ec3bcf87ea085679f26f9af8
---
M modules/profile/manifests/openstack/base/nova/network/service.pp
M modules/profile/manifests/openstack/labtest/nova/network/service.pp
M modules/profile/manifests/openstack/main/nova/network/service.pp
3 files changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/modules/profile/manifests/openstack/base/nova/network/service.pp 
b/modules/profile/manifests/openstack/base/nova/network/service.pp
index 233c4bb..31a25d5 100644
--- a/modules/profile/manifests/openstack/base/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/network/service.pp
@@ -8,7 +8,7 @@
 $network_flat_interface = 
hiera('profile::openstack::base::nova::network_flat_interface'),
 $network_flat_tagged_base_interface = 
hiera('profile::openstack::base::nova::network_flat_tagged_base_interface'),
 $network_flat_interface_vlan = 
hiera('profile::openstack::base::nova::network_flat_interface_vlan'),
-$network_public_ip = 
hiera('profile::openstack::labtestn::nova::network_public_ip'),
+$network_public_ip = 
hiera('profile::openstack::base::nova::network_public_ip'),
 ) {
 
 if ($::fqdn == $nova_network_host) {
diff --git 
a/modules/profile/manifests/openstack/labtest/nova/network/service.pp 
b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
index 4895097..8e44171 100644
--- a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
@@ -6,6 +6,7 @@
 $network_flat_interface = 
hiera('profile::openstack::labtest::nova::network_flat_interface'),
 $network_flat_tagged_base_interface = 
hiera('profile::openstack::labtest::nova::network_flat_tagged_base_interface'),
 $network_flat_interface_vlan = 
hiera('profile::openstack::labtest::nova::network_flat_interface_vlan'),
+$network_public_ip = 
hiera('profile::openstack::labtest::nova::network_public_ip'),
 ) {
 
 require ::profile::openstack::labtest::nova::common
@@ -17,6 +18,7 @@
 network_flat_interface => $network_flat_interface,
 network_flat_tagged_base_interface => 
$network_flat_tagged_base_interface,
 network_flat_interface_vlan=> $network_flat_interface_vlan,
+network_public_ip  => $network_public_ip,
 }
 
 class {'::openstack2::nova::network::monitor':
diff --git a/modules/profile/manifests/openstack/main/nova/network/service.pp 
b/modules/profile/manifests/openstack/main/nova/network/service.pp
index da8671e..7f75f07 100644
--- a/modules/profile/manifests/openstack/main/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/main/nova/network/service.pp
@@ -8,6 +8,7 @@
 $network_flat_interface = 
hiera('profile::openstack::main::nova::network_flat_interface'),
 $network_flat_tagged_base_interface = 
hiera('profile::openstack::main::nova::network_flat_tagged_base_interface'),
 $network_flat_interface_vlan = 
hiera('profile::openstack::main::nova::network_flat_interface_vlan'),
+$network_public_ip = 
hiera('profile::openstack::main::nova::network_public_ip'),
 ) {
 
 require ::profile::openstack::main::nova::common
@@ -21,6 +22,7 @@
 network_flat_interface => $network_flat_interface,
 network_flat_tagged_base_interface => 
$network_flat_tagged_base_interface,
 network_flat_interface_vlan=> $network_flat_interface_vlan,
+network_public_ip  => $network_public_ip,
 }
 
 class {'::openstack2::nova::network::monitor':

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Fix spelling error.

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix spelling error.
..


Fix spelling error.

Bug: T151270
Change-Id: If06c32a19a4f4cdc7faaeb4bee228f182ac6adfa
---
M templates/CRM/Contact/Page/DedupeFind.tpl
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl 
b/templates/CRM/Contact/Page/DedupeFind.tpl
index ca4e491..f518420 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -122,7 +122,7 @@
   {foreach from=$dupe_contacts[$cid] item=dupe_name key=dupe_id}
 {if $dupe_name}
   {capture assign=link}{$dupe_name}{/capture}
-  {capture assign=merge}{ts}merfe{/ts}{/capture}
+  {capture assign=merge}{ts}merge{/ts}{/capture}
   
   {$link}
   {$merge}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If06c32a19a4f4cdc7faaeb4bee228f182ac6adfa
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
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]: Configure ACW for Beta cluster

2017-09-06 Thread Niharika29 (Code Review)

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

Change subject: Configure ACW for Beta cluster
..

Configure ACW for Beta cluster

Bug: T175054
Change-Id: I398c5c4337121a8e447cb37366aef86732fb5337
---
M wmf-config/CommonSettings-labs.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 6feaf4d..a897376 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -336,6 +336,12 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
+
+if ( $wmgUseArticleCreationWorkflow ) {
+   wfLoadExtension( 'ArticleCreationWorkflow' );
+   $wgArticleCreationWorkflows = [[ 'namespaces' => [0], 'excludeRight' => 
'sysop' ]];
+}
+
 $wgStructuredChangeFiltersEnableExperimentalViews = true;
 $wgStructuredChangeFiltersEnableLiveUpdate = true;
 

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Kill upside-down rotation

2017-09-06 Thread Mholloway (Code Review)

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

Change subject: Kill upside-down rotation
..

Kill upside-down rotation

Departs from the norm, has no obvious benefit, causes bugs and complaints.

Bug: T171322
Change-Id: I13efdb42e1d3bd1ff4161b76b9f70c6f30c84ab4
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
2 files changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index a208649..ec0f070 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -5,7 +5,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -51,12 +50,6 @@
 return true;
 default:
 return false;
-}
-}
-
-protected void requestFullUserOrientation() {
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
 }
 }
 
diff --git 
a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java 
b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
index e5fd1cf..e1ab755 100644
--- a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
@@ -28,10 +28,6 @@
 busMethods = new EventBusMethods();
 WikipediaApp.getInstance().getBus().register(busMethods);
 
-// todo: move this down into subclasses or always support all 
orientations and move this up
-//   to BaseActivity
-requestFullUserOrientation();
-
 setTheme();
 removeSplashBackground();
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Follow patch from QA on find duplicates task

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Follow patch from QA on find duplicates task
..


Follow patch from QA on find duplicates task

Per reviewer comments on PR the  needs exploding before counting

Bug: T151270
Change-Id: Ic0b506684116c1f4f9ef933bb3f1d3e69db4a948
---
M CRM/Contact/Form/Task/FindDuplicates.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/CRM/Contact/Form/Task/FindDuplicates.php 
b/CRM/Contact/Form/Task/FindDuplicates.php
index cc7cfa6..7f95a16 100644
--- a/CRM/Contact/Form/Task/FindDuplicates.php
+++ b/CRM/Contact/Form/Task/FindDuplicates.php
@@ -78,12 +78,13 @@
   CRM_Core_Error::statusBounce(ts('It was not possible to identify a 
default rule that was applicable to all selected contacts. You must choose only 
one contact type. You chose %1', array($contactType)));
 }
 
+$contactIDArray = explode(',', $contactIDs);
 
CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', 
array(
   'reset' => 1,
   'action' => 'update',
   'rgid' => $rule_group_id,
-  'criteria' => json_encode(array('contact' => array('id' => array('IN' => 
explode(',', $contactIDs),
-  'limit' => count($contactIDs),
+  'criteria' => json_encode(array('contact' => array('id' => array('IN' => 
$contactIDArray,
+  'limit' => count($contactIDArray),
 )));
   }
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0b506684116c1f4f9ef933bb3f1d3e69db4a948
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 2cb6281

2017-09-06 Thread BearND (Code Review)

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

Change subject: Update mobileapps to 2cb6281
..

Update mobileapps to 2cb6281

List of changes:
b6396b8 Hygiene: POTD/set content-type header
9fe21a0 Hygiene: Add test for parseSpokenWikipedia
b4e2667 Hygiene: update diff test results
f306722 Allow custom content types
7d1315d Hygiene: rename test parseInfobox.js to parse-infobox-test.js
09254fc Hygiene: rename function pageContentPromise to pageJsonPromise
fa2a0d0 Hygiene: Split up tests for sectioning
f526b06 Add tests for extractLeadIntroduction and fix edge case
448975d Make it easier to run unit tests
cb6c625 Hygiene: Correct summary spec test
ae1a658 Empty tags are omitted from summary output
1652e58 Strip any content in brackets (with a few exceptions)
84fab7c Lead intro provided for pages with only one section
bdcced5 Fix 'year page' identification bug.
48b8d63 Add Portuguese to on this day endpoint.
590ef51 Hygiene: update diff test results
88b7bfc Add read-html route
72f4141 Add scripts to measure payloads
af93b72 Add Russian, Spanish and Arabic to 'On this day' endpoint.
9fe8999 read-html: strip reference list contents
ceaf441 Restrict removal of back links in references to legacy version
63da6a0 Add read-base-html route
3f2fd1a Parenthetical stripping should not be greedy
55df4b5 Response format should be json
061c574 Rename endpoint preview-html to summary
2cb6281 Change summary endpoint Content-Type to JSON
xxx Update node module dependencies

Change-Id: I36060cec54b8ee7a7727787f88cbceade71e8916
---
M node_modules/accepts/index.js
M node_modules/accepts/package.json
M node_modules/core-js/LICENSE
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/fn/array/virtual/iterator.js
M node_modules/core-js/fn/array/virtual/values.js
M node_modules/core-js/fn/string/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/values.js
M node_modules/core-js/library/fn/string/virtual/iterator.js
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_promise-resolve.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_promise-resolve.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/domino/package.json
M node_modules/kad/package.json
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/package.json
M node_modules/msgpack5/dist/msgpack5.js
M node_modules/msgpack5/dist/msgpack5.min.js
M node_modules/msgpack5/package.json
M node_modules/msgpack5/test/levelup-encoding.js
M node_modules/nan/nan.h
M node_modules/nan/nan_converters.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/package.json
A node_modules/parsoid-dom-utils/.jshintignore
A node_modules/parsoid-dom-utils/.jshintrc
A node_modules/parsoid-dom-utils/.npmignore
A node_modules/parsoid-dom-utils/.travis.yml
A node_modules/parsoid-dom-utils/LICENSE
A node_modules/parsoid-dom-utils/index.js
A node_modules/parsoid-dom-utils/lib/content_removal.js
A node_modules/parsoid-dom-utils/lib/section_diff.js
A node_modules/parsoid-dom-utils/lib/sections.js
A node_modules/parsoid-dom-utils/package.json
A node_modules/parsoid-dom-utils/test/section_diff.js
A node_modules/parsoid-dom-utils/test/sections.js
A node_modules/parsoid-dom-utils/test/sections.yaml
M src
59 files changed, 5,680 insertions(+), 3,798 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/30/376430/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36060cec54b8ee7a7727787f88cbceade71e8916
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: correct key paths for nova/network hiera

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: correct key paths for nova/network hiera
..


openstack: correct key paths for nova/network hiera

Bug: T171494
Change-Id: I61ccea72f715006f00ea88c6bc7026bba5ff0cc3
---
M hieradata/eqiad/profile/openstack/main/nova/network.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/hieradata/eqiad/profile/openstack/main/nova/network.yaml 
b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
index 80aad6d..a8da411 100644
--- a/hieradata/eqiad/profile/openstack/main/nova/network.yaml
+++ b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
@@ -1,9 +1,9 @@
-profile::openstack::labtestn::nova::network::labs_metal: ['10.64.20.12']
-profile::openstack::labtestn::nova::network::dns_recursor: 
'labs-recursor0.wikimedia.org'
-profile::openstack::labtestn::nova::network::dns_recursor_secondary: 
'labs-recursor1.wikimedia.org'
+profile::openstack::main::nova::network::labs_metal: ['10.64.20.12']
+profile::openstack::main::nova::network::dns_recursor: 
'labs-recursor0.wikimedia.org'
+profile::openstack::main::nova::network::dns_recursor_secondary: 
'labs-recursor1.wikimedia.org'
 
 # A wide variety of hosts are reachable via a public web proxy
-profile::openstack::labtestn::nova::network::nova_dnsmasq_aliases:
+profile::openstack::main::nova::network::nova_dnsmasq_aliases:
   deployment-cache-text04:
 'public_ip': '208.80.155.135'
 'private_ip': '10.68.18.103'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61ccea72f715006f00ea88c6bc7026bba5ff0cc3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
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]: openstack: correct key paths for nova/network hiera

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: correct key paths for nova/network hiera
..

openstack: correct key paths for nova/network hiera

Bug: T171494
Change-Id: I61ccea72f715006f00ea88c6bc7026bba5ff0cc3
---
M hieradata/eqiad/profile/openstack/main/nova/network.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/376429/1

diff --git a/hieradata/eqiad/profile/openstack/main/nova/network.yaml 
b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
index 80aad6d..a8da411 100644
--- a/hieradata/eqiad/profile/openstack/main/nova/network.yaml
+++ b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
@@ -1,9 +1,9 @@
-profile::openstack::labtestn::nova::network::labs_metal: ['10.64.20.12']
-profile::openstack::labtestn::nova::network::dns_recursor: 
'labs-recursor0.wikimedia.org'
-profile::openstack::labtestn::nova::network::dns_recursor_secondary: 
'labs-recursor1.wikimedia.org'
+profile::openstack::main::nova::network::labs_metal: ['10.64.20.12']
+profile::openstack::main::nova::network::dns_recursor: 
'labs-recursor0.wikimedia.org'
+profile::openstack::main::nova::network::dns_recursor_secondary: 
'labs-recursor1.wikimedia.org'
 
 # A wide variety of hosts are reachable via a public web proxy
-profile::openstack::labtestn::nova::network::nova_dnsmasq_aliases:
+profile::openstack::main::nova::network::nova_dnsmasq_aliases:
   deployment-cache-text04:
 'public_ip': '208.80.155.135'
 'private_ip': '10.68.18.103'

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add kafka rack (row) awareness configs

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: Add kafka rack (row) awareness configs
..


Add kafka rack (row) awareness configs

Bug: T167992
Change-Id: Ie90aa97d8b5f456b343de7ff5400aac917d63823
---
M hieradata/common.yaml
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a415be3..801e8ee 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -469,22 +469,31 @@
   kafka2003.codfw.wmnet:
 id: 2003
 
-  # TODO: Add rack/row comments once these are racked.
+  # NOTE:  The 'rack' here is used by the confluent kafka module
+  # to assign broker.rack for Kafka rack awareness.  We are actually setting
+  # the row letter, not the full row-rack number, since each of these brokers
+  # are in different racks anyway.  We do awareness at the row level.
   jumbo-eqiad:
 zookeeper_cluster_name: main-eqiad
 brokers:
   kafka-jumbo1001.eqiad.wmnet:
 id: 1001
+rack: A
   kafka-jumbo1002.eqiad.wmnet:
 id: 1002
+rack: A
   kafka-jumbo1003.eqiad.wmnet:
 id: 1003
+rack: B
   kafka-jumbo1004.eqiad.wmnet:
 id: 1004
+rack: C
   kafka-jumbo1005.eqiad.wmnet:
 id: 1005
+rack: C
   kafka-jumbo1006.eqiad.wmnet:
 id: 1006
+rack: D
 
 deployment_server: tin.eqiad.wmnet
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie90aa97d8b5f456b343de7ff5400aac917d63823
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
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: Live Update: download less data

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Live Update: download less data
..


RCFilters: Live Update: download less data

Make ChangesListSpecialPage respect action=render
to exclude the MW chrome (header, logo, sidebar, etc).

Introduce peek=1 in ChangesListSpecialPage to skip
the form and changes list rendering and return
200 when there is new data and 304 (not modified)
where there isn't.

Together, they reduce the page size from 49.9k to 275b on polling
and eliminate most HTTP 404 console errors.

Bug: T173613
Change-Id: I0aec878ae80e22814b196b26e944db8c78a5f91a
---
M includes/specialpage/ChangesListSpecialPage.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 29 insertions(+), 6 deletions(-)

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



diff --git a/includes/specialpage/ChangesListSpecialPage.php 
b/includes/specialpage/ChangesListSpecialPage.php
index 5f54404..04d03f5 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -519,14 +519,23 @@
public function execute( $subpage ) {
$this->rcSubpage = $subpage;
 
-   $this->setHeaders();
-   $this->outputHeader();
-   $this->addModules();
-
$rows = $this->getRows();
$opts = $this->getOptions();
if ( $rows === false ) {
$rows = new FakeResultWrapper( [] );
+   }
+
+   // Used by Structured UI app to get results without MW chrome
+   if ( $this->getRequest()->getVal( 'action' ) === 'render' ) {
+   $this->getOutput()->setArticleBodyOnly( true );
+   }
+
+   // Used by "live update" and "view newest" to check
+   // if there's new changes with minimal data transfer
+   if ( $this->getRequest()->getBool( 'peek' ) ) {
+   $code = $rows->numRows() > 0 ? 200 : 304;
+   $this->getOutput()->setStatusCode( $code );
+   return;
}
 
$batch = new LinkBatch;
@@ -542,6 +551,10 @@
}
}
$batch->execute();
+
+   $this->setHeaders();
+   $this->outputHeader();
+   $this->addModules();
$this->webOutput( $rows, $opts );
 
$rows->free();
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 81bfb47..8d0aa05 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -561,6 +561,7 @@
'liveUpdate',
{
limit: 1,
+   peek: 1, // bypasses all UI
from: this.changesListModel.getNextFrom()
}
);
@@ -1130,6 +1131,7 @@
 
counterId = counterId || 'updateChangesList';
params = params || {};
+   params.action = 'render'; // bypasses MW chrome
 
uri.extend( params );
 
@@ -1149,7 +1151,7 @@
 
return $.ajax( uri.toString(), { contentType: 'html' } )
.then(
-   function ( html ) {
+   function ( html, reason ) {
var $parsed,
pieces;
 
@@ -1157,7 +1159,15 @@
return $.Deferred().reject();
}
 
-   $parsed = $( $.parseHTML( html ) );
+   if ( params.peek && reason === 
'notmodified' ) {
+   return {
+   changes: 'NO_RESULTS'
+   };
+   }
+
+   // Because of action=render, the 
response is a list of nodes.
+   // It has to be put under a root node 
so it can be queried.
+   $parsed = $( '' ).append( $( 
$.parseHTML( html ) ) );
 
pieces = {
// Changes list

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0aec878ae80e22814b196b26e944db8c78a5f91a

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add kafka rack (row) awareness configs

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: Add kafka rack (row) awareness configs
..

Add kafka rack (row) awareness configs

Bug: T167992
Change-Id: Ie90aa97d8b5f456b343de7ff5400aac917d63823
---
M hieradata/common.yaml
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/376428/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a415be3..801e8ee 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -469,22 +469,31 @@
   kafka2003.codfw.wmnet:
 id: 2003
 
-  # TODO: Add rack/row comments once these are racked.
+  # NOTE:  The 'rack' here is used by the confluent kafka module
+  # to assign broker.rack for Kafka rack awareness.  We are actually setting
+  # the row letter, not the full row-rack number, since each of these brokers
+  # are in different racks anyway.  We do awareness at the row level.
   jumbo-eqiad:
 zookeeper_cluster_name: main-eqiad
 brokers:
   kafka-jumbo1001.eqiad.wmnet:
 id: 1001
+rack: A
   kafka-jumbo1002.eqiad.wmnet:
 id: 1002
+rack: A
   kafka-jumbo1003.eqiad.wmnet:
 id: 1003
+rack: B
   kafka-jumbo1004.eqiad.wmnet:
 id: 1004
+rack: C
   kafka-jumbo1005.eqiad.wmnet:
 id: 1005
+rack: C
   kafka-jumbo1006.eqiad.wmnet:
 id: 1006
+rack: D
 
 deployment_server: tin.eqiad.wmnet
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: WIP: Add support for Schema:Print

2017-09-06 Thread Bmansurov (Code Review)

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

Change subject: WIP: Add support for Schema:Print
..

WIP: Add support for Schema:Print

Change-Id: Id506d44f572687ff9c26118ceaa69c6146fedf86
---
M WikimediaEventsHooks.php
M extension.json
A modules/ext.wikimediaEvents.print.js
3 files changed, 62 insertions(+), 1 deletion(-)


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

diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 709eb12..ff1836c 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -413,10 +413,15 @@
}
 
public static function onResourceLoaderGetConfigVars( &$vars ) {
-   global $wgWMEStatsdBaseUri, $wgWMEReadingDepthSamplingRate, 
$wgWMEReadingDepthEnabled;
+   global $wgWMEStatsdBaseUri, $wgWMEReadingDepthSamplingRate,
+   $wgWMEReadingDepthEnabled, $wgWMEPrintSamplingRate,
+   $wgWMEPrintEnabled;
+
$vars['wgWMEStatsdBaseUri'] = $wgWMEStatsdBaseUri;
$vars['wgWMEReadingDepthSamplingRate'] = 
$wgWMEReadingDepthSamplingRate;
$vars['wgWMEReadingDepthEnabled'] = $wgWMEReadingDepthEnabled;
+   $vars['wgWMEPrintSamplingRate'] = $wgWMEPrintSamplingRate;
+   $vars['wgWMEPrintEnabled'] = $wgWMEPrintEnabled;
}
 
/**
diff --git a/extension.json b/extension.json
index db369ac..4aa637c 100644
--- a/extension.json
+++ b/extension.json
@@ -94,6 +94,11 @@
"schema": "DeprecatedUsage",
"revision": 7906187
},
+   "schema.Print": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "Print",
+   "revision": 17199246
+   },
"schema.ReadingDepth": {
"class": "ResourceLoaderSchemaModule",
"schema": "ReadingDepth",
@@ -221,6 +226,8 @@
"remoteExtPath": "WikimediaEvents/modules"
},
"config": {
+   "WMEPrintSamplingRate": 0.001,
+   "WMEPrintEnabled": false,
"WMEReadingDepthSamplingRate": 0.005,
"WMEReadingDepthEnabled": false,
"WMEStatsdBaseUri": false,
diff --git a/modules/ext.wikimediaEvents.print.js 
b/modules/ext.wikimediaEvents.print.js
new file mode 100644
index 000..6081da3
--- /dev/null
+++ b/modules/ext.wikimediaEvents.print.js
@@ -0,0 +1,49 @@
+/*!
+ * Track browser print events
+ *
+ * @see https://phabricator.wikimedia.org/T169730
+ * @see https://meta.wikimedia.org/wiki/Schema:Print
+ */
+( function ( $, mw, config, user, mwExperiments ) {
+   /**
+   * Log an event to the Schema:Print
+   *
+   * @param {string} action a valid value for the action property inside 
the
+   *   schema Schema:Print
+   */
+   function logEvent( action ) {
+   mw.track( 'event.Print', data );
+   }
+
+   /**
+* @param {number} samplingRate - a float between 0 and 1 for which 
events
+*   in the schema should be logged.
+* @return {boolean}
+*/
+   function isInSample( samplingRate ) {
+   var bucket = mwExperiments.getBucket( {
+   name: 'WMEPrint',
+   enabled: true,
+   buckets: {
+   control: 1 - samplingRate,
+   A: samplingRate
+   }
+   }, user.sessionId() );
+   return bucket === 'A';
+   }
+
+   function logClick() {
+   logEvent( {
+   'action': 'clickPrintableVersion'
+   } );
+   }
+
+   if ( config.get( 'wgWMEPrintEnabled' ) &&
+isInSample( config.get( 'wgWMEPrintSamplingRate', 0 ) ) )
+   {
+   $(function () {
+   $( '#t-print' ).on( 'click', logClick );
+   });
+   }
+
+}( jQuery, mediaWiki, mediaWiki.config, mediaWiki.user, mediaWiki.experiments 
) );

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: port hiera settings to new openstack::net role

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: port hiera settings to new openstack::net role
..


openstack: port hiera settings to new openstack::net role

Bug: T171494
Change-Id: I0ebbd4a073799a18263dfb4496080e467ef28c32
---
A hieradata/role/eqiad/wmcs/openstack/main/net.yaml
A hieradata/role/eqiad/wmcs/openstack/main/net_secondary.yaml
2 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/eqiad/wmcs/openstack/main/net.yaml 
b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
new file mode 100644
index 000..5e28f15
--- /dev/null
+++ b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
@@ -0,0 +1,9 @@
+admin::groups:
+  - labnet-users
+  - wmcs-roots
+
+openstack::log_group: labnet-users
+
+debdeploy::grains:
+  debdeploy-nova-api:
+value: standard
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/net_secondary.yaml 
b/hieradata/role/eqiad/wmcs/openstack/main/net_secondary.yaml
new file mode 100644
index 000..5e28f15
--- /dev/null
+++ b/hieradata/role/eqiad/wmcs/openstack/main/net_secondary.yaml
@@ -0,0 +1,9 @@
+admin::groups:
+  - labnet-users
+  - wmcs-roots
+
+openstack::log_group: labnet-users
+
+debdeploy::grains:
+  debdeploy-nova-api:
+value: standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ebbd4a073799a18263dfb4496080e467ef28c32
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add monitoring hostgroup for jumbo_kafka_eqiad

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: Add monitoring hostgroup for jumbo_kafka_eqiad
..


Add monitoring hostgroup for jumbo_kafka_eqiad

Change-Id: Ia5a65d3fe2f2800090751886c6bc12bd07cfc057
---
M hieradata/common/monitoring.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index 4e17ffb..f8262c3 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -69,6 +69,10 @@
   ganeti_codfw:
 description: Ganeti virt cluster codfw
 
+# Kafka jumbo
+  jumbo_kafka_eqiad:
+description: Kafka jumbo cluster in eqiad
+
 # Kubernetes
   kubernetes_eqiad:
 description: Kubernetes cluster eqiad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5a65d3fe2f2800090751886c6bc12bd07cfc057
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add monitoring hostgroup for jumbo_kafka_eqiad

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: Add monitoring hostgroup for jumbo_kafka_eqiad
..

Add monitoring hostgroup for jumbo_kafka_eqiad

Change-Id: Ia5a65d3fe2f2800090751886c6bc12bd07cfc057
---
M hieradata/common/monitoring.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/376424/1

diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index 4e17ffb..f8262c3 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -69,6 +69,10 @@
   ganeti_codfw:
 description: Ganeti virt cluster codfw
 
+# Kafka jumbo
+  jumbo_kafka_eqiad:
+description: Kafka jumbo cluster in eqiad
+
 # Kubernetes
   kubernetes_eqiad:
 description: Kubernetes cluster eqiad

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Convert its base templates to soy (closure template)

2017-09-06 Thread Paladox (Code Review)

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

Change subject: Gerrit: Convert its base templates to soy (closure template)
..

Gerrit: Convert its base templates to soy (closure template)

This fixes a security issue described in T140366

This change can be merged once we upgrade to 2.14.

Bug: T140366
Change-Id: I2d34a1fefcbef0b730368e5457da7191cef39a92
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/376406/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d34a1fefcbef0b730368e5457da7191cef39a92
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: port hiera settings to new openstack::net role

2017-09-06 Thread Rush (Code Review)

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

Change subject: openstack: port hiera settings to new openstack::net role
..

openstack: port hiera settings to new openstack::net role

Bug: T171494
Change-Id: I0ebbd4a073799a18263dfb4496080e467ef28c32
---
A hieradata/role/eqiad/wmcs/openstack/main/net.yaml
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/376420/1

diff --git a/hieradata/role/eqiad/wmcs/openstack/main/net.yaml 
b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
new file mode 100644
index 000..5e28f15
--- /dev/null
+++ b/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
@@ -0,0 +1,9 @@
+admin::groups:
+  - labnet-users
+  - wmcs-roots
+
+openstack::log_group: labnet-users
+
+debdeploy::grains:
+  debdeploy-nova-api:
+value: standard

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

7bb96fffb Don't fail transaction on SuccessWithWarning
a67ddad8f Only uncheck card on load when shown
6b615954d Fix RETURNURL for PayPal EC, add tests for API params

Change-Id: I40ad3f4e9ab8bba5af5137d10da9a62af18b3ada
---
D tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
D 
tests/phpunit/includes/Responses/paypal_ec/DoExpressCheckoutPayment_11607.testresponse
2 files changed, 0 insertions(+), 492 deletions(-)

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



diff --git a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php 
b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
deleted file mode 100644
index f02315d..000
--- a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<<< HEAD   (39771d Merge branch 'master' into deployment)
-===
-providerConfigurationOverride = 
PayPalTestConfiguration::get(
-   $this->smashPigGlobalConfig
-   );
-   $this->setMwGlobals( array(
-   'wgDonationInterfaceCancelPage' => 
'https://example.com/tryAgain.php',
-   'wgPaypalExpressGatewayEnabled' => true,
-   'wgDonationInterfaceThankYouPage' => 
'https://example.org/wiki/Thank_You',
-   ) );
-   }
-
-   function testPaymentSetup() {
-   $init = array(
-   'amount' => 1.55,
-   'currency' => 'USD',
-   'payment_method' => 'paypal',
-   'utm_source' => 'CD1234_FR',
-   'utm_medium' => 'sitenotice',
-   'country' => 'US',
-   'contribution_tracking_id' => strval( mt_rand() ),
-   'language' => 'fr',
-   );
-   $gateway = $this->getFreshGatewayObject( $init );
-   $gateway::setDummyGatewayResponseCode( 'OK' );
-   $result = $gateway->doPayment();
-   $gateway->logPending(); // GatewayPage or the API calls this 
for redirects
-   $this->assertEquals(
-   
'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout=EC-8US12345X1234567U',
-   $result->getRedirect(),
-   'Wrong redirect for PayPal EC payment setup'
-   );
-   $this->assertEquals( 1, count( $gateway->curled ), 'Should have 
made 1 API call' );
-   $apiCall = $gateway->curled[0];
-   $parsed = [];
-   parse_str( $apiCall, $parsed );
-   $actualReturn = $parsed['RETURNURL'];
-   $parsedReturn = [];
-   parse_str( parse_url( $actualReturn, PHP_URL_QUERY ), 
$parsedReturn );
-   $this->assertEquals(
-   [
-   'title' => 'Special:PaypalExpressGatewayResult',
-   'order_id' => $init['contribution_tracking_id'] 
. '.1',
-   'wmf_token' => 
$gateway->token_getSaltedSessionToken()
-   ],
-   $parsedReturn
-   );
-   unset( $parsed['RETURNURL'] );
-   $expected = [
-   'USER' => 'phpunittest...@wikimedia.org',
-   'PWD' => '9876543210',
-   'VERSION' => '204',
-   'METHOD' => 'SetExpressCheckout',
-   'CANCELURL' => 'https://example.com/tryAgain.php/fr',
-   'REQCONFIRMSHIPPING' => '0',
-   'NOSHIPPING' => '1',
-   'LOCALECODE' => 'fr_US',
-   'L_PAYMENTREQUEST_0_AMT0' => '1.55',
-   'L_PAYMENTREQUEST_0_DESC0' => 'Donation to the 
Wikimedia Foundation',
-   'PAYMENTREQUEST_0_AMT' => '1.55',
-   'PAYMENTREQUEST_0_CURRENCYCODE' => 'USD',
-   'PAYMENTREQUEST_0_CUSTOM' => 
$init['contribution_tracking_id'],
-   'PAYMENTREQUEST_0_DESC' => 'Donation to the Wikimedia 
Foundation',
-   'PAYMENTREQUEST_0_INVNUM' => 
$init['contribution_tracking_id'] . '.1',
-   'PAYMENTREQUEST_0_ITEMAMT' => '1.55',
-   'PAYMENTREQUEST_0_PAYMENTACTION' => 'Sale',
-   'PAYMENTREQUEST_0_PAYMENTREASON' => 'None',
-   'SIGNATURE' => 
'ABCDEFGHIJKLMNOPQRSTUV-ZXCVBNMLKJHGFDSAPOIUYTREWQ',
-   ];
-   $this->assertEquals(
-   $expected, $parsed
-   );
-   $message = QueueWrapper::getQueue( 'pending' )->pop();
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Allow new kafka-jumbo hosts to talk to zookeeper on conf*

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: Allow new kafka-jumbo hosts to talk to zookeeper on conf*
..


Allow new kafka-jumbo hosts to talk to zookeeper on conf*

Bug: T167992
Change-Id: Ia5ff73b2027de773a362e57a305dbe54f9793564
---
M hieradata/role/common/configcluster.yaml
M modules/network/manifests/constants.pp
2 files changed, 15 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/configcluster.yaml 
b/hieradata/role/common/configcluster.yaml
index d424274..8b2986c 100644
--- a/hieradata/role/common/configcluster.yaml
+++ b/hieradata/role/common/configcluster.yaml
@@ -30,4 +30,4 @@
 # To avoid version conflics with Cloudera zookeeper package, this
 # class manually specifies which debian package version should be installed.
 profile::zookeeper::zookeeper_version: '3.4.5+dfsg-2+deb8u2'
-profile::zookeeper::firewall::srange: '(($HADOOP_MASTERS 
$KAFKA_BROKERS_ANALYTICS $KAFKA_BROKERS_MAIN $DRUID_HOSTS $ZOOKEEPER_HOSTS_MAIN 
@resolve(krypton.eqiad.wmnet)))'
+profile::zookeeper::firewall::srange: '(($HADOOP_MASTERS 
$KAFKA_BROKERS_ANALYTICS $KAFKA_BROKERS_JUMBO $KAFKA_BROKERS_MAIN $DRUID_HOSTS 
$ZOOKEEPER_HOSTS_MAIN @resolve(krypton.eqiad.wmnet)))'
diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index d51ca5d..fb00bf2a 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -112,6 +112,20 @@
 '10.64.36.122',# kafka1022.eqiad.wmnet
 '2620:0:861:106:10:64:36:122', # kafka1022.eqiad.wmnet
 ],
+'kafka_brokers_jumbo' => [
+'10.64.5.25', # 
kafka-jumbo1001.eqiad.wmnet
+'2620:0:861:104:1a66:daff:fefc:d530', # 
kafka-jumbo1001.eqiad.wmnet
+'10.64.5.26', # 
kafka-jumbo1002.eqiad.wmnet
+'2620:0:861:104:1a66:daff:fefc:c8f8', # 
kafka-jumbo1002.eqiad.wmnet
+'10.64.21.110',   # 
kafka-jumbo1003.eqiad.wmnet
+'2620:0:861:105:1a66:daff:fefc:ccbc', # 
kafka-jumbo1003.eqiad.wmnet
+'10.64.36.107',   # 
kafka-jumbo1004.eqiad.wmnet
+'2620:0:861:106:1a66:daff:fefb:5e68', # 
kafka-jumbo1004.eqiad.wmnet
+'10.64.36.108',   # 
kafka-jumbo1005.eqiad.wmnet
+'2620:0:861:106:1a66:daff:fefc:d59c', # 
kafka-jumbo1005.eqiad.wmnet
+'10.64.53.34',# 
kafka-jumbo1006.eqiad.wmnet
+'2620:0:861:108:1a66:daff:fefc:d27c', # 
kafka-jumbo1006.eqiad.wmnet
+],
 'zookeeper_hosts_main' => [
 '10.64.0.18', # 
conf1001.eqiad.wmnet
 '2620:0:861:101:d6ae:52ff:fe73:60e6', # 
conf1001.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5ff73b2027de773a362e57a305dbe54f9793564
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
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]: Align "What's this" vertically

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Align "What's this" vertically
..


Align "What's this" vertically

Bug: T165627
Change-Id: I4da04ec48dfe1ad67379d79083e3f1fff431c8a2
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less
1 file changed, 7 insertions(+), 12 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less
index 964f27e..23ef2c4 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less
@@ -12,25 +12,20 @@
color: #555a5d;
.box-sizing( border-box );
display: inline-block;
-   line-height: normal;
}
}
 
&-whatsThisButton {
margin-left: 1.5em;
-   &.oo-ui-buttonElement {
-   vertical-align: text-bottom;
 
-   & > .oo-ui-buttonElement-button {
-   font-weight: normal;
-   // Override OOUI's definitions for button
-   border-color: transparent;
-   padding: 0;
+   &.oo-ui-buttonElement > .oo-ui-buttonElement-button {
+   font-weight: normal;
+   border: 0; // Override OOUI `border` needed for 
frameless keyboard focus
+   padding: 0;
 
-   &:focus {
-   box-shadow: none;
-   outline: 0;
-   }
+   &:focus {
+   box-shadow: none;
+   outline: 0;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4da04ec48dfe1ad67379d79083e3f1fff431c8a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment

2017-09-06 Thread Ejegg (Code Review)

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

7bb96fffb Don't fail transaction on SuccessWithWarning
a67ddad8f Only uncheck card on load when shown
6b615954d Fix RETURNURL for PayPal EC, add tests for API params

Change-Id: I40ad3f4e9ab8bba5af5137d10da9a62af18b3ada
---
D tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
D 
tests/phpunit/includes/Responses/paypal_ec/DoExpressCheckoutPayment_11607.testresponse
2 files changed, 0 insertions(+), 492 deletions(-)


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

diff --git a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php 
b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
deleted file mode 100644
index f02315d..000
--- a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<<< HEAD   (39771d Merge branch 'master' into deployment)
-===
-providerConfigurationOverride = 
PayPalTestConfiguration::get(
-   $this->smashPigGlobalConfig
-   );
-   $this->setMwGlobals( array(
-   'wgDonationInterfaceCancelPage' => 
'https://example.com/tryAgain.php',
-   'wgPaypalExpressGatewayEnabled' => true,
-   'wgDonationInterfaceThankYouPage' => 
'https://example.org/wiki/Thank_You',
-   ) );
-   }
-
-   function testPaymentSetup() {
-   $init = array(
-   'amount' => 1.55,
-   'currency' => 'USD',
-   'payment_method' => 'paypal',
-   'utm_source' => 'CD1234_FR',
-   'utm_medium' => 'sitenotice',
-   'country' => 'US',
-   'contribution_tracking_id' => strval( mt_rand() ),
-   'language' => 'fr',
-   );
-   $gateway = $this->getFreshGatewayObject( $init );
-   $gateway::setDummyGatewayResponseCode( 'OK' );
-   $result = $gateway->doPayment();
-   $gateway->logPending(); // GatewayPage or the API calls this 
for redirects
-   $this->assertEquals(
-   
'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout=EC-8US12345X1234567U',
-   $result->getRedirect(),
-   'Wrong redirect for PayPal EC payment setup'
-   );
-   $this->assertEquals( 1, count( $gateway->curled ), 'Should have 
made 1 API call' );
-   $apiCall = $gateway->curled[0];
-   $parsed = [];
-   parse_str( $apiCall, $parsed );
-   $actualReturn = $parsed['RETURNURL'];
-   $parsedReturn = [];
-   parse_str( parse_url( $actualReturn, PHP_URL_QUERY ), 
$parsedReturn );
-   $this->assertEquals(
-   [
-   'title' => 'Special:PaypalExpressGatewayResult',
-   'order_id' => $init['contribution_tracking_id'] 
. '.1',
-   'wmf_token' => 
$gateway->token_getSaltedSessionToken()
-   ],
-   $parsedReturn
-   );
-   unset( $parsed['RETURNURL'] );
-   $expected = [
-   'USER' => 'phpunittest...@wikimedia.org',
-   'PWD' => '9876543210',
-   'VERSION' => '204',
-   'METHOD' => 'SetExpressCheckout',
-   'CANCELURL' => 'https://example.com/tryAgain.php/fr',
-   'REQCONFIRMSHIPPING' => '0',
-   'NOSHIPPING' => '1',
-   'LOCALECODE' => 'fr_US',
-   'L_PAYMENTREQUEST_0_AMT0' => '1.55',
-   'L_PAYMENTREQUEST_0_DESC0' => 'Donation to the 
Wikimedia Foundation',
-   'PAYMENTREQUEST_0_AMT' => '1.55',
-   'PAYMENTREQUEST_0_CURRENCYCODE' => 'USD',
-   'PAYMENTREQUEST_0_CUSTOM' => 
$init['contribution_tracking_id'],
-   'PAYMENTREQUEST_0_DESC' => 'Donation to the Wikimedia 
Foundation',
-   'PAYMENTREQUEST_0_INVNUM' => 
$init['contribution_tracking_id'] . '.1',
-   'PAYMENTREQUEST_0_ITEMAMT' => '1.55',
-   'PAYMENTREQUEST_0_PAYMENTACTION' => 'Sale',
-   'PAYMENTREQUEST_0_PAYMENTREASON' => 'None',
-   'SIGNATURE' => 
'ABCDEFGHIJKLMNOPQRSTUV-ZXCVBNMLKJHGFDSAPOIUYTREWQ',
-   ];
-   $this->assertEquals(
-   $expected, $parsed
-   );
-   $message = QueueWrapper::getQueue( 'pending'

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Allow new kafka-jumbo hosts to talk to zookeeper on conf*

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: Allow new kafka-jumbo hosts to talk to zookeeper on conf*
..

Allow new kafka-jumbo hosts to talk to zookeeper on conf*

Bug: T167992
Change-Id: Ia5ff73b2027de773a362e57a305dbe54f9793564
---
M hieradata/role/common/configcluster.yaml
M modules/network/manifests/constants.pp
2 files changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/376407/1

diff --git a/hieradata/role/common/configcluster.yaml 
b/hieradata/role/common/configcluster.yaml
index d424274..8b2986c 100644
--- a/hieradata/role/common/configcluster.yaml
+++ b/hieradata/role/common/configcluster.yaml
@@ -30,4 +30,4 @@
 # To avoid version conflics with Cloudera zookeeper package, this
 # class manually specifies which debian package version should be installed.
 profile::zookeeper::zookeeper_version: '3.4.5+dfsg-2+deb8u2'
-profile::zookeeper::firewall::srange: '(($HADOOP_MASTERS 
$KAFKA_BROKERS_ANALYTICS $KAFKA_BROKERS_MAIN $DRUID_HOSTS $ZOOKEEPER_HOSTS_MAIN 
@resolve(krypton.eqiad.wmnet)))'
+profile::zookeeper::firewall::srange: '(($HADOOP_MASTERS 
$KAFKA_BROKERS_ANALYTICS $KAFKA_BROKERS_JUMBO $KAFKA_BROKERS_MAIN $DRUID_HOSTS 
$ZOOKEEPER_HOSTS_MAIN @resolve(krypton.eqiad.wmnet)))'
diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index d51ca5d..fb00bf2a 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -112,6 +112,20 @@
 '10.64.36.122',# kafka1022.eqiad.wmnet
 '2620:0:861:106:10:64:36:122', # kafka1022.eqiad.wmnet
 ],
+'kafka_brokers_jumbo' => [
+'10.64.5.25', # 
kafka-jumbo1001.eqiad.wmnet
+'2620:0:861:104:1a66:daff:fefc:d530', # 
kafka-jumbo1001.eqiad.wmnet
+'10.64.5.26', # 
kafka-jumbo1002.eqiad.wmnet
+'2620:0:861:104:1a66:daff:fefc:c8f8', # 
kafka-jumbo1002.eqiad.wmnet
+'10.64.21.110',   # 
kafka-jumbo1003.eqiad.wmnet
+'2620:0:861:105:1a66:daff:fefc:ccbc', # 
kafka-jumbo1003.eqiad.wmnet
+'10.64.36.107',   # 
kafka-jumbo1004.eqiad.wmnet
+'2620:0:861:106:1a66:daff:fefb:5e68', # 
kafka-jumbo1004.eqiad.wmnet
+'10.64.36.108',   # 
kafka-jumbo1005.eqiad.wmnet
+'2620:0:861:106:1a66:daff:fefc:d59c', # 
kafka-jumbo1005.eqiad.wmnet
+'10.64.53.34',# 
kafka-jumbo1006.eqiad.wmnet
+'2620:0:861:108:1a66:daff:fefc:d27c', # 
kafka-jumbo1006.eqiad.wmnet
+],
 'zookeeper_hosts_main' => [
 '10.64.0.18', # 
conf1001.eqiad.wmnet
 '2620:0:861:101:d6ae:52ff:fe73:60e6', # 
conf1001.eqiad.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Fix RETURNURL for PayPal EC, add tests for API params

2017-09-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix RETURNURL for PayPal EC, add tests for API params
..


Fix RETURNURL for PayPal EC, add tests for API params

Change-Id: I5b0cb7017f99c5d1e39e7b3416abf3dc81909fab
---
M paypal_gateway/express_checkout/paypal_express.adapter.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
2 files changed, 83 insertions(+), 0 deletions(-)

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



diff --git a/paypal_gateway/express_checkout/paypal_express.adapter.php 
b/paypal_gateway/express_checkout/paypal_express.adapter.php
index 00fa775..5af3ac3 100644
--- a/paypal_gateway/express_checkout/paypal_express.adapter.php
+++ b/paypal_gateway/express_checkout/paypal_express.adapter.php
@@ -366,6 +366,8 @@
 
public function doPayment() {
$this->config['transformers'][] = 'PaypalExpressReturnUrl';
+   $this->data_transformers[] = new PaypalExpressReturnUrl();
+   $this->stageData();
if ( $this->getData_Unstaged_Escaped( 'recurring' ) ) {
// Build the billing agreement and get a token to 
redirect.
$resultData = $this->do_transaction( 
'SetExpressCheckout_recurring' );
diff --git a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php 
b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
index cfab70a..37c216f 100644
--- a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
+++ b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
@@ -54,6 +54,46 @@
$result->getRedirect(),
'Wrong redirect for PayPal EC payment setup'
);
+   $this->assertEquals( 1, count( $gateway->curled ), 'Should have 
made 1 API call' );
+   $apiCall = $gateway->curled[0];
+   $parsed = [];
+   parse_str( $apiCall, $parsed );
+   $actualReturn = $parsed['RETURNURL'];
+   $parsedReturn = [];
+   parse_str( parse_url( $actualReturn, PHP_URL_QUERY ), 
$parsedReturn );
+   $this->assertEquals(
+   [
+   'title' => 'Special:PaypalExpressGatewayResult',
+   'order_id' => $init['contribution_tracking_id'] 
. '.1',
+   'wmf_token' => 
$gateway->token_getSaltedSessionToken()
+   ],
+   $parsedReturn
+   );
+   unset( $parsed['RETURNURL'] );
+   $expected = [
+   'USER' => 'phpunittest...@wikimedia.org',
+   'PWD' => '9876543210',
+   'VERSION' => '204',
+   'METHOD' => 'SetExpressCheckout',
+   'CANCELURL' => 'https://example.com/tryAgain.php/fr',
+   'REQCONFIRMSHIPPING' => '0',
+   'NOSHIPPING' => '1',
+   'LOCALECODE' => 'fr_US',
+   'L_PAYMENTREQUEST_0_AMT0' => '1.55',
+   'L_PAYMENTREQUEST_0_DESC0' => 'Donation to the 
Wikimedia Foundation',
+   'PAYMENTREQUEST_0_AMT' => '1.55',
+   'PAYMENTREQUEST_0_CURRENCYCODE' => 'USD',
+   'PAYMENTREQUEST_0_CUSTOM' => 
$init['contribution_tracking_id'],
+   'PAYMENTREQUEST_0_DESC' => 'Donation to the Wikimedia 
Foundation',
+   'PAYMENTREQUEST_0_INVNUM' => 
$init['contribution_tracking_id'] . '.1',
+   'PAYMENTREQUEST_0_ITEMAMT' => '1.55',
+   'PAYMENTREQUEST_0_PAYMENTACTION' => 'Sale',
+   'PAYMENTREQUEST_0_PAYMENTREASON' => 'None',
+   'SIGNATURE' => 
'ABCDEFGHIJKLMNOPQRSTUV-ZXCVBNMLKJHGFDSAPOIUYTREWQ',
+   ];
+   $this->assertEquals(
+   $expected, $parsed
+   );
$message = QueueWrapper::getQueue( 'pending' )->pop();
$this->assertNotEmpty( $message, 'Missing pending message' );
self::unsetVariableFields( $message );
@@ -107,6 +147,47 @@
$result->getRedirect(),
'Wrong redirect for PayPal EC payment setup'
);
+   $this->assertEquals( 1, count( $gateway->curled ), 'Should have 
made 1 API call' );
+   $apiCall = $gateway->curled[0];
+   $parsed = [];
+   parse_str( $apiCall, $parsed );
+   $actualReturn = $parsed['RETURNURL'];
+   $parsedReturn = [];
+   parse_str( parse_url( $actualReturn, PHP_URL_QUERY ), 
$parsedReturn );
+   $this->assertEquals(
+   [
+   'title' =>

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (834fd702f)

2017-09-06 Thread Jforrester (Code Review)

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

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

Update VE core submodule to master (834fd702f)

New changes:
86bd6c879 Localisation updates from https://translatewiki.net.
6d7a4cef0 Update OOjs UI to v0.23.0
37d1512a7 TransactionProcessor: modify DM tree branches instead of rebuilding 
them

Bug: T162762
Bug: T166041
Bug: T167027
Change-Id: Idfaa990dd940e26d7d572513220282bc97ca65fa
---
M .jsduck/categories.json
M .jsduck/eg-iframe.html
M VisualEditor.hooks.php
M extension.json
M lib/ve
5 files changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index c21ffab..81ebb36 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -116,6 +116,8 @@
"ve.dm.*Selection",
"ve.dm.Transaction",
"ve.dm.TransactionBuilder",
+   "ve.dm.TreeCursor",
+   "ve.dm.TreeModifier",
"ve.dm.TransactionProcessor",
"ve.dm.TransactionProcessor.*",
"ve.dm.*Annotation",
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 3810d19..a203540 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -201,6 +201,8 @@



+   
+   



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index d4713a5..290bb5c 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -959,6 +959,7 @@
'lib/ve/tests/dm/ve.dm.LinearData.test.js',
'lib/ve/tests/dm/ve.dm.Transaction.test.js',

'lib/ve/tests/dm/ve.dm.TransactionBuilder.test.js',
+   'lib/ve/tests/dm/ve.dm.TreeModifier.test.js',

'lib/ve/tests/dm/ve.dm.TransactionProcessor.test.js',
'lib/ve/tests/dm/ve.dm.APIResultsQueue.test.js',
'lib/ve/tests/dm/ve.dm.Surface.test.js',
diff --git a/extension.json b/extension.json
index 48dd515..fa3cc77 100644
--- a/extension.json
+++ b/extension.json
@@ -609,6 +609,8 @@
"lib/ve/src/dm/ve.dm.TransactionProcessor.js",
"lib/ve/src/dm/ve.dm.Transaction.js",
"lib/ve/src/dm/ve.dm.TransactionBuilder.js",
+   "lib/ve/src/dm/ve.dm.TreeCursor.js",
+   "lib/ve/src/dm/ve.dm.TreeModifier.js",
"lib/ve/src/dm/ve.dm.Selection.js",
"lib/ve/src/dm/ve.dm.Surface.js",
"lib/ve/src/dm/ve.dm.SurfaceFragment.js",
diff --git a/lib/ve b/lib/ve
index 7a88295..834fd70 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 7a88295090507dec989f406d7364a091d38034b4
+Subproject commit 834fd702fec544913f38339f7bd7ee1966f151e0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfaa990dd940e26d7d572513220282bc97ca65fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] operations/puppet[production]: /etc/kafka/mirror should require confluent-kafka package

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: /etc/kafka/mirror should require confluent-kafka package
..


/etc/kafka/mirror should require confluent-kafka package

Also remove debug notify

Bug: T376379
Change-Id: I787e9e353d523f3686d66339c5969d6785aa277d
---
M modules/confluent/manifests/kafka/client.pp
M modules/role/manifests/kafka/jumbo/broker.pp
2 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/modules/confluent/manifests/kafka/client.pp 
b/modules/confluent/manifests/kafka/client.pp
index f1396d8..b861870 100644
--- a/modules/confluent/manifests/kafka/client.pp
+++ b/modules/confluent/manifests/kafka/client.pp
@@ -58,5 +58,6 @@
 recurse => true,
 purge   => true,
 force   => true,
+require => Package[$package],
 }
 }
diff --git a/modules/role/manifests/kafka/jumbo/broker.pp 
b/modules/role/manifests/kafka/jumbo/broker.pp
index c200a54..59fcab5 100644
--- a/modules/role/manifests/kafka/jumbo/broker.pp
+++ b/modules/role/manifests/kafka/jumbo/broker.pp
@@ -11,9 +11,5 @@
 has_ganglia => false
 }
 include base::firewall
-
-$kafka_cluster_name = 'jumbo'
-$n = kafka_cluster_name($kafka_cluster_name)
-notify { "kafka cluster name is given as ${kafka_cluster_name}, function 
returns ${n}": }
 include profile::kafka::broker
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I787e9e353d523f3686d66339c5969d6785aa277d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
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]: /etc/kafka/mirror should require confluent-kafka package

2017-09-06 Thread Ottomata (Code Review)

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

Change subject: /etc/kafka/mirror should require confluent-kafka package
..

/etc/kafka/mirror should require confluent-kafka package

Also remove debug notify

Bug: T376379
Change-Id: I787e9e353d523f3686d66339c5969d6785aa277d
---
M modules/confluent/manifests/kafka/client.pp
M modules/role/manifests/kafka/jumbo/broker.pp
2 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/376395/1

diff --git a/modules/confluent/manifests/kafka/client.pp 
b/modules/confluent/manifests/kafka/client.pp
index f1396d8..b861870 100644
--- a/modules/confluent/manifests/kafka/client.pp
+++ b/modules/confluent/manifests/kafka/client.pp
@@ -58,5 +58,6 @@
 recurse => true,
 purge   => true,
 force   => true,
+require => Package[$package],
 }
 }
diff --git a/modules/role/manifests/kafka/jumbo/broker.pp 
b/modules/role/manifests/kafka/jumbo/broker.pp
index c200a54..59fcab5 100644
--- a/modules/role/manifests/kafka/jumbo/broker.pp
+++ b/modules/role/manifests/kafka/jumbo/broker.pp
@@ -11,9 +11,5 @@
 has_ganglia => false
 }
 include base::firewall
-
-$kafka_cluster_name = 'jumbo'
-$n = kafka_cluster_name($kafka_cluster_name)
-notify { "kafka cluster name is given as ${kafka_cluster_name}, function 
returns ${n}": }
 include profile::kafka::broker
 }

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

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

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

1 2 3 4 5 >

1 - 100 of 432 matches

Mail list logo