[MediaWiki-commits] [Gerrit] mediawiki...GuidedTour[master]: Fire-and-forget EventLogging for link clicks

[Mattflaschen (Code Review)]

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

Change subject: Fire-and-forget EventLogging for link clicks
..

Fire-and-forget EventLogging for link clicks

Analytics recommends that we fire-and-forget events, even on page
navigations.

It already was not properly waiting for the  fallback on browsers
without sendBeacon (this is due to an EventLogging issue).

However, since that is a WONTFIX, we should remove this code.

See T44815

Change-Id: I60cd31128d4626d68639518fe676f7b8c1763a28
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.EventLogger.js
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
2 files changed, 5 insertions(+), 44 deletions(-)


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

diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.EventLogger.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.EventLogger.js
index 8ab161e..7ce54b8 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.EventLogger.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.EventLogger.js
@@ -31,10 +31,6 @@
 * @param {mw.guidedTour.Step} step Step event is about
 * @param {Object} [event={}] Event object; will be mutated to 
add
 *  common information
-*
-* @return {jQuery.Promise} Promise for logging operation,
-*   that resolves on successful logging (including noop), or 
rejects
-*   on failure
 */
log: function ( schemaName, step, event ) {
var tour = step.tour;
@@ -55,7 +51,7 @@
event.sessionToken = sessionId;
}
 
-   return mw.eventLog.logEvent( schemaName, event );
+   mw.eventLog.logEvent( schemaName, event );
}
};
 
diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index cab663b..d2b979f 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -709,18 +709,8 @@
 */
Step.prototype.handleLinkClick = function ( jQueryEvent ) {
var activationEvent, buttonEvent, isExternal, labelKey, 
loggingOverDfd,
-   isNewWindow, logPromises = [],
$link = $( jQueryEvent.currentTarget ),
-   url = $link.attr( 'href' ), label = $link.text(),
-   LOGGING_TIMEOUT_MS = 500;
-
-   // If it's a new window, we don't need to delay the user,
-   // or worry about delaying them too much.
-   isNewWindow = ( $link.attr( 'target' ) === '_blank' );
-
-   if ( !isNewWindow ) {
-   jQueryEvent.preventDefault();
-   }
+   url = $link.attr( 'href' ), label = $link.text();
 
activationEvent = {
label: label
@@ -728,27 +718,12 @@
 
isExternal = $link.hasClass( 'external' );
 
-   // Resolves when all logging events resolve, at least one 
rejects, or there
-   // is a timeout (which is overall, not per event).
-   //
-   // Workaround to limit delay due to logging; see
-   // https://bugzilla.wikimedia.org/show_bug.cgi?id=52287
-   loggingOverDfd = $.Deferred();
-
-   if ( !isNewWindow ) {
-   window.setTimeout( loggingOverDfd.reject, 
LOGGING_TIMEOUT_MS );
-   }
-
if ( isExternal ) {
activationEvent.href = url;
-   logPromises.push(
-   gt.EventLogger.log( 
'GuidedTourExternalLinkActivation', this, activationEvent )
-   );
+   gt.EventLogger.log( 'GuidedTourExternalLinkActivation', 
this, activationEvent );
} else {
activationEvent.pageName = getPageFromLink( $link );
-   logPromises.push(
-   gt.EventLogger.log( 
'GuidedTourInternalLinkActivation', this, activationEvent )
-   );
+   gt.EventLogger.log( 'GuidedTourInternalLinkActivation', 
this, activationEvent );
}
 
if ( $link.hasClass( 'guidedtour-link-button' ) ) {
@@ -763,17 +738,7 @@
 
buttonEvent.action = isExternal ? 'externalLink' : 
'internalLink';
 
-   logPromises.push(
-   gt.EventLogger.log( 'GuidedTourButtonClick', 
this, buttonEvent )
-   );
-   }
-
-   $.when.apply( $, logPromises 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: When updating an email return early on email match & set on_...

[Eileen (Code Review)]

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

Change subject: When updating an email return early on email match & set 
on_hold otherwise.
..

When updating an email return early on email match & set on_hold otherwise.

Bug: T170350
Change-Id: If092a9131c85d5ec332818d1eb9984142c1c3dda
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 25 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/67/379467/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index dc81149..242d328 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1408,16 +1408,33 @@
   try {
 $loc_type_id = isset($msg['email_location_type_id']) ? 
$msg['email_location_type_id'] : wmf_civicrm_get_default_location_type_id();
 $isPrimary = isset($msg['email_location_type_id']) ? 0 : 1;
-civicrm_api3( "Email", "Replace", array(
-  'debug' => 1,
+
+$emailParams = array(
+  'email' => $msg['email'],
+  'is_primary' => $isPrimary,
+  'is_billing' => $isPrimary,
+);
+
+// Look up contact's existing email to get the id and to determine
+// if the email has changed.
+$existingEmails = civicrm_api3( "Email", 'get', array(
   'location_type_id' => $loc_type_id,
   'contact_id' => $contact_id,
-  'values' => array(array(
-'email' => $msg[ 'email' ],
-'is_primary' => $isPrimary,
-'is_billing' => $isPrimary,
-  ),
-)));
+  'sequential' => 1,
+));
+
+if ($existingEmails['count']) {
+  $existingEmail = $existingEmails['values'][0];
+  if ($existingEmail['email'] === $msg['email']) {
+// A case could be made for ensuring isPrimary / isBilling it set
+// but unclear if the incoming would necesarily be more 
primary/billingy
+return;
+  }
+  $emailParams['id'] = $existingEmail['id'];
+  $emailParams['on_hold'] = 0;
+}
+
+civicrm_api3( "Email", "create", $emailParams);
   }
   catch (CiviCRM_API3_Exception $e) {
 throw new WmfException( 'IMPORT_CONTACT', "Couldn't store email for the 
contact.", $e->getExtraParams());

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...GuidedTour[master]: Simplify link logging for target=_blank

[Mattflaschen (Code Review)]

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

Change subject: Simplify link logging for target=_blank
..

Simplify link logging for target=_blank

We still use the promises (it doesn't hurt anything), but we just
let the link navigation proceed normally if they are using a new
window.

Bug: T169613
Change-Id: I9d1e1ad3b2597e9a1af7e43ce9a14df05bcdbded
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
1 file changed, 17 insertions(+), 6 deletions(-)


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

diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index a7d085b..cab663b 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -709,11 +709,18 @@
 */
Step.prototype.handleLinkClick = function ( jQueryEvent ) {
var activationEvent, buttonEvent, isExternal, labelKey, 
loggingOverDfd,
-   logPromises = [], $link = $( jQueryEvent.currentTarget 
),
+   isNewWindow, logPromises = [],
+   $link = $( jQueryEvent.currentTarget ),
url = $link.attr( 'href' ), label = $link.text(),
LOGGING_TIMEOUT_MS = 500;
 
-   jQueryEvent.preventDefault();
+   // If it's a new window, we don't need to delay the user,
+   // or worry about delaying them too much.
+   isNewWindow = ( $link.attr( 'target' ) === '_blank' );
+
+   if ( !isNewWindow ) {
+   jQueryEvent.preventDefault();
+   }
 
activationEvent = {
label: label
@@ -728,7 +735,9 @@
// https://bugzilla.wikimedia.org/show_bug.cgi?id=52287
loggingOverDfd = $.Deferred();
 
-   window.setTimeout( loggingOverDfd.reject, LOGGING_TIMEOUT_MS );
+   if ( !isNewWindow ) {
+   window.setTimeout( loggingOverDfd.reject, 
LOGGING_TIMEOUT_MS );
+   }
 
if ( isExternal ) {
activationEvent.href = url;
@@ -761,9 +770,11 @@
 
$.when.apply( $, logPromises ).then( loggingOverDfd.resolve, 
loggingOverDfd.reject );
 
-   loggingOverDfd.always( function () {
-   window.location = url;
-   } );
+   if ( !isNewWindow ) {
+   loggingOverDfd.always( function () {
+   window.location = url;
+   } );
+   }
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d1e1ad3b2597e9a1af7e43ce9a14df05bcdbded
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Group follow up.

[Eileen (Code Review)]

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

Change subject: Group follow up.
..

Group follow up.

After running the cleanup on staging I audited the remaining groups
(they fit on a single screen now). All the ones I was wanting to see
kept were there with appropriate owners.

These 4 lists were not removed, or in my email to all. I feel they
are similar enough to others in the list to not re-send.

Bug: T174407
Change-Id: Ic10439a05c150c749e942468f00bf33880b624ec
---
M sites/all/modules/wmf_civicrm/update_7545.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/65/379465/1

diff --git a/sites/all/modules/wmf_civicrm/update_7545.php 
b/sites/all/modules/wmf_civicrm/update_7545.php
index 4aecea8..1ee9a5b 100644
--- a/sites/all/modules/wmf_civicrm/update_7545.php
+++ b/sites/all/modules/wmf_civicrm/update_7545.php
@@ -25,6 +25,7 @@
   );
 
   $groupsToDelete = array(
+// per email
 30 => 'Do Not Trade',
 33 => 'Organizations',
 37 => 'People Opted-Out',
@@ -263,6 +264,11 @@
 293 => 'RL DAF TYLs test',
 294 => 'DAF test',
 
+// Missed off email but I think it is OK.
+139 => 'Wikipedia in Peru Video',
+164 => 'Arthurs test',
+79 => 'Open House Open House 12/03/09 RSVP',
+78 => 'Open House Open House 12/03/09',
   );
 
   foreach (array_keys($groupsToAssignToLeanne) as $group_id) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic10439a05c150c749e942468f00bf33880b624ec
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] operations/dns[master]: depool ulsfo

[BBlack (Code Review)]

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

Change subject: depool ulsfo
..


depool ulsfo

Bug: T176386
Change-Id: I20073f5cf985bbc9ae7ab047a21e2d4e4fd47dee
---
M admin_state
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/admin_state b/admin_state
index 54ee433..6a6dda1 100644
--- a/admin_state
+++ b/admin_state
@@ -72,3 +72,5 @@
 ### v T164610 - semi-permanent to avoid confusion until T164609
 geoip/misc-addrs/ulsfo => DOWN
 ### ^ T164610 - semi-permanent to avoid confusion until T164609
+
+geoip/generic-map/ulsfo => DOWN

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20073f5cf985bbc9ae7ab047a21e2d4e4fd47dee
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: depool ulsfo

[BBlack (Code Review)]

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

Change subject: depool ulsfo
..

depool ulsfo

Bug: T176386
Change-Id: I20073f5cf985bbc9ae7ab047a21e2d4e4fd47dee
---
M admin_state
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/64/379464/1

diff --git a/admin_state b/admin_state
index 54ee433..6a6dda1 100644
--- a/admin_state
+++ b/admin_state
@@ -72,3 +72,5 @@
 ### v T164610 - semi-permanent to avoid confusion until T164609
 geoip/misc-addrs/ulsfo => DOWN
 ### ^ T164610 - semi-permanent to avoid confusion until T164609
+
+geoip/generic-map/ulsfo => DOWN

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20073f5cf985bbc9ae7ab047a21e2d4e4fd47dee
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: The big group clean up.

[Eileen (Code Review)]

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

Change subject: The big group clean up.
..

The big group clean up.

Bug: T174407
Change-Id: Id7308add86b6abeddfe28dd6afb740f9450907c6
---
A sites/all/modules/wmf_civicrm/update_7545.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
2 files changed, 289 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/63/379463/1

diff --git a/sites/all/modules/wmf_civicrm/update_7545.php 
b/sites/all/modules/wmf_civicrm/update_7545.php
new file mode 100644
index 000..081479b
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/update_7545.php
@@ -0,0 +1,279 @@
+ 'Major Gifts Reporting Group',
+263 => 'All $1000 donors - RL',
+264 => 'Organization $1000+ - RL',
+265 => 'Individual $1000+ - RL',
+266 => 'Monthly Figures - Foundation Gifts under $999.99',
+268 => '$500+ smart group',
+269 => '$5k+ smart group',
+270 => '$1k+ smart group',
+272 => '10k+ donors',
+287 => 'Recently modified recurring',
+288 => 'Total giving $1000+',
+289 => 'Total giving $500+',
+  );
+
+  $groupsToAssignToDanny = array(
+296 => '1k+ in three years to today',
+297 => 'Wikimedia in review newsletter',
+298 => 'Wikimedia board report recipients',
+  );
+
+  $groupsToDelete = array(
+30 => 'Do Not Trade',
+33 => 'Organizations',
+37 => 'People Opted-Out',
+217 => 'Fundraiser 2010 Donors - 100-500',
+218 => 'Fundraiser 2010 Donors - 50-99.99',
+219 => 'Fundraiser 2010 Donors - 25-49.99',
+220 => 'Fundraiser 2010 Donors',
+221 => 'Fundraiser 2010 Donors - 0-24.99',
+244 => 'FR2011 - Past - 0200-249.99',
+245 => 'FR2011 - Past - 0-4.99',
+283 => 'Recent Worldpay donors 2',
+284 => 'Incomplete JP Morgan import',
+243 => 'FR2011 - Past Donors',
+  1 => 'WMF Staff',
+7 => 'Committees',
+8 => 'Project Contacts',
+11 => 'Vendors',
+12 => 'Persons of Interest',
+14 => 'Admins_EN_WP',
+21 => 'Questionables',
+23 => 'Large Acknowledged Donors',
+38 => '1K+ October 2008 MG 1 Master Group',
+39 => 'Recipients of 10/08 $1000 exactly major gifts email',
+40 => 'Recipients of 10/08 $1001 - $ major gifts emailing',
+41 => 'WMF Office Bulk Mailing List',
+42 => 'Exclude group for MG 1 10/08 (Recent and special donations)',
+43 => 'Snail Mail Group for MG 10/08 Mailing',
+60 => 'Recipient of 12/12/08 Paper Mailing of Major Gifts Prospects',
+61 => 'Dexia Import Records',
+64 => '07/08 $1k+ Donors',
+71 => 'WMF Board Members 09',
+72 => 'WMF Advisory Board 09',
+73 => 'Recurring Donors 09',
+74 => 'Imported Moneybookers',
+77 => 'Hyperlinked Benefactors Past',
+80 => 'Gift Renewal Email for 09-10 Fundraising Drive',
+83 => 'Prospects',
+84 => 'Open House 12/03/09 Attendees',
+85 => 'Fraud',
+86 => 'US Fraud',
+99 => 'WAC event Feb. 2010 (Invited)',
+104 => '100.00-499.99 donors 07/01/08-01/29/10',
+105 => 'London Prospects',
+107 => 'Delivered Wikimedias 2008-09 Annual Report (100.00-499.99)',
+108 => '02/10 Tulsa Oklahoma Prospects',
+111 => '2000 English Donors for Wikipedia Supporters Discussion Group',
+112 => 'WAC event Feb. 2010 (RSVP)',
+113 => 'Los Angeles Prospects',
+114 => '2010 Discussion Group',
+115 => 'Volunteered after 2010 Discussion Group was full',
+121 => '08/09 Annual Report Snail Mailing',
+122 => 'Trial Group for CiviReport',
+123 => 'November 09 Stewardship',
+125 => 'Citibank France Feb. 2010',
+126 => 'Stewardship Statistics General',
+128 => 'New York City Prospects',
+130 => 'Hyperlink Renewal Email Spring 2010',
+144 => 'Wikimedia in Peru (Responded)',
+145 => 'a personal thank you (Responded)',
+146 => 'WAC event Feb. 2010 (Attended)',
+149 => 'Goldman Sachs Employees',
+153 => 'San Francisco Bay Area Prospects',
+156 => 'Harnisch Inside the Globe Invitees',
+157 => 'July 2010 $500+ Donor Report',
+158 => 'Major Gifts Prospects',
+159 => 'Hyperlinked Benefactors Current',
+162 => 'Survey Group 1 (07/10)',
+163 => 'Survey Group 2 (07/10)',
+166 => 'Harnisch Inside the Globe Invitations Responded',
+168 => 'Harnisch Inside the Globe Invitations RSVP "Yes"',
+173 => 'Open Call',
+175 => 'Harnisch Inside the Globe Attended',
+176 => 'Harnisch Inside the Globe No-shows',
+184 => 'Harnisch Inside the Globe Regrets Email',
+187 => 'Do Not Email Ever',
+194 => 'Focus Group Appeal (Usability)',
+208 => '2010 Snail Mail Campaign',
+209 => '2010 Fundraiser Donors',
+210 => 'Do Not Email Ever - Duplicates',
+229 => 'Quality Assurance',
+231 => 'JVD Group',
+234 => 'Wikimedia Deliverability Addresses',
+242 => 'Fundraiser 2011 - Donor 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: EditPage: Stop using globals for configuration in non-static...

[Legoktm (Code Review)]

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

Change subject: EditPage: Stop using globals for configuration in non-static 
functions
..

EditPage: Stop using globals for configuration in non-static functions

Change-Id: Ie884527b64f86b6a989117a45c6ffa6d1893d2b7
---
M includes/EditPage.php
1 file changed, 19 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/379462/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index bd58c81..1588f82 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -821,7 +821,7 @@
 * @return bool
 */
protected function previewOnOpen() {
-   global $wgPreviewOnOpenNamespaces;
+   $previewOnOpenNamespaces = $this->context->getConfig()->get( 
'PreviewOnOpenNamespaces' );
$request = $this->context->getRequest();
if ( $request->getVal( 'preview' ) == 'yes' ) {
// Explicit override from request
@@ -838,8 +838,8 @@
// Standard preference behavior
return true;
} elseif ( !$this->mTitle->exists()
-   && isset( 
$wgPreviewOnOpenNamespaces[$this->mTitle->getNamespace()] )
-   && 
$wgPreviewOnOpenNamespaces[$this->mTitle->getNamespace()]
+   && isset( 
$previewOnOpenNamespaces[$this->mTitle->getNamespace()] )
+   && 
$previewOnOpenNamespaces[$this->mTitle->getNamespace()]
) {
// Categories are special
return true;
@@ -1769,9 +1769,6 @@
 * time.
 */
public function internalAttemptSave( &$result, $bot = false ) {
-   global $wgMaxArticleSize;
-   global $wgContentHandlerUseDB;
-
$status = Status::newGood();
$user = $this->context->getUser();
 
@@ -1883,7 +1880,9 @@
}
 
$this->contentLength = strlen( $this->textbox1 );
-   if ( $this->contentLength > $wgMaxArticleSize * 1024 ) {
+   $config = $this->context->getConfig();
+   $maxArticleSize = $config->get( 'MaxArticleSize' );
+   if ( $this->contentLength > $maxArticleSize * 1024 ) {
// Error will be displayed by showEditForm()
$this->tooBig = true;
$status->setResult( false, self::AS_CONTENT_TOO_BIG );
@@ -1903,7 +1902,7 @@
 
$changingContentModel = false;
if ( $this->contentModel !== $this->mTitle->getContentModel() ) 
{
-   if ( !$wgContentHandlerUseDB ) {
+   if ( !$config->get( 'ContentHandlerUseDB' ) ) {
$status->fatal( 
'editpage-cannot-use-custom-model' );
$status->value = 
self::AS_CANNOT_USE_CUSTOM_MODEL;
return $status;
@@ -2182,7 +2181,7 @@
 
// Check for length errors again now that the section is merged 
in
$this->contentLength = strlen( $this->toEditText( $content ) );
-   if ( $this->contentLength > $wgMaxArticleSize * 1024 ) {
+   if ( $this->contentLength > $maxArticleSize * 1024 ) {
$this->tooBig = true;
$status->setResult( false, 
self::AS_MAX_ARTICLE_SIZE_EXCEEDED );
return $status;
@@ -2383,8 +2382,6 @@
}
 
public function setHeaders() {
-   global $wgAjaxEditStash;
-
$out = $this->context->getOutput();
 
$out->addModules( 'mediawiki.action.edit' );
@@ -2436,7 +2433,7 @@
# Keep Resources.php/mediawiki.action.edit.preview in sync with 
the possible keys
$out->addJsConfigVars( [
'wgEditMessage' => $msg,
-   'wgAjaxEditStash' => $wgAjaxEditStash,
+   'wgAjaxEditStash' => $this->context->getConfig()->get( 
'AjaxEditStash' ),
] );
}
 
@@ -2938,8 +2935,6 @@
}
 
protected function showHeader() {
-   global $wgAllowUserCss, $wgAllowUserJs;
-
$out = $this->context->getOutput();
$user = $this->context->getUser();
if ( $this->isConflict ) {
@@ -3064,14 +3059,15 @@
$isCssSubpage ? 
'usercssispublic' : 'userjsispublic'
);
if ( $this->formtype !== 'preview' ) {
-   if ( $isCssSubpage && 
$wgAllowUserCss ) {
+   $config = 
$this->context->getConfig();
+ 

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: New build with added `alt` attributes and further a11y impro...

[VolkerE (Code Review)]

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

Change subject: New build with added `alt` attributes and further a11y 
improvments
..

New build with added `alt` attributes and further a11y improvments

Bug: T173629
Change-Id: I3553ddf430720ffcad033632d416562a25674629
---
M build/content.html
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/index.html
M build/fr/privacy.html
M build/fr/stories.html
M build/index.html
M build/privacy.html
M build/stories.html
M build/stylesheets/master.css
11 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/61/379461/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3553ddf430720ffcad033632d416562a25674629
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
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] wikimedia/TransparencyReport[master]: Fix logo handling on screenreaders

[VolkerE (Code Review)]

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

Change subject: Fix logo handling on screenreaders
..


Fix logo handling on screenreaders

Output logo title on homepage, hiding it visually and
enable it for screnreaders only.

Bug: T173629
Change-Id: I77326f4593e41a9316ea0eb442c979360eb4f82a
---
M source/layouts/layout.erb
M source/stylesheets/master.css.scss
2 files changed, 12 insertions(+), 4 deletions(-)

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



diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 47e3208..a20285f 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -37,10 +37,8 @@



-   
-   <% if request.path != 
'index.html'  %>
-   <%= t('menu.title') %>
-   <% end %>
+   
+   <%= 
t('menu.title') %>



diff --git a/source/stylesheets/master.css.scss 
b/source/stylesheets/master.css.scss
index 4b055ed..417d2f9 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -118,6 +118,16 @@
}
 }
 
+// Visually hide title on navbar on homepage, screenreaders still receive it
+.index .navbar-default .navbar-brand .name {
+   position: absolute;
+   overflow: hidden;
+   clip: rect( 0 0 0 0 );
+   width: 1px;
+   height: 1px;
+   margin: -1px;
+}
+
 .container .jumbotron {
padding-left: 24px;
padding-top: 38px;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77326f4593e41a9316ea0eb442c979360eb4f82a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: VolkerE 

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

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: Fix logo handling on screenreaders

[VolkerE (Code Review)]

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

Change subject: Fix logo handling on screenreaders
..

Fix logo handling on screenreaders

Output logo title on homepage, hiding it visually and
enable it for screnreaders only.

Bug: T173629
Change-Id: I77326f4593e41a9316ea0eb442c979360eb4f82a
---
M source/layouts/layout.erb
M source/stylesheets/master.css.scss
2 files changed, 12 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/60/379460/1

diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 47e3208..a20285f 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -37,10 +37,8 @@



-   
-   <% if request.path != 
'index.html'  %>
-   <%= t('menu.title') %>
-   <% end %>
+   
+   <%= 
t('menu.title') %>



diff --git a/source/stylesheets/master.css.scss 
b/source/stylesheets/master.css.scss
index 4b055ed..417d2f9 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -118,6 +118,16 @@
}
 }
 
+// Visually hide title on navbar on homepage, screenreaders still receive it
+.index .navbar-default .navbar-brand .name {
+   position: absolute;
+   overflow: hidden;
+   clip: rect( 0 0 0 0 );
+   width: 1px;
+   height: 1px;
+   margin: -1px;
+}
+
 .container .jumbotron {
padding-left: 24px;
padding-top: 38px;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: EditPage: Deprecate $mArticle for public usage

[Legoktm (Code Review)]

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

Change subject: EditPage: Deprecate $mArticle for public usage
..

EditPage: Deprecate $mArticle for public usage

Change-Id: I2a931826ea142f2214c5f29944c3c3b18da19bad
---
M includes/EditPage.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/379459/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 267feb1..fab1260 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -203,7 +203,10 @@
 */
const POST_EDIT_COOKIE_DURATION = 1200;
 
-   /** @var Article */
+   /**
+* @deprecated for public usage since 1.30 use EditPage::getArticle()
+* @var Article
+*/
public $mArticle;
/** @var WikiPage */
private $page;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a931826ea142f2214c5f29944c3c3b18da19bad
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...TwoColConflict[master]: Don't use EditPage::$mArticle directly

[Legoktm (Code Review)]

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

Change subject: Don't use EditPage::$mArticle directly
..

Don't use EditPage::$mArticle directly

It's being deprecated in I2a931826ea142f.

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


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

diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index ed9c268..498580a 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -35,7 +35,7 @@
$key = array_search( 'TwoColConflictHooks::onAlternateEdit', 
$wgHooks['AlternateEdit'] );
unset( $wgHooks[ 'AlternateEdit' ][ $key ] );
 
-   $twoColConflictPage = new TwoColConflictPage( 
$editPage->mArticle );
+   $twoColConflictPage = new TwoColConflictPage( 
$editPage->getArticle() );
$twoColConflictPage->edit();
 
return false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic236906313bb660782c59f82783c83dbe938df2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
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[master]: Omnimail recipient - further fixes to batching.

[Eileen (Code Review)]

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

Change subject: Omnimail recipient - further fixes to batching.
..

Omnimail recipient - further fixes to batching.

Opps the save wasn't in the loop. Save progress whenever we save to the DB to
be able to pick up again if cancelled

Bug: T176255
Change-Id: I5b068ce70459113ba295b41c92b37833679a88da
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
1 file changed, 10 insertions(+), 9 deletions(-)


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

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
index 06f8c9e..0be0dd1 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
@@ -43,19 +43,18 @@
 $count = 0;
 $insertBatchSize = CRM_Utils_Array::value('insert_batch_size', $params, 1);
 $valueStrings = array();
+$progressSettings = array(
+  'last_timestamp' => $jobSettings['last_timestamp'],
+  'retrieval_parameters' => $omnimail->getRetrievalParameters(),
+  'progress_end_date' => $omnimail->endTimeStamp,
+);
 
 foreach ($recipients as $recipient) {
   if ($count === $limit) {
 // Do this here - ie. before processing a new row rather than at the 
end of the last row
 // to avoid thinking a job is incomplete if the limit co-incides with 
available rows.
 // Also write any remaining rows to the DB before exiting.
-_civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings);
-$omnimail->saveJobSetting(array(
-  'last_timestamp' => $jobSettings['last_timestamp'],
-  'retrieval_parameters' => $omnimail->getRetrievalParameters(),
-  'progress_end_date' => $omnimail->endTimeStamp,
-  'offset' => $omnimail->getOffset() + $count,
-));
+_civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings, 
$omnimail, $progressSettings, $omnimail->getOffset() + $count);
 return civicrm_api3_create_success(1);
   }
   $insertValues = array(
@@ -84,8 +83,9 @@
   if ($throttleSeconds && $rowsLeftBeforeThrottle <= 0) {
 sleep(ceil($throttleStagePoint - strtotime('now')));
   }
+  _civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings, 
$omnimail, $progressSettings, $omnimail->getOffset() + $count);
 }
-_civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings);
+
 $omnimail->saveJobSetting(array('last_timestamp' => 
$omnimail->endTimeStamp));
 return civicrm_api3_create_success(1);
   }
@@ -103,9 +103,10 @@
 /**
  * @param $valueStrings
  */
-function _civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings) {
+function _civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings, 
$job, $jobSettings, $newOffSet) {
   if (count($valueStrings)) {
 _civicrm_api3_omnirecipient_load_batch_write_to_db($valueStrings, 
count($valueStrings));
+$job->saveJobSetting(array_merge($jobSettings, array('offset' => 
$newOffSet)));
   }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b068ce70459113ba295b41c92b37833679a88da
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...crm[master]: Omnimail recipient job: Follow up fix on suffix

[Eileen (Code Review)]

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

Change subject: Omnimail recipient job: Follow up fix on suffix
..

Omnimail recipient job: Follow up fix on suffix

It turned out the setting was not merging 2 suffixes but overwriting.

Bug: T176255
Change-Id: Ic9c396b2ce7226b0eee0fdcb2be55baa78e46017
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
2 files changed, 14 insertions(+), 4 deletions(-)


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

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
index 2d40168..a6a5174 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
@@ -39,6 +39,11 @@
   /**
* @var array
*/
+  protected $settings = array();
+
+  /**
+   * @var array
+   */
   protected $retrievalParameters;
 
   /**
@@ -60,6 +65,7 @@
   public function __construct($params) {
 $this->job_suffix = !empty($params['job_suffix']) ? $params['job_suffix'] 
: '';
 $this->mail_provider = $params['mail_provider'];
+$this->settings = CRM_Omnimail_Helper::getSettings();
 $this->setJobSettings($params);
 $this->setOffset($params);
 
$this->setRetrievalParameters(CRM_Utils_Array::value('retrieval_parameters', 
$this->jobSettings));
@@ -160,8 +166,7 @@
* @param $params
*/
   protected function setJobSettings($params) {
-$settings = CRM_Omnimail_Helper::getSettings();
-$this->jobSettings = CRM_Utils_Array::value($params['mail_provider'] . 
$this->job_suffix, $settings['omnimail_' . $this->job . '_load'], array());
+$this->jobSettings = CRM_Utils_Array::value($params['mail_provider'] . 
$this->job_suffix, $this->settings['omnimail_' . $this->job . '_load'], 
array());
   }
 
   /**
@@ -170,10 +175,11 @@
* @param array $setting
*/
   function saveJobSetting($setting) {
+$key = 'omnimail_' . $this->job . '_load';
 civicrm_api3('Setting', 'create', array(
-  'omnimail_' . $this->job . '_load' => array(
+  $key => array_merge($this->settings[$key], array(
 $this->mail_provider . $this->job_suffix => $setting,
-  ),
+  ))
 ));
   }
 
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
index f502fdd..ef7b939 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
@@ -242,14 +242,18 @@
   ),
   'progress_end_date' => '1488495600',
 ),
+'Silverpop' => array('last_timestamp' => '1487890800'),
   ),
 ));
+$settings = $this->getJobSettings(array('mail_provider' => 'Silverpop'));
 
 civicrm_api3('Omnirecipient', 'load', array('mail_provider' => 
'Silverpop', 'username' => 'Donald', 'password' => 'Duck', 'client' => $client, 
'job_suffix' => '_woot'));
 $this->assertEquals(4, CRM_Core_DAO::singleValueQuery('SELECT COUNT(*) 
FROM civicrm_mailing_provider_data'));
 $this->assertEquals(array(
   'last_timestamp' => '1488495600',
 ), $this->getJobSettings(array('mail_provider' => 'Silverpop', 
'job_suffix' => '_woot')));
+
+$this->assertEquals($settings, $this->getJobSettings(array('mail_provider' 
=> 'Silverpop')));
   }
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9c396b2ce7226b0eee0fdcb2be55baa78e46017
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] apps...wikipedia[master]: Fix incorrect variant issues in Chinese articles

[Cooltey (Code Review)]

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

Change subject: Fix incorrect variant issues in Chinese articles
..

Fix incorrect variant issues in Chinese articles

In this update:
 - Adds a "uselang" parameter to the MwPageService for setting up the app 
language code

Also noticed that we can add "Accept-Language" to the Header in 
CommonHeaderRequestInterceptor, but it is not totally accurate based on certain 
conditions (e.g. Links inside the translated articles)

Bug: T176374
Change-Id: Id8b452cc5e5ce8b3f286b0901f44f1bfbeaead90
---
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
M app/src/main/java/org/wikipedia/dataclient/page/PageClient.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageClient.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M 
app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
M app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwPageClientTest.java
M app/src/test/java/org/wikipedia/dataclient/page/BasePageClientTest.java
M app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageLeadTest.java
11 files changed, 47 insertions(+), 31 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
index c676331..65bf77e 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
@@ -10,6 +10,7 @@
 
 import okhttp3.CacheControl;
 import retrofit2.Call;
+import retrofit2.http.Query;
 
 /**
  * Retrofit web service client for MediaWiki PHP API.
@@ -31,18 +32,20 @@
 @NonNull 
CacheOption cacheOption,
 @NonNull String 
title,
 int leadImageWidth,
-boolean noImages) {
+boolean noImages,
+@Nullable String 
useLang) {
 return service.lead(cacheControl == null ? null : 
cacheControl.toString(),
-optional(cacheOption.save()), title, leadImageWidth, 
optional(noImages));
+optional(cacheOption.save()), title, leadImageWidth, 
optional(noImages), useLang);
 }
 
 @SuppressWarnings("unchecked")
 @NonNull @Override public Call sections(@Nullable 
CacheControl cacheControl,
  @NonNull 
CacheOption cacheOption,
  @NonNull 
String title,
- boolean 
noImages) {
+ boolean 
noImages,
+ @Nullable 
String useLang) {
 return service.sections(cacheControl == null ? null : 
cacheControl.toString(),
-optional(cacheOption.save()), title, optional(noImages));
+optional(cacheOption.save()), title, optional(noImages), 
useLang);
 }
 
 /**
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
index f0884e5..cbf6a73 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
@@ -58,7 +58,8 @@
  @Header(SaveHeader.FIELD) Boolean 
save,
  @NonNull @Query("page") String 
title,
  @Query("thumbwidth") int 
leadImageWidth,
- @Nullable @Query("noimages") 
Boolean noImages);
+ @Nullable @Query("noimages") 
Boolean noImages,
+ @Nullable @Query("uselang") 
String useLang);
 
 /**
  * Gets the remaining sections of a given title.
@@ -72,5 +73,6 @@
 @NonNull Call sections(@Nullable 
@Header("Cache-Control") String cacheControl,
   
@Header(SaveHeader.FIELD) Boolean save,
 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: registration: Fix typo in validator

[Legoktm (Code Review)]

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

Change subject: registration: Fix typo in validator
..

registration: Fix typo in validator

Change-Id: Ic4f0eb5f05504922c20213e1d321fa14c979b6f8
---
M includes/registration/ExtensionJsonValidator.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/registration/ExtensionJsonValidator.php 
b/includes/registration/ExtensionJsonValidator.php
index 8142111..c8e5e19 100644
--- a/includes/registration/ExtensionJsonValidator.php
+++ b/includes/registration/ExtensionJsonValidator.php
@@ -105,7 +105,7 @@
// All good.
return true;
} else {
-   $out = "$path did pass validation.\n";
+   $out = "$path did not pass validation.\n";
foreach ( $validator->getErrors() as $error ) {
$out .= "[{$error['property']}] 
{$error['message']}\n";
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4f0eb5f05504922c20213e1d321fa14c979b6f8
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] wikimedia...crm[deployment]: Update vendor for Omnimail offset fix

[jenkins-bot (Code Review)]

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

Change subject: Update vendor for Omnimail offset fix
..


Update vendor for Omnimail offset fix

Change-Id: I2ae14e42c17649f1777fd082819a06f5f87074f0
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index 16e33f1..676c276 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 16e33f174720fdeccf6c840cf2340ba8ce29a59b
+Subproject commit 676c2766929804984058aa5bee90749e2e0c49b2

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor for Omnimail offset fix

[Eileen (Code Review)]

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

Change subject: Update vendor for Omnimail offset fix
..

Update vendor for Omnimail offset fix

Change-Id: I2ae14e42c17649f1777fd082819a06f5f87074f0
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/vendor b/vendor
index 16e33f1..676c276 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 16e33f174720fdeccf6c840cf2340ba8ce29a59b
+Subproject commit 676c2766929804984058aa5bee90749e2e0c49b2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ae14e42c17649f1777fd082819a06f5f87074f0
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] mediawiki...TimedMediaHandler[master]: Use jQuery on/off instead of deprecated bind/unbind

[Krinkle (Code Review)]

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

Change subject: Use jQuery on/off instead of deprecated bind/unbind
..

Use jQuery on/off instead of deprecated bind/unbind

Bug: T169385
Change-Id: I03fd00bf341d3ee895ec2833cee3c785f83d11f3
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerImageOverlay.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerKplayer.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
M MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
M MwEmbedModules/EmbedPlayer/resources/skins/kskin/mw.PlayerSkinKskin.js
M MwEmbedModules/TimedText/TimedText.loader.js
M MwEmbedModules/TimedText/resources/mw.TimedText.js
8 files changed, 50 insertions(+), 50 deletions(-)


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

diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
index 14ba1cb..ff47568 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
@@ -366,16 +366,16 @@
/**
 * Bind helpers to help iOS retain bind context
 *
-* Yes, iOS will fail when you run $( embedPlayer ).bind()
-* but "work" when you run embedPlayer.bind() if the script 
urls are from diffrent "resources"
+* Yes, iOS will fail when you run $( embedPlayer ).on()
+* but "work" when you run .on() from script urls that are 
different "resources"
 */
bindHelper: function( name, callback ){
-   $( this ).bind( name, callback );
+   $( this ).on( name, callback );
return this;
},
unbindHelper: function( bindName ){
if( bindName ) {
-   $( this ).unbind( bindName );
+   $( this ).off( bindName );
}
return this;
},
@@ -443,7 +443,7 @@
this._playContorls = false;
// turn off hover:
this.getInterface().find( '.play-btn' )
-   .unbind('mouseenter mouseleave')
+   .off('mouseenter mouseleave')
.css('cursor', 'default' );
 
this.controlBuilder.disableSeekBar();
@@ -1363,8 +1363,8 @@
var $pBtn = this.getInterface().find('.play-btn-large')
.attr( 'title', 
mw.msg('mwe-embedplayer-play_clip') )
.show()
-   .unbind( 'click' )
-   .click( function() {
+   .off( 'click' )
+   .on( 'click', function() {
_this.triggerHelper( 'firstPlay', [ 
_this.id ] ); // To send stats event for play
_this.triggerHelper( 'playing' );
return true;
@@ -1524,7 +1524,7 @@
 
//If we are change playing media add a ready binding:
var bindName = 'playerReady.changeMedia';
-   $this.unbind( bindName ).bind( bindName, function(){
+   $this.off( bindName ).on( bindName, function(){
mw.log('EmbedPlayer::changeMedia playerReady 
callback');
// hide the loading spinner:
_this.hideSpinnerAndPlayBtn();
@@ -2050,8 +2050,8 @@
 
// If we have start time defined, start playing from 
that point
if( this.currentTime < this.startTime ) {
-   $this.bind('playing.startTime', function(){
-   $this.unbind('playing.startTime');
+   $this.on('playing.startTime', function(){
+   $this.off('playing.startTime');
if( !mw.isIOS() ){
_this.setCurrentTime( 
_this.startTime );
_this.startTime = 0;
@@ -2099,8 +2099,8 @@
this.hideSpinnerOncePlaying();
 
this.getInterface().find( '.play-btn' )
-   .unbind('click')
-   .click( function( ) {
+   .off('click')
+   .on( 'click', function( ) {
   

[MediaWiki-commits] [Gerrit] marvin[master]: Update: increase the base H4 font size

[Niedzielski (Code Review)]

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

Change subject: Update: increase the base H4 font size
..

Update: increase the base H4 font size

Design requested that the base H4 font size be increased by one pixel.
This affects the page title font size.

Change-Id: I1bb301db7ee1c293ce32dde473b841e2b1537169
---
M src/client/index.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/51/379451/1

diff --git a/src/client/index.css b/src/client/index.css
index 6984247..d2bbd18 100644
--- a/src/client/index.css
+++ b/src/client/index.css
@@ -9,7 +9,7 @@
   --font-size-note: 14px;
   --font-size-base: 16px;
   --font-size-h5: 18px;
-  --font-size-h4: 23px;
+  --font-size-h4: 24px;
   --font-size-h3: 28px;
   --font-size-h2: 36px;
   --font-size-h1: 46px;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bb301db7ee1c293ce32dde473b841e2b1537169
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] marvin[master]: Update: the wiki page to use a Page component

[Niedzielski (Code Review)]

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

Change subject: Update: the wiki page to use a Page component
..

Update: the wiki page to use a Page component

- Update the wiki page to use the Page component.
- Add a footer to the page component.
- Use the header and footer of the page component instead of the
  summary.
- Update the footer to use Great Britain time format.

Change-Id: I8a24c857806c778d1e758241ded5f6fdf56295f7
---
M src/common/components/page-summary/page-summary.css
M src/common/components/page-summary/page-summary.tsx
M src/common/components/page/page.css
M src/common/components/page/page.tsx
M src/common/pages/wiki.tsx
5 files changed, 47 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/50/379450/1

diff --git a/src/common/components/page-summary/page-summary.css 
b/src/common/components/page-summary/page-summary.css
index e96713d..96869ba 100644
--- a/src/common/components/page-summary/page-summary.css
+++ b/src/common/components/page-summary/page-summary.css
@@ -1,13 +1,20 @@
 .PageSummary {}
+.PageSummary:after {
+  /* Add an empty node that clears the left and right so the page summary
+  container can wrap its contents fully even if they're floated. */
+  content: "";
+  clear: both;
 
-.PageSummary-header {}
-.PageSummary-title {}
-.PageSummary-description {}
-.PageSummary-description::first-letter {
-  text-transform: uppercase;
+  /* Make the node dimensionless. */
+  display: block;
+  width: 0;
+  height: 0;
+
+  /* Forbid scrollbars and hide. */
+  overflow: hidden;
+  visibility: hidden;
 }
 
-.PageSummary-body {}
 .PageSummary-thumbnail {
   background: var(--wmui-color-base0);
 
@@ -57,9 +64,3 @@
 }
 
 .PageSummary-extract {}
-
-.PageSummary-footer {
-  /* The footer must appear on its own line when the image is floated. */
-  clear: both;
-}
-.PageSummary-lastModified {}
diff --git a/src/common/components/page-summary/page-summary.tsx 
b/src/common/components/page-summary/page-summary.tsx
index b372fba..12aca17 100644
--- a/src/common/components/page-summary/page-summary.tsx
+++ b/src/common/components/page-summary/page-summary.tsx
@@ -6,6 +6,18 @@
   summary: PageSummaryModel;
 }
 
+export const PageSummary = ({ summary }: Props): JSX.Element => (
+  
+
+{summary.extractHTML && (
+  
+)}
+  
+);
+
 const Thumbnail = ({ summary }: Props) => {
   if (!summary.thumbnail || !summary.image) {
 return null;
@@ -30,31 +42,3 @@
 
   );
 };
-
-export const PageSummary = ({ summary }: Props): JSX.Element => (
-  
-
-  
-  {summary.descriptionText && (
-{summary.descriptionText}
-  )}
-
-
-  
-  {summary.extractHTML && (
-
-  )}
-
-
-  
-{summary.lastModified.toLocaleString()}
-  
-
-  
-);
diff --git a/src/common/components/page/page.css 
b/src/common/components/page/page.css
index 9c3a552..dfc29f3 100644
--- a/src/common/components/page/page.css
+++ b/src/common/components/page/page.css
@@ -32,3 +32,5 @@
   present double spacing at the bottom of the container */
   margin-bottom: 0;
 }
+
+.Page-footer-separator {}
diff --git a/src/common/components/page/page.tsx 
b/src/common/components/page/page.tsx
index f4bc3ef..7ccddac 100644
--- a/src/common/components/page/page.tsx
+++ b/src/common/components/page/page.tsx
@@ -6,12 +6,14 @@
 
 interface Props extends ChildrenProps {
   title: ComponentChild;
-  subtitle: ComponentChild;
+  subtitle?: ComponentChild;
+  footer?: ComponentChild;
 }
 
 export default function Page({
   title,
   subtitle,
+  footer,
   children
 }: Props): JSX.Element {
   return (
@@ -23,6 +25,8 @@
 
 {children && }
 {children}
+{footer && }
+{footer}
   
 
   );
diff --git a/src/common/pages/wiki.tsx b/src/common/pages/wiki.tsx
index 80eeabf..0cf3ece 100644
--- a/src/common/pages/wiki.tsx
+++ b/src/common/pages/wiki.tsx
@@ -6,7 +6,7 @@
   PageTitleID,
   PageTitlePath
 } from "../models/page";
-import Paper from "../components/paper/paper";
+import Page from "../components/page/page";
 import { RouteParams } from "../routers/route";
 import { requestPageSummary } from "../data-clients/page-data-client";
 
@@ -27,8 +27,20 @@
 
 export const Component = ({ summary }: Props): JSX.Element => (
   
-
+}
+  subtitle={summary.descriptionText}
+  footer={}
+>
   
-
+
   
 );
+
+const Title = ({ summary }: Props) => (
+  
+);
+
+const Footer = ({ summary }: Props) => (
+  {summary.lastModified.toLocaleString("en-GB")}
+);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a24c857806c778d1e758241ded5f6fdf56295f7
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

[MediaWiki-commits] [Gerrit] marvin[master]: Update: page summary layout to be responsive

[Niedzielski (Code Review)]

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

Change subject: Update: page summary layout to be responsive
..

Update: page summary layout to be responsive

- For large screens: float the image to the left (no change).
- For small screens:
  - When the image is landscape: occupy the full-width.
  - When the image is portrait: add a background that occupies the full
width and center the image.

It can be difficult to track differences in between CSS rules, so an
explicit unset style was used as a cue. For example, `float` takes
precedence over `display` so what's unused in a given rule is unset to
make that explicit.

Change-Id: Ic5fbadb6f7870556759c687b0d9852133eb70d9e
---
M src/common/components/page-summary/page-summary.css
M src/common/components/page-summary/page-summary.tsx
M src/common/marshallers/page-restbase-mount-everest-expected.test.json
M src/common/marshallers/page-unmarshaller.ts
M src/common/models/page.ts
M src/common/pages/home.tsx
6 files changed, 99 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/49/379449/1

diff --git a/src/common/components/page-summary/page-summary.css 
b/src/common/components/page-summary/page-summary.css
index fb07c7c..e96713d 100644
--- a/src/common/components/page-summary/page-summary.css
+++ b/src/common/components/page-summary/page-summary.css
@@ -1,5 +1,4 @@
-.PageSummary {
-}
+.PageSummary {}
 
 .PageSummary-header {}
 .PageSummary-title {}
@@ -8,17 +7,59 @@
   text-transform: uppercase;
 }
 
-.PageSummary-body {
-}
+.PageSummary-body {}
 .PageSummary-thumbnail {
-  float: left;
-  margin: 0 var(--space) var(--space) 0;
+  background: var(--wmui-color-base0);
+
+  /* Center the image within the container. */
+  text-align: center;
+
+  /* Set the container to occupy the full-width. */
+  display: inline-block;
+  width: 100%;
+  float: unset;
+
+  /* No margin is wanted when the container is full-width. */
+  margin-right: unset;
 }
-.PageSummary-extract {
+/* TODO: use CSS variable. */
+@media (min-width: 1024px) {
+  .PageSummary-thumbnail {
+/* Wrap the container to the width of the image and left-align it. */
+display: unset;
+width: unset;
+float: left;
+
+/* Since the image is side-by-side with the text, add a margin. */
+margin-right: var(--space);
+  }
+}
+.PageSummary-thumbnail-image {
+  /* Don't pad the linked image with text descender space. */
+  vertical-align: top;
+}
+.PageSummary-thumbnail-image-landscape {
+  /* Stretch the image to occupy the available width and proprotionally scale
+  the height. */
+  width: 100%;
+  height: auto;
+}
+/* TODO: use CSS variable. */
+@media (min-width: 1024px) {
+  .PageSummary-thumbnail-image-landscape {
+/* Use the image's native width and height. */
+width: unset;
+height: unset;
+  }
+}
+.PageSummary-thumbnail-image-portrait {
+  /* Use the image's native width and height. */
 }
 
+.PageSummary-extract {}
+
 .PageSummary-footer {
+  /* The footer must appear on its own line when the image is floated. */
   clear: both;
 }
-.PageSummary-lastModified {
-}
+.PageSummary-lastModified {}
diff --git a/src/common/components/page-summary/page-summary.tsx 
b/src/common/components/page-summary/page-summary.tsx
index 88211d4..b372fba 100644
--- a/src/common/components/page-summary/page-summary.tsx
+++ b/src/common/components/page-summary/page-summary.tsx
@@ -6,6 +6,31 @@
   summary: PageSummaryModel;
 }
 
+const Thumbnail = ({ summary }: Props) => {
+  if (!summary.thumbnail || !summary.image) {
+return null;
+  }
+
+  const landscape = summary.image.landscape;
+  const imageOrientationClass = `PageSummary-thumbnail-image-${landscape
+? "landscape"
+: "portrait"}`;
+  return (
+// todo: replace anchor with Link.
+
+  
+
+  
+
+  );
+};
+
 export const PageSummary = ({ summary }: Props): JSX.Element => (
   
 
@@ -18,19 +43,7 @@
   )}
 
 
-  {summary.thumbnail &&
-summary.image && (
-  /* todo: replace with Link. */
-  
-
-  
-)}
+  
   {summary.extractHTML && (
 Mount Everest, known in Nepali as 
Sagarmāthā and in Tibetan as Chomolungma, is Earth's highest 
mountain, located in the Mahalangur Himal sub-range of the Himalayas. The 
international border between China (Tibet Autonomous Region) and Nepal runs 
across its summit point.\nThe current official height of 8,848 m (29,029 
ft), recognised by China and Nepal, was established by a 1955 Indian survey and 
subsequently confirmed by a Chinese survey in 1975. In 2005, China remeasured 
the rock height of the mountain, with a result of 8844.43 m. There followed an 
argument between China and Nepal as to whether the official height should be 
the rock height (8,844 m., China) or the snow height (8,848 m., Nepal). In 
2010, an agreement 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: RCFilters: Add 'learn more' link to guided tour introducing ...

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Add 'learn more' link to guided tour introducing 
rcfilters
..

RCFilters: Add 'learn more' link to guided tour introducing rcfilters

Bug: T169613
Change-Id: I2dd93ef7080a7058f8733f444f26792bdb59a53d
---
M WikimediaMessages.hooks.php
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
M modules/rcfilters-intro-tour.js
M modules/rcfilters-intro-tour.less
5 files changed, 24 insertions(+), 7 deletions(-)


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

diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index c0392fa..d7f3c82 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1363,6 +1363,7 @@
'messages' => [

'eri-rcfilters-tour-intro-welcome-title',

'eri-rcfilters-tour-intro-welcome-description',
+   'eri-rcfilters-tour-help',

'eri-rcfilters-tour-intro-welcome-no-ores-description',

'eri-rcfilters-tour-intro-preferences-description',

'eri-rcfilters-tour-intro-welcome-button',
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index 4a00e8e..d8b48f1 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -289,8 +289,9 @@
"eri-rcfilters-tour-welcome-no-ores-description": "Review edits using 
an easier and more powerful interface, additional filters, user-defined 
highlighting and other improvements.",
"eri-rcfilters-tour-welcome-button": "OK, got it",
"eri-rcfilters-tour-intro-welcome-title": "Welcome to improved Recent 
Changes filtering",
-   "eri-rcfilters-tour-intro-welcome-description": "Review edits more 
efficiently using improved tools, a new interface and the power of machine 
learning.",
-   "eri-rcfilters-tour-intro-welcome-no-ores-description": "Review edits 
more efficiently using new filters, a more powerful interface, user-defined 
highlighting and and other improvements.",
+   "eri-rcfilters-tour-intro-welcome-description": "Review edits more 
efficiently using improved tools, a new interface and the power of machine 
learning. $1",
+   "eri-rcfilters-tour-intro-welcome-no-ores-description": "Review edits 
more efficiently using new filters, a more powerful interface, user-defined 
highlighting and and other improvements. $1",
+   "eri-rcfilters-tour-help": "Learn more",
"eri-rcfilters-tour-intro-preferences-description": "Access your 
preferences any time to disable the improved version of Recent Changes.",
"eri-rcfilters-tour-intro-welcome-button": "OK, got it",
"eri-rcfilters-tour-highlight-title": "Color code your results",
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index a8843db..03e14c0 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -318,8 +318,9 @@
"eri-rcfilters-tour-welcome-no-ores-description": "Description of the 
first step of the guided tour introducing the RC filters beta feature, if 
machine learning tools are not available on the wiki.",
"eri-rcfilters-tour-welcome-button": "Text of the button to close the 
RC filters beta feature guided tour.",
"eri-rcfilters-tour-intro-welcome-title": "Title of the first step of 
the guided tour introducing the new Recent Changes filtering features.",
-   "eri-rcfilters-tour-intro-welcome-description": "Description of the 
first step of the guided tour introducing the new Recent Changes filtering 
features, if machine learning tools are available on this wiki.",
-   "eri-rcfilters-tour-intro-welcome-no-ores-description": "Description of 
the first step of the guided tour introducing the new Recent Changes filtering 
features, if machine learning tools are not available on the wiki.",
+   "eri-rcfilters-tour-intro-welcome-description": "Description of the 
first step of the guided tour introducing the new Recent Changes filtering 
features, if machine learning tools are available on this 
wiki.\n\nParameters:\n$1 - Link to the Enhanced Filters help page",
+   "eri-rcfilters-tour-intro-welcome-no-ores-description": "Description of 
the first step of the guided tour introducing the new Recent Changes filtering 
features, if machine learning tools are not available on the 
wiki.\n\nParameters:\n$1 - Link to the Enhanced Filters help page",
+   "eri-rcfilters-tour-help": "Title for the link to the help page of 
enanced filters in the guided tour introducing the new Recent Changes filtering 
features",
"eri-rcfilters-tour-intro-preferences-description": "Description for 
the second step of the guided tour 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Make the interface not jump around while loading

[Catrope (Code Review)]

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

Change subject: RCFilters: Make the interface not jump around while loading
..

RCFilters: Make the interface not jump around while loading

* Move the "show new changes" widget into the .rcfilters-head container
** It doesn't conceptually belong here, but this way the min-height
   trick can capture it
* Increase the min-height to account for "show new changes" and drift
* Set a different (higher) min-height on the watchlist
* Adjust the loading spinner position to account for "show new changes" having 
moved
* Don't apply a margin-top to the first table in WatchlistTopSectionWidget,
  only the second one
* Make .watchlistDetails float while loading
** This is because it starts outside rcfilters-head but is then moved into it.
   Floating it makes it not take any space, which makes the min-height math
   a lot easier (and tolerant to taller .watchlistDetails divs like on enwiki)
* Don't remove the margin and padding from the first h4, this causes jumpiness
** This does increase whitespace slightly, if we want to fix that we could
   set a negative margin-bottom on rcfilters-head instead
* Move the margin-left rules making space for the highlights into a mixin,
  and apply it before initialization instead of after

Bug: T176300
Change-Id: I353deab90cd944209d7540559c6b41decad20e7d
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js
6 files changed, 30 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/379447/1

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index dd4f9d4..b0c674a 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -2,7 +2,8 @@
 @import 'mw.rcfilters.mixins';
 
 @rcfilters-spinner-width: 70px;
-@rcfilters-head-min-height: 200px;
+@rcfilters-head-min-height: 250px;
+@rcfilters-wl-head-min-height: 315px;
 
 // Corrections for the standard special page
 .client-js {
@@ -10,9 +11,15 @@
border: 0;
}
 
+   // Reserve space for the UI while it loads
.rcfilters-head {
min-height: @rcfilters-head-min-height;
}
+   // On the watchlist, reserve a bit more
+   .mw-special-Watchlist .rcfilters-head {
+   min-height: @rcfilters-wl-head-min-height;
+   }
+
body:not( .mw-rcfilters-ui-initialized ) .rcfilters-head {
opacity: 0.5;
pointer-events: none;
@@ -33,6 +40,11 @@
// since we replace it anyways with a specific
// message of our own
display: none;
+   }
+
+   ul,
+   table.mw-enhanced-rc {
+   .result-circle-margin();
}
}
 
@@ -79,13 +91,19 @@
body.mw-rcfilters-ui-loading .rcfilters-spinner {
display: block;
// When loading new results, display the spinner on top of the 
results area
-   margin-top: 4em;
+   margin-top: 2em;
}
 
#contentSub,
form#mw-watchlist-resetbutton {
display: none;
}
+
+   // Make the watchlist-details message display while loading, but make 
it not take up any
+   // space. This makes the min-height trick work better.
+   .watchlistDetails {
+   float: left;
+   }
 }
 
 .mw-rcfilters-staticfilters-selected {
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
index 6c8ebac..6c44cc4 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
@@ -43,6 +43,11 @@
}
 }
 
+// A mixin for changes list containers. Applies enough margin-left to fit the 
5 highlight circles.
+.result-circle-margin() {
+   margin-left: ~'calc( ( @{result-circle-diameter} + 
@{result-circle-margin} ) * 5 + @{result-circle-general-margin} )';
+}
+
 // A mixin just for changesListWrapperWidget page, to output the scope of the 
widget
 // so it is before the rest of the rule; we need the li& to be in
 // between the wrapper scope and the color-cX class, which doesn't
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.19]: Log error events to the correct schema

[jenkins-bot (Code Review)]

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

Change subject: Log error events to the correct schema
..


Log error events to the correct schema

Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
(cherry picked from commit e2f1c25bf997b03e7f872be9632b1f711b7b47cd)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4b194bc..bd055a8 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -982,7 +982,7 @@
// ship the event
mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( 'SearchSatisfactionErrors', 
evt );
} );
} );
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.18]: Log error events to the correct schema

[jenkins-bot (Code Review)]

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

Change subject: Log error events to the correct schema
..


Log error events to the correct schema

Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 30fb174..6364c76 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -942,7 +942,7 @@
// ship the event
mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( 'SearchSatisfactionErrors', 
evt );
} );
} );
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.19]: Log error events to the correct schema

[EBernhardson (Code Review)]

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

Change subject: Log error events to the correct schema
..

Log error events to the correct schema

Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
(cherry picked from commit e2f1c25bf997b03e7f872be9632b1f711b7b47cd)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4b194bc..bd055a8 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -982,7 +982,7 @@
// ship the event
mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( 'SearchSatisfactionErrors', 
evt );
} );
} );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.18]: Log error events to the correct schema

[EBernhardson (Code Review)]

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

Change subject: Log error events to the correct schema
..

Log error events to the correct schema

Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 30fb174..6364c76 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -942,7 +942,7 @@
// ship the event
mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( 'SearchSatisfactionErrors', 
evt );
} );
} );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.18
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Log error events to the correct schema

[jenkins-bot (Code Review)]

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

Change subject: Log error events to the correct schema
..


Log error events to the correct schema

Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4b194bc..bd055a8 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -982,7 +982,7 @@
// ship the event
mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( 'SearchSatisfactionErrors', 
evt );
} );
} );
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Log error events to the correct schema

[EBernhardson (Code Review)]

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

Change subject: Log error events to the correct schema
..

Log error events to the correct schema

Change-Id: Ia9580a9732def2fa701cc022a2b7f2116a6b078f
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 4b194bc..bd055a8 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -982,7 +982,7 @@
// ship the event
mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
eventLog = eventLog || extendMwEventLog();
-   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   eventLog.logEvent( 'SearchSatisfactionErrors', 
evt );
} );
} );
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: When no form is found, retry without gateway

[Ejegg (Code Review)]

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

Change subject: When no form is found, retry without gateway
..

When no form is found, retry without gateway

This will fix some situations where a donor has changed their mind
and is trying to donate with a payment method not supported by a
gateway that may be left over in session.

Bug: T176356
Change-Id: I74b47e618b61c675f2c54cda66348e938cd10078
---
M special/GatewayFormChooser.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/43/379443/1

diff --git a/special/GatewayFormChooser.php b/special/GatewayFormChooser.php
index 5666548..645408a 100644
--- a/special/GatewayFormChooser.php
+++ b/special/GatewayFormChooser.php
@@ -71,6 +71,11 @@
// FIXME: here we should check for ffname, and if that's a 
valid form skip the choosing
$form = self::getOneValidForm( $country, $currency, 
$paymentMethod, $paymentSubMethod, $recurring, $gateway );
 
+   // If we can't find a good form and we're forcing a gateway, 
try again without the gateway
+   if ( $form === null && $gateway ) {
+   $form = self::getOneValidForm( $country, $currency, 
$paymentMethod, $paymentSubMethod, $recurring, null );
+   }
+
if ( $form === null ) {
$utmSource = $this->getRequest()->getVal( 'utm_source', 
'' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74b47e618b61c675f2c54cda66348e938cd10078
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
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[wmf/1.30.0-wmf.19]: Lazy creation for heavy menu

[jenkins-bot (Code Review)]

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

Change subject: Lazy creation for heavy menu
..


Lazy creation for heavy menu

Assumptions:
* Generally if we have a model we don't need UI
* UI can be created lazy if it is not shown to user

Bug: T176250
Change-Id: Iba7f889d8610de2eb3056248cd1c664b0cd90940
(cherry picked from commit 7a28c62e99a9b935cf8c3c94d367b1b5d8d56223)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
2 files changed, 30 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 20c1463..5ab32ea 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -96,7 +96,12 @@
}
};
 
-   $( rcfilters.init );
+   // Early execute of init
+   if ( document.readyState === 'interactive' || document.readyState === 
'complete' ) {
+   rcfilters.init();
+   } else {
+   $( rcfilters.init );
+   }
 
module.exports = rcfilters;
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index 07d4506..5ba42e7 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
@@ -32,6 +32,7 @@
this.views = {};
this.userSelecting = false;
 
+   this.menuInitialized = false;
this.inputValue = '';
this.$overlay = config.$overlay || this.$element;
this.$body = $( '' ).addClass( 
'mw-rcfilters-ui-menuSelectWidget-body' );
@@ -129,13 +130,26 @@
};
 
/**
-* Respond to model initialize event. Populate the menu from the model
+* @inheritdoc
 */
-   mw.rcfilters.ui.MenuSelectWidget.prototype.onModelInitialize = function 
() {
+   mw.rcfilters.ui.MenuSelectWidget.prototype.toggle = function ( show ) {
+   this.lazyMenuCreation();
+   mw.rcfilters.ui.MenuSelectWidget.parent.prototype.toggle.call( 
this, show );
+   };
+
+   /**
+* lazy creation of the menu
+*/
+   mw.rcfilters.ui.MenuSelectWidget.prototype.lazyMenuCreation = function 
() {
var widget = this,
viewGroupCount = {},
groups = this.model.getFilterGroups();
 
+   if ( this.menuInitialized ) {
+   return;
+   }
+
+   this.menuInitialized = true;
// Reset
this.clearItems();
 
@@ -188,6 +202,13 @@
} );
 
this.switchView( this.model.getCurrentView() );
+   };
+
+   /**
+* Respond to model initialize event. Populate the menu from the model
+*/
+   mw.rcfilters.ui.MenuSelectWidget.prototype.onModelInitialize = function 
() {
+   this.menuInitialized = false;
};
 
/**
@@ -285,6 +306,7 @@
 * @return {mw.rcfilters.ui.ItemMenuOptionWidget} Option widget
 */
mw.rcfilters.ui.MenuSelectWidget.prototype.getItemFromModel = function 
( model ) {
+   this.lazyMenuCreation();
return this.views[ model.getGroupModel().getView() ].filter( 
function ( item ) {
return item.getName() === model.getName();
} )[ 0 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba7f889d8610de2eb3056248cd1c664b0cd90940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Eranroz 
Gerrit-Reviewer: Jack Phoenix 
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]: WIP: Prometheus metrics reporting

[Ejegg (Code Review)]

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

Change subject: WIP: Prometheus metrics reporting
..

WIP: Prometheus metrics reporting

Sort of written with genericity in mind.

Bug: T171524
Change-Id: I05a7b9299903658034a3baf4043be04d537e
---
A sites/all/modules/metrics_reporting/MetricsReporter.php
A sites/all/modules/metrics_reporting/PrometheusReporter.php
A sites/all/modules/metrics_reporting/metrics_reporting.info
A sites/all/modules/metrics_reporting/metrics_reporting.module
M sites/default/enabled_modules
5 files changed, 113 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/42/379442/1

diff --git a/sites/all/modules/metrics_reporting/MetricsReporter.php 
b/sites/all/modules/metrics_reporting/MetricsReporter.php
new file mode 100644
index 000..9043976
--- /dev/null
+++ b/sites/all/modules/metrics_reporting/MetricsReporter.php
@@ -0,0 +1,9 @@
+prometheusPath = $prometheusPath;
+   }
+
+   /**
+* @param string $component name of the component doing the reporting
+* @param array $metrics associative array of metric names to values
+*/
+   public function reportMetrics( $component, $metrics = array() ) {
+   $contents = [];
+   foreach ( $metrics as $name => $value ) {
+   $contents[] = "$name $value";
+   }
+   $path = $this->prometheusPath . DIRECTORY_SEPARATOR . 
$component;
+   file_put_contents( $path, implode( "\n", $contents ) );
+   }
+}
diff --git a/sites/all/modules/metrics_reporting/metrics_reporting.info 
b/sites/all/modules/metrics_reporting/metrics_reporting.info
new file mode 100644
index 000..f10962a
--- /dev/null
+++ b/sites/all/modules/metrics_reporting/metrics_reporting.info
@@ -0,0 +1,6 @@
+name = Metrics Reporting
+description = Generic metrics reporting
+core = 7.x
+configure = admin/config/metrics_reporting/configure
+files[] = MetricsReporter.php
+files[] = PrometheusReporter.php
diff --git a/sites/all/modules/metrics_reporting/metrics_reporting.module 
b/sites/all/modules/metrics_reporting/metrics_reporting.module
new file mode 100644
index 000..00a217d
--- /dev/null
+++ b/sites/all/modules/metrics_reporting/metrics_reporting.module
@@ -0,0 +1,64 @@
+ 'metrics reporting',
+   'access arguments' => array( 'administer metrics reporting' ),
+   'page callback' => 'system_admin_menu_block_page',
+   'file' => 'system.admin.inc',
+   'file path' => drupal_get_path( 'module', 'system' ),
+   );
+
+   // forces 'metrics reporting' to appear on the config page
+   $items['admin/config/metrics_reporting/configure'] = array(
+   'title' => 'Configure',
+   'description' => 'Configure metrics reporting.',
+   'access arguments' => array( 'administer metrics reporting' ),
+   'page callback' => 'drupal_get_form',
+   'page arguments' => array( 'metrics_reporting_settings' ),
+   );
+
+   return $items;
+}
+
+/**
+ * Invocation of hook_permission
+ */
+function metrics_reporting_permission() {
+   return array(
+   'administer metrics reporting' => array(
+   'title' => t( 'Administer metrics reporting' ),
+   ),
+   );
+}
+
+/**
+ * Generate settings form
+ */
+function metrics_reporting_settings() {
+   $form = array();
+
+   $form['metrics_reporting_prometheus_path'] = array(
+   '#type' => 'textfield',
+   '#title' => t( 'Prometheus Path' ),
+   '#required' => true,
+   '#default_value' => variable_get( 
'metrics_reporting_prometheus_path', '/var/log/fundraising_metrics' ),
+   '#description' => t( 'The full path to the directory where we 
should write Prometheus metrics files.' )
+   );
+
+   return system_settings_form( $form );
+}
+
+function metrics_reporting_report_metrics( $component, $metrics = array() ) {
+   $prometheusPath = variable_get(
+   'metrics_reporting_prometheus_path', 
'/var/log/fundraising_metrics'
+   );
+   $reporter = new PrometheusReporter( $prometheusPath );
+   $reporter->reportMetrics( $component, $metrics );
+}
diff --git a/sites/default/enabled_modules b/sites/default/enabled_modules
index b49e4e0..51a71fa 100644
--- a/sites/default/enabled_modules
+++ b/sites/default/enabled_modules
@@ -13,6 +13,7 @@
 ingenico_audit
 large_donation
 libraries
+metrics_reporting
 oauth_common
 oauth_common_providerui
 offline2civicrm

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Retry deadlocked inserts, take two

[jenkins-bot (Code Review)]

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

Change subject: Retry deadlocked inserts, take two
..


Retry deadlocked inserts, take two

The previous attempt was looking at the wrong property. Which was
good, because it would also have sent two copies of the message to
the damaged database, one to retry and one to just sit there.

This should also make sure we don't get a failmail when something
has been re-queued.

How to test locally:
* set a breakpoint inside processMessage in the donation queue consumer.
* consume a message with drush qc
* when you hit the breakpoint, do the following in a mysql command prompt
begin;
set @numemails = ( select count(*) from civicrm_email );
insert into civicrm_email ( contact_id, email, is_primary )
 values ( 1, concat( 'blah', @numemails, '@example.org' ), 0 );
select count(*) from civicrm_email;
* Then let the queue consumer keep running without committing the other thing

Bug: T118487
Change-Id: I6ac7906ca4244520e69435998c6f8805e952ccb3
---
M sites/all/modules/wmf_common/WmfException.php
M sites/all/modules/wmf_common/WmfQueueConsumer.php
2 files changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/sites/all/modules/wmf_common/WmfException.php 
b/sites/all/modules/wmf_common/WmfException.php
index 4617391..a8d7a4e 100644
--- a/sites/all/modules/wmf_common/WmfException.php
+++ b/sites/all/modules/wmf_common/WmfException.php
@@ -136,7 +136,11 @@
 }
 $this->message = "{$this->type} {$message}";
 $this->userMessage = $this->message;
-$this->message = $this->message . "\nSource: " . var_export( 
$this->extra, true );
+$addToMessage = $this->extra;
+if ( isset ( $addToMessage['trace'] ) ) {
+   unset ( $addToMessage['trace'] );
+   }
+$this->message = $this->message . "\nSource: " . var_export( 
$addToMessage, true );
 
 if ( function_exists( 'watchdog' ) ) {
 // It seems that dblog_watchdog will pass through XSS, so
@@ -170,7 +174,7 @@
 
 function isRejectMessage()
 {
-return $this->getErrorCharacteristic('reject', FALSE);
+return !$this->isRequeue() && $this->getErrorCharacteristic('reject', 
FALSE);
 }
 
 function isDropMessage()
@@ -180,11 +184,11 @@
 
 function isRequeue()
 {
-   if ( $this->extra && !empty( $this->extra['sql'] ) ) {
+   if ( $this->extra && !empty( $this->extra['trace'] ) ) {
// We want to retry later if the problem was a lock wait timeout
// or a deadlock. Unfortunately we have to do string 
parsing to
// figure that out.
-   if ( preg_match( '/\bnativecode=12(05|13)\b/', 
$this->extra['sql'] ) ) {
+   if ( preg_match( '/\'12(05|13) \*\* /', $this->extra['trace'] ) 
) {
return TRUE;
}
}
diff --git a/sites/all/modules/wmf_common/WmfQueueConsumer.php 
b/sites/all/modules/wmf_common/WmfQueueConsumer.php
index c78952a..2a109d1 100644
--- a/sites/all/modules/wmf_common/WmfQueueConsumer.php
+++ b/sites/all/modules/wmf_common/WmfQueueConsumer.php
@@ -43,6 +43,7 @@
) {
$mailableDetails = '';
$reject = false;
+   $requeued = false;
 
if ( $ex->isRequeue() ) {
$delay = intval( variable_get( 
'wmf_common_requeue_delay', 20 * 60 ) );
@@ -64,6 +65,7 @@
} else {
$retryDate = time() + $delay;
$this->sendToDamagedStore( $message, $ex, 
$retryDate );
+   $requeued = true;
}
}
 
@@ -91,7 +93,7 @@
$mailableDetails = "Redacted contents of message ID: 
$logId";
}
 
-   if ( !$ex->isNoEmail() ) {
+   if ( !$ex->isNoEmail() && !$requeued ) {
wmf_common_failmail( 'wmf_common', '', $ex, 
$mailableDetails );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ac7906ca4244520e69435998c6f8805e952ccb3
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] analytics/reportupdater-queries[master]: Add draft creation config and query

[Nettrom (Code Review)]

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

Change subject: Add draft creation config and query
..

Add draft creation config and query

SQL query to count the number of page creations in the Draft (118)
namespace on English Wikipedia, and updated configuration file.

Bug: T176375
Change-Id: I22f3fcb2945596228b1b5e3c61bcf70d1d50dc50
---
M page-creation/config.yaml
A page-creation/pagecreations_draft.sql
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater-queries 
refs/changes/41/379441/1

diff --git a/page-creation/config.yaml b/page-creation/config.yaml
index dc14b73..b3e268c 100644
--- a/page-creation/config.yaml
+++ b/page-creation/config.yaml
@@ -62,3 +62,10 @@
 lag: 3600 # this can wait an hour
 explode_by:
 wiki_db: enwiki
+
+pagecreations_draft:
+granularity: days
+starts: 2017-07-21
+lag: 3600 # this can wait an hour
+explode_by:
+wiki_db: enwiki
diff --git a/page-creation/pagecreations_draft.sql 
b/page-creation/pagecreations_draft.sql
new file mode 100644
index 000..8367e3e
--- /dev/null
+++ b/page-creation/pagecreations_draft.sql
@@ -0,0 +1,7 @@
+SELECT DATE('{from_timestamp}') AS date,
+COUNT(*) AS {wiki_db}
+FROM mediawiki_page_create_2
+WHERE `database`='{wiki_db}'
+AND page_namespace = 118
+AND rev_timestamp >= STR_TO_DATE('{from_timestamp}', '%Y%m%d%H%i%s')
+AND rev_timestamp < STR_TO_DATE('{to_timestamp}', '%Y%m%d%H%i%s')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22f3fcb2945596228b1b5e3c61bcf70d1d50dc50
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater-queries
Gerrit-Branch: master
Gerrit-Owner: Nettrom 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable jQuery 3 on commons.wikimedia.org

[jenkins-bot (Code Review)]

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

Change subject: Enable jQuery 3 on commons.wikimedia.org
..


Enable jQuery 3 on commons.wikimedia.org

Bug: T124742
Change-Id: Ibb70fc6b7f0497683d99a32158ec3c5c61604149
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3251890..64c7932 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14965,6 +14965,7 @@
'mediawikiwiki' => true,
 
// opt-in (T124742)
+   'commonswiki' => true, // @Krinkle
'metawiki' => true, // @Krinkle
'nlwiki' => true, // @Krinkle
'nlwikibooks' => true, // @Krinkle

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb70fc6b7f0497683d99a32158ec3c5c61604149
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
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...DonationInterface[master]: WIP shouldRectifyOrphan for Ingenico

[Ejegg (Code Review)]

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

Change subject: WIP shouldRectifyOrphan for Ingenico
..

WIP shouldRectifyOrphan for Ingenico

TODO: set up a test with a real contribution_tracking row that has
a civi contribution_id in it. Will fail till we implement something
like GlobalCollectOrphanAdapter's getContributionTracking

Bug: T176376
Change-Id: Icfb5e193f48a0160fb469d7fdd84a5dbbb8646fe
---
M ingenico_gateway/ingenico.adapter.php
M tests/phpunit/Adapter/Ingenico/IngenicoOrphanAdapterTest.php
2 files changed, 37 insertions(+), 23 deletions(-)


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

diff --git a/ingenico_gateway/ingenico.adapter.php 
b/ingenico_gateway/ingenico.adapter.php
index daa88b7..a13d7b0 100644
--- a/ingenico_gateway/ingenico.adapter.php
+++ b/ingenico_gateway/ingenico.adapter.php
@@ -243,4 +243,23 @@
$this->getData_Unstaged_Escaped( 'gateway_txn_id' )
);
}
+
+   public function shouldRectifyOrphan() {
+   if ( $this->getPaymentMethod() !== 'cc' ) {
+   // Skip other payment methods which shouldn't be in the 
pending
+   // queue anyway.  See 
https://phabricator.wikimedia.org/T161160
+   $this->logger->info( "Skipping non-credit card pending 
record." );
+   return false;
+   }
+   $civiId = $this->getData_Unstaged_Escaped( 'contribution_id' );
+   if ( $civiId ) {
+   $ctId = $this->getData_Unstaged_Escaped( 
'contribution_tracking_id' );
+   $this->logger->error(
+   "$ctId: Contribution tracking already has 
contribution_id $civiId.  " .
+   'Stop confusing donors!'
+   );
+   return false;
+   }
+   return true;
+   }
 }
diff --git a/tests/phpunit/Adapter/Ingenico/IngenicoOrphanAdapterTest.php 
b/tests/phpunit/Adapter/Ingenico/IngenicoOrphanAdapterTest.php
index 4e7eee5..826e0be 100644
--- a/tests/phpunit/Adapter/Ingenico/IngenicoOrphanAdapterTest.php
+++ b/tests/phpunit/Adapter/Ingenico/IngenicoOrphanAdapterTest.php
@@ -31,9 +31,16 @@
  * @group OrphanSlayer
  */
 class DonationInterface_Adapter_Ingenico_Orphans_IngenicoTest extends 
DonationInterfaceTestCase {
+   protected $dummy_utm_data;
+
public function setUp() {
parent::setUp();
-   $this->markTestSkipped( 'Orphan adapter not yet implemented' );
+   $this->dummy_utm_data = array(
+   'utm_source' => 'dummy_source',
+   'utm_campaign' => 'dummy_campaign',
+   'utm_medium' => 'dummy_medium',
+   'date' => time(),
+   );
 
TestingContext::get()->providerConfigurationOverride =
TestingProviderConfiguration::createForProvider(
@@ -43,34 +50,18 @@
 
$this->setMwGlobals( array(
'wgIngenicoGatewayEnabled' => true,
-   'wgDonationInterfaceAllowedHtmlForms' => array(
-   'cc-vmad' => array(
-   'gateway' => 'ingenico',
-   'payment_methods' => array( 'cc' => 
array( 'visa', 'mc', 'amex', 'discover' ) ),
-   'countries' => array(
-   '+' => array( 'US', ),
-   ),
-   ),
-   ),
) );
}
 
-   /**
-* @param $name string The name of the test case
-* @param $data array Any parameters read from a dataProvider
-* @param $dataName string|int The name or index of the data set
-*/
-   function __construct( $name = null, array $data = array(), $dataName = 
'' ) {
-   parent::__construct( $name, $data, $dataName );
-   $this->dummy_utm_data = array(
-   'utm_source' => 'dummy_source',
-   'utm_campaign' => 'dummy_campaign',
-   'utm_medium' => 'dummy_medium',
-   'date' => time(),
-   );
+   public function testShouldRectifyOrphan() {
+   $message = $this->createOrphan( array( 'gateway' => 'ingenico' 
) );
+   $this->gatewayAdapter = $this->getFreshGatewayObject( $message 
);
+   $result = $this->gatewayAdapter->shouldRectifyOrphan();
+   $this->assertEquals( $result, true, 'shouldRectifyOrphan 
returning false.' );
}
 
public function testConstructor() {
+   

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.18]: Log javascript errors during search satisfaction tests

[jenkins-bot (Code Review)]

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

Change subject: Log javascript errors during search satisfaction tests
..


Log javascript errors during search satisfaction tests

We have some unexplained problems with data collection recently:
* The interleaved AB test didn't send the trigger key with all expected
  searches
* Sampling rates combined with recorded sessions are off by about 5x
  from what we might expect based on backend logging.

Perhaps these are due to javascript errors occuring in the browser
that we can't see. Log them to get some insight.

Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 24 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index db369ac..cf41ccd 100644
--- a/extension.json
+++ b/extension.json
@@ -119,6 +119,11 @@
"schema": "TestSearchSatisfaction2",
"revision": 16909631
},
+   "schema.SearchSatisfactionErrors": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfactionErrors",
+   "revision": 17181648
+   },
"schema.GeoFeatures": {
"class": "ResourceLoaderSchemaModule",
"schema": "GeoFeatures",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 15ec52a..30fb174 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -25,7 +25,7 @@
return;
}
 
-   var search, autoComplete, session, eventLog, initSubTest,
+   var search, autoComplete, session, eventLog, initSubTest, 
initDebugLogging,
isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
uri = new mw.Uri( location.href ),
checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 180, 
210, 240, 300, 360, 420 ],
@@ -930,6 +930,23 @@
}
} );
 
+   initDebugLogging = atMostOnce( function ( session ) {
+   mw.trackSubscribe( 'global.error', function ( topic, data ) {
+   var evt = {
+   searchSessionId: session.get( 'sessionId' ),
+   visitPageId: session.get( 'pageViewId' ),
+   message: data.errorMessage,
+   error: data.errorObject.toString()
+   };
+
+   // ship the event
+   mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
+   eventLog = eventLog || extendMwEventLog();
+   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   } );
+   } );
+   } );
+
/**
 * Delay session initialization as late in the
 * process as possible, but only do it once.
@@ -940,6 +957,7 @@
session = session || new SessionState();
 
if ( session.isActive() ) {
+   initDebugLogging( session );
initSubTest( session );
fn( session );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.18
Gerrit-Owner: EBernhardson 
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] mediawiki...LandingCheck[master]: Better language fallback for unsupported locales

[jenkins-bot (Code Review)]

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

Change subject: Better language fallback for unsupported locales
..


Better language fallback for unsupported locales

If language is given as an unsupported lang-country combination,
try the unsuffixed language before falling back to English.

Bug: T174693
Change-Id: Iaa628d49c6cac434b52a1bc913d6e986d3025ebb
---
M SpecialLandingCheck.php
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/SpecialLandingCheck.php b/SpecialLandingCheck.php
index a1a7858..a3e01d7 100644
--- a/SpecialLandingCheck.php
+++ b/SpecialLandingCheck.php
@@ -56,6 +56,15 @@
$language = 'en';
}
 
+   // if it's not a supported language, but the section before a
+   // dash or underscore is, use that
+   if ( !Language::isSupportedLanguage( $language ) ) {
+   $parts = preg_split( '/[-_]/', $language );
+   if ( Language::isSupportedLanguage( $parts[0] ) ) {
+   $language = $parts[0];
+   }
+   }
+
// Use the GeoIP cookie if available.
if ( !$country ) {
$geoip = $request->getCookie( 'GeoIP', '' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa628d49c6cac434b52a1bc913d6e986d3025ebb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LandingCheck
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.19]: Log javascript errors during search satisfaction tests

[jenkins-bot (Code Review)]

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

Change subject: Log javascript errors during search satisfaction tests
..


Log javascript errors during search satisfaction tests

We have some unexplained problems with data collection recently:
* The interleaved AB test didn't send the trigger key with all expected
  searches
* Sampling rates combined with recorded sessions are off by about 5x
  from what we might expect based on backend logging.

Perhaps these are due to javascript errors occuring in the browser
that we can't see. Log them to get some insight.

Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
(cherry picked from commit 63de830bb2b33d5ebb7917a54507bf2dc95689ba)
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 24 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index cbc7db6..cac3d20 100644
--- a/extension.json
+++ b/extension.json
@@ -127,6 +127,11 @@
"schema": "TestSearchSatisfaction2",
"revision": 16909631
},
+   "schema.SearchSatisfactionErrors": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfactionErrors",
+   "revision": 17181648
+   },
"schema.GeoFeatures": {
"class": "ResourceLoaderSchemaModule",
"schema": "GeoFeatures",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 9e52636..4b194bc 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -25,7 +25,7 @@
return;
}
 
-   var search, autoComplete, session, eventLog, initSubTest,
+   var search, autoComplete, session, eventLog, initSubTest, 
initDebugLogging,
isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
uri = new mw.Uri( location.href ),
checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 180, 
210, 240, 300, 360, 420 ],
@@ -970,6 +970,23 @@
}
} );
 
+   initDebugLogging = atMostOnce( function ( session ) {
+   mw.trackSubscribe( 'global.error', function ( topic, data ) {
+   var evt = {
+   searchSessionId: session.get( 'sessionId' ),
+   visitPageId: session.get( 'pageViewId' ),
+   message: data.errorMessage,
+   error: data.errorObject.toString()
+   };
+
+   // ship the event
+   mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
+   eventLog = eventLog || extendMwEventLog();
+   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   } );
+   } );
+   } );
+
/**
 * Delay session initialization as late in the
 * process as possible, but only do it once.
@@ -980,6 +997,7 @@
session = session || new SessionState();
 
if ( session.isActive() ) {
+   initDebugLogging( session );
initSubTest( session );
fn( session );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: EBernhardson 
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]: phab/aphlict: ensure aphlict group always exists

[Dzahn (Code Review)]

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

Change subject: phab/aphlict: ensure aphlict group always exists
..


phab/aphlict: ensure aphlict group always exists

Ensure the group always exists, whether aphlict is
enabled or not, otherwise we don't get the group
on non-active server (ensure => absent) while the
class is still trying to create the user
which will fail without the group.

Also revert Ia9b72f9caf26fb5cc2

Bug: T765
Change-Id: I730f935d68db61211f92ffde7995242af7c9ed1b
---
M modules/phabricator/manifests/aphlict.pp
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index 6db523f..d6c6a01 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -68,15 +68,16 @@
 
 # accounts
 group { $group:
-ensure => $ensure,
+ensure => 'present',
 system => true,
 }
 
 user { $user:
-gid=> $group,
-shell  => '/bin/false',
-home   => '/var/run/aphlict',
-system => true,
+gid => $group,
+shell   => '/bin/false',
+home=> '/var/run/aphlict',
+system  => true,
+require => Group[$group],
 }
 
 base::service_unit { 'aphlict':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I730f935d68db61211f92ffde7995242af7c9ed1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
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]: phab/aphlict: ensure aphlict group always exists

[Dzahn (Code Review)]

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

Change subject: phab/aphlict: ensure aphlict group always exists
..

phab/aphlict: ensure aphlict group always exists

Ensure the group always exists, whether aphlict is
enabled or not, otherwise we don't get the group
on non-active server (ensure => absent) while the
class is still trying to create the user
which will fail without the group.

Also revert Ia9b72f9caf26fb5cc2

Bug: T765
Change-Id: I730f935d68db61211f92ffde7995242af7c9ed1b
---
M modules/phabricator/manifests/aphlict.pp
1 file changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index 6db523f..d6c6a01 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -68,15 +68,16 @@
 
 # accounts
 group { $group:
-ensure => $ensure,
+ensure => 'present',
 system => true,
 }
 
 user { $user:
-gid=> $group,
-shell  => '/bin/false',
-home   => '/var/run/aphlict',
-system => true,
+gid => $group,
+shell   => '/bin/false',
+home=> '/var/run/aphlict',
+system  => true,
+require => Group[$group],
 }
 
 base::service_unit { 'aphlict':

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add John Michael Kohler Art Center throttle rule

[jenkins-bot (Code Review)]

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

Change subject: Add John Michael Kohler Art Center throttle rule
..


Add John Michael Kohler Art Center throttle rule

New throttle rule:
* Event name  John Michael Kohler Art Center
* Event start ... 2017-09-21 13:00-05:00
* Event end . 2017-09-26 22:00-05:00
* IP  192.168.50.52
* Projects .. enwiki, commonswiki
* Attendees . 100 (margin set at 100)

Cleaned former throttle rules.

Bug: T176287
Change-Id: Ie3f86233979797ad16450f329c7486b66aa039c1
---
M wmf-config/throttle.php
1 file changed, 8 insertions(+), 22 deletions(-)

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



diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index 1d83a31..4d3e40f 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -44,27 +44,13 @@
'value' => 120 // 100 expected
 ];
 
-$wmgThrottlingExceptions[] = [ // T175534 (1)
-   'from' => '2017-09-16T10:00 +8:00',
-   'to' => '2017-09-16T17:00 +8:00',
-   'IP' => '140.114.51.248',
-   'dbname' => [ 'commonswiki', 'zhwiki' ],
-   'value' => 80, // 50 expected
-];
-
-$wmgThrottlingExceptions[] = [ // T175534 (2)
-   'from' => '2017-09-17T09:00 +8:00',
-   'to' => '2017-09-17T16:00 +8:00',
-   'IP' => '140.114.51.248',
-   'dbname' => [ 'commonswiki', 'zhwiki' ],
-   'value' => 80, // 50 expected
-];
-
-$wmgThrottlingExceptions[] = [ // T175700
-   'from'   => '2017-09-15T10:00 +1:00',
-   'to' => '2017-09-15T18:00 +1:00',
-   'range'  => '130.88.64.0/24',
-   'dbname' => [ 'enwiki' ],
-   'value'  => 30 // 20 expected
+$wmgThrottlingExceptions[] = [ // T176287 - John Michael Kohler Art Center
+   'from'   => '2017-09-21T13:00-05:00', // Central
+   'to' => '2017-09-26T22:00-05:00',
+   'IP'  => [
+   '192.168.50.52',
+   ],
+   'dbname' => [ 'enwiki', 'commonswiki' ],
+   'value'  => 100, // 100 expected participants (not specified)
 ];
 ## Add throttling definitions above.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3f86233979797ad16450f329c7486b66aa039c1
Gerrit-PatchSet: 10
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Melos 
Gerrit-Reviewer: Samtar 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable user email blacklist on meta

[jenkins-bot (Code Review)]

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

Change subject: Enable user email blacklist on meta
..


Enable user email blacklist on meta

Bug: T174694
Change-Id: I8e3f98849aa48b174f65295cfe189330da7c4b0a
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d7ba193..3251890 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4920,6 +4920,11 @@
'default' => true,
 ],
 
+'wgEnableUserEmailBlacklist' => [
+   'default' => false,
+   'metawiki' => true,
+],
+
 'wgAutoConfirmCount' => [
'default' => 0,
'arwiki' => 50, // T14123

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e3f98849aa48b174f65295cfe189330da7c4b0a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dmaza 
Gerrit-Reviewer: Catrope 
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...DonationInterface[master]: Record the form variant in contribution tracking

[jenkins-bot (Code Review)]

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

Change subject: Record the form variant in contribution tracking
..


Record the form variant in contribution tracking

As part of the convoluted payments_form.
TODO: also send in the message?

Bug: T173869
Change-Id: I826e6ad2bdd3641c9526a1849019c2815e41d0b5
---
M gateway_common/DonationData.php
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 8623f59..0d18971 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -834,9 +834,11 @@
 
$tracking_data['payments_form'] = $this->getVal( 'gateway' );
 
-   // FIXME: currently 'appeal' is the only way to A/B test 
different CSS.
-   // Change this tracking element to 'ffname' when we restore 
that.
-   if ( $this->isSomething( 'appeal' ) ) {
+   // Variant is the new way to a/b test forms. Appeal is still 
used to
+   // render wikitext at the side, but it's almost always 
JimmyQuote
+   if ( $this->isSomething( 'variant' ) ) {
+   $tracking_data['payments_form'] .= '.v=' . 
$this->getVal( 'variant' );
+   } elseif ( $this->isSomething( 'appeal' ) ) {
$tracking_data['payments_form'] .= '.' . $this->getVal( 
'appeal' );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Adding submodules of bundled REL1_30 extensions/skins/vendor

[jenkins-bot (Code Review)]

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

Change subject: Adding submodules of bundled REL1_30 extensions/skins/vendor
..


Adding submodules of bundled REL1_30 extensions/skins/vendor

Change-Id: I2daab1788406f98773c02799c4d4edfd842ea8f2
---
A .gitmodules
A extensions/Cite
A extensions/CiteThisPage
A extensions/ConfirmEdit
A extensions/Gadgets
A extensions/ImageMap
A extensions/InputBox
A extensions/Interwiki
A extensions/LocalisationUpdate
A extensions/Nuke
A extensions/ParserFunctions
A extensions/PdfHandler
A extensions/Poem
A extensions/Renameuser
A extensions/SpamBlacklist
A extensions/SyntaxHighlight_GeSHi
A extensions/TitleBlacklist
A extensions/WikiEditor
A skins/CologneBlue
A skins/Modern
A skins/MonoBook
A skins/Vector
A vendor
23 files changed, 110 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..e34d4fb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,88 @@
+[submodule "extensions/Cite"]
+   path = extensions/Cite
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Cite
+   branch = REL1_30
+[submodule "extensions/CiteThisPage"]
+   path = extensions/CiteThisPage
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CiteThisPage
+   branch = REL1_30
+[submodule "extensions/ConfirmEdit"]
+   path = extensions/ConfirmEdit
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ConfirmEdit
+   branch = REL1_30
+[submodule "extensions/Gadgets"]
+   path = extensions/Gadgets
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Gadgets
+   branch = REL1_30
+[submodule "extensions/ImageMap"]
+   path = extensions/ImageMap
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ImageMap
+   branch = REL1_30
+[submodule "extensions/InputBox"]
+   path = extensions/InputBox
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/InputBox
+   branch = REL1_30
+[submodule "extensions/Interwiki"]
+   path = extensions/Interwiki
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Interwiki
+   branch = REL1_30
+[submodule "extensions/LocalisationUpdate"]
+   path = extensions/LocalisationUpdate
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/LocalisationUpdate
+   branch = REL1_30
+[submodule "extensions/Nuke"]
+   path = extensions/Nuke
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Nuke
+   branch = REL1_30
+[submodule "extensions/ParserFunctions"]
+   path = extensions/ParserFunctions
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ParserFunctions
+   branch = REL1_30
+[submodule "extensions/PdfHandler"]
+   path = extensions/PdfHandler
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PdfHandler
+   branch = REL1_30
+[submodule "extensions/Poem"]
+   path = extensions/Poem
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Poem
+   branch = REL1_30
+[submodule "extensions/Renameuser"]
+   path = extensions/Renameuser
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Renameuser
+   branch = REL1_30
+[submodule "extensions/SpamBlacklist"]
+   path = extensions/SpamBlacklist
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SpamBlacklist
+   branch = REL1_30
+[submodule "extensions/SyntaxHighlight_GeSHi"]
+   path = extensions/SyntaxHighlight_GeSHi
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SyntaxHighlight_GeSHi
+   branch = REL1_30
+[submodule "extensions/TitleBlacklist"]
+   path = extensions/TitleBlacklist
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/TitleBlacklist
+   branch = REL1_30
+[submodule "extensions/WikiEditor"]
+   path = extensions/WikiEditor
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikiEditor
+   branch = REL1_30
+[submodule "skins/CologneBlue"]
+   path = skins/CologneBlue
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/CologneBlue
+   branch = REL1_30
+[submodule "skins/Modern"]
+   path = skins/Modern
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/Modern
+   branch = REL1_30
+[submodule "skins/MonoBook"]
+   path = skins/MonoBook
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/MonoBook
+   branch = REL1_30
+[submodule "skins/Vector"]
+   path = skins/Vector
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/Vector
+   branch = REL1_30
+[submodule "vendor"]
+   path = vendor
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/vendor
+   branch = REL1_30
diff --git a/extensions/Cite 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Adding mlwiki to categories, by request.

[jenkins-bot (Code Review)]

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

Change subject: Adding mlwiki to categories, by request.
..


Adding mlwiki to categories, by request.

Change-Id: I49c8ef7c5c529c21f3747cfd0507f184e50175b1
---
M dblists/categories-rdf.dblist
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/dblists/categories-rdf.dblist b/dblists/categories-rdf.dblist
index 3626987..25ad820 100644
--- a/dblists/categories-rdf.dblist
+++ b/dblists/categories-rdf.dblist
@@ -17,3 +17,4 @@
 viwiki
 warwiki
 mediawikiwiki
+mlwiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49c8ef7c5c529c21f3747cfd0507f184e50175b1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Catrope 
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/puppet[production]: phab/aphlict: fix puppet

[Paladox (Code Review)]

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

Change subject: phab/aphlict: fix puppet
..

phab/aphlict: fix puppet

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c831130a60ede3d4bc642933d2ee0159dec4421
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/mediawiki-config[master]: Create a 'patroller' user group at Meta-Wiki

[jenkins-bot (Code Review)]

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

Change subject: Create a 'patroller' user group at Meta-Wiki
..


Create a 'patroller' user group at Meta-Wiki

- Added rights: autopatrol, patrol, patrolmarks and rollback.
- Granted and removed by administrators

Bug: T176079
Change-Id: Iac8ec9e0f535b95d4be3f14b2e871dc48b3a425a
---
M wmf-config/InitialiseSettings.php
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index bf8b0bf..d7ba193 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8913,6 +8913,12 @@
'oauthadmin' => [ // T142123
'autopatrol' => true,
],
+   'patroller' => [ // T176079
+   'autopatrol' => true,
+   'patrol' => true,
+   'patrolmarks' => true,
+   'rollback' => true,
+   ],
'steward' => [
'centralauth-rename' => true,
'userrights-interwiki' => true,
@@ -10122,7 +10128,7 @@
],
'+metawiki' => [
'bureaucrat' => [ 'centralnoticeadmin', 'flood', 'uploader', 
'translationadmin' ], // T48639, T110674
-   'sysop' => [ 'autopatrolled', 'massmessage-sender' ], // T59611
+   'sysop' => [ 'autopatrolled', 'massmessage-sender', 'patroller' 
], // T59611, T176079
],
'+mkwiki' => [
'bureaucrat' => [ 'patroller', 'autopatrolled', 'autoreviewed' 
],
@@ -10877,7 +10883,7 @@
],
'+metawiki' => [
'bureaucrat' => [ 'flood', 'translationadmin', 
'centralnoticeadmin', 'uploader' ], // T39198, T52287, T110674
-   'sysop' => [ 'autopatrolled', 'massmessage-sender' ], // T59611
+   'sysop' => [ 'autopatrolled', 'massmessage-sender', 'patroller' 
], // T59611, T176079
],
'+mkwiki' => [
'bureaucrat' => [ 'patroller', 'autopatrolled', 'autoreviewed' 
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac8ec9e0f535b95d4be3f14b2e871dc48b3a425a
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Add 'ingenico' to error form definitions

[Ejegg (Code Review)]

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

Change subject: Add 'ingenico' to error form definitions
..

Add 'ingenico' to error form definitions

Change-Id: Ib85ce089473d725157973969b33a19a05e84d190
---
M DonationInterfaceFormSettings.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/DonationInterfaceFormSettings.php 
b/DonationInterfaceFormSettings.php
index 5b9bdd6..d173407 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -434,17 +434,17 @@
  * *** */
 
 $forms_whitelist['error-default'] = array(
-   'gateway' => array( 'globalcollect', 'adyen', 'amazon', 'astropay', 
'paypal', 'paypal_ec' ),
+   'gateway' => array( 'globalcollect', 'ingenico', 'adyen', 'amazon', 
'astropay', 'paypal', 'paypal_ec' ),
'special_type' => 'error',
 );
 
 $forms_whitelist['error-noform'] = array(
-   'gateway' => array( 'globalcollect', 'adyen', 'amazon', 'astropay', 
'paypal', 'paypal_ec' ),
+   'gateway' => array( 'globalcollect', 'ingenico', 'adyen', 'amazon', 
'astropay', 'paypal', 'paypal_ec' ),
'special_type' => 'error',
 );
 
 $forms_whitelist['error-cc'] = array(
-   'gateway' => array( 'globalcollect', 'adyen', 'astropay' ),
+   'gateway' => array( 'globalcollect', 'ingenico', 'adyen', 'astropay' ),
'payment_methods' => array( 'cc' => 'ALL' ),
'special_type' => 'error',
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib85ce089473d725157973969b33a19a05e84d190
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
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...Graph[master]: ui.MWGraphDialog: update dialog fragment after popping staging

[DLynch (Code Review)]

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

Change subject: ui.MWGraphDialog: update dialog fragment after popping staging
..

ui.MWGraphDialog: update dialog fragment after popping staging

Depends-On: I905a4d5860a3bdf36477fc798a233e166febd63b
Bug: T166134
Change-Id: Ie8e949a21b305329eeb3633d80cd076de541a197
---
M modules/ve-graph/ve.ui.MWGraphDialog.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/ve-graph/ve.ui.MWGraphDialog.js 
b/modules/ve-graph/ve.ui.MWGraphDialog.js
index ad00467..b3426cc 100644
--- a/modules/ve-graph/ve.ui.MWGraphDialog.js
+++ b/modules/ve-graph/ve.ui.MWGraphDialog.js
@@ -294,6 +294,7 @@
// Kill staging
if ( data === undefined ) {
this.getFragment().getSurface().popStaging();
+   this.getFragment().update( 
this.getFragment().getSurface().getSelection() );
}
}, this );
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8e949a21b305329eeb3633d80cd076de541a197
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Surface: reset selection when popping staging

[DLynch (Code Review)]

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

Change subject: Surface: reset selection when popping staging
..

Surface: reset selection when popping staging

Bug: T166134
Change-Id: I905a4d5860a3bdf36477fc798a233e166febd63b
---
M src/dm/ve.dm.Surface.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/35/379435/1

diff --git a/src/dm/ve.dm.Surface.js b/src/dm/ve.dm.Surface.js
index f04ce18..053c531 100644
--- a/src/dm/ve.dm.Surface.js
+++ b/src/dm/ve.dm.Surface.js
@@ -262,7 +262,7 @@
transaction = transactions[ i ].reversed();
reverseTransactions.push( transaction );
}
-   this.changeInternal( reverseTransactions, undefined, true );
+   this.changeInternal( reverseTransactions, staging.selectionBefore, true 
);
 
if ( !this.isStaging() ) {
this.startHistoryTracking();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I905a4d5860a3bdf36477fc798a233e166febd63b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Adding submodules of bundled REL1_30 extensions/skins/vendor

[Chad (Code Review)]

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

Change subject: Adding submodules of bundled REL1_30 extensions/skins/vendor
..

Adding submodules of bundled REL1_30 extensions/skins/vendor

Change-Id: I2daab1788406f98773c02799c4d4edfd842ea8f2
---
A .gitmodules
A extensions/Cite
A extensions/CiteThisPage
A extensions/ConfirmEdit
A extensions/Gadgets
A extensions/ImageMap
A extensions/InputBox
A extensions/Interwiki
A extensions/LocalisationUpdate
A extensions/Nuke
A extensions/ParserFunctions
A extensions/PdfHandler
A extensions/Poem
A extensions/Renameuser
A extensions/SpamBlacklist
A extensions/SyntaxHighlight_GeSHi
A extensions/TitleBlacklist
A extensions/WikiEditor
A skins/CologneBlue
A skins/Modern
A skins/MonoBook
A skins/Vector
A vendor
23 files changed, 110 insertions(+), 0 deletions(-)


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

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..e34d4fb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,88 @@
+[submodule "extensions/Cite"]
+   path = extensions/Cite
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Cite
+   branch = REL1_30
+[submodule "extensions/CiteThisPage"]
+   path = extensions/CiteThisPage
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CiteThisPage
+   branch = REL1_30
+[submodule "extensions/ConfirmEdit"]
+   path = extensions/ConfirmEdit
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ConfirmEdit
+   branch = REL1_30
+[submodule "extensions/Gadgets"]
+   path = extensions/Gadgets
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Gadgets
+   branch = REL1_30
+[submodule "extensions/ImageMap"]
+   path = extensions/ImageMap
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ImageMap
+   branch = REL1_30
+[submodule "extensions/InputBox"]
+   path = extensions/InputBox
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/InputBox
+   branch = REL1_30
+[submodule "extensions/Interwiki"]
+   path = extensions/Interwiki
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Interwiki
+   branch = REL1_30
+[submodule "extensions/LocalisationUpdate"]
+   path = extensions/LocalisationUpdate
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/LocalisationUpdate
+   branch = REL1_30
+[submodule "extensions/Nuke"]
+   path = extensions/Nuke
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Nuke
+   branch = REL1_30
+[submodule "extensions/ParserFunctions"]
+   path = extensions/ParserFunctions
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ParserFunctions
+   branch = REL1_30
+[submodule "extensions/PdfHandler"]
+   path = extensions/PdfHandler
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PdfHandler
+   branch = REL1_30
+[submodule "extensions/Poem"]
+   path = extensions/Poem
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Poem
+   branch = REL1_30
+[submodule "extensions/Renameuser"]
+   path = extensions/Renameuser
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Renameuser
+   branch = REL1_30
+[submodule "extensions/SpamBlacklist"]
+   path = extensions/SpamBlacklist
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SpamBlacklist
+   branch = REL1_30
+[submodule "extensions/SyntaxHighlight_GeSHi"]
+   path = extensions/SyntaxHighlight_GeSHi
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SyntaxHighlight_GeSHi
+   branch = REL1_30
+[submodule "extensions/TitleBlacklist"]
+   path = extensions/TitleBlacklist
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/TitleBlacklist
+   branch = REL1_30
+[submodule "extensions/WikiEditor"]
+   path = extensions/WikiEditor
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikiEditor
+   branch = REL1_30
+[submodule "skins/CologneBlue"]
+   path = skins/CologneBlue
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/CologneBlue
+   branch = REL1_30
+[submodule "skins/Modern"]
+   path = skins/Modern
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/Modern
+   branch = REL1_30
+[submodule "skins/MonoBook"]
+   path = skins/MonoBook
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/MonoBook
+   branch = REL1_30
+[submodule "skins/Vector"]
+   path = skins/Vector
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/skins/Vector
+   branch = REL1_30
+[submodule "vendor"]
+   path = vendor
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/vendor
+   branch = REL1_30
diff --git a/extensions/Cite b/extensions/Cite
new 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.18]: Log javascript errors during search satisfaction tests

[EBernhardson (Code Review)]

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

Change subject: Log javascript errors during search satisfaction tests
..

Log javascript errors during search satisfaction tests

We have some unexplained problems with data collection recently:
* The interleaved AB test didn't send the trigger key with all expected
  searches
* Sampling rates combined with recorded sessions are off by about 5x
  from what we might expect based on backend logging.

Perhaps these are due to javascript errors occuring in the browser
that we can't see. Log them to get some insight.

Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 24 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index db369ac..cf41ccd 100644
--- a/extension.json
+++ b/extension.json
@@ -119,6 +119,11 @@
"schema": "TestSearchSatisfaction2",
"revision": 16909631
},
+   "schema.SearchSatisfactionErrors": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfactionErrors",
+   "revision": 17181648
+   },
"schema.GeoFeatures": {
"class": "ResourceLoaderSchemaModule",
"schema": "GeoFeatures",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 15ec52a..30fb174 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -25,7 +25,7 @@
return;
}
 
-   var search, autoComplete, session, eventLog, initSubTest,
+   var search, autoComplete, session, eventLog, initSubTest, 
initDebugLogging,
isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
uri = new mw.Uri( location.href ),
checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 180, 
210, 240, 300, 360, 420 ],
@@ -930,6 +930,23 @@
}
} );
 
+   initDebugLogging = atMostOnce( function ( session ) {
+   mw.trackSubscribe( 'global.error', function ( topic, data ) {
+   var evt = {
+   searchSessionId: session.get( 'sessionId' ),
+   visitPageId: session.get( 'pageViewId' ),
+   message: data.errorMessage,
+   error: data.errorObject.toString()
+   };
+
+   // ship the event
+   mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
+   eventLog = eventLog || extendMwEventLog();
+   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   } );
+   } );
+   } );
+
/**
 * Delay session initialization as late in the
 * process as possible, but only do it once.
@@ -940,6 +957,7 @@
session = session || new SessionState();
 
if ( session.isActive() ) {
+   initDebugLogging( session );
initSubTest( session );
fn( session );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.18
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.19]: Log javascript errors during search satisfaction tests

[EBernhardson (Code Review)]

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

Change subject: Log javascript errors during search satisfaction tests
..

Log javascript errors during search satisfaction tests

We have some unexplained problems with data collection recently:
* The interleaved AB test didn't send the trigger key with all expected
  searches
* Sampling rates combined with recorded sessions are off by about 5x
  from what we might expect based on backend logging.

Perhaps these are due to javascript errors occuring in the browser
that we can't see. Log them to get some insight.

Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
(cherry picked from commit 63de830bb2b33d5ebb7917a54507bf2dc95689ba)
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 24 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index cbc7db6..cac3d20 100644
--- a/extension.json
+++ b/extension.json
@@ -127,6 +127,11 @@
"schema": "TestSearchSatisfaction2",
"revision": 16909631
},
+   "schema.SearchSatisfactionErrors": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfactionErrors",
+   "revision": 17181648
+   },
"schema.GeoFeatures": {
"class": "ResourceLoaderSchemaModule",
"schema": "GeoFeatures",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 9e52636..4b194bc 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -25,7 +25,7 @@
return;
}
 
-   var search, autoComplete, session, eventLog, initSubTest,
+   var search, autoComplete, session, eventLog, initSubTest, 
initDebugLogging,
isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
uri = new mw.Uri( location.href ),
checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 180, 
210, 240, 300, 360, 420 ],
@@ -970,6 +970,23 @@
}
} );
 
+   initDebugLogging = atMostOnce( function ( session ) {
+   mw.trackSubscribe( 'global.error', function ( topic, data ) {
+   var evt = {
+   searchSessionId: session.get( 'sessionId' ),
+   visitPageId: session.get( 'pageViewId' ),
+   message: data.errorMessage,
+   error: data.errorObject.toString()
+   };
+
+   // ship the event
+   mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
+   eventLog = eventLog || extendMwEventLog();
+   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   } );
+   } );
+   } );
+
/**
 * Delay session initialization as late in the
 * process as possible, but only do it once.
@@ -980,6 +997,7 @@
session = session || new SessionState();
 
if ( session.isActive() ) {
+   initDebugLogging( session );
initSubTest( session );
fn( session );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Log javascript errors during search satisfaction tests

[jenkins-bot (Code Review)]

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

Change subject: Log javascript errors during search satisfaction tests
..


Log javascript errors during search satisfaction tests

We have some unexplained problems with data collection recently:
* The interleaved AB test didn't send the trigger key with all expected
  searches
* Sampling rates combined with recorded sessions are off by about 5x
  from what we might expect based on backend logging.

Perhaps these are due to javascript errors occuring in the browser
that we can't see. Log them to get some insight.

Change-Id: Ibd7c9aa9eaa6c15c3a0cd5c9305eebcc30103c4f
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 24 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index cbc7db6..cac3d20 100644
--- a/extension.json
+++ b/extension.json
@@ -127,6 +127,11 @@
"schema": "TestSearchSatisfaction2",
"revision": 16909631
},
+   "schema.SearchSatisfactionErrors": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "SearchSatisfactionErrors",
+   "revision": 17181648
+   },
"schema.GeoFeatures": {
"class": "ResourceLoaderSchemaModule",
"schema": "GeoFeatures",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 9e52636..4b194bc 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -25,7 +25,7 @@
return;
}
 
-   var search, autoComplete, session, eventLog, initSubTest,
+   var search, autoComplete, session, eventLog, initSubTest, 
initDebugLogging,
isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
uri = new mw.Uri( location.href ),
checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 180, 
210, 240, 300, 360, 420 ],
@@ -970,6 +970,23 @@
}
} );
 
+   initDebugLogging = atMostOnce( function ( session ) {
+   mw.trackSubscribe( 'global.error', function ( topic, data ) {
+   var evt = {
+   searchSessionId: session.get( 'sessionId' ),
+   visitPageId: session.get( 'pageViewId' ),
+   message: data.errorMessage,
+   error: data.errorObject.toString()
+   };
+
+   // ship the event
+   mw.loader.using( [ 'schema.SearchSatisfactionErrors' ] 
).then( function () {
+   eventLog = eventLog || extendMwEventLog();
+   eventLog.logEvent( 'TestSearchSatisfaction2', 
evt );
+   } );
+   } );
+   } );
+
/**
 * Delay session initialization as late in the
 * process as possible, but only do it once.
@@ -980,6 +997,7 @@
session = session || new SessionState();
 
if ( session.isActive() ) {
+   initDebugLogging( session );
initSubTest( session );
fn( session );
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Revert "Creating new WMF 1.30.0-wmf.19 branch"

[jenkins-bot (Code Review)]

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

Change subject: Revert "Creating new WMF 1.30.0-wmf.19 branch"
..


Revert "Creating new WMF 1.30.0-wmf.19 branch"

This reverts commit c3a0f25c040e4f69daba5223393d99a03074b0a0.

I done goofed. This comment shouldn't be in REL1_30

Change-Id: I8417172d868113b94589c199d13a527fa4fe0a15
---
D .gitmodules
A extensions/.gitignore
D extensions/AbuseFilter
D extensions/ActiveAbstract
D extensions/AntiSpoof
D extensions/ApiFeatureUsage
D extensions/ArticleCreationWorkflow
D extensions/Babel
D extensions/BetaFeatures
D extensions/BounceHandler
D extensions/Calendar
D extensions/Campaigns
D extensions/Capiunto
D extensions/CategoryTree
D extensions/CentralAuth
D extensions/CentralNotice
D extensions/CharInsert
D extensions/CheckUser
D extensions/CirrusSearch
D extensions/Cite
D extensions/CiteThisPage
D extensions/Citoid
D extensions/CleanChanges
D extensions/CodeEditor
D extensions/CodeMirror
D extensions/CodeReview
D extensions/Cognate
D extensions/CollaborationKit
D extensions/Collection
D extensions/CommonsMetadata
D extensions/ConfirmEdit
D extensions/ContactPage
D extensions/ContentTranslation
D extensions/ContributionTracking
D extensions/CreditsSource
D extensions/Dashiki
D extensions/DisableAccount
D extensions/Disambiguator
D extensions/DismissableSiteNotice
D extensions/DonationInterface
D extensions/DoubleWiki
D extensions/DynamicSidebar
D extensions/Echo
D extensions/EducationProgram
D extensions/Elastica
D extensions/ElectronPdfService
D extensions/EventBus
D extensions/EventLogging
D extensions/ExtensionDistributor
D extensions/FeaturedFeeds
D extensions/FlaggedRevs
D extensions/Flow
D extensions/FundraiserLandingPage
D extensions/FundraisingTranslateWorkflow
D extensions/GWToolset
D extensions/Gadgets
D extensions/GeoCrumbs
D extensions/GeoData
D extensions/GettingStarted
D extensions/GlobalBlocking
D extensions/GlobalCssJs
D extensions/GlobalUsage
D extensions/GlobalUserPage
D extensions/GoogleNewsSitemap
D extensions/Graph
D extensions/GuidedTour
D extensions/ImageMap
D extensions/InputBox
D extensions/Insider
D extensions/Interwiki
D extensions/InterwikiSorting
D extensions/Josa
D extensions/JsonConfig
D extensions/Kartographer
D extensions/LabeledSectionTransclusion
D extensions/LandingCheck
D extensions/LdapAuthentication
D extensions/Linter
D extensions/LiquidThreads
D extensions/Listings
D extensions/LocalisationUpdate
D extensions/LoginNotify
D extensions/MapSources
D extensions/MassMessage
D extensions/Math
D extensions/MobileApp
D extensions/MobileFrontend
D extensions/MultimediaViewer
D extensions/MwEmbedSupport
D extensions/NavigationTiming
D extensions/NewUserMessage
D extensions/Newsletter
D extensions/Nuke
D extensions/OATHAuth
D extensions/OAuth
D extensions/ORES
D extensions/OpenStackManager
D extensions/PageAssessments
D extensions/PageImages
D extensions/PageTriage
D extensions/PageViewInfo
D extensions/PagedTiffHandler
D extensions/ParserFunctions
D extensions/ParserMigration
D extensions/ParsoidBatchAPI
D extensions/PdfHandler
D extensions/Petition
D extensions/Poem
D extensions/PoolCounter
D extensions/Popups
D extensions/ProofreadPage
D extensions/QuickSurveys
D extensions/Quiz
A extensions/README
D extensions/RSS
D extensions/RelatedArticles
D extensions/RelatedSites
D extensions/Renameuser
D extensions/RevisionSlider
D extensions/SandboxLink
D extensions/Score
D extensions/Scribunto
D extensions/SearchExtraNS
D extensions/SecurePoll
D extensions/ShortUrl
D extensions/SiteMatrix
D extensions/SpamBlacklist
D extensions/SubPageList3
D extensions/SubpageSortkey
D extensions/SyntaxHighlight_GeSHi
D extensions/TemplateData
D extensions/TemplateSandbox
D extensions/TemplateStyles
D extensions/TextExtracts
D extensions/Thanks
D extensions/TimedMediaHandler
D extensions/TitleBlacklist
D extensions/TocTree
D extensions/TorBlock
D extensions/Translate
D extensions/TranslationNotifications
D extensions/TrustedXFF
D extensions/TwoColConflict
D extensions/UnicodeConverter
D extensions/UniversalLanguageSelector
D extensions/UploadWizard
D extensions/UploadsLink
D extensions/UrlShortener
D extensions/UserMerge
D extensions/VectorBeta
D extensions/VipsScaler
D extensions/VisualEditor
D extensions/WikiEditor
D extensions/WikiLove
D extensions/Wikidata
D extensions/WikidataPageBanner
D extensions/WikimediaEvents
D extensions/WikimediaIncubator
D extensions/WikimediaMaintenance
D extensions/WikimediaMessages
D extensions/XAnalytics
D extensions/ZeroBanner
D extensions/ZeroPortal
D extensions/cldr
D extensions/intersection
D extensions/timeline
D extensions/wikihiero
D skins/CologneBlue
D skins/MinervaNeue
D skins/Modern
D skins/MonoBook
D skins/Nostalgia
D skins/Timeless
D skins/Vector
D vendor
175 files changed, 33 insertions(+), 860 deletions(-)

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



diff 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.19]: Lazy creation for heavy menu

[Catrope (Code Review)]

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

Change subject: Lazy creation for heavy menu
..

Lazy creation for heavy menu

Assumptions:
* Generally if we have a model we don't need UI
* UI can be created lazy if it is not shown to user

Bug: T176250
Change-Id: Iba7f889d8610de2eb3056248cd1c664b0cd90940
(cherry picked from commit 7a28c62e99a9b935cf8c3c94d367b1b5d8d56223)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
2 files changed, 30 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/379431/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 20c1463..5ab32ea 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -96,7 +96,12 @@
}
};
 
-   $( rcfilters.init );
+   // Early execute of init
+   if ( document.readyState === 'interactive' || document.readyState === 
'complete' ) {
+   rcfilters.init();
+   } else {
+   $( rcfilters.init );
+   }
 
module.exports = rcfilters;
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index 07d4506..5ba42e7 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
@@ -32,6 +32,7 @@
this.views = {};
this.userSelecting = false;
 
+   this.menuInitialized = false;
this.inputValue = '';
this.$overlay = config.$overlay || this.$element;
this.$body = $( '' ).addClass( 
'mw-rcfilters-ui-menuSelectWidget-body' );
@@ -129,13 +130,26 @@
};
 
/**
-* Respond to model initialize event. Populate the menu from the model
+* @inheritdoc
 */
-   mw.rcfilters.ui.MenuSelectWidget.prototype.onModelInitialize = function 
() {
+   mw.rcfilters.ui.MenuSelectWidget.prototype.toggle = function ( show ) {
+   this.lazyMenuCreation();
+   mw.rcfilters.ui.MenuSelectWidget.parent.prototype.toggle.call( 
this, show );
+   };
+
+   /**
+* lazy creation of the menu
+*/
+   mw.rcfilters.ui.MenuSelectWidget.prototype.lazyMenuCreation = function 
() {
var widget = this,
viewGroupCount = {},
groups = this.model.getFilterGroups();
 
+   if ( this.menuInitialized ) {
+   return;
+   }
+
+   this.menuInitialized = true;
// Reset
this.clearItems();
 
@@ -188,6 +202,13 @@
} );
 
this.switchView( this.model.getCurrentView() );
+   };
+
+   /**
+* Respond to model initialize event. Populate the menu from the model
+*/
+   mw.rcfilters.ui.MenuSelectWidget.prototype.onModelInitialize = function 
() {
+   this.menuInitialized = false;
};
 
/**
@@ -285,6 +306,7 @@
 * @return {mw.rcfilters.ui.ItemMenuOptionWidget} Option widget
 */
mw.rcfilters.ui.MenuSelectWidget.prototype.getItemFromModel = function 
( model ) {
+   this.lazyMenuCreation();
return this.views[ model.getGroupModel().getView() ].filter( 
function ( item ) {
return item.getName() === model.getName();
} )[ 0 ];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba7f889d8610de2eb3056248cd1c664b0cd90940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Eranroz 

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

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Rm FormatNum

[Chad (Code Review)]

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

Change subject: Rm FormatNum
..


Rm FormatNum

Bug:T176081
Change-Id: Ia3a3803b997858ae05c7b185e8c43bc7aca3e47c
---
M .gitmodules
D FormatNum
2 files changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index 7782531..bd31d75 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -866,10 +866,6 @@
path = FormatDates
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/FormatDates
branch = .
-[submodule "FormatNum"]
-   path = FormatNum
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/FormatNum
-   branch = .
 [submodule "FormelApplet"]
path = FormelApplet
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/FormelApplet
diff --git a/FormatNum b/FormatNum
deleted file mode 16
index c86443f..000
--- a/FormatNum
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c86443f60cbce44fe8b10ac4cc7ca790884d7b9c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3a3803b997858ae05c7b185e8c43bc7aca3e47c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: MacFan4000 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Move linter config properties to the linter config object

[Subramanya Sastry (Code Review)]

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

Change subject: Move linter config properties to the linter config object
..

Move linter config properties to the linter config object

Change-Id: Ic198d3833ea849cee07b6298cfb6724bb1e6b0e1
---
M config.example.yaml
M lib/config/ParsoidConfig.js
M lib/logger/LintLogger.js
M lib/utils/Util.js
4 files changed, 23 insertions(+), 20 deletions(-)


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

diff --git a/config.example.yaml b/config.example.yaml
index e74103a..a19f5da 100644
--- a/config.example.yaml
+++ b/config.example.yaml
@@ -84,8 +84,11 @@
 
 # Enable linting of some wikitext errors to the log
 #linting: true
+#linter:
 # Send lint errors to MW API instead of to the log
-#linterSendAPI: false
+#  - sendAPI: false
+# Sampling rate (1 / 10)
+#apiSampling: 10
 
 # Require SSL certificates to be valid (default true)
 # Set to false when using self-signed SSL certificates
diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
index 359dc2e..7f6a364 100644
--- a/lib/config/ParsoidConfig.js
+++ b/lib/config/ParsoidConfig.js
@@ -233,25 +233,25 @@
  */
 ParsoidConfig.prototype.linting = false;
 
-/**
- * @property {boolean} linterSendAPI
- * Whether to send lint errors to the MW API
- * Requires the MW Linter extension to be installed
- * and configured.
- */
-ParsoidConfig.prototype.linterSendAPI = false;
-
-/**
- * @property {number} linterSampling
- *
- * Ratio at which to sample linter errors, per page.
- * This is deterministic and based on page_id.
- */
-ParsoidConfig.prototype.linterAPISampling = 1;
-
 // FIXME: Fold other linter config options into this.
 ParsoidConfig.prototype.linter = {
/**
+* @property {boolean} sendAPI
+* Whether to send lint errors to the MW API
+* Requires the MW Linter extension to be installed
+* and configured.
+*/
+   sendAPI: false,
+
+   /**
+* @property {number} apiSampling
+*
+* Ratio at which to sample linter errors, per page.
+* This is deterministic and based on page_id.
+*/
+   apiSampling: 1,
+
+   /**
 * @property {number} tidyWhiteSpaceBugMaxLength
 *
 * Max length of content covered by 'white-space:nowrap' CSS
diff --git a/lib/logger/LintLogger.js b/lib/logger/LintLogger.js
index 0297233..89f1c6e 100644
--- a/lib/logger/LintLogger.js
+++ b/lib/logger/LintLogger.js
@@ -38,7 +38,7 @@
 
this.buffer = [];
 
-   if (env.page.id % env.conf.parsoid.linterAPISampling !== 0) {
+   if (env.page.id % env.conf.parsoid.linter.apiSampling !== 0) {
return;
}
 
@@ -47,7 +47,7 @@
return;
}
 
-   if (!env.conf.parsoid.linterSendAPI) {
+   if (!env.conf.parsoid.linter.sendAPI) {
enabledBuffer.forEach(function(item) {
// Call this async, since recursive sync calls 
to the logger
// are suppressed.  This messes up the 
ordering, as you'd
diff --git a/lib/utils/Util.js b/lib/utils/Util.js
index 232d2ac..691a3f3 100644
--- a/lib/utils/Util.js
+++ b/lib/utils/Util.js
@@ -242,7 +242,7 @@
}
if (opts.lint) {
parsoidConfig.linting = true;
-   parsoidConfig.linterSendAPI = false;
+   parsoidConfig.linter.sendAPI = false;
}
if (opts.useBatchAPI !== null) {
parsoidConfig.useBatchAPI = 
Util.booleanOption(opts.useBatchAPI);

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Detect misnested tags that have different behavior in HTML5 ...

[Subramanya Sastry (Code Review)]

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

Change subject: Detect misnested tags that have different behavior in HTML5 vs 
HTML4
..

Detect misnested tags that have different behavior in HTML5 vs HTML4

* This will make a different when Tidy is replaced by Remex and
  will also make Parsoid rendering more compatible with Tidy.

Bug: T176363
Change-Id: I93d779eba9b7738c309b8a8a4a89f337bb4ac168
---
M lib/utils/DOMUtils.js
M lib/wt2html/pp/handlers/linter.js
M tests/mocha/linter.js
3 files changed, 76 insertions(+), 9 deletions(-)


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

diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js
index e073bde..5de498f 100644
--- a/lib/utils/DOMUtils.js
+++ b/lib/utils/DOMUtils.js
@@ -1244,6 +1244,12 @@
return next;
},
 
+   hasFollowingContent: function(node) {
+   return !DU.isBody(node) && (
+   DU.nextNonSepSibling(node) || 
DU.hasFollowingContent(node.parentNode)
+   );
+   },
+
numNonDeletedChildNodes: function(node) {
var n = 0;
var child = node.firstChild;
diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index 8e95440..bd6fb5b 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -17,6 +17,24 @@
 var Util = require('../../../utils/Util.js').Util;
 var Consts = require('../../../config/WikitextConstants.js').WikitextConstants;
 
+var tagsWithChangedMisnestingBehavior;
+function getTagsWithChangedMisnestingBehavior() {
+   if (!tagsWithChangedMisnestingBehavior) {
+   tagsWithChangedMisnestingBehavior = new Set();
+   Consts.HTML.HTML5Tags.forEach(function(t) {
+   if (Consts.Sanitizer.TagWhiteList.has(t) &&
+   !Consts.HTML.BlockTags.has(t) &&
+   !Consts.HTML.FormattingTags.has(t) &&
+   !Consts.HTML.VoidTags.has(t)
+   ) {
+   tagsWithChangedMisnestingBehavior.add(t);
+   }
+   });
+   }
+
+   return tagsWithChangedMisnestingBehavior;
+}
+
 /*
  * Log Transclusion with more than one parts
  * Ex - {{table-start}}
@@ -172,16 +190,22 @@
templateInfo: templateInfo,
params: { name: cNodeName },
};
-   var adjNode = getNextMatchingNode(c, c);
-   if (adjNode) {
-   var adjDp = DU.getDataParsoid(adjNode);
-   if (!adjDp.tmp) {
-   adjDp.tmp = {};
+   if 
(getTagsWithChangedMisnestingBehavior().has(c.nodeName) &&
+   DU.hasFollowingContent(c)
+   ) {
+   env.log('lint/html5-misnesting', lintObj);
+   } else {
+   var adjNode = getNextMatchingNode(c, c);
+   if (adjNode) {
+   var adjDp = DU.getDataParsoid(adjNode);
+   if (!adjDp.tmp) {
+   adjDp.tmp = {};
+   }
+   adjDp.tmp.linted = true;
+   env.log('lint/misnested-tag', lintObj);
+   } else if (DU.hasLiteralHTMLMarker(dp)) {
+   env.log('lint/missing-end-tag', 
lintObj);
}
-   adjDp.tmp.linted = true;
-   env.log('lint/misnested-tag', lintObj);
-   } else if (DU.hasLiteralHTMLMarker(dp)) {
-   env.log('lint/missing-end-tag', lintObj);
}
}
 
diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js
index f1ad362..d206801 100644
--- a/tests/mocha/linter.js
+++ b/tests/mocha/linter.js
@@ -600,4 +600,41 @@
return expectEmptyResults(wt, { tweakEnv: tweakEnv });
});
});
+
+   describe('HTML5 MISNESTED TAGS', function() {
+   it('should not trigger html5 misnesting if there is no 
following content', function() {
+   return parseWT('foo\nbar').then(function(result) {
+   result.should.have.length(1);
+   result[0].should.have.a.property("type", 
"missing-end-tag");
+   result[0].should.have.a.property("params");
+  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WLFilters: Don't hide .watchlistDetails while loading

[Catrope (Code Review)]

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

Change subject: WLFilters: Don't hide .watchlistDetails while loading
..

WLFilters: Don't hide .watchlistDetails while loading

It doesn't actually get replaced, just relocated slightly.
Also, watchlist-details is abused for community tools on some wikis,
including enwiki. (watchlist-summary is the right place for that though.)

Bug: T176300
Change-Id: Ic9605b9910c1953ef2536de4ab1b57ec125f0539
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/27/379427/1

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index a0bc3a2..dd4f9d4 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -83,7 +83,6 @@
}
 
#contentSub,
-   .watchlistDetails,
form#mw-watchlist-resetbutton {
display: none;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Revert "Creating new WMF 1.30.0-wmf.19 branch"

[Chad (Code Review)]

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

Change subject: Revert "Creating new WMF 1.30.0-wmf.19 branch"
..

Revert "Creating new WMF 1.30.0-wmf.19 branch"

This reverts commit c3a0f25c040e4f69daba5223393d99a03074b0a0.

I done goofed. This comment shouldn't be in REL1_30

Change-Id: I8417172d868113b94589c199d13a527fa4fe0a15
---
D .gitmodules
A extensions/.gitignore
D extensions/AbuseFilter
D extensions/ActiveAbstract
D extensions/AntiSpoof
D extensions/ApiFeatureUsage
D extensions/ArticleCreationWorkflow
D extensions/Babel
D extensions/BetaFeatures
D extensions/BounceHandler
D extensions/Calendar
D extensions/Campaigns
D extensions/Capiunto
D extensions/CategoryTree
D extensions/CentralAuth
D extensions/CentralNotice
D extensions/CharInsert
D extensions/CheckUser
D extensions/CirrusSearch
D extensions/Cite
D extensions/CiteThisPage
D extensions/Citoid
D extensions/CleanChanges
D extensions/CodeEditor
D extensions/CodeMirror
D extensions/CodeReview
D extensions/Cognate
D extensions/CollaborationKit
D extensions/Collection
D extensions/CommonsMetadata
D extensions/ConfirmEdit
D extensions/ContactPage
D extensions/ContentTranslation
D extensions/ContributionTracking
D extensions/CreditsSource
D extensions/Dashiki
D extensions/DisableAccount
D extensions/Disambiguator
D extensions/DismissableSiteNotice
D extensions/DonationInterface
D extensions/DoubleWiki
D extensions/DynamicSidebar
D extensions/Echo
D extensions/EducationProgram
D extensions/Elastica
D extensions/ElectronPdfService
D extensions/EventBus
D extensions/EventLogging
D extensions/ExtensionDistributor
D extensions/FeaturedFeeds
D extensions/FlaggedRevs
D extensions/Flow
D extensions/FundraiserLandingPage
D extensions/FundraisingTranslateWorkflow
D extensions/GWToolset
D extensions/Gadgets
D extensions/GeoCrumbs
D extensions/GeoData
D extensions/GettingStarted
D extensions/GlobalBlocking
D extensions/GlobalCssJs
D extensions/GlobalUsage
D extensions/GlobalUserPage
D extensions/GoogleNewsSitemap
D extensions/Graph
D extensions/GuidedTour
D extensions/ImageMap
D extensions/InputBox
D extensions/Insider
D extensions/Interwiki
D extensions/InterwikiSorting
D extensions/Josa
D extensions/JsonConfig
D extensions/Kartographer
D extensions/LabeledSectionTransclusion
D extensions/LandingCheck
D extensions/LdapAuthentication
D extensions/Linter
D extensions/LiquidThreads
D extensions/Listings
D extensions/LocalisationUpdate
D extensions/LoginNotify
D extensions/MapSources
D extensions/MassMessage
D extensions/Math
D extensions/MobileApp
D extensions/MobileFrontend
D extensions/MultimediaViewer
D extensions/MwEmbedSupport
D extensions/NavigationTiming
D extensions/NewUserMessage
D extensions/Newsletter
D extensions/Nuke
D extensions/OATHAuth
D extensions/OAuth
D extensions/ORES
D extensions/OpenStackManager
D extensions/PageAssessments
D extensions/PageImages
D extensions/PageTriage
D extensions/PageViewInfo
D extensions/PagedTiffHandler
D extensions/ParserFunctions
D extensions/ParserMigration
D extensions/ParsoidBatchAPI
D extensions/PdfHandler
D extensions/Petition
D extensions/Poem
D extensions/PoolCounter
D extensions/Popups
D extensions/ProofreadPage
D extensions/QuickSurveys
D extensions/Quiz
A extensions/README
D extensions/RSS
D extensions/RelatedArticles
D extensions/RelatedSites
D extensions/Renameuser
D extensions/RevisionSlider
D extensions/SandboxLink
D extensions/Score
D extensions/Scribunto
D extensions/SearchExtraNS
D extensions/SecurePoll
D extensions/ShortUrl
D extensions/SiteMatrix
D extensions/SpamBlacklist
D extensions/SubPageList3
D extensions/SubpageSortkey
D extensions/SyntaxHighlight_GeSHi
D extensions/TemplateData
D extensions/TemplateSandbox
D extensions/TemplateStyles
D extensions/TextExtracts
D extensions/Thanks
D extensions/TimedMediaHandler
D extensions/TitleBlacklist
D extensions/TocTree
D extensions/TorBlock
D extensions/Translate
D extensions/TranslationNotifications
D extensions/TrustedXFF
D extensions/TwoColConflict
D extensions/UnicodeConverter
D extensions/UniversalLanguageSelector
D extensions/UploadWizard
D extensions/UploadsLink
D extensions/UrlShortener
D extensions/UserMerge
D extensions/VectorBeta
D extensions/VipsScaler
D extensions/VisualEditor
D extensions/WikiEditor
D extensions/WikiLove
D extensions/Wikidata
D extensions/WikidataPageBanner
D extensions/WikimediaEvents
D extensions/WikimediaIncubator
D extensions/WikimediaMaintenance
D extensions/WikimediaMessages
D extensions/XAnalytics
D extensions/ZeroBanner
D extensions/ZeroPortal
D extensions/cldr
D extensions/intersection
D extensions/timeline
D extensions/wikihiero
D skins/CologneBlue
D skins/MinervaNeue
D skins/Modern
D skins/MonoBook
D skins/Nostalgia
D skins/Timeless
D skins/Vector
D vendor
175 files changed, 33 insertions(+), 860 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/379428/1

diff 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make using CirrusSearch engine default for wbsearchentities

[Smalyshev (Code Review)]

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

Change subject: Make using CirrusSearch engine default for wbsearchentities
..

Make using CirrusSearch engine default for wbsearchentities

Bug: T175741
Change-Id: I3641080d71886ca2b960442ced3d200e8f8b1bc0
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index c97a157..874e40f 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -132,9 +132,8 @@
// on either Item or Property pages. T86453
$wgCaptchaTriggersOnNamespace[NS_MAIN]['addurl'] = false;
$wgCaptchaTriggersOnNamespace[WB_NS_PROPERTY]['addurl'] = false;
-   // Soft-enable Cirrus usage for wbsearchentities
-   // Cirrus search will be used if useCirrus=1 parameter is set
-   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   // Cirrus usage for wbsearchentities is on
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = true;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phab/aphlict: remove require for group by user

[Dzahn (Code Review)]

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

Change subject: phab/aphlict: remove require for group by user
..


phab/aphlict: remove require for group by user

follow-up to Change-Id I582deafa4faea0f45 which introduced
a puppet error when it tries to create the user "aphlict" due
to missing group "aphlict" even though it should be created and
there is a "require" for it.

Following examples in puppet docs, there is no require needed
between group and user like that.

Bug: T765
Change-Id: Ia9b72f9caf26fb5cc2a0971f0673d283b2de31ee
---
M modules/phabricator/manifests/aphlict.pp
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index e76b9f0..6db523f 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -73,11 +73,10 @@
 }
 
 user { $user:
-gid => $group,
-shell   => '/bin/false',
-home=> '/var/run/aphlict',
-system  => true,
-require => Group[$group],
+gid=> $group,
+shell  => '/bin/false',
+home   => '/var/run/aphlict',
+system => true,
 }
 
 base::service_unit { 'aphlict':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9b72f9caf26fb5cc2a0971f0673d283b2de31ee
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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...PageTriage[master]: Fixing the topreviewers API in PageTriage

[Kaldari (Code Review)]

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

Change subject: Fixing the topreviewers API in PageTriage
..

Fixing the topreviewers API in PageTriage

Bug: T168335
Change-Id: Icce256ebfd40c2cd803490637e281770564bba71
---
M includes/PageTriageUtil.php
1 file changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage 
refs/changes/25/379425/1

diff --git a/includes/PageTriageUtil.php b/includes/PageTriageUtil.php
index 654ea92..75b72fe 100644
--- a/includes/PageTriageUtil.php
+++ b/includes/PageTriageUtil.php
@@ -174,7 +174,7 @@
/**
 * Get top page triagers in various time frame
 * @param string $time time to look back for top triagers, possible 
values include
-* last-day, last-week, last-month
+* last-day and last-week
 * @return array
 */
public static function getTopTriagers( $time = 'last-week' ) {
@@ -186,7 +186,6 @@
$timeFrame = [
'last-day' => [ 'ts' => $now - 24 * 60 * 60, 
'expire' => 60 * 60 ],
'last-week' => [ 'ts' => $now - 7 * 24 * 60 * 
60, 'expire' => 24 * 60 * 60 ],
-   'last-month' => [ 'ts' => $now - 30 * 24 * 60 * 
60, 'expire' => 24 * 60 * 60 ],
];
 
if ( !isset( $timeFrame[$time] ) ) {
@@ -198,19 +197,26 @@
 
$topTriager = $wgMemc->get( $key );
if ( $topTriager === false ) {
+   // We pull the reviewing stats from the main logging 
table instead of the pagetriage_log
+   // table since the data in the pagetriage_log table 
isn't persistant. See T168335.
$res = $dbr->select(
-   [ 'pagetriage_log', 'user' ],
-   [ 'user_name', 'user_id', 'COUNT(ptrl_id) AS 
num' ],
+   [ 'logging' ],
+   [ 'log_user_text AS username', 'COUNT(log_id) 
AS reviewed' ],
[
-   'user_id = ptrl_user_id',
-   'ptrl_reviewed' => 1, // only reviewed 
status
-   'ptrl_timestamp > ' . $dbr->addQuotes( 
$dbr->timestamp( $timeFrame[$time]['ts'] ) )
+   'log_namespace' => 0, // only main 
(article) namespace
+   'log_type' => 'pagetriage-curation',
+   'log_action' => 'reviewed',
+   'log_timestamp > ' . $dbr->addQuotes( 
$dbr->timestamp( $timeFrame[$time]['ts'] ) )
],
__METHOD__,
-   [ 'GROUP BY' => 'user_id', 'ORDER BY' => 'num 
DESC', 'LIMIT' => 50 ]
+   [ 'GROUP BY' => 'username', 'ORDER BY' => 
'reviewed DESC', 'LIMIT' => 50 ]
);
 
$topTriager = iterator_to_array( $res );
+   // Convert the review count from a string to an integer
+   foreach ( $topTriager as $triager ) {
+   $triager->reviewed = (int) $triager->reviewed;
+   }
 
$wgMemc->set( $key, $topTriager, 
$timeFrame[$time]['expire'] );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icce256ebfd40c2cd803490637e281770564bba71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Nobody uses the smw bundle from this script anymore

[jenkins-bot (Code Review)]

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

Change subject: Nobody uses the smw bundle from this script anymore
..


Nobody uses the smw bundle from this script anymore

Change-Id: I2e2c9939d6718c6cca006703ac2a6f7a6ebf2f21
---
M make-release/make-release.py
M make-release/make-release.yaml
2 files changed, 0 insertions(+), 30 deletions(-)

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



diff --git a/make-release/make-release.py b/make-release/make-release.py
index a5d7c67..1504b1e 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -314,14 +314,7 @@
 """return value should be usable as an exit code"""
 
 extensions = []
-bundles = self.config.get('bundles', {})
 
-if options.smw:
-if 'smw' not in bundles:
-raise Exception("No SMW extensions given.")
-
-# Other extensions for inclusion
-extensions.extend(bundles['smw'])
 if options.list_bundled:
 return self.print_bundled(extensions)
 
diff --git a/make-release/make-release.yaml b/make-release/make-release.yaml
index 5a9ce4d..c11c240 100644
--- a/make-release/make-release.yaml
+++ b/make-release/make-release.yaml
@@ -22,29 +22,6 @@
 - skins/Modern
 - skins/MonoBook
 - skins/Vector
-smw:
-- extensions/AdminLinks
-- extensions/ApprovedRevs
-- extensions/Arrays
-- extensions/DataTransfer
-- extensions/ExternalData
-- extensions/HeaderTabs
-- extensions/Maps
-- extensions/PageSchemas
-- extensions/ReplaceText
-- extensions/SemanticCompoundQueries
-- extensions/SemanticDrilldown
-- extensions/SemanticForms
-- extensions/SemanticFormsInputs
-- extensions/SemanticImageInput
-- extensions/SemanticInternalObjects
-- extensions/SemanticMaps
-- extensions/SemanticMediaWiki
-- extensions/SemanticResultFormats
-- extensions/SemanticTasks
-- extensions/SemanticWatchlist
-- extensions/Validator
-- extensions/Widgets
 diff:
 ignore:
 - "*~"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e2c9939d6718c6cca006703ac2a6f7a6ebf2f21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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...release[master]: Nobody uses the smw bundle from this script anymore

[Chad (Code Review)]

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

Change subject: Nobody uses the smw bundle from this script anymore
..

Nobody uses the smw bundle from this script anymore

Change-Id: I2e2c9939d6718c6cca006703ac2a6f7a6ebf2f21
---
M make-release/make-release.py
M make-release/make-release.yaml
2 files changed, 0 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/24/379424/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index a5d7c67..1504b1e 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -314,14 +314,7 @@
 """return value should be usable as an exit code"""
 
 extensions = []
-bundles = self.config.get('bundles', {})
 
-if options.smw:
-if 'smw' not in bundles:
-raise Exception("No SMW extensions given.")
-
-# Other extensions for inclusion
-extensions.extend(bundles['smw'])
 if options.list_bundled:
 return self.print_bundled(extensions)
 
diff --git a/make-release/make-release.yaml b/make-release/make-release.yaml
index 5a9ce4d..c11c240 100644
--- a/make-release/make-release.yaml
+++ b/make-release/make-release.yaml
@@ -22,29 +22,6 @@
 - skins/Modern
 - skins/MonoBook
 - skins/Vector
-smw:
-- extensions/AdminLinks
-- extensions/ApprovedRevs
-- extensions/Arrays
-- extensions/DataTransfer
-- extensions/ExternalData
-- extensions/HeaderTabs
-- extensions/Maps
-- extensions/PageSchemas
-- extensions/ReplaceText
-- extensions/SemanticCompoundQueries
-- extensions/SemanticDrilldown
-- extensions/SemanticForms
-- extensions/SemanticFormsInputs
-- extensions/SemanticImageInput
-- extensions/SemanticInternalObjects
-- extensions/SemanticMaps
-- extensions/SemanticMediaWiki
-- extensions/SemanticResultFormats
-- extensions/SemanticTasks
-- extensions/SemanticWatchlist
-- extensions/Validator
-- extensions/Widgets
 diff:
 ignore:
 - "*~"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e2c9939d6718c6cca006703ac2a6f7a6ebf2f21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Session logging cleanup

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Session logging cleanup
..


Hygiene: Session logging cleanup

* Remove unnecessary usages of 'this'
* Clean up legacy Saved Pages logging stuff
* Clean up other references to HistoryEntry.SOURCE_SAVED_PAGE
* Add call to app.getSessionFunnel.restSectionsFetchEnd back in
* Other minor cleanup in the pageLoadComplete listener callback in
  PageFragmentLoadState

Change-Id: I9e2a029230cc7436b5aaf0785497c0c5612f0980
---
M app/src/main/java/org/wikipedia/analytics/SessionData.java
M app/src/main/java/org/wikipedia/edit/EditHandler.java
M app/src/main/java/org/wikipedia/history/HistoryEntry.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
4 files changed, 12 insertions(+), 45 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/analytics/SessionData.java 
b/app/src/main/java/org/wikipedia/analytics/SessionData.java
index fc98006..3ba006d 100644
--- a/app/src/main/java/org/wikipedia/analytics/SessionData.java
+++ b/app/src/main/java/org/wikipedia/analytics/SessionData.java
@@ -14,7 +14,6 @@
 private int pagesFromInternal;
 private int pagesFromExternal;
 private int pagesFromHistory;
-private int pagesFromSaved;
 private int pagesFromReadingList;
 private int pagesFromNearby;
 private int pagesFromDisambig;
@@ -37,9 +36,6 @@
 break;
 case HistoryEntry.SOURCE_HISTORY:
 pagesFromHistory++;
-break;
-case HistoryEntry.SOURCE_SAVED_PAGE:
-pagesFromSaved++;
 break;
 case HistoryEntry.SOURCE_READING_LIST:
 pagesFromReadingList++;
@@ -111,10 +107,6 @@
 return pagesFromHistory;
 }
 
-public int getPagesFromSaved() {
-return pagesFromSaved;
-}
-
 public int getPagesFromReadingList() {
 return pagesFromReadingList;
 }
@@ -136,16 +128,16 @@
 }
 
 public void addPageFromBack() {
-this.pagesFromBack++;
+pagesFromBack++;
 }
 
 public void addPageWithNoDescription() {
-this.pagesWithNoDescription++;
+pagesWithNoDescription++;
 }
 
 public int getTotalPages() {
 return pagesFromSearch + pagesFromRandom + pagesFromLangLink + 
pagesFromInternal
-+ pagesFromExternal + pagesFromHistory + pagesFromSaved + 
pagesFromReadingList
-+ pagesFromNearby + pagesFromDisambig;
++ pagesFromExternal + pagesFromHistory + pagesFromReadingList 
+ pagesFromNearby
++ pagesFromDisambig;
 }
 }
diff --git a/app/src/main/java/org/wikipedia/edit/EditHandler.java 
b/app/src/main/java/org/wikipedia/edit/EditHandler.java
index ef0cef8..3804019 100644
--- a/app/src/main/java/org/wikipedia/edit/EditHandler.java
+++ b/app/src/main/java/org/wikipedia/edit/EditHandler.java
@@ -1,6 +1,5 @@
 package org.wikipedia.edit;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
@@ -12,7 +11,6 @@
 import org.wikipedia.analytics.ProtectedEditAttemptFunnel;
 import org.wikipedia.auth.AccountUtil;
 import org.wikipedia.bridge.CommunicationBridge;
-import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.page.Page;
 import org.wikipedia.page.PageFragment;
 import org.wikipedia.page.Section;
@@ -68,25 +66,6 @@
 return;
 }
 if (messageType.equals("editSectionClicked")) {
-if (fragment.getHistoryEntry().getSource() == 
HistoryEntry.SOURCE_SAVED_PAGE) {
-new AlertDialog.Builder(fragment.getActivity())
-.setCancelable(false)
-.setMessage(R.string.edit_saved_page_refresh)
-
.setPositiveButton(R.string.edit_saved_page_refresh_yes, new 
DialogInterface.OnClickListener() {
-@Override
-public void onClick(DialogInterface 
dialogInterface, int i) {
-fragment.refreshPage();
-}
-})
-
.setNegativeButton(R.string.edit_saved_page_refresh_no, new 
DialogInterface.OnClickListener() {
-@Override
-public void onClick(DialogInterface 
dialogInterface, int i) {
-dialogInterface.dismiss();
-}
-})
-.show();
-return;
-}
 startEditingSection(messagePayload.optInt("sectionID"), null);
 }
 }
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: More 1.30 fixes

[jenkins-bot (Code Review)]

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

Change subject: More 1.30 fixes
..


More 1.30 fixes

Change-Id: Idb1dfe035b90f132ac204b6aa670a83e49d8f225
---
M make-release/make-branches
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/make-release/make-branches b/make-release/make-branches
index 6f847cf..f7cbe21 100755
--- a/make-release/make-branches
+++ b/make-release/make-branches
@@ -8,7 +8,6 @@
 from requests.exceptions import HTTPError
 from pygerrit.rest import GerritRestAPI
 import yaml
-from pprint import pprint
 
 
 def main():
@@ -24,6 +23,8 @@
 'mediawiki/core': '0cd28e19cb0f9385a2a1cc11a4d8c9c21ff0b830',
 'mediawiki/vendor': '68b54dbcd8d65de64225a4ccc9dceb94429ca42a',
 }
+shit_to_skip = ['mediawiki/extensions/BlueSpiceExtendedStatistics',
+'mediawiki/extensions/BlueSpiceUserManager']
 new_branch_name = 'REL1_30'
 
 for stuff in ['skins', 'extensions']:
@@ -34,6 +35,8 @@
 
 for repo in things_to_branch:
 branch_point = 'HEAD'
+if repo in shit_to_skip:
+continue
 if repo in manual_branch_points:
 branch_point = manual_branch_points[repo]
 data = '{"revision":"%s"}' % branch_point

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb1dfe035b90f132ac204b6aa670a83e49d8f225
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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...release[master]: More 1.30 fixes

[Chad (Code Review)]

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

Change subject: More 1.30 fixes
..

More 1.30 fixes

Change-Id: Idb1dfe035b90f132ac204b6aa670a83e49d8f225
---
M make-release/make-branches
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/23/379423/1

diff --git a/make-release/make-branches b/make-release/make-branches
index 6f847cf..f7cbe21 100755
--- a/make-release/make-branches
+++ b/make-release/make-branches
@@ -8,7 +8,6 @@
 from requests.exceptions import HTTPError
 from pygerrit.rest import GerritRestAPI
 import yaml
-from pprint import pprint
 
 
 def main():
@@ -24,6 +23,8 @@
 'mediawiki/core': '0cd28e19cb0f9385a2a1cc11a4d8c9c21ff0b830',
 'mediawiki/vendor': '68b54dbcd8d65de64225a4ccc9dceb94429ca42a',
 }
+shit_to_skip = ['mediawiki/extensions/BlueSpiceExtendedStatistics',
+'mediawiki/extensions/BlueSpiceUserManager']
 new_branch_name = 'REL1_30'
 
 for stuff in ['skins', 'extensions']:
@@ -34,6 +35,8 @@
 
 for repo in things_to_branch:
 branch_point = 'HEAD'
+if repo in shit_to_skip:
+continue
 if repo in manual_branch_points:
 branch_point = manual_branch_points[repo]
 data = '{"revision":"%s"}' % branch_point

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb1dfe035b90f132ac204b6aa670a83e49d8f225
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phab/aphlict: use groups instead of gid, remove require

[Dzahn (Code Review)]

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

Change subject: phab/aphlict: use groups instead of gid, remove require
..

phab/aphlict: use groups instead of gid, remove require

follow-up to Change-Id I582deafa4faea0f45 which introduced
a puppet error when it tries to create the user "aphlict" due
to missing group "aphlict" even though it should be created and
there is a "require" for it.

The "gid" parameter is for a number, while "groups" should be for
a group name.

Following examples in puppet docs, there is also no require needed
between group and user like that.

Bug: T765
Change-Id: Ia9b72f9caf26fb5cc2a0971f0673d283b2de31ee
---
M modules/phabricator/manifests/aphlict.pp
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/379422/1

diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index e76b9f0..c85feda 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -73,11 +73,10 @@
 }
 
 user { $user:
-gid => $group,
+groups  => $group,
 shell   => '/bin/false',
 home=> '/var/run/aphlict',
 system  => true,
-require => Group[$group],
 }
 
 base::service_unit { 'aphlict':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Lazy creation for heavy menu

[jenkins-bot (Code Review)]

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

Change subject: Lazy creation for heavy menu
..


Lazy creation for heavy menu

Assumptions:
* Generally if we have a model we don't need UI
* UI can be created lazy if it is not shown to user

Bug: T176250
Change-Id: Iba7f889d8610de2eb3056248cd1c664b0cd90940
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
2 files changed, 30 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 83e5796..7f1372c 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -90,7 +90,12 @@
}
};
 
-   $( rcfilters.init );
+   // Early execute of init
+   if ( document.readyState === 'interactive' || document.readyState === 
'complete' ) {
+   rcfilters.init();
+   } else {
+   $( rcfilters.init );
+   }
 
module.exports = rcfilters;
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index 07d4506..5ba42e7 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
@@ -32,6 +32,7 @@
this.views = {};
this.userSelecting = false;
 
+   this.menuInitialized = false;
this.inputValue = '';
this.$overlay = config.$overlay || this.$element;
this.$body = $( '' ).addClass( 
'mw-rcfilters-ui-menuSelectWidget-body' );
@@ -129,13 +130,26 @@
};
 
/**
-* Respond to model initialize event. Populate the menu from the model
+* @inheritdoc
 */
-   mw.rcfilters.ui.MenuSelectWidget.prototype.onModelInitialize = function 
() {
+   mw.rcfilters.ui.MenuSelectWidget.prototype.toggle = function ( show ) {
+   this.lazyMenuCreation();
+   mw.rcfilters.ui.MenuSelectWidget.parent.prototype.toggle.call( 
this, show );
+   };
+
+   /**
+* lazy creation of the menu
+*/
+   mw.rcfilters.ui.MenuSelectWidget.prototype.lazyMenuCreation = function 
() {
var widget = this,
viewGroupCount = {},
groups = this.model.getFilterGroups();
 
+   if ( this.menuInitialized ) {
+   return;
+   }
+
+   this.menuInitialized = true;
// Reset
this.clearItems();
 
@@ -188,6 +202,13 @@
} );
 
this.switchView( this.model.getCurrentView() );
+   };
+
+   /**
+* Respond to model initialize event. Populate the menu from the model
+*/
+   mw.rcfilters.ui.MenuSelectWidget.prototype.onModelInitialize = function 
() {
+   this.menuInitialized = false;
};
 
/**
@@ -285,6 +306,7 @@
 * @return {mw.rcfilters.ui.ItemMenuOptionWidget} Option widget
 */
mw.rcfilters.ui.MenuSelectWidget.prototype.getItemFromModel = function 
( model ) {
+   this.lazyMenuCreation();
return this.views[ model.getGroupModel().getView() ].filter( 
function ( item ) {
return item.getName() === model.getName();
} )[ 0 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba7f889d8610de2eb3056248cd1c664b0cd90940
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Eranroz 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Eranroz 
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...VisualEditor[REL1_30]: Update VE core submodule to REL1_30 HEAD (8694af408)

[Jforrester (Code Review)]

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

Change subject: Update VE core submodule to REL1_30 HEAD (8694af408)
..

Update VE core submodule to REL1_30 HEAD (8694af408)

New changes:
8694af408 Setup slugs in TreeModifier

Change-Id: Ib9755fb9b213dd9046887bde11574730e9844d32
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/21/379421/1

diff --git a/lib/ve b/lib/ve
index 75726b8..8694af4 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 75726b8504e95a5e73c877a1b4f1c42162b49047
+Subproject commit 8694af408ea647e0cc29a085d1c6fdf4b306d414

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9755fb9b213dd9046887bde11574730e9844d32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: REL1_30
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]: Phabricator: configure notification server

[Dzahn (Code Review)]

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

Change subject: Phabricator: configure notification server
..


Phabricator: configure notification server

This provides the config for phabricator's aphlict notification server
so that we can begin testing the network config needed to tunnel
the websocket port through the lvs+varnish+nginx proxy layers.
(T112765)

Bug: T765
Change-Id: I582deafa4faea0f45b50277c52b5fd42b6780a8f
---
M modules/phabricator/manifests/aphlict.pp
M modules/phabricator/manifests/init.pp
M modules/profile/manifests/phabricator/main.pp
3 files changed, 43 insertions(+), 9 deletions(-)

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



diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index e292d6b..e76b9f0 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -5,6 +5,7 @@
 $ensure = 'present',
 $user   = 'aphlict',
 $group  = 'aphlict',
+$basedir = '/srv/phab'
 ) {
 validate_ensure($ensure)
 
@@ -12,7 +13,6 @@
 require_package('nodejs')
 
 # paths
-$basedir = $phabricator::phabdir
 $phabdir = "${basedir}/phabricator/"
 $aphlict_dir = "${phabdir}/support/aphlict/server"
 $node_modules = "${aphlict_dir}/node_modules"
@@ -73,10 +73,11 @@
 }
 
 user { $user:
-gid=> $group,
-shell  => '/bin/false',
-home   => '/var/run/aphlict',
-system => true,
+gid => $group,
+shell   => '/bin/false',
+home=> '/var/run/aphlict',
+system  => true,
+require => Group[$group],
 }
 
 base::service_unit { 'aphlict':
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index 7383adf..3f950c8 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -344,8 +344,4 @@
 hasrestart => true,
 },
 }
-
-if $phab_settings['notification.servers'] {
-include ::phabricator::aphlict
-}
 }
diff --git a/modules/profile/manifests/phabricator/main.pp 
b/modules/profile/manifests/phabricator/main.pp
index 3fe1fdc..a425f6e 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -20,6 +20,7 @@
 $active_server = hiera('phabricator_server', undef),
 $passive_server = hiera('phabricator_server_failover', undef),
 $logmail = hiera('phabricator_logmail', false),
+$aphlict_enabled = hiera('phabricator_aphlict_enabled', false),
 ){
 
 mailalias { 'root':
@@ -35,10 +36,31 @@
 $dump_rsync_ensure = 'present'
 $dump_enabled = true
 $ferm_ensure = 'present'
+$aphlict_ensure = 'present'
 } else {
 $dump_rsync_ensure ='absent'
 $dump_enabled = false
 $ferm_ensure = 'absent'
+$aphlict_ensure = 'absent'
+}
+
+if $aphlict_enabled {
+$notification_servers = [
+{
+'type'  => 'client',
+'host'  => $domain,
+'port'  => 22280,
+'protocol'  => 'http',
+},
+{
+'type'  => 'admin',
+'host'  => $phabricator_active_server,
+'port'  => 22281,
+'protocol'  => 'http',
+}
+]
+} else {
+$notification_servers = []
 }
 
 # logmail must be explictly enabled in Hiera with 'phabricator_logmail: 
true'
@@ -157,10 +179,17 @@
 'diffusion.allow-http-auth'  => true,
 'diffusion.ssh-host' => 
$phab_diffusion_ssh_host,
 'gitblit.hostname'   => 'git.wikimedia.org',
+'notification.servers'   => $notification_servers,
 },
 conf_files => $conf_files,
 }
 # lint:endignore
+
+class { '::phabricator::aphlict':
+ensure  => $aphlict_ensure,
+basedir => $phab_root_dir,
+require => Class[phabricator]
+}
 
 # This exists to offer git services at git-ssh.wikimedia.org
 $vcs_ip_v4 = hiera('phabricator::vcs::address::v4', undef)
@@ -265,6 +294,14 @@
 srange => "@resolve((${phabricator_servers_ferm}))",
 }
 
+if $aphlict_enabled {
+ferm::service { 'notification_server':
+ensure => $ferm_ensure,
+proto  => 'tcp',
+port   => '22280',
+}
+}
+
 # redirect bugzilla URL patterns to phabricator
 # handles translation of bug numbers to maniphest task ids
 phabricator::redirector { "redirector.${domain}":

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

Gerrit-MessageType: merged

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Vendor update, omnimail-silverpop.

[jenkins-bot (Code Review)]

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

Change subject: Vendor update, omnimail-silverpop.
..


Vendor update, omnimail-silverpop.

Add support for offset parameter to recipient retrieval

Change-Id: I50f65ff6f6c2e1dd2060bfb6a77fb8e88aa4a0f7
---
M composer/installed.json
M wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
M wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
3 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/composer/installed.json b/composer/installed.json
index 1af2f47..fee000a 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2277,7 +2277,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "313ef51cc3990238438f5dc5207b25cb132ea131"
+"reference": "288f2602952468a4fd5874b11b1bd8da5b0dfb7b"
 },
 "require": {
 "league/csv": "^8.0",
@@ -2288,7 +2288,7 @@
 "require-dev": {
 "guzzlehttp/guzzle": "*"
 },
-"time": "2017-09-12T23:04:53+00:00",
+"time": "2017-09-20T02:50:06+00:00",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git 
a/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php 
b/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
index 28cc42b..787779e 100644
--- 
a/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
+++ 
b/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
@@ -9,7 +9,7 @@
 
 use Omnimail\Silverpop\Responses\RecipientsResponse;
 
-class RawRecipientDataExportRequest extends BaseRequest
+class RawRecipientDataExportRequest extends SilverpopBaseRequest
 {
 
   protected $retrievalParameters;
@@ -83,6 +83,7 @@
 $response = new RecipientsResponse(array());
 $response->setRetrievalParameters($this->getRetrievalParameters());
 $response->setSilverpop($this->silverPop);
+$response->setOffset($this->getOffset());
 $response->setContactReferenceField($this->getContactReferenceField());
 return $response;
   }
diff --git a/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php 
b/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
index 7d7c9cf..1bf9685 100644
--- a/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
+++ b/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
@@ -112,6 +112,7 @@
   return $rowIndex != 0;
 };
 $this->reader->addFilter($filterOutRow);
+$this->reader->setOffset($this->getOffset());
 
 $formatFunction = function ($row) {
   if (isset($row['email'])) {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Enable ui for slaves

[Paladox (Code Review)]

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

Change subject: Gerrit: Enable ui for slaves
..

Gerrit: Enable ui for slaves

Note that it will still be in read only, just you will be able
to see what the slave has data wise.

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bd7021ab531b54e5155e98a1f4adc12f9c42275
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] mediawiki/core[wmf/1.30.0-wmf.19]: Fix ip_changes insert counting

[jenkins-bot (Code Review)]

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

Change subject: Fix ip_changes insert counting
..


Fix ip_changes insert counting

Change-Id: I02b457d9dcaadc97eead623e42a5a1ccf8335724
(cherry picked from commit 548e0da3278ae1cac8f5a5caed632e0f5eefb942)
---
M maintenance/populateIpChanges.php
1 file changed, 4 insertions(+), 7 deletions(-)

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



diff --git a/maintenance/populateIpChanges.php 
b/maintenance/populateIpChanges.php
index 2b2a2b4..40a596c 100644
--- a/maintenance/populateIpChanges.php
+++ b/maintenance/populateIpChanges.php
@@ -110,14 +110,11 @@
}
}
 
-   $dbw->insert(
-   'ip_changes',
-   $insertRows,
-   __METHOD__,
-   'IGNORE'
-   );
+   if ( $insertRows ) {
+   $dbw->insert( 'ip_changes', $insertRows, 
__METHOD__, 'IGNORE' );
 
-   $inserted += $dbw->affectedRows();
+   $inserted += $dbw->affectedRows();
+   }
 
$lbFactory->waitForReplication();
usleep( $throttle * 1000 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02b457d9dcaadc97eead623e42a5a1ccf8335724
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Parent5446 
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...vendor[master]: Vendor update, omnimail-silverpop.

[Eileen (Code Review)]

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

Change subject: Vendor update, omnimail-silverpop.
..

Vendor update, omnimail-silverpop.

Add support for offset parameter to recipient retrieval

Change-Id: I50f65ff6f6c2e1dd2060bfb6a77fb8e88aa4a0f7
---
M composer/installed.json
M wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
M wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
3 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/19/379419/1

diff --git a/composer/installed.json b/composer/installed.json
index 1af2f47..fee000a 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2277,7 +2277,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "313ef51cc3990238438f5dc5207b25cb132ea131"
+"reference": "288f2602952468a4fd5874b11b1bd8da5b0dfb7b"
 },
 "require": {
 "league/csv": "^8.0",
@@ -2288,7 +2288,7 @@
 "require-dev": {
 "guzzlehttp/guzzle": "*"
 },
-"time": "2017-09-12T23:04:53+00:00",
+"time": "2017-09-20T02:50:06+00:00",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git 
a/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php 
b/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
index 28cc42b..787779e 100644
--- 
a/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
+++ 
b/wikimedia/omnimail-silverpop/src/Requests/RawRecipientDataExportRequest.php
@@ -9,7 +9,7 @@
 
 use Omnimail\Silverpop\Responses\RecipientsResponse;
 
-class RawRecipientDataExportRequest extends BaseRequest
+class RawRecipientDataExportRequest extends SilverpopBaseRequest
 {
 
   protected $retrievalParameters;
@@ -83,6 +83,7 @@
 $response = new RecipientsResponse(array());
 $response->setRetrievalParameters($this->getRetrievalParameters());
 $response->setSilverpop($this->silverPop);
+$response->setOffset($this->getOffset());
 $response->setContactReferenceField($this->getContactReferenceField());
 return $response;
   }
diff --git a/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php 
b/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
index 7d7c9cf..1bf9685 100644
--- a/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
+++ b/wikimedia/omnimail-silverpop/src/Responses/RecipientsResponse.php
@@ -112,6 +112,7 @@
   return $rowIndex != 0;
 };
 $this->reader->addFilter($filterOutRow);
+$this->reader->setOffset($this->getOffset());
 
 $formatFunction = function ($row) {
   if (isset($row['email'])) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50f65ff6f6c2e1dd2060bfb6a77fb8e88aa4a0f7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
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] operations/mediawiki-config[master]: Enable user email blacklist on meta

[Dmaza (Code Review)]

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

Change subject: Enable user email blacklist on meta
..

Enable user email blacklist on meta

Bug: T174694
Change-Id: I8e3f98849aa48b174f65295cfe189330da7c4b0a
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index bf8b0bf..cd3f0d5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4920,6 +4920,11 @@
'default' => true,
 ],
 
+'wgEnableUserEmailBlacklist' => [
+   'default' => false,
+   'metawiki' => true,
+],
+
 'wgAutoConfirmCount' => [
'default' => 0,
'arwiki' => 50, // T14123

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove unnecessary trigger refresh

[jenkins-bot (Code Review)]

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

Change subject: Remove unnecessary trigger refresh
..


Remove unnecessary trigger refresh

Fewer db privs needed during test.

Change-Id: I4896c8460c8cb76f362066a10ca717c154af5ef7
---
M sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
1 file changed, 1 insertion(+), 12 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
index 6753876..76b97dc 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
@@ -7,7 +7,7 @@
 class PhoneImportTest extends BaseWmfDrupalPhpUnitTestCase {
 
 public function testPhoneImport() {
-  $this->refreshStripFunction();
+civicrm_initialize();
 
 $phoneNumber = '555-555-';
 
@@ -32,16 +32,5 @@
 $this->assertEquals(wmf_civicrm_get_default_location_type_id(), 
$phone['location_type_id']);
 
$this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Phone', 
'phone_type_id', 'Phone'), $phone['phone_type_id']);
 }
-
-  /**
-   * This SQL function is not created during the test at the right time & it 
seems the triggers ARE
-   * created despite it not being present. This is not an issue on live (where 
the function seems to already exist).
-   */
-  public function refreshStripFunction() {
-civicrm_initialize();
-
CRM_Core_DAO::executeQuery(CRM_Contact_BAO_Contact::DROP_STRIP_FUNCTION_43);
-
CRM_Core_DAO::executeQuery(CRM_Contact_BAO_Contact::CREATE_STRIP_FUNCTION_43);
-CRM_Core_DAO::executeQuery("UPDATE civicrm_phone SET phone_numeric = 
civicrm_strip_non_numeric(phone)");
-  }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4896c8460c8cb76f362066a10ca717c154af5ef7
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

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

+ 68732e38560d68feaf0899efb0d7f47a31e049fd Define a constant to allow switching 
dbs for phpunit
+ 8973ebe802e98ada6cd663e5180ec9eff50f5335 Orphan Slayer Module
+ b961f2c0e51d59f467efaa2a193554654cdb0e3f Minor refactor on Omnimail classes.
+ d4277e9c65e82c54c80166faeb59b775db6c09cd Update Omnimail vendor dir to 
support offset on recipients.
+ d7a2c9bd2a23ec98bdba0c984332699ad6e22a3a Update Omnimail Recipient.load to 
support offset & limit
+ 2488f25eea81e748f3336934ce789ad7ed616bb9 Update Omnimail jobs to support 
storing settings about multiple jobs.
+ f060a249b60a9df7c6673ade540120f754d6a7dd Update Omnimail recipient load to 
support parameterised batching.

Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8
---
D phpunit.xml
1 file changed, 0 insertions(+), 53 deletions(-)

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



diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 66a2d0a..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<<< HEAD   (0fb467 Fix last vendor commit)
-===
-http://www.w3.org/2001/XMLSchema-instance;
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd;
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
-  
-  
-sites/all/modules/exchange_rates/tests/phpunit
-  
-  
-sites/all/modules/orphan_slayer/tests/phpunit
-  
-  
-sites/all/modules/queue2civicrm/tests/phpunit
-  
-  
-sites/all/modules/recurring_globalcollect/tests
-  
-  
-sites/all/modules/thank_you/tests/phpunit
-  
-  
-sites/all/modules/wmf_audit/tests
-  
-  
-sites/all/modules/wmf_campaigns/tests
-  
-  
-sites/all/modules/wmf_civicrm/tests/phpunit
-  
-  
-sites/all/modules/wmf_common/tests/phpunit
-  
-  
-
sites/all/modules/wmf_communication/tests/phpunit
-
sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php
-  
-  
-
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit
-  
-
-
->>> BRANCH (f060a2 Update Omnimail recipient load to support parameterised 
batc)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
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...DonationInterface[master]: Adding getStatus tests

[jenkins-bot (Code Review)]

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

Change subject: Adding getStatus tests
..


Adding getStatus tests

Change-Id: Ie9eb0d1b7cab92acda1f01112aa93d3c2e0a74f8
---
M ingenico_gateway/ingenico.adapter.php
M tests/phpunit/Adapter/Ingenico/IngenicoTest.php
M tests/phpunit/BaseIngenicoTestCase.php
3 files changed, 163 insertions(+), 226 deletions(-)

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



diff --git a/ingenico_gateway/ingenico.adapter.php 
b/ingenico_gateway/ingenico.adapter.php
index 8570127..daa88b7 100644
--- a/ingenico_gateway/ingenico.adapter.php
+++ b/ingenico_gateway/ingenico.adapter.php
@@ -92,7 +92,7 @@
)
);
 
-   $this->transactions['getHostedCheckoutStatus'] = array(
+   $this->transactions['getHostedPaymentStatus'] = array(
'request' => array( 'hostedCheckoutId' ),
'response' => array(
'id',
@@ -151,7 +151,7 @@
case 'createHostedCheckout':
$result = $provider->createHostedPayment( $data 
);
break;
-   case 'getHostedCheckoutStatus':
+   case 'getHostedPaymentStatus':
$result = $provider->getHostedPaymentStatus(
$data['hostedCheckoutId']
);
@@ -230,10 +230,10 @@
 
protected function getOrderStatusFromProcessor() {
// FIXME: sometimes we should use getPayment
-   return $this->do_transaction( 'getHostedCheckoutStatus' );
+   return $this->do_transaction( 'getHostedPaymentStatus' );
}
 
-   protected function post_process_getHostedCheckoutStatus() {
+   protected function post_process_getHostedPaymentStatus() {
return parent::post_process_get_orderstatus();
}
 
diff --git a/tests/phpunit/Adapter/Ingenico/IngenicoTest.php 
b/tests/phpunit/Adapter/Ingenico/IngenicoTest.php
index 225d261..127afd9 100644
--- a/tests/phpunit/Adapter/Ingenico/IngenicoTest.php
+++ b/tests/phpunit/Adapter/Ingenico/IngenicoTest.php
@@ -95,10 +95,9 @@
}
 
/**
-* Just run the GET_ORDERSTATUS transaction and make sure we load the 
data
+* Just run the getHostedCheckoutStatus transaction and make sure we 
load the data
 */
-   function testGetOrderStatus() {
-   $this->markTestSkipped( 'OrderStatus not implemented' );
+   function testGetHostedPaymentStatus() {
$init = $this->getDonorTestData();
$init['payment_method'] = 'cc';
$init['payment_submethod'] = 'visa';
@@ -106,11 +105,60 @@
 
$gateway = $this->getFreshGatewayObject( $init );
 
-   $gateway->do_transaction( 'GET_ORDERSTATUS' );
+   $this->hostedCheckoutProvider->expects( $this->once() )
+   ->method( 'getHostedPaymentStatus' )
+   ->willReturn(
+   array(
+   "createdPaymentOutput" => array(
+   "payment" => array(
+   "id" => 
"008915660725016821",
+   "paymentOutput" => 
array(
+   "amountOfMoney" 
=> array(
+   
"amount" => 2345,
+   
"currencyCode" => "USD"
+   ),
+   "references" => 
array(
+   
"paymentReference" => "0"
+   ),
+   "paymentMethod" 
=> "card",
+   
"cardPaymentMethodSpecificOutput" => array(
+   
"paymentProductId" => 1,
+   
"authorisationCode" => "123456",
+   "card" 
=> array(
+   
"cardNumber" => "7977",
+   
"expiryDate" => "1220"
+   ),
+ 

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Rm FormatNum

[MacFan4000 (Code Review)]

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

Change subject: Rm FormatNum
..

Rm FormatNum

Bug:T176081
Change-Id: Ia3a3803b997858ae05c7b185e8c43bc7aca3e47c
---
M .gitmodules
D FormatNum
2 files changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/.gitmodules b/.gitmodules
index 7782531..bd31d75 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -866,10 +866,6 @@
path = FormatDates
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/FormatDates
branch = .
-[submodule "FormatNum"]
-   path = FormatNum
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/FormatNum
-   branch = .
 [submodule "FormelApplet"]
path = FormelApplet
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/FormelApplet
diff --git a/FormatNum b/FormatNum
deleted file mode 16
index c86443f..000
--- a/FormatNum
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c86443f60cbce44fe8b10ac4cc7ca790884d7b9c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3a3803b997858ae05c7b185e8c43bc7aca3e47c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: MacFan4000 

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

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

[jenkins-bot (Code Review)]

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

Change subject: Fix case of SpecialRecentChanges class
..


Fix case of SpecialRecentChanges class

Test fails with $wgAutoloadAttemptLowercase = false

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

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



diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php 
b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
index 0af3089..0b6962d 100644
--- a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
+++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
@@ -12,7 +12,7 @@
 class SpecialRecentchangesTest extends AbstractChangesListSpecialPageTestCase {
protected function getPage() {
return TestingAccessWrapper::newFromObject(
-   new SpecialRecentchanges
+   new SpecialRecentChanges
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8cd202d36d35a36e7513f81cea4a7f8346661bc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jjanes 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Eileen (Code Review)]

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

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

+ 68732e38560d68feaf0899efb0d7f47a31e049fd Define a constant to allow switching 
dbs for phpunit
+ 8973ebe802e98ada6cd663e5180ec9eff50f5335 Orphan Slayer Module
+ b961f2c0e51d59f467efaa2a193554654cdb0e3f Minor refactor on Omnimail classes.
+ d4277e9c65e82c54c80166faeb59b775db6c09cd Update Omnimail vendor dir to 
support offset on recipients.
+ d7a2c9bd2a23ec98bdba0c984332699ad6e22a3a Update Omnimail Recipient.load to 
support offset & limit
+ 2488f25eea81e748f3336934ce789ad7ed616bb9 Update Omnimail jobs to support 
storing settings about multiple jobs.
+ f060a249b60a9df7c6673ade540120f754d6a7dd Update Omnimail recipient load to 
support parameterised batching.

Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8
---
D phpunit.xml
1 file changed, 0 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/16/379416/1

diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 66a2d0a..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<<< HEAD   (0fb467 Fix last vendor commit)
-===
-http://www.w3.org/2001/XMLSchema-instance;
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd;
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
-  
-  
-sites/all/modules/exchange_rates/tests/phpunit
-  
-  
-sites/all/modules/orphan_slayer/tests/phpunit
-  
-  
-sites/all/modules/queue2civicrm/tests/phpunit
-  
-  
-sites/all/modules/recurring_globalcollect/tests
-  
-  
-sites/all/modules/thank_you/tests/phpunit
-  
-  
-sites/all/modules/wmf_audit/tests
-  
-  
-sites/all/modules/wmf_campaigns/tests
-  
-  
-sites/all/modules/wmf_civicrm/tests/phpunit
-  
-  
-sites/all/modules/wmf_common/tests/phpunit
-  
-  
-
sites/all/modules/wmf_communication/tests/phpunit
-
sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php
-  
-  
-
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit
-  
-
-
->>> BRANCH (f060a2 Update Omnimail recipient load to support parameterised 
batc)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8
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] mediawiki/core[wmf/1.30.0-wmf.19]: Fix ip_changes insert counting

[MaxSem (Code Review)]

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

Change subject: Fix ip_changes insert counting
..

Fix ip_changes insert counting

Change-Id: I02b457d9dcaadc97eead623e42a5a1ccf8335724
(cherry picked from commit 548e0da3278ae1cac8f5a5caed632e0f5eefb942)
---
M maintenance/populateIpChanges.php
1 file changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/379415/1

diff --git a/maintenance/populateIpChanges.php 
b/maintenance/populateIpChanges.php
index 2b2a2b4..40a596c 100644
--- a/maintenance/populateIpChanges.php
+++ b/maintenance/populateIpChanges.php
@@ -110,14 +110,11 @@
}
}
 
-   $dbw->insert(
-   'ip_changes',
-   $insertRows,
-   __METHOD__,
-   'IGNORE'
-   );
+   if ( $insertRows ) {
+   $dbw->insert( 'ip_changes', $insertRows, 
__METHOD__, 'IGNORE' );
 
-   $inserted += $dbw->affectedRows();
+   $inserted += $dbw->affectedRows();
+   }
 
$lbFactory->waitForReplication();
usleep( $throttle * 1000 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02b457d9dcaadc97eead623e42a5a1ccf8335724
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update Omnimail recipient load to support parameterised batc...

[jenkins-bot (Code Review)]

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

Change subject: Update Omnimail recipient load to support parameterised 
batching.
..


Update Omnimail recipient load to support parameterised batching.

Jeff suggested that many small inserts puts more load on replication. This 
gives us
'insert_batch_size' as another lever to tinker with. It's not reall applicable 
to
the groupmember job as we use the api for that, as we do with the other import 
jobs.

Bug: T176255
Change-Id: I191e8ddaf21f388732c360c372ad5a93fe63c6fa
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
2 files changed, 87 insertions(+), 7 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
index 5a328cc..06f8c9e 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
@@ -41,17 +41,21 @@
 $rowsLeftBeforeThrottle = $throttleCount;
 $limit = (isset($params['options']['limit'])) ? 
$params['options']['limit'] : NULL;
 $count = 0;
+$insertBatchSize = CRM_Utils_Array::value('insert_batch_size', $params, 1);
+$valueStrings = array();
 
 foreach ($recipients as $recipient) {
   if ($count === $limit) {
+// Do this here - ie. before processing a new row rather than at the 
end of the last row
+// to avoid thinking a job is incomplete if the limit co-incides with 
available rows.
+// Also write any remaining rows to the DB before exiting.
+_civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings);
 $omnimail->saveJobSetting(array(
   'last_timestamp' => $jobSettings['last_timestamp'],
   'retrieval_parameters' => $omnimail->getRetrievalParameters(),
   'progress_end_date' => $omnimail->endTimeStamp,
   'offset' => $omnimail->getOffset() + $count,
 ));
-// Do this here - ie. before processing a new row rather than at the 
end of the last row
-// to avoid thinking a job is incomplete if the limit co-incides with 
available rows.
 return civicrm_api3_create_success(1);
   }
   $insertValues = array(
@@ -68,11 +72,8 @@
 ),
 6 => array((string) $recipient->getContactReference(), 'String'),
   );
-  CRM_Core_DAO::executeQuery("
- INSERT IGNORE INTO civicrm_mailing_provider_data
- (`contact_identifier`, `mailing_identifier`, `email`, `event_type`, 
`recipient_action_datetime`, `contact_id`)
- values(%1, %2, %3, %4, %5, %6 )",
-$insertValues);
+  $valueStrings[] = CRM_Core_DAO::composeQuery("(%1, %2, %3, %4, %5, %6 
)", $insertValues);
+  $valueStrings = 
_civicrm_api3_omnirecipient_load_batch_write_to_db($valueStrings, 
$insertBatchSize);
 
   $rowsLeftBeforeThrottle--;
   $count++;
@@ -84,6 +85,7 @@
 sleep(ceil($throttleStagePoint - strtotime('now')));
   }
 }
+_civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings);
 $omnimail->saveJobSetting(array('last_timestamp' => 
$omnimail->endTimeStamp));
 return civicrm_api3_create_success(1);
   }
@@ -96,6 +98,38 @@
 return civicrm_api3_create_success(1);
   }
 
+}
+
+/**
+ * @param $valueStrings
+ */
+function _civicrm_api3_omnirecipient_load_write_remainder_rows($valueStrings) {
+  if (count($valueStrings)) {
+_civicrm_api3_omnirecipient_load_batch_write_to_db($valueStrings, 
count($valueStrings));
+  }
+}
+
+/**
+ * Write the imported values to the DB, batching per parameter.
+ *
+ * Save the values to the DB in batch sizes accordant with the insertBatchSize
+ * parameter.
+ *
+ * @param array $valueStrings
+ * @param int $insertBatchSize
+ *
+ * @return array
+ */
+function _civicrm_api3_omnirecipient_load_batch_write_to_db($valueStrings, 
$insertBatchSize) {
+  if (count($valueStrings) === $insertBatchSize) {
+CRM_Core_DAO::executeQuery("
+ INSERT IGNORE INTO civicrm_mailing_provider_data
+ (`contact_identifier`, `mailing_identifier`, `email`, `event_type`, 
`recipient_action_datetime`, `contact_id`)
+ values" . implode(',', $valueStrings)
+);
+$valueStrings = array();
+  }
+  return $valueStrings;
 }
 
 /**
@@ -150,5 +184,11 @@
 'type' => CRM_Utils_Type::T_STRING,
 'api.default' => '',
   );
+  $params['insert_batch_size'] = array(
+'title' => ts('Number of rows to insert in each DB write'),
+'description' => ts('Set this to increase row batching.'),
+'type' => 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra: Link-in upgraded cassandra-metrics-collector jar

[Dzahn (Code Review)]

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

Change subject: cassandra: Link-in upgraded cassandra-metrics-collector jar
..


cassandra: Link-in upgraded cassandra-metrics-collector jar

Bug: T171772
Change-Id: Ib0ef2b8d495232992d69dff58e99cbb3de58d0c3
---
M modules/cassandra/manifests/metrics.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/cassandra/manifests/metrics.pp 
b/modules/cassandra/manifests/metrics.pp
index 84bb372..0856a47 100644
--- a/modules/cassandra/manifests/metrics.pp
+++ b/modules/cassandra/manifests/metrics.pp
@@ -54,7 +54,7 @@
 } elsif $target_cassandra_version == '2.2' {
 $collector_version = '3.1.4-20170427.001104-1'
 } else {
-$collector_version = '4.0.1'
+$collector_version = '4.1.0'
 }
 
 scap::target { 'cassandra/metrics-collector':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0ef2b8d495232992d69dff58e99cbb3de58d0c3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Eevans 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Mobrovac 
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...PollNY[master]: Converted alerts, and confirms to OOJSUI

[jenkins-bot (Code Review)]

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

Change subject: Converted alerts, and confirms to OOJSUI
..


Converted alerts, and confirms to OOJSUI

T156304 will need a little bigger refactorisation, so will implement it in 
parts.

Bug: T156304
Change-Id: Id0a2251836d169120fc4bf8ea69c9a91c002056d
---
M extension.json
M resources/js/Poll.js
2 files changed, 80 insertions(+), 71 deletions(-)

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



diff --git a/extension.json b/extension.json
index 9d80880..d1f2d85 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PollNY",
-   "version": "3.4.2",
+   "version": "3.4.3",
"author": [
"Aaron Wright",
"David Pean",
@@ -105,7 +105,9 @@
],
"dependencies": [
"ext.socialprofile.flash",
-   "ext.socialprofile.LightBox"
+   "ext.socialprofile.LightBox",
+   "oojs-ui-core",
+   "oojs-ui-windows"
],
"position": "bottom"
},
diff --git a/resources/js/Poll.js b/resources/js/Poll.js
index fc40518..57800e4 100644
--- a/resources/js/Poll.js
+++ b/resources/js/Poll.js
@@ -147,7 +147,7 @@
mw.config.get( 
'wgCanonicalSpecialPageName' ) == 'CreatePoll'
)
{
-   alert( mw.msg( 
'poll-createpoll-error-nomore' ) );
+   OO.ui.alert( mw.msg( 
'poll-createpoll-error-nomore' ) );
} else {
// We have run out of polls to show
// Show a lightbox prompting the user 
to create more polls
@@ -169,32 +169,35 @@
 */
toggleStatus: function( status ) {
var msg;
-   if( status === 0 ) {
-   msg = mw.msg( 'poll-close-message' );
-   }
-   if( status == 1 ) {
-   msg = mw.msg( 'poll-open-message' );
-   }
-   if( status == 2 ) {
-   msg = mw.msg( 'poll-flagged-message' );
-   }
-   var ask = confirm( msg );
+   switch ( status ) {
+   case 0:
+   msg = mw.msg( 'poll-close-message' );
+   break;
+   case 1:
+   msg = mw.msg( 'poll-open-message' );
+   break;
+   case 2:
+   msg = mw.msg( 'poll-flagged-message' );
+   break;
+   }
 
-   if( ask ) {
-   jQuery.ajax({
-   type: 'POST',
-   url: mw.util.wikiScript( 'api' ),
-   data: {
-   action: 'pollny',
-   what: 'updateStatus',
-   pollID: document.getElementById( 
'poll_id' ).value,
-   status: status,
-   format: 'json'
-   }
-   } ).done( function() {
-   window.location.reload();
-   } );
-   }
+   OO.ui.confirm( msg ).done( function ( confirmed ) {
+   if ( confirmed ) {
+   jQuery.ajax({
+   type: 'POST',
+   url: mw.util.wikiScript( 'api' ),
+   data: {
+   action: 'pollny',
+   what: 'updateStatus',
+   pollID: 
document.getElementById( 'poll_id' ).value,
+   status: status,
+   format: 'json'
+   }
+   } ).done( function() {
+   window.location.reload();
+   } );
+   }
+   } );
},
 
// Embed poll stuff
@@ -275,32 +278,35 @@
 */
poll_admin_status: function( id, status ) {
var msg;
-   if( status === 0 ) {
-   msg = mw.msg( 'poll-close-message' );

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Remove old test harness

[jenkins-bot (Code Review)]

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

Change subject: Remove old test harness
..


Remove old test harness

Hasn't been touched since 2013, no longer does its job.

Change-Id: I1214a3302769724487b53ae3f7f1158b97347718
---
D tests/phpunit/unittest.conf.dist
D tests/phpunit/unittest.sh
2 files changed, 0 insertions(+), 387 deletions(-)

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



diff --git a/tests/phpunit/unittest.conf.dist b/tests/phpunit/unittest.conf.dist
deleted file mode 100644
index 174c558..000
--- a/tests/phpunit/unittest.conf.dist
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-#
-# Wikimedia Foundation
-#
-# LICENSE
-#
-# 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 2 of the License, or
-# (at your option) any later version.
-#
-# 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.
-#
-#
-# @categoryUnitTesting
-# @package Fundraising_Miscellaneous
-# @license http://www.gnu.org/copyleft/gpl.html GNU GENERAL PUBLIC 
LICENSE
-# @since   r462
-# @author  Jeremy Postlethwaite 
-#
-
-#
-# This is the distributed configuration file. If you need to make changes to 
-# these settings, copy this file to this directory and remove the ".dist" 
-# extension.
-#
-
-#
-# @var string $UNITTEST_HOSTNAME   The hostname to the webserver.
-#
-: ${UNITTEST_HOSTNAME:="localhost"}
-#
-# @var string $UNITTEST_URLThe url to the webserver. You need the trailing 
-# slash.
-#
-: ${UNITTEST_URL:="http://localhost/queue_handling/tests/"}
-#
-# @var string $PHPUNIT If phpunit.php is not within your shell $PATH, you may
-# specify the full path here.
-#
-: ${PHPUNIT:="phpunit.php"}
-#
-# @var string $PHPUNIT_OPTSBy default, all testing will be run in verbose 
mode.
-#
-: ${PHPUNIT_OPTS:="--verbose"}
-#
-# @var string $PHPUNIT_LIST_GROUPS Specify the relative path to the file 
in 
-# which you want to list groups designated by the doctag @group
-#
-: ${PHPUNIT_LIST_GROUPS:"=AllTests.php"}
-#
-# @var string $PHPUNIT_FILESpecify the relative path to the test in which 
you 
-# want to run. You need to omit the ".php" extension.
-#
-: ${PHPUNIT_FILE:="AllTests"}
-#
-# @var string $PHPUNIT_COVERAGE_HTML   The relative path to the code coverage 
-# html directory 
-#
-# This is where code coverage will be saved if the flag -ch is passed. If you 
wish to specify a full path, use:
-# --coverage-html "/some/absolute/path"
-#
-# These directories will need to exist, they will not be created.
-#
-: ${PHPUNIT_COVERAGE_HTML:="logs/coverage/html"}
-#
-# @var string $PHPUNIT_COVERAGE_CLOVER The relative path to the code coverage 
-# clover directory 
-#
-# This is where code coverage will be saved if the flag -ch is passed. If you 
wish to specify a full path, use:
-# --coverage-clover "/some/absolute/path"
-#
-# These directories will need to exist, they will not be created.
-#
-: ${PHPUNIT_COVERAGE_CLOVER:="logs/coverage/clover/index.xml"}
-#
-# @var string $PHPUNIT_TESTDOX_HTMLThe relative path to the testdox output 
html
-# directory. It is okay to put this the same directory as html coverage. 
-#
-# This is where testdox will be saved if the flag -tdh is passed. If you wish 
to specify a full path, use:
-# --testdox-html "/some/absolute/path"
-#
-# These directories will need to exist, they will not be created.
-#
-: ${PHPUNIT_TESTDOX_HTML:="logs/coverage/html/testdox.html"}
-
diff --git a/tests/phpunit/unittest.sh b/tests/phpunit/unittest.sh
deleted file mode 100755
index f124229..000
--- a/tests/phpunit/unittest.sh
+++ /dev/null
@@ -1,297 +0,0 @@
-#!/bin/bash
-
-#
-# Wikimedia Foundation
-#
-# LICENSE
-#
-# 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 2 of the License, or
-# (at your option) any later version.
-#
-# 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.
-#
-#
-# @category  

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Bump branch number for eventual rc.0

[jenkins-bot (Code Review)]

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

Change subject: Bump branch number for eventual rc.0
..


Bump branch number for eventual rc.0

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

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bd00be2..5ffa064 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.30.0-wmf.19';
+$wgVersion = '1.30.0-rc.0';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a98fafbb72b7ef17be88b33c9282ae383e43e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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...VisualEditor[master]: Update VE core submodule to REL1_30 HEAD (8694af408)

[Jforrester (Code Review)]

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

Change subject: Update VE core submodule to REL1_30 HEAD (8694af408)
..

Update VE core submodule to REL1_30 HEAD (8694af408)

New changes:
8694af408 Setup slugs in TreeModifier

Change-Id: Ib9755fb9b213dd9046887bde11574730e9844d32
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/08/379408/1

diff --git a/lib/ve b/lib/ve
index 75726b8..8694af4 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 75726b8504e95a5e73c877a1b4f1c42162b49047
+Subproject commit 8694af408ea647e0cc29a085d1c6fdf4b306d414

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9755fb9b213dd9046887bde11574730e9844d32
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] wikimedia...crm[master]: Update Omnimail jobs to support storing settings about multi...

[jenkins-bot (Code Review)]

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

Change subject: Update Omnimail jobs to support storing settings about multiple 
jobs.
..


Update Omnimail jobs to support storing settings about multiple jobs.

Omnimail jobs store information about where the job is up to. This change
permits an input parameter 'job_suffix' to denote a job,
allowing multiple jobs of the same type to be tracked.

This might be used if a slow back-fill job is running off-peak
(ahem) due to possibly a mistake cause some data to have been missed
.
without interfering with the up-to-date job.

Bug: T176255
Change-Id: If0a709b9e9cec7e3276d231e75cca49d2909d4cb
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
5 files changed, 139 insertions(+), 64 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
index b40f880..2d40168 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
@@ -42,6 +42,15 @@
   protected $retrievalParameters;
 
   /**
+   * @var string
+   */
+  protected $job_suffix;
+
+  /**
+   * @var string
+   */
+  protected $mail_provider;
+  /**
* CRM_Omnimail_Omnimail constructor.
*
* @param array $params
@@ -49,6 +58,8 @@
* @throws \API_Exception
*/
   public function __construct($params) {
+$this->job_suffix = !empty($params['job_suffix']) ? $params['job_suffix'] 
: '';
+$this->mail_provider = $params['mail_provider'];
 $this->setJobSettings($params);
 $this->setOffset($params);
 
$this->setRetrievalParameters(CRM_Utils_Array::value('retrieval_parameters', 
$this->jobSettings));
@@ -150,7 +161,20 @@
*/
   protected function setJobSettings($params) {
 $settings = CRM_Omnimail_Helper::getSettings();
-$this->jobSettings = CRM_Utils_Array::value($params['mail_provider'], 
$settings['omnimail_' . $this->job . '_load'], array());
+$this->jobSettings = CRM_Utils_Array::value($params['mail_provider'] . 
$this->job_suffix, $settings['omnimail_' . $this->job . '_load'], array());
+  }
+
+  /**
+   * Save the job settings.
+   *
+   * @param array $setting
+   */
+  function saveJobSetting($setting) {
+civicrm_api3('Setting', 'create', array(
+  'omnimail_' . $this->job . '_load' => array(
+$this->mail_provider . $this->job_suffix => $setting,
+  ),
+));
   }
 
 }
\ No newline at end of file
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
index eba0d6c..e0e8b7f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
@@ -27,15 +27,11 @@
 $contacts = $job->getResult($params);
   }
   catch (CRM_Omnimail_IncompleteDownloadException $e) {
-civicrm_api3('Setting', 'create', array(
-  'omnimail_omnigroupmembers_load' => array(
-$params['mail_provider'] => array(
-  'last_timestamp' => $jobSettings['last_timestamp'],
-  'retrieval_parameters' => $e->getRetrievalParameters(),
-  'progress_end_date' => $e->getEndTimestamp(),
-  'offset' => 0,
-),
-  ),
+$job->saveJobSetting(array(
+  'last_timestamp' => $jobSettings['last_timestamp'],
+  'retrieval_parameters' => $e->getRetrievalParameters(),
+  'progress_end_date' => $e->getEndTimestamp(),
+  'offset' => 0,
 ));
 return civicrm_api3_create_success(1);
   }
@@ -43,26 +39,17 @@
   $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
   $locationTypeID = $defaultLocationType->id;
 
-  if (isset($params['options']['offset'])) {
-$offset = $params['options']['offset'];
-  }
-  else {
-$offset = CRM_Utils_Array::value('offset', $jobSettings, 0);
-  }
+  $offset = $job->getOffset();
   $limit = (isset($params['options']['limit'])) ? $params['options']['limit'] 
: NULL;
   $count = 0;
 
   foreach ($contacts as $contact) {
 if ($count === $limit) {
-  civicrm_api3('Setting', 'create', array(
-'omnimail_omnigroupmembers_load' => array(

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Prepare for 1.31 branch

[jenkins-bot (Code Review)]

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

Change subject: Prepare for 1.31 branch
..


Prepare for 1.31 branch

Change-Id: I2a1ce7b7af7ef9991a054332593b1f63a0213469
---
A RELEASE-NOTES-1.31
M includes/DefaultSettings.php
M includes/PHPVersionCheck.php
3 files changed, 95 insertions(+), 2 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
new file mode 100644
index 000..bbaaf16
--- /dev/null
+++ b/RELEASE-NOTES-1.31
@@ -0,0 +1,93 @@
+== MediaWiki 1.31 ==
+
+THIS IS NOT A RELEASE YET
+
+MediaWiki 1.31 is an alpha-quality branch and is not recommended for use in
+production.
+
+=== Configuration changes in 1.31 ===
+* …
+
+=== New features in 1.31 ===
+* …
+
+=== External library changes in 1.31 ===
+
+ Upgraded external libraries 
+* …
+
+ New external libraries 
+* …
+
+ Removed and replaced external libraries 
+* …
+
+=== Bug fixes in 1.31 ===
+* …
+
+=== Action API changes in 1.31 ===
+* …
+
+=== Action API internal changes in 1.31 ===
+* …
+
+=== Languages updated in 1.31 ===
+MediaWiki supports over 350 languages. Many localisations are updated
+regularly. Below only new and removed languages are listed, as well as
+changes to languages because of Phabricator reports.
+
+* …
+
+=== Other changes in 1.31 ===
+* …
+
+== Compatibility ==
+MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
+HHVM 3.6.5 or later.
+
+MySQL/MariaDB is the recommended DBMS. PostgreSQL or SQLite can also be used,
+but support for them is somewhat less mature. There is experimental support for
+Oracle and Microsoft SQL Server.
+
+The supported versions are:
+
+* MySQL 5.0.3 or later
+* PostgreSQL 8.3 or later
+* SQLite 3.3.7 or later
+* Oracle 9.0.1 or later
+* Microsoft SQL Server 2005 (9.00.1399)
+
+== Upgrading ==
+1.31 has several database changes since 1.30, and will not work without schema
+updates. Note that due to changes to some very large tables like the revision
+table, the schema update may take quite long (minutes on a medium sized site,
+many hours on a large site).
+
+Don't forget to always back up your database before upgrading!
+
+See the file UPGRADE for more detailed upgrade instructions, including
+important information when upgrading from versions prior to 1.11.
+
+For notes on 1.30.x and older releases, see HISTORY.
+
+== Online documentation ==
+Documentation for both end-users and site administrators is available on
+MediaWiki.org, and is covered under the GNU Free Documentation License (except
+for pages that explicitly state that their contents are in the public domain):
+
+   https://www.mediawiki.org/wiki/Special:MyLanguage/Documentation
+
+== Mailing list ==
+A mailing list is available for MediaWiki user support and discussion:
+
+   https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
+
+A low-traffic announcements-only list is also available:
+
+   https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
+
+It's highly recommended that you sign up for one of these lists if you're
+going to run a public MediaWiki, so you can be notified of security fixes.
+
+== IRC help ==
+There's usually someone online in #mediawiki on irc.freenode.net.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 852cd08..cdb7ce8 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.30.0-alpha';
+$wgVersion = '1.31.0-alpha';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index e9e271c..a862903 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -29,7 +29,7 @@
  */
 class PHPVersionCheck {
/* @var string The number of the MediaWiki version used */
-   var $mwVersion = '1.30';
+   var $mwVersion = '1.31';
var $functionsExtensionsMapping = array(
'mb_substr'   => 'mbstring',
'utf8_encode' => 'xml',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a1ce7b7af7ef9991a054332593b1f63a0213469
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Bump branch number for eventual rc.0

[Chad (Code Review)]

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

Change subject: Bump branch number for eventual rc.0
..

Bump branch number for eventual rc.0

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/379393/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bd00be2..5ffa064 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.30.0-wmf.19';
+$wgVersion = '1.30.0-rc.0';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix warning in DifferenceEngine

[jenkins-bot (Code Review)]

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

Change subject: Fix warning in DifferenceEngine
..


Fix warning in DifferenceEngine

Make sure that the ar_namespace and ar_text fields are selected from the
database.

Change-Id: Ic2e8f99f43025510c14e0a8ff2b708b378cf7ef3
(cherry picked from commit 7a44c515808307150ea57c5f007ba48677132c47)
---
M includes/diff/DifferenceEngine.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index ed8cbb4..a9d6ad6 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -182,7 +182,10 @@
if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
$dbr = wfGetDB( DB_REPLICA );
$row = $dbr->selectRow( 'archive',
-   Revision::selectArchiveFields(),
+   array_merge(
+   Revision::selectArchiveFields(),
+   [ 'ar_namespace', 'ar_title' ]
+   ),
[ 'ar_rev_id' => $id ],
__METHOD__ );
if ( $row ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2e8f99f43025510c14e0a8ff2b708b378cf7ef3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix ip_changes insert counting

[jenkins-bot (Code Review)]

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

Change subject: Fix ip_changes insert counting
..


Fix ip_changes insert counting

Change-Id: I02b457d9dcaadc97eead623e42a5a1ccf8335724
---
M maintenance/populateIpChanges.php
1 file changed, 4 insertions(+), 7 deletions(-)

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



diff --git a/maintenance/populateIpChanges.php 
b/maintenance/populateIpChanges.php
index 2b2a2b4..40a596c 100644
--- a/maintenance/populateIpChanges.php
+++ b/maintenance/populateIpChanges.php
@@ -110,14 +110,11 @@
}
}
 
-   $dbw->insert(
-   'ip_changes',
-   $insertRows,
-   __METHOD__,
-   'IGNORE'
-   );
+   if ( $insertRows ) {
+   $dbw->insert( 'ip_changes', $insertRows, 
__METHOD__, 'IGNORE' );
 
-   $inserted += $dbw->affectedRows();
+   $inserted += $dbw->affectedRows();
+   }
 
$lbFactory->waitForReplication();
usleep( $throttle * 1000 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02b457d9dcaadc97eead623e42a5a1ccf8335724
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Parent5446 
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]: Update Omnimail Recipient.load to support offset & limit

[jenkins-bot (Code Review)]

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

Change subject: Update Omnimail Recipient.load to support offset & limit
..


Update Omnimail Recipient.load to support offset & limit

Bug: T176255

Change-Id: Iecf88cd36b0cd2a0d12e9eb5093cc0f6ffb32d66
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/Load.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
6 files changed, 92 insertions(+), 19 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index e58be97..408e9cc 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -43,14 +43,11 @@
 $request = Omnimail::create($params['mail_provider'], 
$mailerCredentials)->getGroupMembers($jobParameters);
 $request->setOffset((int) $this->offset);
 
-$startTimestamp = self::getStartTimestamp($params, $this->jobSettings);
+$startTimestamp = $this->getStartTimestamp($params);
 $this->endTimeStamp = 
self::getEndTimestamp(CRM_Utils_Array::value('end_date', $params), $settings, 
$startTimestamp);
 
-if (isset($this->jobSettings['retrieval_parameters'])) {
-  if (!empty($params['end_date']) || !empty($params['start_date'])) {
-throw new API_Exception('A prior retrieval is in progress. Do not pass 
in dates to complete a retrieval');
-  }
-  
$request->setRetrievalParameters($this->jobSettings['retrieval_parameters']);
+if ($this->getRetrievalParameters()) {
+  $request->setRetrievalParameters($this->getRetrievalParameters());
 }
 elseif ($startTimestamp) {
   $request->setStartTimeStamp($startTimestamp);
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
index 72aba34..b40f880 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
@@ -45,10 +45,19 @@
* CRM_Omnimail_Omnimail constructor.
*
* @param array $params
+   *
+   * @throws \API_Exception
*/
   public function __construct($params) {
 $this->setJobSettings($params);
 $this->setOffset($params);
+
$this->setRetrievalParameters(CRM_Utils_Array::value('retrieval_parameters', 
$this->jobSettings));
+
+if ($this->getRetrievalParameters()) {
+  if (!empty($params['end_date']) || !empty($params['start_date'])) {
+throw new API_Exception('A prior retrieval is in progress. Do not pass 
in dates to complete a retrieval');
+  }
+}
   }
 
   /**
@@ -69,16 +78,15 @@
* Get the timestamp to start from.
*
* @param array $params
-   * @param array $jobSettings
*
* @return string
*/
-  protected static function getStartTImestamp($params, $jobSettings) {
+  public function getStartTimestamp($params) {
 if (isset($params['start_date'])) {
   return strtotime($params['start_date']);
 }
-if (!empty($jobSettings['last_timestamp'])) {
-  return $jobSettings['last_timestamp'];
+if (!empty($this->jobSettings['last_timestamp'])) {
+  return $this->jobSettings['last_timestamp'];
 }
 return strtotime('450 days ago');
   }
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
index 24a7c36..32b5e4f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
@@ -37,15 +37,13 @@
 
 /** @var Omnimail\Silverpop\Requests\RawRecipientDataExportRequest 
$request */
 $request = Omnimail::create($params['mail_provider'], 
$mailerCredentials)->getRecipients();
+$request->setOffset($this->offset);
 
-$startTimestamp = self::getStartTimestamp($params, $this->jobSettings);
+$startTimestamp = $this->getStartTimestamp($params);
 $this->endTimeStamp =